Description
David Cook
2020-08-19 03:41:40 UTC
I will say the search terms being retained after a catalog search has been pretty unpopular among librarians. As a standard workflow might include scanning barcode after barcode. Stopping to clear the search out between each scan becomes quite time consuming. Created attachment 117408 [details] [review] Bug 26247: Make retaining search terms in staff client optional This patch adds a new system preference 'StaffRetainSearchTerms' - if enabled header searches will be retained on the results page as current behvaiour. If disabled the search box will be empty after searching To test: 1 - Search in staff client from header 2 - Confirm search terms are retained 3 - Apply patch, update database 4 - Search again, terms still retained 5 - Disable StaffRetainSearchTerms preference 6 - Search again 7 - Search box is cleared Created attachment 117409 [details] [review] Bug 26247: Consolidate search box code This cleans up the various search bar templates to use a single template for the 'Search the catalog box' To test: 1 - Apply patch 2 - Confirm the 'Search the catalog' appears and works from modules: Budgets Cataloging Circulation Currencies Contracts Home page Notices and slips Patrons Administration Serials Acquisitions -> suggestions Z3950 Admin Created attachment 117410 [details] [review] Bug 26247: Only copy header inputs if marked sticky This alters the 'keep_text' function to require 'head-searchbox' elements to be marked with class 'sticky' ti have values carry over There have been complaints about the stickiness of retained search terms, this patch attempts to mitigate that while preserving stickiness for other searches To test: 1 - Enable 'StaffRetainSearchTerms' (or don't apply previous patches) 2 - Search in staff client from header 3 - Search term is retained in the search box 4 - Click abother tab like 'checkin' 5 - Search term is copied to new tab 6 - Apply patch 7 - Reload the page 8 - Search in header 9 - Search term still retained 10 - Click on another header tab 11 - Search term is not copied Created attachment 117411 [details] [review] Bug 26247: Make search terms optionally sticky This patch adds a configurable option for retaining stickiness of search terms across search tabs To test: 1 - Apply all patches except this one, enable StaffRetainSearchTerms 2 - Search in staff client from header 3 - Confirm behaviour is that term is retained, but not copied when switching header search tab 4 - Apply this patch, updatedatabase 5 - Search again 6 - Previous behaviour is restored, search terms are sticky between tabs 7 - Disable preference StaffStickySearchTerms 8 - Search again 9 - Search terms retained, but not sticky Created attachment 117461 [details] [review] Bug 26247: Atomic update Created attachment 117535 [details] [review] Bug 26247: Make retaining search terms in staff client optional This patch adds a new system preference 'StaffRetainSearchTerms' - if enabled header searches will be retained on the results page as current behvaiour. If disabled the search box will be empty after searching To test: 1 - Search in staff client from header 2 - Confirm search terms are retained 3 - Apply patch, update database 4 - Search again, terms still retained 5 - Disable StaffRetainSearchTerms preference 6 - Search again 7 - Search box is cleared Signed-off-by: Sally <sally.healey@cheshiresharedservices.gov.uk> Created attachment 117536 [details] [review] Bug 26247: Consolidate search box code This cleans up the various search bar templates to use a single template for the 'Search the catalog box' To test: 1 - Apply patch 2 - Confirm the 'Search the catalog' appears and works from modules: Budgets Cataloging Circulation Currencies Contracts Home page Notices and slips Patrons Administration Serials Acquisitions -> suggestions Z3950 Admin Signed-off-by: Sally <sally.healey@cheshiresharedservices.gov.uk> Created attachment 117537 [details] [review] Bug 26247: Only copy header inputs if marked sticky This alters the 'keep_text' function to require 'head-searchbox' elements to be marked with class 'sticky' ti have values carry over There have been complaints about the stickiness of retained search terms, this patch attempts to mitigate that while preserving stickiness for other searches To test: 1 - Enable 'StaffRetainSearchTerms' (or don't apply previous patches) 2 - Search in staff client from header 3 - Search term is retained in the search box 4 - Click abother tab like 'checkin' 5 - Search term is copied to new tab 6 - Apply patch 7 - Reload the page 8 - Search in header 9 - Search term still retained 10 - Click on another header tab 11 - Search term is not copied Signed-off-by: Sally <sally.healey@cheshiresharedservices.gov.uk> Created attachment 117538 [details] [review] Bug 26247: Make search terms optionally sticky This patch adds a configurable option for retaining stickiness of search terms across search tabs To test: 1 - Apply all patches except this one, enable StaffRetainSearchTerms 2 - Search in staff client from header 3 - Confirm behaviour is that term is retained, but not copied when switching header search tab 4 - Apply this patch, updatedatabase 5 - Search again 6 - Previous behaviour is restored, search terms are sticky between tabs 7 - Disable preference StaffStickySearchTerms 8 - Search again 9 - Search terms retained, but not sticky Signed-off-by: Sally <sally.healey@cheshiresharedservices.gov.uk> Created attachment 117539 [details] [review] Bug 26247: Atomic update Signed-off-by: Sally <sally.healey@cheshiresharedservices.gov.uk> The functions all work as described - the two system preferences are: StaffRetainSearchTerms: Retain / Don't retain StaffStickySearchItems: Copy / Don't copy Settings: Retain + Copy Result: Current behaviour as on master Settings: Don't retain + Copy Result: Previous behaviour before Bug 19046 Settings: Retain + Don't Copy Settings: Don't retain + Don't copy Result: As stated Speaking as a user, I think this feature is an either/or scenario, which is a shame. The way I would like to use it might be impossible to code, but worth asking, I suppose! Users want search terms to persist for the following scenario: - search for 'Roald Dahl' - return 6000 results, realise you want to search for 'Roald Dahl BFG' - search isn't retained, so you have to write the whole term again - but if the search is retained, you just have to add 'BFG' to the end Users don't want the search terms copied across to other fields (i.e. check out), as described by Lucas. But if you set: Retain + Don't copy, although this is really close to what's needed, it re-introduces the problem that copying was designed to fix: - type a catalog search into the bar whilst you're on the wrong tab (e.g. check out) - realise and move tab to search the catalog - now the search is empty again so the term needs to be rewritten, although it persisted in the other tabs It feels to me that the problem is that copying should only go in one direction - from left to right on the screen, so content written in check out could be moved into search the catalog, but content written in search the catalog tabs can't be moved into check out This would give the following result: - librarian types search into check out box; librarian can change tab to search catalog and the term is retained - librarian searches the catalog and wants to modify the search; term is retained - librarian searches the catalog, tabs back to check out; term should disappear I realise it might be impossible, but as an end user, that feels like the ultimate goal. I've signed it off because the patches do work as described, and do bring back the old functionality. Created attachment 120353 [details] [review] Bug 26247: Make retaining search terms in staff client optional This patch adds a new system preference 'StaffRetainSearchTerms' - if enabled header searches will be retained on the results page as current behvaiour. If disabled the search box will be empty after searching To test: 1 - Search in staff client from header 2 - Confirm search terms are retained 3 - Apply patch, update database 4 - Search again, terms still retained 5 - Disable StaffRetainSearchTerms preference 6 - Search again 7 - Search box is cleared Signed-off-by: Sally <sally.healey@cheshiresharedservices.gov.uk> Created attachment 120354 [details] [review] Bug 26247: Consolidate search box code This cleans up the various search bar templates to use a single template for the 'Search the catalog box' To test: 1 - Apply patch 2 - Confirm the 'Search the catalog' appears and works from modules: Budgets Cataloging Circulation Currencies Contracts Home page Notices and slips Patrons Administration Serials Acquisitions -> suggestions Z3950 Admin Signed-off-by: Sally <sally.healey@cheshiresharedservices.gov.uk> Created attachment 120355 [details] [review] Bug 26247: Only copy header inputs if marked sticky This alters the 'keep_text' function to require 'head-searchbox' elements to be marked with class 'sticky' ti have values carry over There have been complaints about the stickiness of retained search terms, this patch attempts to mitigate that while preserving stickiness for other searches To test: 1 - Enable 'StaffRetainSearchTerms' (or don't apply previous patches) 2 - Search in staff client from header 3 - Search term is retained in the search box 4 - Click abother tab like 'checkin' 5 - Search term is copied to new tab 6 - Apply patch 7 - Reload the page 8 - Search in header 9 - Search term still retained 10 - Click on another header tab 11 - Search term is not copied Signed-off-by: Sally <sally.healey@cheshiresharedservices.gov.uk> Created attachment 120356 [details] [review] Bug 26247: Make search terms optionally sticky This patch adds a configurable option for retaining stickiness of search terms across search tabs To test: 1 - Apply all patches except this one, enable StaffRetainSearchTerms 2 - Search in staff client from header 3 - Confirm behaviour is that term is retained, but not copied when switching header search tab 4 - Apply this patch, updatedatabase 5 - Search again 6 - Previous behaviour is restored, search terms are sticky between tabs 7 - Disable preference StaffStickySearchTerms 8 - Search again 9 - Search terms retained, but not sticky Signed-off-by: Sally <sally.healey@cheshiresharedservices.gov.uk> Created attachment 120357 [details] [review] Bug 26247: Atomic update Signed-off-by: Sally <sally.healey@cheshiresharedservices.gov.uk> Created attachment 120358 [details] [review] Bug 26247: (QA follow-up) Fix tab chars Created attachment 120359 [details] [review] Bug 26247: (QA follow-up) Fix 0/1 and terminology in preferences Created attachment 120360 [details] [review] Bug 26247: (QA follow-up) Move prefs from Search > Results display to Search > Search form Hi Nick, I've done some small follow-ups and some testing: Tested with: copy & retain 1) Budgets /cgi-bin/koha/admin/aqbudgetperiods.pl When I add a search term to catalog search or checkout tab, it's not copied to the other tab. 2) Cataloging /cgi-bin/koha/cataloguing/addbooks.pl This seems to work ok. But only the catalog search retains the search term, cataloging seach does not. I think this is intentional, but would probably be a good addition? 3) Circulation 4) Currencies 5) Contracts 6) Home page 7 Notices and slips 8) Patrons 9) Administration 10) Serials When I enter an ISSN or Title in the first tab, it isn't copied to the other tabs. 11) Acquisitions -> suggestions 12) Z3950 Admin 13) Then I have set "don't copy" and "don't retain". But the only tab this seem to affect is the catalog search tab? If I enter a search term in "check out", it will still be copied to checkin, renew, search patrons. Only when switching to catalog search it will be emptied. This appears a bit of strange behaviour, if it's intentional, we should change the pref description. *** Bug 28401 has been marked as a duplicate of this bug. *** Hello, Is someone still working on this one? Indeed, the librarians from Lyon 3 university libraries complain about the retain of the barcode after the search.. Thanks Sonia As a quickfix, I propose this JavaScript that sets empty when entering the input : $(document).ready(function() { $("#header_search #catalog_search input[name='q']").focusin(function() { $(this).val(""); }); }); (In reply to Fridolin Somers from comment #24) > As a quickfix, I propose this JavaScript that sets empty when entering the > input : > > $(document).ready(function() { > $("#header_search #catalog_search input[name='q']").focusin(function() { > $(this).val(""); > }); > }); I've tried adding this to IntranetUserJS but the search term is not erased. This is in Koha 20.05.18. I've tried both Brave Browser and Firefox. The Firefox inspector shows that the code for the event is attached to the entry field, but for some reason the code doesn't seem to be running. My librarian is pretty upset about this problem. It interferes with our workflow for checking the status of a stack of books. Adding to above comment: I found that if I use the tab key to move focus away from the search box, then move the focus back to the search box by clicking in it, the entry is cleared. So the "focusin" event code is running, but not at the right time. I'm not familiar with jquery so any help with fixing this would be greatly appreciated. Hi, You can try empying directly after page loaded : $(document).ready(function() { $("#header_search #catalog_search input[name='q']").val(""); }); This needs a rebase since Bug 28356 As a really quick fix, you can remove term retaining in catalogue search box with : diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue-search-box.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue-search-box.inc index 134bf93..6323123 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue-search-box.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue-search-box.inc @@ -5,7 +5,7 @@ [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %] [% INCLUDE 'search_indexes.inc' %] [% END %] - <input type="text" name="q" id="search-form" size="40" value="[% ms_value | html %]" title="Enter the terms you wish to search for." class="query form-text head-searchbox" /> + <input type="text" name="q" id="search-form" size="40" title="Enter the terms you wish to search for." class="query form-text head-searchbox" /> <input type="submit" value="Submit" class="submit" /> </form> </div> I tried this fix in cat-search.inc (in 20.05), and in catalogue-search-box.inc (in 21.11) and it does not work. Other things I tried that did not work: 1. Disabling keep_text in staff-global.js. 2. Disabling the code in search.pl that inserts ms_value into the template. 3. The Javascript snippet mentioned above. It runs correctly, but then at some later point, the search box gets filled in again with the last search term. Do you test only with barcode scanner ? Or maybe it is a behavior of autocomplete from web browser itself. I did not test with a barcode scanner. I entered the barcodes manually. I tried it with three browsers: Firefox, Brave, and Chrome. It doesn't behave like an autocompletion issue. When I hit the Submit button, the Javascript snippet clears the entry field, then immediately after that something fills the entry field with the last search term. I did not move the cursor into the search field and start typing characters to get that barcode to appear; I simply hit the Submit button. *** Bug 27697 has been marked as a duplicate of this bug. *** Thank you for the reference to bug 23475. Disabling the new code in detail.tt fixed the problem for me. Created attachment 136683 [details] [review] Bug 26247: Adding two Sysprefs for Search Terms This patch adds two system preferences options : 'RetainCatalogSearchTerms' and 'RetainPatronsSearchTerms'. If enabled, search terms will be retained between searches made from, respectively, the Search Catalog header and the Checkout or Search Patrons headers. If disabled, the searchbars will clear out between page loads. To test: 1 - From the staff client, search some terms using the Check out header search bar. 2 - Confirm search terms are retained. 3 - Do Step 1-2 twice again, this time using the Search patrons and Search the catalog. 4 - Apply patch, update database. 5 - In the system preferences, look for RetainCatalogSearchTerms and set it to 'don't retain'. 6 - Use the checkout head search bar again, confirm that search terms aren't retained after page load. 7 - Do Step 5-6 once again, this time with the RetainPatronsSearchTerms and the Search Patrons and Search the catalog headers. 8 - Search boxes should be cleared. Thanks-to: Fridolin Somers and Nick Clemens for the bases I built on Patch no longer applies: Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 26247: Make retaining search terms in staff client optional Using index info to reconstruct a base tree... M catalogue/search.pl M installer/data/mysql/mandatory/sysprefs.sql M installer/data/mysql/updatedatabase.pl M koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref Auto-merging installer/data/mysql/updatedatabase.pl Auto-merging installer/data/mysql/mandatory/sysprefs.sql Auto-merging catalogue/search.pl Applying: Bug 26247: Consolidate search box code .git/rebase-apply/patch:170: trailing whitespace. </form> .git/rebase-apply/patch:217: trailing whitespace. </form> .git/rebase-apply/patch:242: trailing whitespace. </form> warning: 3 lines add whitespace errors. Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc M koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc M koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc M koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc M koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc M koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc M koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc M koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc M koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc M koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc M koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc M koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc M koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc .git/rebase-apply/patch:170: trailing whitespace. </form> .git/rebase-apply/patch:217: trailing whitespace. </form> .git/rebase-apply/patch:242: trailing whitespace. </form> warning: 3 lines add whitespace errors. Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc error: Failed to merge in the changes. Patch failed at 0001 Bug 26247: Consolidate search box code These are my draft testing notes (may need updating when the patch applies again and I can complete the tests): 1. In the staff interface, type "perl" in the "Search the catalog" input field and click "Submit" 2. Switch between the different areas in the search header from the catalog search results page and confirm that the search term is retained for: - Check out - Check in - Renew 3. Go back to the staff interface home page for each of the following, and enter and submit appropriate information in the other input fields in the search header: - Search patrons, for example: 'a': search term retained when there is more than one search result - Search patrons, for example: 'Mary': search term cleared when there is only one result, and you select it from the autocomple and go to the patron's details page - Check out - same as for search patrons: search term retained if there is a search results page, not retained if select specific person, cleared once specific person selected from search results - Check in - enter a barcode: not retained (cleared) - Renew - enter a barcode: not retained (cleared) 4. Apply the patches (git bz apply 26247), update the database (updatedatabase), flush_memcached, restart_all, and clear your browser cache (or open the staff interface in a new private or incognito window) 5. In the system preferences, go to Searching > Search form and review the two new system preferences: . RetainCatalogSearchTerms . RetainPatronsSearchTerms 6. Review the text for the system preferences and make sure they make sense. 7. Test the retain and don't retain settings for each system preference and the various combinations, they should work as expected (see also step 3): - RetainCatalogSearchTerms (don't retain) and RetainPatronsSearchTerms (don't retain) - RetainCatalogSearchTerms (retain) and RetainPatronsSearchTerms (retain) - RetainCatalogSearchTerms (don't retain) and RetainPatronsSearchTerms (retain) - RetainCatalogSearchTerms (retain) and RetainPatronsSearchTerms (don't retain) 8. Confirm the "Search the catalog" appears and works as expected from modules: - Budgets - Cataloging - Circulation - Currencies - Contracts - Home page - Notices and slips - Patrons - Administration - Serials - Acquisitions -> suggestions - Z3950 Admin 9. Signoff! I think the text for the two new system preferences needs updating after the last patch (Adding two Sysprefs for Search Terms), similar to Katrin's QA follow-up - Fix 0/1 and terminology in preferences patch (staff client to staff interface): - RetainCatalogSearchTerms: When searching from search the catalog in the staff interface header, [don't retain|retain] search terms between searches. - RetainPatronsSearchTerms: When searching from check out or search patrons in the staff interface header, [don't retain|retain] search terms between searches. Simpler could be: [don't retain|retain] search terms between searches when searching from .... in the staff interface header. Not sure about the 0/1 settings... Also, whether they should be under Searching > Search form (like Katrin's patch) or split over circulation and searching system preference areas. Created attachment 136767 [details] [review] Bug 26247: [ALTERNATE] Adding 2 Sysprefs for Search Terms This patch adds two system preferences options : 'RetainCatalogSearchTerms' and 'RetainPatronsSearchTerms'. If enabled, search terms will be retained between searches made from, respectively, the Search Catalog header and the Checkout or Search Patrons headers. If disabled, the searchbars will clear out between page loads. Attention, this is an alternate solution from the previous patches, ONLY apply this patch when testing and not the previous ones.Changed the syspref wording as well. To test: 1 - From the staff client, search some terms using the Check out header search bar. 2 - Confirm search terms are retained. 3 - Do Step 1-2 twice again, this time using the Search patrons and Search the catalog. 4 - Apply patch (again, only this one), update database. 5 - In the system preferences, look for RetainCatalogSearchTerms and set it to 'don't retain'. 6 - Use the checkout head search bar again, confirm that search terms aren't retained after page load. 7 - Do Step 5-6 once again, this time with the RetainPatronsSearchTerms and the Search Patrons and Search the catalog headers. 8 - Search boxes should be cleared. Thanks-to: Fridolin Somers and Nick Clemens for the bases I built on. Signed-off-by: Florian Bontemps <florian.bontemps@biblibre.com> This should work now as a standalone patch, do not apply the previous ones when testing my proposed solution, as this does not build on what was proposed first. Also rephrased the system preferences texts according to David's suggestion. Created attachment 137310 [details] [review] Bug 26247: [ALTERNATE] Adding 2 Sysprefs for Search Terms This patch adds two system preferences options : 'RetainCatalogSearchTerms' and 'RetainPatronsSearchTerms'. If enabled, search terms will be retained between searches made from, respectively, the Search Catalog header and the Checkout or Search Patrons headers. If disabled, the searchbars will clear out between page loads. Attention, this is an alternate solution from the previous patches, ONLY apply this patch when testing and not the previous ones.Changed the syspref wording as well. To test: 1 - From the staff client, search some terms using the Check out header search bar. 2 - Confirm search terms are retained. 3 - Do Step 1-2 twice again, this time using the Search patrons and Search the catalog. 4 - Apply patch (again, only this one), update database. 5 - In the system preferences, look for RetainCatalogSearchTerms and set it to 'don't retain'. 6 - Use the checkout head search bar again, confirm that search terms aren't retained after page load. 7 - Do Step 5-6 once again, this time with the RetainPatronsSearchTerms and the Search Patrons and Search the catalog headers. 8 - Search boxes should be cleared. Thanks-to: Fridolin Somers and Nick Clemens for the bases I built on. Signed-off-by: Florian Bontemps <florian.bontemps@biblibre.com> Signed-off-by: David Nind <david@davidnind.com> (In reply to Florian from comment #40) > Also rephrased the system preferences texts according to David's suggestion. Thanks! I have retested as per the test plan and updated the text for the release notes (as the 'Consolidate search box code' is not included. I would like to see 'Consolidate the search code' patch picked up as it seemed like an nice tidy up - maybe a separate bug? I'll leave that for the QA team to decide or comment on. (In reply to David Nind from comment #42) > I would like to see 'Consolidate the search code' patch picked up as it > seemed like an nice tidy up - maybe a separate bug? Bug 28356 (In reply to Nick Clemens from comment #43) > (In reply to David Nind from comment #42) > > I would like to see 'Consolidate the search code' patch picked up as it > > seemed like an nice tidy up - maybe a separate bug? > > Bug 28356 Thanks Nick! Created attachment 138478 [details] [review] Bug 26247: [ALTERNATE] Adding 2 Sysprefs for Search Terms This patch adds two system preferences options : 'RetainCatalogSearchTerms' and 'RetainPatronsSearchTerms'. If enabled, search terms will be retained between searches made from, respectively, the Search Catalog header and the Checkout or Search Patrons headers. If disabled, the searchbars will clear out between page loads. Attention, this is an alternate solution from the previous patches, ONLY apply this patch when testing and not the previous ones.Changed the syspref wording as well. To test: 1 - From the staff client, search some terms using the Check out header search bar. 2 - Confirm search terms are retained. 3 - Do Step 1-2 twice again, this time using the Search patrons and Search the catalog. 4 - Apply patch (again, only this one), update database. 5 - In the system preferences, look for RetainCatalogSearchTerms and set it to 'don't retain'. 6 - Use the checkout head search bar again, confirm that search terms aren't retained after page load. 7 - Do Step 5-6 once again, this time with the RetainPatronsSearchTerms and the Search Patrons and Search the catalog headers. 8 - Search boxes should be cleared. Thanks-to: Fridolin Somers and Nick Clemens for the bases I built on. Signed-off-by: Florian Bontemps <florian.bontemps@biblibre.com> Signed-off-by: David Nind <david@davidnind.com> Created attachment 140473 [details] [review] Bug 26247: Adding 2 Sysprefs for Search Terms This patch adds two system preferences options : 'RetainCatalogSearchTerms' and 'RetainPatronsSearchTerms'. If enabled, search terms will be retained between searches made from, respectively, the Search Catalog header and the Checkout or Search Patrons headers. If disabled, the searchbars will clear out between page loads. Attention, this is an alternate solution from the previous patches, ONLY apply this patch when testing and not the previous ones.Changed the syspref wording as well. To test: 1 - From the staff client, search some terms using the Check out header search bar. 2 - Confirm search terms are retained. 3 - Do Step 1-2 twice again, this time using the Search patrons and Search the catalog. 4 - Apply patch (again, only this one), update database. 5 - In the system preferences, look for RetainCatalogSearchTerms and set it to 'don't retain'. 6 - Use the checkout head search bar again, confirm that search terms aren't retained after page load. 7 - Do Step 5-6 once again, this time with the RetainPatronsSearchTerms and the Search Patrons and Search the catalog headers. 8 - Search boxes should be cleared. Thanks-to: Fridolin Somers and Nick Clemens for the bases I built on. Signed-off-by: Florian Bontemps <florian.bontemps@biblibre.com> Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 140474 [details] [review] Bug 26247: (QA follow-up) Merge DB Updates Great work, Passing QA Pushed to master for 22.11. Nice work everyone, thanks! Please clean atomicupdate folder Can we close ? |