gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 34561: (QA follow-up) Rename to StaffReportsHome to match othe html customizations 

I noticed the rest of the html customizations don't have html in the option name, so I renamed for consistency.

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit c1a1b85c87)
Signed-off-by: Paul Derscheid <paul.derscheid@lmscloud.de>
This commit is contained in:
Lisette Scheer 2025-06-25 15:11:00 +00:00 committed by Paul Derscheid
parent b1be1478ec
commit b77389b396
No known key found for this signature in database
GPG Key ID: C25F9FD44CED595B
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
installer/data/mysql/atomicupdate/bug-34561-move-StaffReportsHomeHTML-to-additional-contents.pl
View File

@ -8,28 +8,28 @@ return {
my ( $dbh, $out ) = @$args{qw(dbh out)};
# Get any existing value from the IntranetReportsHomeHTML system preference
my ($staffreportshomehtml) = $dbh->selectrow_array(
my ($staffreportshome) = $dbh->selectrow_array(
q|
SELECT value FROM systempreferences WHERE variable='IntranetReportsHomeHTML';
|
);
if ($staffreportshomehtml) {
if ($staffreportshome) {
$dbh->do(
"INSERT INTO additional_contents ( category, code, location, branchcode, published_on ) VALUES ('html_customizations', 'StaffReportsHomeHTML', 'StaffReportsHomeHTML', NULL, CAST(NOW() AS date) )"
"INSERT INTO additional_contents ( category, code, location, branchcode, published_on ) VALUES ('html_customizations', 'StaffReportsHome', 'StaffReportsHome', NULL, CAST(NOW() AS date) )"
);
my ($insert_id) = $dbh->selectrow_array(
"SELECT id FROM additional_contents WHERE category = 'html_customizations' AND code = 'StaffReportsHomeHTML' AND location = 'StaffReportsHomeHTML' LIMIT 1",
"SELECT id FROM additional_contents WHERE category = 'html_customizations' AND code = 'StaffReportsHome' AND location = 'StaffReportsHome' LIMIT 1",
{}
);
$dbh->do(
"INSERT INTO additional_contents_localizations ( additional_content_id, title, content, lang ) VALUES ( ?, 'StaffReportsHomeHTML default', ?, 'default' )",
undef, $insert_id, $staffreportshomehtml
"INSERT INTO additional_contents_localizations ( additional_content_id, title, content, lang ) VALUES ( ?, 'StaffReportsHome default', ?, 'default' )",
undef, $insert_id, $staffreportshome
);
say $out "Added 'StaffReportsHomeHTML' HTML customization";
say $out "Added 'StaffReportsHome' HTML customization";
}
# Remove old system preference

2
koha-tmpl/intranet-tmpl/prog/en/includes/html-customization-help.inc
View File

@ -16,7 +16,7 @@
<div id="IntranetmainUserblock_notes" class="hint customization_note"> Include this content in its own section on the main page of the staff interface </div>
<div id="StaffReportsHomeHTML_notes" class="hint customization_note"> Include this content in its own section on the reports home page</div>
<div id="StaffReportsHome_notes" class="hint customization_note"> Include this content in its own section on the reports home page</div>
<div id="opaccredits_notes" class="hint customization_note"> Include this content in the footer of all pages in the OPAC. </div>

12
koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt
View File

@ -128,24 +128,24 @@
</div>
<!-- /.row -->
[% SET StaffReportsHomeHTML = AdditionalContents.get( location => "StaffReportsHomeHTML", lang => lang, library => Branches.GetLoggedInBranchcode || default_branch ) %]
[% SET StaffReportsHome = AdditionalContents.get( location => "StaffReportsHome", lang => lang, library => Branches.GetLoggedInBranchcode || default_branch ) %]
[% IF ( StaffReportsHomeHTML.content && StaffReportsHomeHTML.content.count > 0 ) %]
[% IF ( StaffReportsHome.content && StaffReportsHome.content.count > 0 ) %]
<div class="row">
<div class="col-sm-12">
<div id="[% StaffReportsHomeHTML.location | html %]">
[% FOREACH n IN StaffReportsHomeHTML.content %]
<div id="[% StaffReportsHome.location | html %]">
[% FOREACH n IN StaffReportsHome.content %]
<div class="[% n.lang | html %]_item">
<div class="[% n.lang | html %]_body">[% n.content | $raw %]</div>
</div>
[% END %]
</div>
<!-- /#StaffReportsHomeHTML -->
<!-- /#StaffReportsHome -->
</div>
<!-- /.col-sm-12 -->
</div>
<!-- /.row -->
[% END # /IF StaffReportsHomeHTML %]
[% END # /IF StaffReportsHome %]
</div>
</div>
</div>

2
koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt
View File

@ -542,7 +542,7 @@
[% END %]
[% END %]
</optgroup>
[% SET staff_available_options = [ 'IntranetmainUserblock', 'StaffReportsHomeHTML', 'RoutingListNote', 'StaffAcquisitionsHome', 'StaffAuthoritiesHome', 'StaffCataloguingHome', 'StaffListsHome', 'StaffLoginInstructions', 'StaffPatronsHome', 'StaffPOSHome', 'StaffSerialsHome' ] %]
[% SET staff_available_options = [ 'IntranetmainUserblock', 'StaffReportsHome', 'RoutingListNote', 'StaffAcquisitionsHome', 'StaffAuthoritiesHome', 'StaffCataloguingHome', 'StaffListsHome', 'StaffLoginInstructions', 'StaffPatronsHome', 'StaffPOSHome', 'StaffSerialsHome' ] %]
<optgroup label="Staff interface">
[% FOREACH l IN staff_available_options.sort %]
[% IF l == location %]