From 88a2079a48867680af02eb92007eae4c95fe1fb0 Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Sun, 19 Feb 2012 09:37:14 +0100 Subject: [PATCH] Bug 7523: Improve checks for routing permissions - system preference RoutingSerials and user permission routing should be taken into account - print routing list should be independent from routing permission To test, compare to master and check: 1) If system preference RoutingSerials is OFF, routing list functionality is not visible in the templates. 2) If system preference RoutingSerials is ON, but user doesn't have routing permission, routing list functionality is not visible in templates, with exception of 'print list' on the serial collection page. 3) If system preference RoutingSerials is ON and user has routing permissions, all routing links are visible (serial collection, serials navigation, result list of serial search) Additional changes: Changed labels on templates to match HTML4 rule from coding guidelines. http://wiki.koha-community.org/wiki/Coding_Guidelines#Upper_and_Lower_cases_in_strings Signed-off-by: Julian Maurice Signed-off-by: Paul Poulain --- .../prog/en/includes/serials-menu.inc | 14 ++++----- .../en/modules/serials/routing-preview.tt | 4 +-- .../en/modules/serials/serials-collection.tt | 30 +++++++++++-------- .../prog/en/modules/serials/serials-edit.tt | 10 +++---- .../prog/en/modules/serials/serials-home.tt | 28 ++++++++--------- serials/routing-preview.pl | 4 +-- serials/serials-collection.pl | 1 + serials/subscription-detail.pl | 1 + 8 files changed, 49 insertions(+), 43 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc index b54c84249f..0feafda757 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc @@ -1,13 +1,13 @@ [% IF ( subscriptionid ) %] [% END %] @@ -16,6 +16,6 @@
  • Claims
    • [% END %] [% IF ( CAN_user_serials_check_expiration ) %] -
  • Check Expiration
    • +
  • Check expiration
    • [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt index 2cc1936b22..b48e9022bb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt @@ -24,14 +24,14 @@ function print_slip(subscriptionid,issue){
    -

    Preview Routing List for [% title |html %]

    +

    Preview routing list for [% title |html %]

    1. Issue:[% issue %]
      2. -
    2. List Member: +
    3. List member:
      4. [% FOREACH memberloo IN memberloop %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt index 7b8efefecb..1db30c1617 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt @@ -64,7 +64,7 @@ $(document).ready(function() { [% UNLESS ( popup ) %] [% INCLUDE 'serials-toolbar.inc' %] -

      Serial Collection information for [% bibliotitle %] +

      Serial collection information for [% bibliotitle %] [% IF location %] ([% location %] ) [% END %] [% IF ( callnumber ) %]callnumber: [% callnumber %][% END %]

      [% END %] @@ -72,18 +72,18 @@ $(document).ready(function() { [% IF ( subscriptions ) %]
      Name
      [% memberloo.surname %], [% memberloo.firstname %]
      [% IF ( subscriptions.size == 1 ) %] - + [% ELSE %] - + [% END %] - + - + [% IF ( routing && CAN_user_serials_routing ) %][% END %] [% FOREACH subscription IN subscriptions %] @@ -146,10 +146,14 @@ $(document).ready(function() { [% END %] - - + [% IF ( routing && CAN_user_serials_routing ) %] + + [% END %] [% IF ( subscription.abouttoexpire ) %] [% ELSE %] [% IF ( subscription.subscriptionexpired ) %] @@ -199,9 +203,7 @@ $(document).ready(function() { - - + [% IF ( routing ) %][% END %] [% IF ( CAN_user_serials_receive_serials ) %][% END %] [% FOREACH serial IN year.serials %] @@ -227,9 +229,11 @@ $(document).ready(function() { - + [% IF ( routing ) %] + + [% END %] [% IF ( CAN_user_serials_receive_serials ) %] - [% IF ( routing ) %] + [% IF ( routing && CAN_user_serials_routing ) %] [% END %] @@ -99,7 +99,7 @@ Serials updated : - + [% IF ( routing && CAN_user_serials_routing ) %][% END %] @@ -120,20 +120,20 @@ Serials updated : [% IF ( subscription.branchcode ) %][% subscription.branchcode %][% END %] [% IF ( subscription.callnumber ) %]([% subscription.callnumber %])[% END %] - [% IF ( routing ) %] + [% IF ( routing && CAN_user_serials_routing ) %] [% END %] -
      Subscription Summary Subscription summary Subscription Summaries Subscription summaries
      Subscription Num. Subscription num. Frequency Numbering pattern Library Call number NotesRoutingRoutingRenew
      [% subscription.branchcode %] [% subscription.callnumber %] [% subscription.notes %] [% IF ( subscription.subscriptionexpired ) %]
      Subscription Expired +       		[% subscription.notes %] [% IF ( subscription.subscriptionexpired ) %]
      Subscription expired [% END %]       		Edit Routing List + Edit routing list + Renew Renew Branch Routing - RoutingEdit
      [% serial.branchcode %] - Print list - + Print list + [% IF ( serial.cannotedit ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt index f82f791d65..083580b03b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt @@ -431,12 +431,12 @@ $(document).ready(function() { [% INCLUDE 'serials-menu.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt index ec1faf31c2..bb0f9d381e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt @@ -84,9 +84,9 @@ Serials updated : Title Notes - Library (Callnumber) + Library (callnumber) Routing list 
      - [% IF ( subscription.cannotedit ) %] -   - [% ELSE %] - [% IF ( subscription.routingedit ) %] - Edit - [% ELSE %] - New - [% END %] - [% END %] + [% IF ( subscription.cannotedit ) %] +   + [% ELSE %] + [% IF ( subscription.routingedit ) %] + Edit + [% ELSE %] + New + [% END %] + [% END %] Issue History + Issue history [% IF ( subscription.cannotedit ) %] diff --git a/serials/routing-preview.pl b/serials/routing-preview.pl index 6746f53938..6c8f184146 100755 --- a/serials/routing-preview.pl +++ b/serials/routing-preview.pl @@ -99,7 +99,7 @@ if($ok){ query => $query, type => "intranet", authnotrequired => 0, - flagsrequired => {serials => 'routing'}, + flagsrequired => {serials => '*'}, debug => 1, }); $template->param("libraryname"=>$branchname); @@ -109,7 +109,7 @@ if($ok){ query => $query, type => "intranet", authnotrequired => 0, - flagsrequired => {serials => 'routing'}, + flagsrequired => {serials => '*'}, debug => 1, }); } diff --git a/serials/serials-collection.pl b/serials/serials-collection.pl index 4fe55f0fcd..7453e86210 100755 --- a/serials/serials-collection.pl +++ b/serials/serials-collection.pl @@ -158,6 +158,7 @@ $template->param( bibliotitle => $title, suggestion => C4::Context->preference("suggestion"), virtualshelves => C4::Context->preference("virtualshelves"), + routing => C4::Context->preference("RoutingSerials"), subscr=>$query->param('subscriptionid'), subscriptioncount => $subscriptioncount, location => $locationlib, diff --git a/serials/subscription-detail.pl b/serials/subscription-detail.pl index 0b6d35afa4..afe633e645 100755 --- a/serials/subscription-detail.pl +++ b/serials/subscription-detail.pl @@ -124,6 +124,7 @@ $template->param( subscriptionid => $subscriptionid, serialslist => \@serialslist, hasRouting => $hasRouting, + routing => C4::Context->preference("RoutingSerials"), totalissues => $totalissues, hemisphere => $hemisphere, cannotedit =>(C4::Context->preference('IndependantBranches') && -- 2.39.5