Koha-community/Koha
15
7
Fork 0
Code Issues Releases Wiki Activity

Bug 36083: Fix HTML additional contents for the logged in branchcode

Browse source 
This patch updates the calls to AdditionalContents.get() to use
Branches.GetLoggedInBranchcode instead of the logged in users
homebranch for the library parameter.

To test:
1. In Tools > HTML Customizations
2. Choose to create an entry in StaffAcquisitionsHome
3. Assign it to a specific library
   It's helpful to test with libraries other than Centerville
4. Add text and publication date (important or it will never display)
5. Save
6. Go to the Acquisitions Home page - logged into that library, no text displays.
7. Apply patch and refresh browser
8. Notice the library specifc content displays
9. Notice content created for all libraries still displays too
10. Test HTML content for specific libraries works on all 8 pages
    IntranetmainUserBlock
    Staff AcquisitionsHome
    StaffAuthoritiesHome
    StaffCataloguing Home
    StaffListsHome
    StaffPatronsHome
    StaffPOSHome
    StaffSerialsHome

Signed-off-by: Sam Lau <samalau@gmail.com>
Signed-off-by: Laura_Escamilla <laura.escamilla@bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
This commit is contained in:
Brendan Lawlor 2024-08-22 16:39:55 +00:00 committed by Martin Renvoize
parent 56091d9660
commit ae61b031ae
Signed by: martin.renvoize
GPG key ID: 422B469130441A0F
8 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt
View file

@ -201,7 +201,7 @@
</div><!-- /.page-section -->
[% END %]
[%- SET StaffAcquisitionsHome = AdditionalContents.get( location => "StaffAcquisitionsHome", lang => lang, library => logged_in_user.branchcode ) -%]
[%- SET StaffAcquisitionsHome = AdditionalContents.get( location => "StaffAcquisitionsHome", lang => lang, library => Branches.GetLoggedInBranchcode ) -%]
[%- FOREACH block IN StaffAcquisitionsHome.content -%]
<div class="page-section">
[%- block.content | $raw -%]

2
koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tt
View file

@ -34,7 +34,7 @@
<div id="merge_in_progress" class="page-section bg-info" style="display:none;"></div>
[%- SET StaffAuthoritiesHome = AdditionalContents.get( location => "StaffAuthoritiesHome", lang => lang, library => logged_in_user.branchcode ) -%]
[%- SET StaffAuthoritiesHome = AdditionalContents.get( location => "StaffAuthoritiesHome", lang => lang, library => Branches.GetLoggedInBranchcode ) -%]
[%- FOREACH block IN StaffAuthoritiesHome.content -%]
<div class="page-section">
[%- block.content | $raw -%]

2
koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/cataloging-home.tt
View file

@ -219,7 +219,7 @@
</div>
</div>
[%- SET StaffCataloguingHome = AdditionalContents.get( location => "StaffCataloguingHome", lang => lang, library => logged_in_user.branchcode ) -%]
[%- SET StaffCataloguingHome = AdditionalContents.get( location => "StaffCataloguingHome", lang => lang, library => Branches.GetLoggedInBranchcode ) -%]
[%- FOREACH block IN StaffCataloguingHome.content -%]
<div class="page-section">
[%- block.content | $raw -%]

2
koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
View file

@ -276,7 +276,7 @@
</div> <!-- /.col-sm-12 -->
</div> <!-- /.row -->
[% SET IntranetmainUserblock = AdditionalContents.get( location => "IntranetmainUserblock", lang => lang, library => logged_in_user.branchcode || default_branch ) %]
[% SET IntranetmainUserblock = AdditionalContents.get( location => "IntranetmainUserblock", lang => lang, library => Branches.GetLoggedInBranchcode || default_branch ) %]
[% IF ( IntranetmainUserblock.content && IntranetmainUserblock.content.count > 0 ) %]
<div class="row">

2
koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
View file

@ -120,7 +120,7 @@
</form>
[% END %]
[%- SET StaffPatronsHome = AdditionalContents.get( location => "StaffPatronsHome", lang => lang, library => logged_in_user.branchcode ) -%]
[%- SET StaffPatronsHome = AdditionalContents.get( location => "StaffPatronsHome", lang => lang, library => Branches.GetLoggedInBranchcode ) -%]
[%- FOREACH block IN StaffPatronsHome.content -%]
<div class="page-section">
[%- block.content | $raw -%]

2
koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt
View file

@ -168,7 +168,7 @@
</form>
[% END %]
[%- SET StaffPOSHome = AdditionalContents.get( location => "StaffPOSHome", lang => lang, library => logged_in_user.branchcode ) -%]
[%- SET StaffPOSHome = AdditionalContents.get( location => "StaffPOSHome", lang => lang, library => Branches.GetLoggedInBranchcode ) -%]
[%- FOREACH block IN StaffPOSHome.content -%]
<div class="page-section">
[%- block.content | $raw -%]

2
koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt
View file

@ -37,7 +37,7 @@
[% INCLUDE 'serials-advsearch.inc' %]
[%- SET StaffSerialsHome = AdditionalContents.get( location => "StaffSerialsHome", lang => lang, library => logged_in_user.branchcode ) -%]
[%- SET StaffSerialsHome = AdditionalContents.get( location => "StaffSerialsHome", lang => lang, library => Branches.GetLoggedInBranchcode ) -%]
[%- FOREACH block IN StaffSerialsHome.content -%]
<div class="page-section">
[%- block.content | $raw -%]

2
koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
View file

@ -547,7 +547,7 @@
[% END # /WRAPPER tab_panels %]
[% END # /WRAPPER tabs %]
[%- SET StaffListsHome = AdditionalContents.get( location => "StaffListsHome", lang => lang, library => logged_in_user.branchcode ) -%]
[%- SET StaffListsHome = AdditionalContents.get( location => "StaffListsHome", lang => lang, library => Branches.GetLoggedInBranchcode ) -%]
[%- FOREACH block IN StaffListsHome.content -%]
<div class="page-section">
[%- block.content | $raw -%]