As noted on bug 37446 the test on DisplayLibraryFacets is wrong in installer/data/mysql/db_revs/231200036.pl We need to deal with the facet_order instead of the label of the facet.
Created attachment 171656 [details] [review] Bug 37953: (bug 35138 follow-up) Fix DisplayLibraryFacets - facet order Before bug 35138: DisplayLibraryFacets had priority over the settings in the mappings page. If you had DisplayLibraryFacets set to "holding library" (only) then only the holding library facet was displayed. On 231200036 we were not adjusting the facet order/appearance, but the label, which was wrong. The label must be adjusted for both facets and the order depending on DisplayLibraryFacets. Note that bug 37446 is adding a new db rev to adjust the label for installations that have been updated already. Test plan: 0. checkout c120975b783 (the commit right before 35138 has been pushed) 1. reset_all 2. holding library is set in DisplayLibraryFacets by default 3. checkout main (so without this patch) 4. updatedatabase => ES search result display both facets 5. Repeat 0,1,2 and checkout main + this patch, updatedatabase => ES search result display only the holding library facet Feel free to try with another value in DisplayLibraryFacets
Created attachment 171716 [details] [review] Bug 37953: (bug 35138 follow-up) Fix DisplayLibraryFacets - facet order Before bug 35138: DisplayLibraryFacets had priority over the settings in the mappings page. If you had DisplayLibraryFacets set to "holding library" (only) then only the holding library facet was displayed. On 231200036 we were not adjusting the facet order/appearance, but the label, which was wrong. The label must be adjusted for both facets and the order depending on DisplayLibraryFacets. Note that bug 37446 is adding a new db rev to adjust the label for installations that have been updated already. Test plan: 0. checkout c120975b783 (the commit right before 35138 has been pushed) 1. reset_all 2. holding library is set in DisplayLibraryFacets by default 3. checkout main (so without this patch) 4. updatedatabase => ES search result display both facets 5. Repeat 0,1,2 and checkout main + this patch, updatedatabase => ES search result display only the holding library facet Feel free to try with another value in DisplayLibraryFacets Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
I cheated and tested with: perl -e 'use C4::Installer; my $db= C4::Installer::run_db_rev( "installer/data/mysql/db_revs/231200036.pl" ); warn Data::Dumper::Dumper($db->{output})' I added both homelibrary and holdinglibrary facets back in after each test. Tested with all settings of DisplayLibraryFacets For libraries who have already upgraded, they will get both facets, but this will prevent issues for libraries who have not yet upgraded. Small patch, moving to PQA for RM/RMaint testing
Pushed for 24.11! Well done everyone, thank you!