Bugzilla – Attachment 69132 Details for
Bug 19621
Routing lists tab not present when viewing 'Holds history' tab for a patron
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 19621 - Use preference check on template side to display/not display Routing lists tab
Bug-19621---Use-preference-check-on-template-side-.patch (text/plain), 10.31 KB, created by
Nick Clemens
on 2017-11-13 17:21:00 UTC
(
hide
)
Description:
Bug 19621 - Use preference check on template side to display/not display Routing lists tab
Filename:
MIME Type:
Creator:
Nick Clemens
Created:
2017-11-13 17:21:00 UTC
Size:
10.31 KB
patch
obsolete
>From 94cfba694253477120a572934a59613fe4a8a2e2 Mon Sep 17 00:00:00 2001 >From: Nick Clemens <nick@bywatersolutions.com> >Date: Mon, 13 Nov 2017 17:18:44 +0000 >Subject: [PATCH] Bug 19621 - Use preference check on template side to > display/not display Routing lists tab > >Currently we pass a param to control display - the param is a just a >check of syspref so can be done directly form template > >To test: >1 - Enable RoutingSerials syspref >2 - Open a patron record >3 - Click through the tabs on the left side of the screen >4 - Note that 'Routing lists' is visible on all screens except 'Holds >history' >5 - Apply patch >6 - 'Routing lists' should now be visible in all tabs. >--- > koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc | 2 +- > members/boraccount.pl | 1 - > members/deletemem.pl | 1 - > members/files.pl | 1 - > members/mancredit.pl | 1 - > members/maninvoice.pl | 1 - > members/member-flags.pl | 1 - > members/member-password.pl | 1 - > members/moremember.pl | 1 - > members/notices.pl | 1 - > members/pay.pl | 1 - > members/paycollect.pl | 1 - > members/purchase-suggestions.pl | 1 - > members/readingrec.pl | 1 - > members/routing-lists.pl | 1 - > members/statistics.pl | 1 - > tools/viewlog.pl | 1 - > 17 files changed, 1 insertion(+), 17 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc >index de75551..7a419bd 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc >@@ -81,7 +81,7 @@ > [% IF ( finesview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrowernumber %]">Fines</a></li> > [% END %] > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] >- [% IF ( RoutingSerials ) %][% IF ( routinglistview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/routing-lists.pl?borrowernumber=[% borrowernumber %]">Routing lists</a></li>[% END %] >+ [% IF Koha.Preference("RoutingSerials") %][% IF ( routinglistview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/routing-lists.pl?borrowernumber=[% borrowernumber %]">Routing lists</a></li>[% END %] > [% END %] > [% IF ( CAN_user_borrowers ) %] > [% IF ( intranetreadinghistory ) %] >diff --git a/members/boraccount.pl b/members/boraccount.pl >index e7d769e..ac7cee2 100755 >--- a/members/boraccount.pl >+++ b/members/boraccount.pl >@@ -117,7 +117,6 @@ $template->param( > is_child => ($patron->category->category_type eq 'C'), > reverse_col => $reverse_col, > accounts => $accts, >- RoutingSerials => C4::Context->preference('RoutingSerials'), > ); > > output_html_with_http_headers $input, $cookie, $template->output; >diff --git a/members/deletemem.pl b/members/deletemem.pl >index 4cbb4d6..ea12ae6 100755 >--- a/members/deletemem.pl >+++ b/members/deletemem.pl >@@ -132,7 +132,6 @@ if ( $op eq 'delete_confirm' or $countissues > 0 or $flags->{'CHARGES'} or $is_ > phone => $patron->phone, > email => $patron->email, > branchcode => $patron->branchcode, >- RoutingSerials => C4::Context->preference('RoutingSerials'), > ); > if ($countissues >0) { > $template->param(ItemsOnIssues => $countissues); >diff --git a/members/files.pl b/members/files.pl >index 8cc25a9..069182d 100755 >--- a/members/files.pl >+++ b/members/files.pl >@@ -109,7 +109,6 @@ else { > > $template->param( > categoryname => $patron_category->description, >- RoutingSerials => C4::Context->preference('RoutingSerials'), > ); > > if (C4::Context->preference('ExtendedPatronAttributes')) { >diff --git a/members/mancredit.pl b/members/mancredit.pl >index 5a93e95..7534b83 100755 >--- a/members/mancredit.pl >+++ b/members/mancredit.pl >@@ -101,7 +101,6 @@ if ($add){ > borrowernumber => $borrowernumber, > categoryname => $patron->category->description, > is_child => ($patron->category->category_type eq 'C'), # FIXME is_child should be a Koha::Patron method >- RoutingSerials => C4::Context->preference('RoutingSerials'), > ); > output_html_with_http_headers $input, $cookie, $template->output; > } >diff --git a/members/maninvoice.pl b/members/maninvoice.pl >index bd24a10..44d2b18 100755 >--- a/members/maninvoice.pl >+++ b/members/maninvoice.pl >@@ -127,7 +127,6 @@ if ($add){ > borrowernumber => $borrowernumber, > categoryname => $patron->category->description, > is_child => ($patron->category->category_type eq 'C'), >- RoutingSerials => C4::Context->preference('RoutingSerials'), > ); > output_html_with_http_headers $input, $cookie, $template->output; > } >diff --git a/members/member-flags.pl b/members/member-flags.pl >index 158074a..27e020c 100755 >--- a/members/member-flags.pl >+++ b/members/member-flags.pl >@@ -219,7 +219,6 @@ $template->param( > branchcode => $bor->{'branchcode'}, > loop => \@loop, > is_child => ( $category_type eq 'C' ), >- RoutingSerials => C4::Context->preference('RoutingSerials'), > csrf_token => > Koha::Token->new->generate_csrf( { session_id => scalar $input->cookie('CGISESSID'), } ), > ); >diff --git a/members/member-password.pl b/members/member-password.pl >index c458ae8..db51b17 100755 >--- a/members/member-password.pl >+++ b/members/member-password.pl >@@ -145,7 +145,6 @@ $template->param( > userid => $bor->{'userid'}, > destination => $destination, > is_child => ( $category_type eq 'C' ), >- RoutingSerials => C4::Context->preference('RoutingSerials'), > csrf_token => Koha::Token->new->generate_csrf({ session_id => scalar $input->cookie('CGISESSID'), }), > ); > >diff --git a/members/moremember.pl b/members/moremember.pl >index 2a54cbe..27185ef 100755 >--- a/members/moremember.pl >+++ b/members/moremember.pl >@@ -357,7 +357,6 @@ $template->param( > quickslip => $quickslip, > housebound_role => scalar $patron->housebound_role, > privacy_guarantor_checkouts => $data->{'privacy_guarantor_checkouts'}, >- RoutingSerials => C4::Context->preference('RoutingSerials'), > PatronsPerPage => C4::Context->preference("PatronsPerPage") || 20, > relatives_issues_count => $relatives_issues_count, > relatives_borrowernumbers => \@relatives, >diff --git a/members/notices.pl b/members/notices.pl >index 9f0ab11..7129f18 100755 >--- a/members/notices.pl >+++ b/members/notices.pl >@@ -82,7 +82,6 @@ $template->param( > borrowernumber => $borrowernumber, > sentnotices => 1, > categoryname => $patron->category->description, >- RoutingSerials => C4::Context->preference('RoutingSerials'), > ); > output_html_with_http_headers $input, $cookie, $template->output; > >diff --git a/members/pay.pl b/members/pay.pl >index 70e45e2..84f1fa0 100755 >--- a/members/pay.pl >+++ b/members/pay.pl >@@ -123,7 +123,6 @@ for (@names) { > > $template->param( > finesview => 1, >- RoutingSerials => C4::Context->preference('RoutingSerials'), > ); > > add_accounts_to_template(); >diff --git a/members/paycollect.pl b/members/paycollect.pl >index 9ec3077..6b09090 100755 >--- a/members/paycollect.pl >+++ b/members/paycollect.pl >@@ -188,7 +188,6 @@ $template->param( > borrower => $borrower, > categoryname => $borrower->{description}, > total => $total_due, >- RoutingSerials => C4::Context->preference('RoutingSerials'), > ExtendedPatronAttributes => C4::Context->preference('ExtendedPatronAttributes'), > > csrf_token => Koha::Token->new->generate_csrf({ session_id => scalar $input->cookie('CGISESSID') }), >diff --git a/members/purchase-suggestions.pl b/members/purchase-suggestions.pl >index 5acc3cc..f6df07d 100755 >--- a/members/purchase-suggestions.pl >+++ b/members/purchase-suggestions.pl >@@ -57,7 +57,6 @@ foreach my $key ( keys %$data ) { > $template->param( > suggestionsview => 1, > categoryname => $data->{'description'}, >- RoutingSerials => C4::Context->preference('RoutingSerials'), > ); > > if (C4::Context->preference('ExtendedPatronAttributes')) { >diff --git a/members/readingrec.pl b/members/readingrec.pl >index ba5e174..7fe990d 100755 >--- a/members/readingrec.pl >+++ b/members/readingrec.pl >@@ -131,7 +131,6 @@ $template->param( > categoryname => $data->{description}, > is_child => ( $data->{category_type} eq 'C' ), > loop_reading => $issues, >- RoutingSerials => C4::Context->preference('RoutingSerials'), > ); > output_html_with_http_headers $input, $cookie, $template->output; > >diff --git a/members/routing-lists.pl b/members/routing-lists.pl >index b03be94..be9a863 100755 >--- a/members/routing-lists.pl >+++ b/members/routing-lists.pl >@@ -91,7 +91,6 @@ $template->param( > borrowernumber => $borrowernumber, > branch => $branch, > categoryname => $patron_info->{description}, >- RoutingSerials => C4::Context->preference('RoutingSerials'), > ); > > if (C4::Context->preference('ExtendedPatronAttributes')) { >diff --git a/members/statistics.pl b/members/statistics.pl >index 07019d3..ffed672 100755 >--- a/members/statistics.pl >+++ b/members/statistics.pl >@@ -107,7 +107,6 @@ $template->param( > count_total_issues_returned => $count_total_issues_returned, > count_total_precedent_state => $count_total_precedent_state, > count_total_actual_state => $count_total_actual_state, >- RoutingSerials => C4::Context->preference('RoutingSerials'), > ); > > output_html_with_http_headers $input, $cookie, $template->output; >diff --git a/tools/viewlog.pl b/tools/viewlog.pl >index 00469ba..0b11aac 100755 >--- a/tools/viewlog.pl >+++ b/tools/viewlog.pl >@@ -95,7 +95,6 @@ if ( $src eq 'circ' ) { > menu => 1, > borrowernumber => $borrowernumber, > categoryname => $patron->category->description, >- RoutingSerials => C4::Context->preference('RoutingSerials'), > ); > } > >-- >2.1.4
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 19621
:
69132
|
69171
|
70091