|
Description
Nick Clemens (kidclamp)
2021-09-20 11:19:23 UTC
Created attachment 125054 [details] [review] Bug 29058: Add 'Always show holds' checkbox to request.pl This patch adds a new cookie 'awalys_show_holds' and utlises it on request.pl to determine if the existing holds table should be loaded. If the cookie does not exist, the table is loaded to preserve exiting behaviour. If the cookie exists and is set to 'DONT' a new button 'Show holds' is added to the page to allow force loading the table To test: 1 - Place some holds on a record 2 - Click 'Holds' tab or 'Place a hold' from details page 3 - Note search box to place hold and table of existing holds 4 - Apply patch 5 - Reload the holds page and note new checkbox 'Always show holds' 6 - Confirm the box is checked 7 - Uncheck it 8 - Reload the page and confirm holds do not automatically load 9 - Click the new 'Show holds' button 10 - Confirm the existing holds load, and that 'Always show holds' is unchecked 11 - Check 'Always show holds' 12 - Reload page and confirm holds don't show 13 - Uncheck the box, load holds for another record, confirm it remains unchecked 14 - Bring up browser console (F12) 15 - In 'Storage' tab, under 'Cookies', delete the cookie for 'always_show_holds' 16 - Reload holds page, confirm holds load and check box is checked Created attachment 125062 [details] [review] Bug 29058: Add 'Always show holds' checkbox to request.pl This patch adds a new cookie 'awalys_show_holds' and utlises it on request.pl to determine if the existing holds table should be loaded. If the cookie does not exist, the table is loaded to preserve exiting behaviour. If the cookie exists and is set to 'DONT' a new button 'Show holds' is added to the page to allow force loading the table To test: 1 - Place some holds on a record 2 - Click 'Holds' tab or 'Place a hold' from details page 3 - Note search box to place hold and table of existing holds 4 - Apply patch 5 - Reload the holds page and note new checkbox 'Always show holds' 6 - Confirm the box is checked 7 - Uncheck it 8 - Reload the page and confirm holds do not automatically load 9 - Click the new 'Show holds' button 10 - Confirm the existing holds load, and that 'Always show holds' is unchecked 11 - Check 'Always show holds' 12 - Reload page and confirm holds don't show 13 - Uncheck the box, load holds for another record, confirm it remains unchecked 14 - Bring up browser console (F12) 15 - In 'Storage' tab, under 'Cookies', delete the cookie for 'always_show_holds' 16 - Reload holds page, confirm holds load and check box is checked Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com> Created attachment 125091 [details] [review] Bug 29058: (follow-up) Add hold count and don't display show options if no holds Sorry, another one that doesn't apply any more :(. Created attachment 125487 [details] [review] Bug 29058: Add 'Always show holds' checkbox to request.pl This patch adds a new cookie 'awalys_show_holds' and utlises it on request.pl to determine if the existing holds table should be loaded. If the cookie does not exist, the table is loaded to preserve exiting behaviour. If the cookie exists and is set to 'DONT' a new button 'Show holds' is added to the page to allow force loading the table To test: 1 - Place some holds on a record 2 - Click 'Holds' tab or 'Place a hold' from details page 3 - Note search box to place hold and table of existing holds 4 - Apply patch 5 - Reload the holds page and note new checkbox 'Always show holds' 6 - Confirm the box is checked 7 - Uncheck it 8 - Reload the page and confirm holds do not automatically load 9 - Click the new 'Show holds' button 10 - Confirm the existing holds load, and that 'Always show holds' is unchecked 11 - Check 'Always show holds' 12 - Reload page and confirm holds don't show 13 - Uncheck the box, load holds for another record, confirm it remains unchecked 14 - Bring up browser console (F12) 15 - In 'Storage' tab, under 'Cookies', delete the cookie for 'always_show_holds' 16 - Reload holds page, confirm holds load and check box is checked Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com> Created attachment 125488 [details] [review] Bug 29058: (follow-up) Add hold count and don't display show options if no holds Can you please rebase? Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 29058: Add 'Always show holds' checkbox to request.pl Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt M reserve/request.pl Falling back to patching base and 3-way merge... Auto-merging reserve/request.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt error: Failed to merge in the changes. Patch failed at 0001 Bug 29058: Add 'Always show holds' checkbox to request.pl The copy of the patch that failed is found in: .git/rebase-apply/patch When you have resolved this problem run "git bz apply --continue". If you would prefer to skip this patch, instead run "git bz apply --skip". To restore the original branch and stop patching run "git bz apply --abort". Patch left in /tmp/Bug-29058-Add-Always-show-holds-checkbox-to-reques-gBYoJH.patch Created attachment 126995 [details] [review] Bug 29058: (follow-up) Add hold count and don't display show options if no holds There is still something odd with the patches here. When I started, there was only the follow-up patch, I reactivated the main patch, but I get a conflict on applying: Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 29058: Add 'Always show holds' checkbox to request.pl Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt M reserve/request.pl Falling back to patching base and 3-way merge... Auto-merging reserve/request.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt error: Failed to merge in the changes. Patch failed at 0001 Bug 29058: Add 'Always show holds' checkbox to request.pl The copy of the patch that failed is found in: .git/rebase-apply/patch When you have resolved this problem run "git bz apply --continue". If you would prefer to skip this patch, instead run "git bz apply --skip". To restore the original branch and stop patching run "git bz apply --abort". Patch left in /tmp/Bug-29058-Add-Always-show-holds-checkbox-to-reques-BjIBIP.patch Created attachment 129924 [details] [review] Bug 29058: Add 'Always show holds' checkbox to request.pl This patch adds a new cookie 'awalys_show_holds' and utlises it on request.pl to determine if the existing holds table should be loaded. If the cookie does not exist, the table is loaded to preserve exiting behaviour. If the cookie exists and is set to 'DONT' a new button 'Show holds' is added to the page to allow force loading the table To test: 1 - Place some holds on a record 2 - Click 'Holds' tab or 'Place a hold' from details page 3 - Note search box to place hold and table of existing holds 4 - Apply patch 5 - Reload the holds page and note new checkbox 'Always show holds' 6 - Confirm the box is checked 7 - Uncheck it 8 - Reload the page and confirm holds do not automatically load 9 - Click the new 'Show holds' button 10 - Confirm the existing holds load, and that 'Always show holds' is unchecked 11 - Check 'Always show holds' 12 - Reload page and confirm holds don't show 13 - Uncheck the box, load holds for another record, confirm it remains unchecked 14 - Bring up browser console (F12) 15 - In 'Storage' tab, under 'Cookies', delete the cookie for 'always_show_holds' 16 - Reload holds page, confirm holds load and check box is checked Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com> Bug 29058: (follow-up) Add hold count and don't display show options if no holds Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Created attachment 129925 [details] [review] Bug 29058: Don't display 'Show holds' button if holds are displayed Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Created attachment 129930 [details] [review] Bug 29058: Don't display 'Always show holds' at the bottom of the patron list The checkbox should not appear if we are selecting a patron Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Created attachment 129931 [details] [review] Bug 29058: Add missing filters Created attachment 129932 [details] [review] Bug 29058: Don't display 'Show holds' button if holds are displayed Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Created attachment 129933 [details] [review] Bug 29058: Don't display 'Always show holds' at the bottom of the patron list The checkbox should not appear if we are selecting a patron Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> QA scripts will show : FAIL koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt FAIL spelling DONT' ==> DON'T False alert It is not a displayed text it is the value of cookie 'always_show_holds' Pushed to master for 22.05, thanks to everybody involved [U+1F984] We are missing the update to the wiki here, but I am not seeing/finding the information about duration etc. right now: https://wiki.koha-community.org/wiki/Use_of_Cookies This documentation is important for libraries dealing with GDPR. |