Description
Kyle M Hall
2014-10-06 13:43:28 UTC
Created attachment 32012 [details] [review] Bug 13030 - Show waiting hold expiration date for waiting holds on circulation.pl We should show the date a waiting hold is set to expire for each hold in the list of waiting holds in circulation.pl Test Plan: 1) Apply this patch 2) Find a waiting hold for a patron, browser to circulation.pl for that patron 3) Set system preference ReservesMaxPickUpDelay to 5 4) Refresh circulation.pl, note the waiting holds now display a "waiting until" part with the waiting date plus 5 days 5) Set system preference ReservesMaxPickUpDelay to 0 ( or empty string ) 6) Refresh circulation.pl, note the waiting hols no longer have a "waiting until" line. Created attachment 32070 [details] [review] Bug 13030 - Show waiting hold expiration date for waiting holds on circulation.pl We should show the date a waiting hold is set to expire for each hold in the list of waiting holds in circulation.pl Test Plan: 1) Apply this patch 2) Find a waiting hold for a patron, browser to circulation.pl for that patron 3) Set system preference ReservesMaxPickUpDelay to 5 4) Refresh circulation.pl, note the waiting holds now display a "waiting until" part with the waiting date plus 5 days 5) Set system preference ReservesMaxPickUpDelay to 0 ( or empty string ) 6) Refresh circulation.pl, note the waiting hols no longer have a "waiting until" line. I'm unable to apply this patch to my devel Git repository, with a very strange error message: fatal: sha1 information is lacking or useless (Koha/Hold.pm). (In reply to Frédéric Demians from comment #3) > fatal: sha1 information is lacking or useless (Koha/Hold.pm). This usually means you didn't apply a dependent patch first. Created attachment 32935 [details] [review] [SIGNED-OFF] Bug 13030 - Show waiting hold expiration date for waiting holds on circulation.pl We should show the date a waiting hold is set to expire for each hold in the list of waiting holds in circulation.pl Test Plan: 1) Apply this patch 2) Find a waiting hold for a patron, browser to circulation.pl for that patron 3) Set system preference ReservesMaxPickUpDelay to 5 4) Refresh circulation.pl, note the waiting holds now display a "waiting until" part with the waiting date plus 5 days 5) Set system preference ReservesMaxPickUpDelay to 0 ( or empty string ) 6) Refresh circulation.pl, note the waiting hols no longer have a "waiting until" line. Signed-off-by: Owen Leonard <oleonard@myacpl.org> Followed test plan successfully. Automated tests successful. Needs 12892 and 13019. Since 12892 was rewritten to not depend on 13019, this bug is no longer blocked Patch won't apply - is it possible it relies on code from one of the other solutions for the waiting holds bug? (In reply to Chris Cormack from comment #7) > Since 12892 was rewritten to not depend on 13019, this bug is no longer > blocked I'm afraid instead of removing the block, it's broken the patch entirely! I'll have to fix it up. This patch is blocked for QA by bug 13851, please reintroduce it in the QA queue when it will be ready. We need to get bug 13851 signed off first in order to continue here. Created attachment 40027 [details] [review] Bug 13030 - Show waiting hold expiration date for waiting holds on circulation.pl We should show the date a waiting hold is set to expire for each hold in the list of waiting holds in circulation.pl Test Plan: 1) Apply this patch 2) Find a waiting hold for a patron, browser to circulation.pl for that patron 3) Set system preference ReservesMaxPickUpDelay to 5 4) Refresh circulation.pl, note the waiting holds now display a "waiting until" part with the waiting date plus 5 days 5) Set system preference ReservesMaxPickUpDelay to 0 ( or empty string ) 6) Refresh circulation.pl, note the waiting hols no longer have a "waiting until" line. Signed-off-by: Owen Leonard <oleonard@myacpl.org> Followed test plan successfully. Automated tests successful. Created attachment 40038 [details] [review] [SIGNED-OFF] Bug 13030 - Show waiting hold expiration date for waiting holds on circulation.pl We should show the date a waiting hold is set to expire for each hold in the list of waiting holds in circulation.pl Test Plan: 1) Apply this patch 2) Find a waiting hold for a patron, browser to circulation.pl for that patron 3) Set system preference ReservesMaxPickUpDelay to 5 4) Refresh circulation.pl, note the waiting holds now display a "waiting until" part with the waiting date plus 5 days 5) Set system preference ReservesMaxPickUpDelay to 0 ( or empty string ) 6) Refresh circulation.pl, note the waiting hols no longer have a "waiting until" line. Signed-off-by: Owen Leonard <oleonard@myacpl.org> Followed test plan successfully. Automated tests successful. Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Cathi Wiggins <CWIGGINS@ci.arcadia.ca.us> Signed-off-by: Megan Wianecki <mwianecki@mplmain.mtpl.org> Do the tests pass for you? I get the following errors: t/Hold.t .. 2/5 DBIx::Class::Storage::DBI::_warn_undetermined_driver(): This version of DBIC does not yet seem to supply a driver for your particular RDBMS and/or connection method ('Mock'). While we will attempt to continue anyway, the results are likely to be underwhelming. Please upgrade DBIC, and if this message does not go away, file a bugreport including the following info: { DBD => "DBD::Mock", DBD_VER => "1.45", DBIC_DRIVER => "DBIx::Class::Storage::DBI", DBIC_DSN => sub { package Koha::Database; use warnings; use strict; use feature 'say', 'state', 'switch', 'unicode_strings'; 'C4::Context'->dbh; }, DBIC_VER => "0.082810", DBI_VER => "1.631" } DBIx::Class::Storage::DBI::sql_maker(): Your storage class (DBIx::Class::Storage::DBI) does not set sql_limit_dialect and you have not supplied an explicit limit_dialect in your connection_info. DBIC will attempt to use the GenericSubQ dialect, which works on most databases but can be (and often is) painfully slow. Please file an RT ticket against 'DBIx::Class::Storage::DBI' at Koha/Objects.pm line 85 Created attachment 40411 [details] [review] Bug 13030 [QA Followup] - Fix unit testsBug 13030 [QA Followup] - Fix unit tests Created attachment 40412 [details] [review] Bug 13030 [QA Followup] - Fix unit tests Comment on attachment 40038 [details] [review] [SIGNED-OFF] Bug 13030 - Show waiting hold expiration date for waiting holds on circulation.pl Review of attachment 40038 [details] [review]: ----------------------------------------------------------------- ::: koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ +775,4 @@ > > <br/> > [% IF ( w.branch.branchcode == Branches.GetLoggedInBranchcode() ) %]<strong class="waitinghere">[% ELSE %]<strong>[% END %] > + Waiting at [% w.branch.branchname | html %] [% IF w.waiting_expires_on %] until [% w.waiting_expires_on | $KohaDates %] [% END %] Sorry, I didn't see that before: there are 2 calls to the waiting_expires_on method. It is easy to make only 1 call. Created attachment 40414 [details] [review] Bug 13030 - Show waiting hold expiration date for waiting holds on circulation.pl We should show the date a waiting hold is set to expire for each hold in the list of waiting holds in circulation.pl Test Plan: 1) Apply this patch 2) Find a waiting hold for a patron, browser to circulation.pl for that patron 3) Set system preference ReservesMaxPickUpDelay to 5 4) Refresh circulation.pl, note the waiting holds now display a "waiting until" part with the waiting date plus 5 days 5) Set system preference ReservesMaxPickUpDelay to 0 ( or empty string ) 6) Refresh circulation.pl, note the waiting hols no longer have a "waiting until" line. Signed-off-by: Owen Leonard <oleonard@myacpl.org> Followed test plan successfully. Automated tests successful. Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Cathi Wiggins <CWIGGINS@ci.arcadia.ca.us> Signed-off-by: Megan Wianecki <mwianecki@mplmain.mtpl.org> Bug 13030 [QA Followup] - Fix unit tests Signed-off-by: Jonathan Druart <jonathan.druart@koha-community.org> Created attachment 40415 [details] [review] Bug 13030: Remove the unnecessary double call Signed-off-by: Jonathan Druart <jonathan.druart@koha-community.org> I have squashed the 2 patches to avoid the add/del of a file in the same patch set. Patches pushed to master. Thanks Kyle! |