Bugzilla – Attachment 171411 Details for
Bug 37883
Add a filter for staff search results to filter by library
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 37883: Minor fix-ups and perltidy
Bug-37883-Minor-fix-ups-and-perltidy.patch (text/plain), 3.98 KB, created by
Brendan Lawlor
on 2024-09-12 14:42:27 UTC
(
hide
)
Description:
Bug 37883: Minor fix-ups and perltidy
Filename:
MIME Type:
Creator:
Brendan Lawlor
Created:
2024-09-12 14:42:27 UTC
Size:
3.98 KB
patch
obsolete
>From fdc1866f4bd359bd806cbd9a1574bf1146849fd5 Mon Sep 17 00:00:00 2001 >From: Lucas Gass <lucas@bywatersolutions.com> >Date: Tue, 10 Sep 2024 20:32:53 +0000 >Subject: [PATCH] Bug 37883: Minor fix-ups and perltidy > >Signed-off-by: Brendan Lawlor <blawlor@clamsnet.org> >--- > installer/data/mysql/atomicupdate/bug_37883.pl | 6 ++++-- > .../intranet-tmpl/prog/en/modules/catalogue/results.tt | 8 ++++---- > 2 files changed, 8 insertions(+), 6 deletions(-) > >diff --git a/installer/data/mysql/atomicupdate/bug_37883.pl b/installer/data/mysql/atomicupdate/bug_37883.pl >index cc9d07e4bd..ba14a6b278 100755 >--- a/installer/data/mysql/atomicupdate/bug_37883.pl >+++ b/installer/data/mysql/atomicupdate/bug_37883.pl >@@ -9,10 +9,12 @@ return { > my ( $dbh, $out ) = @$args{qw(dbh out)}; > > # Do you stuffs here >- $dbh->do(q{ >+ $dbh->do( >+ q{ > INSERT IGNORE INTO systempreferences (`variable`,`value`,`options`,`explanation`,`type`) > VALUES ('FilterSearchResultsByLoggedInBranch','0','','Option to filter location column on staff search results by logged in branch','YesNo') >- }); >+ } >+ ); > > say $out "Added new system preference 'FilterSearchResultsByLoggedInBranch'"; > }, >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >index 1203a0ab7c..e5600ae6f6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >@@ -627,15 +627,15 @@ > [% IF status_count == "onloancount" %] > [% IF SEARCH_RESULT.${status_count} > 0 %] > <div class="results_checkedout all">[% SEARCH_RESULT.${status_count} | html %] checked out:</div> >- [% IF Koha.Preference('FilterSearchResultsByLoggedInBranch') %] >+ [% IF ( SEARCH_RESULT.branchonloancount > 0 ) && Koha.Preference('FilterSearchResultsByLoggedInBranch') %] > <div class="results_checkedout branch_specific">[% SEARCH_RESULT.branchonloancount | html %] checked out:</div> > [% END %] > [% END %] > [% ELSIF status_count == "othercount" %] > [% IF SEARCH_RESULT.${status_count} > 0 %] >- <div class="results_unavailablei all">[% SEARCH_RESULT.${status_count} | html %] unavailable:</div> >- [% IF Koha.Preference('FilterSearchResultsByLoggedInBranch') %] >- <div class="results_unavailablei branch_specific">[% SEARCH_RESULT.branchothercount | html %] unavailable:</div> >+ <div class="results_unavailable all">[% SEARCH_RESULT.${status_count} | html %] unavailable:</div> >+ [% IF ( SEARCH_RESULT.branchothercount > 0 ) && Koha.Preference('FilterSearchResultsByLoggedInBranch') %] >+ <div class="results_unavailable branch_specific">[% SEARCH_RESULT.branchothercount | html %] unavailable:</div> > [% END %] > [% END %] > [% END %] >-- >2.39.2
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 37883
:
171256
|
171257
|
171261
|
171286
|
171287
|
171289
|
171291
|
171406
|
171407
|
171408
|
171409
|
171410
| 171411 |
176697
|
177306