When you have single branch mode on, there is no need to display the branch name on every line of results.
Currently we only use this syspref on the staff detail.tt page. koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt: <td class="location">[% UNLESS ( singlebranchmode ) %][% itemloo.branchname %] [% END %]</td> This bug would extend this functionality to the opac
Hmm actually opac-results.tt is respecting the systempreference already
Yep, its just the xslt pages for the opac not obeying the syspref, will fix now
Created attachment 11367 [details] [review] Bug 6886 - OPAC XSLT respecting single branch mode This is only for the MARC21 XSLT at this stage, follow up patch for UNIMARC will come Conflicts: C4/XSLT.pm koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
Created attachment 11369 [details] [review] Bug 6886 - Follow up for UNIMARC
Created attachment 11370 [details] [review] Bug 6886 Follow up for NORMARC
Please test NORMAC and UNIMARC thoroughly
Created attachment 11501 [details] [review] [SIGNED-OFF] Bug 6886 - OPAC XSLT respecting single branch mode This is only for the MARC21 XSLT at this stage, follow up patch for UNIMARC will come Conflicts: C4/XSLT.pm koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Created attachment 11502 [details] [review] [SIGNED-OFF] Bug 6886 - Follow up for UNIMARC Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Created attachment 11504 [details] [review] [SIGNED-OFF] Bug 6886 Follow up for NORMARC Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Tested the 3 XSLT on master with singleBranchMode ON, branches are displayed. Tested the 3 XSLT with the patch with singleBranchMode ON, branches are not displayed Tested with singleBranchMode OFF, with and without the patch, display doesn't change. Ok.
QA Comment: Looks good to me. Passed QA
Patch pushed to master
Pushed to 3.8.x will be in 3.8.5
Does this patch only work for available items? After applying the patch, we're seeing that the 'not for loan' items still show the branch name, but the 'available' items don't. I don't think we really need to see the branch name on ANY of the items when single branch mode is on. Before the patch, we had the branch name showing on all items in the search results. After the patch, we have the branch name showing only on not for loan items. It seems confusing to see it on some items and not on others. Can we make it hide the branch name regardless of status?
Created attachment 14434 [details] [review] Bug 6886 - Single branch mode should disable showing the branch name in front of all callnumbers - Followup - Copies available for reference
Created attachment 15065 [details] [review] [SIGNED-OFF] Bug 6886 - Single branch mode should disable showing the branch name in front of all callnumbers Followup - Copies available for reference Test plan: Enable singleBranchMode and OPACXSLTResultsDisplay. Perform a search in the OPAC which returns results containing not-for-loan items. Before the patch these items will show their library in search results loan items. After the patch there will be not be a library listed, matching other items in results. Signed-off-by: Owen Leonard <oleonard@myacpl.org> Works according to the test plan I invented.
Patch does not apply. Caused by bug 5079 which removes the "Copies available for reference" block.
Created attachment 16028 [details] [review] Bug 6886 - Single branch mode should disable showing the branch name in front of all callnumbers Followup - Copies available for reference Test plan: Enable singleBranchMode and OPACXSLTResultsDisplay. Perform a search in the OPAC which returns results containing not-for-loan items. Before the patch these items will show their library in search results loan items. After the patch there will be not be a library listed, matching other items in results.
tested on sandbox, seems to work.
Patch tested with a sandbox, by Broust <jean-manuel.broust@univ-lyon2.fr>
Created attachment 16385 [details] [review] Bug 9744 - Add a column Fund name on the home page of acquisitions This patch offers an alternative option to fix Bug 9744. In this version the table of funds swaps positions with the suggestions block so that the table has the whole width of the screen. This eliminates the need to adjust its float property. Other changes: - Simplification of the column and row-hiding JavaScript - The addition of an "Active" column to be shown when all funds are shown (this helps indicate to the user which rows were hidden) - Linking the fund owner to their patron record - Linking the fund id, given the correct permissions, to the view of all funds for that budget (the best alternative to linking to a view of the fund details, which we do not have). - Correcting permission level required to add a budget To test, view the acquisitions home page. The layout should feel comfortable. The table of available funds thsould show the fund name. The checkbox to show all funds should work correctly. Signed-off-by: caroline very-mathieu <caroline.very-mathieu@nimes-ville.fr> Signed-off-by: Broust <jean-manuel.broust@univ-lyon2.fr>
This patch already exists on master. This last one is for 3.6 branch. This patch cannot be tested on a sandbox.
Created attachment 16391 [details] [review] Bug 6886 - Single branch mode should disable showing the branch name in front of all callnumbers Followup - Copies available for reference Test plan: Enable singleBranchMode and OPACXSLTResultsDisplay. Perform a search in the OPAC which returns results containing not-for-loan items. Before the patch these items will show their library in search results loan items. After the patch there will be not be a library listed, matching other items in results. Signed-off-by jmbroust <jean-manuel.broust@univ-lyon2.fr>
(In reply to comment #23) > This patch already exists on master. This last one is for 3.6 branch. This > patch cannot be tested on a sandbox. Forget that, it is for master!
Why using a choose when an if would do? + <xsl:choose> + <xsl:when test="$singleBranchMode=0"> + <xsl:value-of select="items:homebranch"/> + </xsl:when> + </xsl:choose>
This can't be tested as on current master reference items (itemtype = not for loan) are no longer shown in the result list. I reported bug 9995 for that.
Created attachment 17289 [details] [review] Bug 6886 - Single branch mode should disable showing the branch name in front of all callnumbers Followup - Copies available for reference Test plan: Enable singleBranchMode and OPACXSLTResultsDisplay. Perform a search in the OPAC which returns results containing not-for-loan items. Before the patch these items will show their library in search results loan items. After the patch there will be not be a library listed, matching other items in results. Signed-off-by jmbroust <jean-manuel.broust@univ-lyon2.fr>
What does the status of 'BLOCKED' mean?
BLOCKED was added to help testers to notice dependencies. Like this bug couldn't be tested before 9995 was fixed.
This works, but I am a bit torn on the <choose> constructs: + <xsl:choose> + <xsl:when test="$singleBranchMode=0"> + <xsl:value-of select="items:homebranch"/> + </xsl:when> + </xsl:choose> This could be: <xsl:if test="$singleBranchMode=0"> <xsl:value-of select="items:homebranch"/> </xsl:if>
Kyle, could you please take a look at my comment please? I am still torn if this is a fail, but it just doesn't look right to me :)
I was just replicating what other parts of the xslt was already doing. If you think the if is better ( which I imagine it is ) that's fine by me. Would you like to add a qa followup, or shall I? (In reply to Katrin Fischer from comment #31) > This works, but I am a bit torn on the <choose> constructs: > > + <xsl:choose> > + <xsl:when test="$singleBranchMode=0"> > + <xsl:value-of select="items:homebranch"/> > + </xsl:when> > + </xsl:choose> > > This could be: > > <xsl:if test="$singleBranchMode=0"> > <xsl:value-of select="items:homebranch"/> > </xsl:if>
Hi Kyle, please change the patch yourself, so I can test it.
Created attachment 23304 [details] [review] Bug 6886 - Single branch mode should disable showing the branch name in front of all callnumbers - QA Followup
Here's is the QA followup! (In reply to Katrin Fischer from comment #34) > Hi Kyle, please change the patch yourself, so I can test it.
Created attachment 23745 [details] [review] [PASSED QA] Bug 6886 - Single branch mode should disable showing the branch name in front of all callnumbers Followup - Copies available for reference Test plan: Enable singleBranchMode and OPACXSLTResultsDisplay. Perform a search in the OPAC which returns results containing not-for-loan items. Before the patch these items will show their library in search results loan items. After the patch there will be not be a library listed, matching other items in results. Signed-off-by jmbroust <jean-manuel.broust@univ-lyon2.fr> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Comments on second patch.
Created attachment 23746 [details] [review] [PASSED QA] Bug 6886 - Single branch mode should disable showing the branch name in front of all callnumbers - QA Followup Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Passes all tests and QA script. Switching SingleBranchMode: Tested with MARC21 and UNIMARC: - "Don't allow" - branch is not shown in result list - "Allow" - branch is shown for available items in result list Changes are consistent over all 3 MARC flavours.
Pushed to master, along with a follow-up that removes a redundant check on singleBranchMode. Thanks, Kyle! This patch does not update the XSLT for the Bootstrap theme, but I think that can be relegated to bug 11310.
3 new patches pushed to 3.14.x, will be in 3.14.4.