MT 1816: Granular permissions for the serials module

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>

diff --git a/installer/data/mysql/en/mandatory/userpermissions.sql b/installer/data/mysql/en/mandatory/userpermissions.sql
index 29b3b05..5fea3a8 100644 (file)
--- a/installer/data/mysql/en/mandatory/userpermissions.sql
+++ b/installer/data/mysql/en/mandatory/userpermissions.sql
@@ -15,5 +15,13 @@ INSERT INTO permissions (module_bit, code, description) VALUES
    (13, 'import_patrons', 'Import patron data'),
    (13, 'delete_anonymize_patrons', 'Delete old borrowers and anonymize circulation history (deletes borrower reading history)'),
    (13, 'batch_upload_patron_images', 'Upload patron images in batch or one at a time'),
-   (13, 'schedule_tasks', 'Schedule tasks to run')
+   (13, 'schedule_tasks', 'Schedule tasks to run'),
+   (15, 'check_expiration', 'Check the expiration of a serial'),
+   (15, 'claim_serials', 'Claim missing serials'),
+   (15, 'create_subscription', 'Create a new subscription'),
+   (15, 'delete_subscription', 'Delete an existing subscription'),
+   (15, 'edit_subscription', 'Edit an existing subscription'),
+   (15, 'receive_serials', 'Serials receiving'),
+   (15, 'renew_subscription', 'Renew a subscription'),
+   (15, 'routing', 'Routing')
 ;

diff --git a/installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql b/installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql
index 29b3b05..5fea3a8 100644 (file)
--- a/installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql
+++ b/installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql
@@ -15,5 +15,13 @@ INSERT INTO permissions (module_bit, code, description) VALUES
    (13, 'import_patrons', 'Import patron data'),
    (13, 'delete_anonymize_patrons', 'Delete old borrowers and anonymize circulation history (deletes borrower reading history)'),
    (13, 'batch_upload_patron_images', 'Upload patron images in batch or one at a time'),
-   (13, 'schedule_tasks', 'Schedule tasks to run')
+   (13, 'schedule_tasks', 'Schedule tasks to run'),
+   (15, 'check_expiration', 'Check the expiration of a serial'),
+   (15, 'claim_serials', 'Claim missing serials'),
+   (15, 'create_subscription', 'Create a new subscription'),
+   (15, 'delete_subscription', 'Delete an existing subscription'),
+   (15, 'edit_subscription', 'Edit an existing subscription'),
+   (15, 'receive_serials', 'Serials receiving'),
+   (15, 'renew_subscription', 'Renew a subscription'),
+   (15, 'routing', 'Routing')
 ;

diff --git a/installer/data/mysql/updatedatabase30.pl b/installer/data/mysql/updatedatabase30.pl
index 0e0ea3a..6bd1de5 100644 (file)
--- a/installer/data/mysql/updatedatabase30.pl
+++ b/installer/data/mysql/updatedatabase30.pl
@@ -567,6 +567,21 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
              ");
     SetVersion ($DBversion);
 }
+$DBversion = "3.00.04.017";
+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+    $dbh->do("
+       INSERT INTO `permissions` (`module_bit`, `code`, `description`) VALUES
+       (15, 'check_expiration', 'Check the expiration of a serial'),
+       (15, 'claim_serials', 'Claim missing serials'),
+       (15, 'create_subscription', 'Create a new subscription'),
+       (15, 'delete_subscription', 'Delete an existing subscription'),
+       (15, 'edit_subscription', 'Edit an existing subscription'),
+       (15, 'receive_serials', 'Serials receiving'),
+       (15, 'renew_subscription', 'Renew a subscription'),
+       (15, 'routing', 'Routing');
+                ");
+    SetVersion ($DBversion);
+}
 
 =item DropAllForeignKeys($table)
 

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
index fd28c3e..f6856ea 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
@@ -13,8 +13,9 @@
        <li><a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a></li>
        <!-- /TMPL_IF -->
        <li><a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a></li>
+       <!-- /TMPL_IF -->
        <!-- TMPL_IF NAME="CAN_user_serials" -->
-       <li><a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></li><!-- /TMPL_IF -->
+       <li><a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></li>
        <!-- /TMPL_IF -->
        <!-- TMPL_IF NAME="CAN_user_reports" --><li><a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a></li><!-- /TMPL_IF -->
        <!-- TMPL_IF NAME="CAN_user_tools" --><li><a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a></li><!-- /TMPL_IF -->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/mainmenu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/mainmenu.inc
index 46a0191..1318f6b 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/mainmenu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/mainmenu.inc
@@ -47,7 +47,11 @@
     <li><a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a><ul>
         <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Add MARC Record</a></li>
         <li><a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a></li>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="CAN_user_serials" -->
         <li><a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></li>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="CAN_user_editcatalogue" -->
     </ul></li>
     
     <li><a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a></li>

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 6f21f93..88e32e3 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc
@@ -1,12 +1,21 @@
 <!-- TMPL_IF NAME="subscriptionid" -->
 <ul>
 <li><a href="serials-collection.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Serial Collection</a></li>
-       <!-- TMPL_IF NAME="routing" --><li><a href="routing.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->">Edit Routing List</a></li><!-- TMPL_ELSE -->
-       <li><a href="routing.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->&amp;op=new">Create Routing List</a></li><!-- /TMPL_IF -->
+       <!-- TMPL_IF NAME="CAN_user_serials_routing" -->
+           <!-- TMPL_IF NAME="routing" -->
+               <li><a href="routing.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->">Edit Routing List</a></li>
+           <!-- TMPL_ELSE -->
+               <li><a href="routing.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->&amp;op=new">Create Routing List</a></li>
+           <!-- /TMPL_IF -->
+       <!-- /TMPL_IF -->
 </ul>
 <!-- /TMPL_IF -->
 
 <ul>
+    <!-- TMPL_IF NAME="CAN_user_serials_claim_serials" -->
        <li><a href="/cgi-bin/koha/serials/claims.pl">Claims</a></li>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="CAN_user_serials_check_expiration" -->
        <li><a href="/cgi-bin/koha/serials/checkexpiration.pl">Check Expiration</a></li>
-</ul>
\ No newline at end of file
+    <!-- /TMPL_IF -->
+</ul>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc
index b7b773c..6bed3a0 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc
@@ -17,9 +17,15 @@
        
     <!-- TMPL_IF NAME="subscriptionid" -->
            var editmenu = [
-               { text: _("Edit Subscription"),  <!-- TMPL_IF NAME="cannotedit" -->disabled: true, <!-- /TMPL_IF --> url: "/cgi-bin/koha/serials/subscription-add.pl?op=mod&amp;subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" },
-               { text: _("Edit as New (Duplicate)"), <!-- TMPL_IF NAME="cannotedit" -->disabled: true, <!-- /TMPL_IF --> url: "/cgi-bin/koha/serials/subscription-add.pl?op=dup&amp;subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" },
+               <!-- TMPL_IF NAME="CAN_user_serials_edit_subscription" -->
+                   { text: _("Edit Subscription"),  <!-- TMPL_IF NAME="cannotedit" -->disabled: true, <!-- /TMPL_IF --> url: "/cgi-bin/koha/serials/subscription-add.pl?op=mod&amp;subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" },
+               <!-- /TMPL_IF -->
+               <!-- TMPL_IF NAME="CAN_user_serials_create_subscription" -->
+                   { text: _("Edit as New (Duplicate)"), <!-- TMPL_IF NAME="cannotedit" -->disabled: true, <!-- /TMPL_IF --> url: "/cgi-bin/koha/serials/subscription-add.pl?op=dup&amp;subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" },
+               <!-- /TMPL_IF -->
+               <!-- TMPL_IF NAME="CAN_user_serials_delete_subscription" -->
                        { text: _("Delete Subscription"), <!-- TMPL_IF NAME="cannotedit" -->disabled: true, <!-- /TMPL_IF --> onclick: {fn: confirm_deletion }}
+               <!-- /TMPL_IF -->
            ];
         <!-- /TMPL_IF -->
            new YAHOO.widget.Button("newsubscription");
@@ -50,21 +56,39 @@ onclick: {fn:function(){popup(<!--TMPL_VAR Name="subscriptionid"-->)}}
        //]]>
        </script>
 <ul class="toolbar">
-    <!-- TMPL_IF NAME="biblionumber_for_new_subscription" -->
-           <li><a id="newsubscription" href="/cgi-bin/koha/serials/subscription-add.pl?biblionumber_for_new_subscription=<!-- TMPL_VAR NAME="biblionumber_for_new_subscription" -->">New Subscription</a></li>
-    <!-- TMPL_ELSE -->
-           <li><a id="newsubscription" href="/cgi-bin/koha/serials/subscription-add.pl">New Subscription</a></li>
+    <!-- TMPL_IF NAME="CAN_user_serials_create_subscription" -->
+       <!-- TMPL_IF NAME="biblionumber_for_new_subscription" -->
+               <li><a id="newsubscription" href="/cgi-bin/koha/serials/subscription-add.pl?biblionumber_for_new_subscription=<!-- TMPL_VAR NAME="biblionumber_for_new_subscription" -->">New Subscription</a></li>
+       <!-- TMPL_ELSE -->
+               <li><a id="newsubscription" href="/cgi-bin/koha/serials/subscription-add.pl">New Subscription</a></li>
+       <!-- /TMPL_IF -->
     <!-- /TMPL_IF -->
-    <!-- TMPL_IF NAME="subscriptionid" -->
-        <!-- TMPL_UNLESS name="cannotedit" -->
-            <li id="editmenuc"><a id="edit" href="/cgi-bin/koha/serials/subscription-add.pl?op=mod&amp;subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Edit</a></li>
-        <!-- /TMPL_UNLESS -->
-        <li><a id="duplicate" href="/cgi-bin/koha/serials/subscription-add.pl?op=dup&amp;subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Duplicate </a></li>
-        <!-- TMPL_UNLESS name="cannotedit" -->
-            <li id="renewc"><a id="renew" href="#" onclick="popup(<!--TMPL_VAR Name="subscriptionid"-->)">Renew </a></li>
-            <li><a id="receive" href="/cgi-bin/koha/serials/serials-edit.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->&amp;serstatus=1,3">Receive</a></li>
-            <li><a id="delete" href="javascript:confirm_deletion()">Delete</a></li>
-        <!-- /TMPL_UNLESS -->
+
+    <!-- TMPL_IF EXPR="CAN_user_serials_edit_subscription || CAN_user_serials_create_subscription || CAN_user_serials_delete_subscription" -->
+       <!-- TMPL_IF NAME="subscriptionid" -->
+
+           <!-- TMPL_IF expr="CAN_user_serials_edit_subscription || CAN_user_serials_create_subscription || CAN_user_serials_delete_subscription" -->
+               <!-- TMPL_UNLESS name="cannotedit" -->
+                   <li id="editmenuc"><a id="edit" href="/cgi-bin/koha/serials/subscription-add.pl?op=mod&amp;subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Edit</a></li>
+               <!-- /TMPL_UNLESS -->
+           <!-- /TMPL_IF -->
+
+           <!-- TMPL_IF name="CAN_user_serials_create_subscription" -->
+               <li><a id="duplicate" href="/cgi-bin/koha/serials/subscription-add.pl?op=dup&amp;subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Duplicate </a></li>
+           <!-- /TMPL_IF -->
+
+           <!-- TMPL_UNLESS name="cannotedit" -->
+               <!-- TMPL_IF name="CAN_user_serials_renew_subscription" -->
+                   <li id="renewc"><a id="renew" href="#" onclick="popup(<!--TMPL_VAR Name="subscriptionid"-->)">Renew </a></li>
+               <!-- /TMPL_IF -->
+               <!-- TMPL_IF name="CAN_user_serials_receive_serials" -->
+                   <li><a id="receive" href="/cgi-bin/koha/serials/serials-edit.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->&amp;serstatus=1,3">Receive</a></li>
+               <!-- /TMPL_IF -->
+               <!-- TMPL_IF name="CAN_user_serials_delete_subscription" -->
+                   <li><a id="delete" href="javascript:confirm_deletion()">Delete</a></li>
+               <!-- /TMPL_IF -->
+           <!-- /TMPL_UNLESS -->
+       <!-- /TMPL_IF -->
     <!-- /TMPL_IF -->
 </ul>
 </div>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl
index b2fbc4e..d4033b4 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl
@@ -116,7 +116,7 @@ Serials updated :
                 <!-- TMPL_IF NAME="cannotedit" -->
                   &nbsp;        
                 <!-- TMPL_ELSE -->
-                  <a href="/cgi-bin/koha/serials/serials-edit.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->&amp;serstatus=1,3">Serial receive</a>
+                  <!-- TMPL_IF name="CAN_user_serials_receive_serials" --><a href="/cgi-bin/koha/serials/serials-edit.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->&amp;serstatus=1,3">Serial receive</a><!-- /TMPL_IF -->
                 <!-- /TMPL_IF -->
                 </td>
             </tr>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl
index 52ee62b..27ce4d7 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl
@@ -971,8 +971,15 @@ $(document).ready(function() {
             
                 <input type="text" name="biblionumber" id="biblionumber" value="<!-- TMPL_VAR name="bibnum" -->" size="8" /> 
                 (<input type="text" name="title" value="<!-- TMPL_VAR name="bibliotitle" -->" disabled="disabled" readonly="readonly" />) <span class="required" title="Subscriptions must be associated with a bibliographic record">Required</span>
-               <div class="inputnote"> <a href="#" onclick="Plugin(f)">Search for Biblio</a> | <!--TMPL_IF Name="mod"--><a href="#" onclick="addbiblioPopup(<!-- TMPL_VAR NAME="bibnum" -->); return false;">Edit biblio</a><!-- TMPL_ELSE -->
-                <a href="#" onclick="addbiblioPopup(); return false;">Create Biblio</a><!--/TMPL_IF--></div>
+               <div class="inputnote"> <a href="#" onclick="Plugin(f)">Search for Biblio</a>
+                   <!-- TMPL_IF name="CAN_user_editcatalogue" --> 
+                      <!--TMPL_IF Name="mod"-->
+                      | <a href="#" onclick="addbiblioPopup(<!-- TMPL_VAR NAME="bibnum" -->); return false;">Edit biblio</a>
+                      <!-- TMPL_ELSE -->
+                      | <a href="#" onclick="addbiblioPopup(); return false;">Create Biblio</a>
+                      <!--/TMPL_IF-->
+                   <!--/TMPL_IF-->
+              </div>
             
         </li>
         <li class="radio">

diff --git a/serials/acqui-search-result.pl b/serials/acqui-search-result.pl
index df73738..7b856b8 100755 (executable)
--- a/serials/acqui-search-result.pl
+++ b/serials/acqui-search-result.pl
@@ -55,7 +55,7 @@ my ($template, $loggedinuser, $cookie)
                  query => $query,
                  type => "intranet",
                  authnotrequired => 0,
-                 flagsrequired => {serials => 1},
+                 flagsrequired => {serials => '*'},
                  debug => 1,
                  });
 

diff --git a/serials/acqui-search.pl b/serials/acqui-search.pl
index 408ac83..a629315 100755 (executable)
--- a/serials/acqui-search.pl
+++ b/serials/acqui-search.pl
@@ -33,7 +33,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,
-        flagsrequired   => { serials => 1 },
+        flagsrequired   => { serials => '*' },
         debug           => 1,
     }
 );

diff --git a/serials/checkexpiration.pl b/serials/checkexpiration.pl
index 865e163..178d875 100755 (executable)
--- a/serials/checkexpiration.pl
+++ b/serials/checkexpiration.pl
@@ -60,7 +60,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user (
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,
-        flagsrequired   => { serials => 1 },
+        flagsrequired   => { serials => 'check_expiration' },
         debug           => 1,
     }
 );

diff --git a/serials/claims.pl b/serials/claims.pl
index 3c0c4fc..75f78ed 100755 (executable)
--- a/serials/claims.pl
+++ b/serials/claims.pl
@@ -27,7 +27,7 @@ my ($template, $loggedinuser, $cookie)
             query => $input,
             type => "intranet",
             authnotrequired => 0,
-            flagsrequired => {serials => 1},
+            flagsrequired => {serials => 'claim_serials'},
             debug => 1,
             });
 

diff --git a/serials/member-search.pl b/serials/member-search.pl
index a2063f8..f2eb451 100755 (executable)
--- a/serials/member-search.pl
+++ b/serials/member-search.pl
@@ -38,7 +38,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,
-        flagsrequired   => { serials => 1 },
+        flagsrequired   => { serials => 'routing' },
         debug           => 1,
     }
 );

diff --git a/serials/routing-preview.pl b/serials/routing-preview.pl
index d89b28c..8ef8ee8 100755 (executable)
--- a/serials/routing-preview.pl
+++ b/serials/routing-preview.pl
@@ -84,7 +84,7 @@ if($ok){
                                query => $query,
                                type => "intranet",
                                authnotrequired => 0,
-                               flagsrequired => {serials => 1},
+                               flagsrequired => {serials => 'routing'},
                                debug => 1,
                                });
     $template->param("libraryname"=>$branchname);
@@ -94,7 +94,7 @@ if($ok){
                                query => $query,
                                type => "intranet",
                                authnotrequired => 0,
-                               flagsrequired => {serials => 1},
+                               flagsrequired => {serials => 'routing'},
                                debug => 1,
                                });
 }

diff --git a/serials/routing.pl b/serials/routing.pl
index d49d450..1b3da2d 100755 (executable)
--- a/serials/routing.pl
+++ b/serials/routing.pl
@@ -89,7 +89,7 @@ my ($template, $loggedinuser, $cookie)
                                query => $query,
                                type => "intranet",
                                authnotrequired => 0,
-                               flagsrequired => {serials => 1},
+                               flagsrequired => {serials => 'routing'},
                                debug => 1,
                                });
 # my $date;

diff --git a/serials/serial-issues.pl b/serials/serial-issues.pl
index 842876a..467a458 100755 (executable)
--- a/serials/serial-issues.pl
+++ b/serials/serial-issues.pl
@@ -72,7 +72,7 @@ if ($selectview eq "full"){
      query => $query,
      type => "intranet",
      authnotrequired => 0,
-        flagsrequired => {serials => 1},
+        flagsrequired => {serials => '*'},
      debug => 1,
      });
 

diff --git a/serials/serials-collection.pl b/serials/serials-collection.pl
index c80886b..f66d724 100755 (executable)
--- a/serials/serials-collection.pl
+++ b/serials/serials-collection.pl
@@ -42,7 +42,7 @@ my ($template, $loggedinuser, $cookie);
                             query => $query,
                             type => "intranet",
                             authnotrequired => 0,
-                            flagsrequired => {serials => 1},
+                            flagsrequired => {serials => 'receive_serials'},
                             debug => 1,
                             });
 my $biblionumber = $query->param('biblionumber');

diff --git a/serials/serials-edit.pl b/serials/serials-edit.pl
index 08eae33..93caa55 100755 (executable)
--- a/serials/serials-edit.pl
+++ b/serials/serials-edit.pl
@@ -115,7 +115,7 @@ my ($template, $loggedinuser, $cookie)
                 query => $query,
                 type => "intranet",
                 authnotrequired => 0,
-                flagsrequired => {serials => 1},
+                flagsrequired => {serials => 'receive_serials'},
                 debug => 1,
                 });
 

diff --git a/serials/serials-home.pl b/serials/serials-home.pl
index ec2ddee..ee8b08d 100755 (executable)
--- a/serials/serials-home.pl
+++ b/serials/serials-home.pl
@@ -67,7 +67,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,
-        flagsrequired   => { serials => 1 },
+        flagsrequired   => { serials => '*' },
         debug           => 1,
     }
 );

diff --git a/serials/statecollection.pl b/serials/statecollection.pl
index 715260a..10fbc70 100755 (executable)
--- a/serials/statecollection.pl
+++ b/serials/statecollection.pl
@@ -46,7 +46,7 @@ my ($template, $loggedinuser, $cookie)
                                query => $query,
                                type => "intranet",
                                authnotrequired => 0,
-                               flagsrequired => {serials => 1},
+                               flagsrequired => {serials => '*'},
                                debug => 1,
                                });
 

diff --git a/serials/subscription-add.pl b/serials/subscription-add.pl
index 4b50819..57902ca 100755 (executable)
--- a/serials/subscription-add.pl
+++ b/serials/subscription-add.pl
@@ -43,12 +43,17 @@ my ($subscriptionid,$auser,$branchcode,$librarian,$cost,$aqbooksellerid, $aqbook
        $bibliotitle, $callnumber, $notes, $hemisphere, $letter, $manualhistory,$serialsadditems);
 
        my @budgets;
+
+# Permission needed if it is a modification : edit_subscription
+# Permission needed otherwise (nothing or dup) : create_subscription
+my $permission = ($op eq "mod") ? "edit_subscription" : "create_subscription";
+
 my ($template, $loggedinuser, $cookie)
 = get_template_and_user({template_name => "serials/subscription-add.tmpl",
                                query => $query,
                                type => "intranet",
                                authnotrequired => 0,
-                               flagsrequired => {serials => 1},
+                               flagsrequired => {serials => $permission},
                                debug => 1,
                                });
 

diff --git a/serials/subscription-bib-search.pl b/serials/subscription-bib-search.pl
index fc70f09..2493be8 100755 (executable)
--- a/serials/subscription-bib-search.pl
+++ b/serials/subscription-bib-search.pl
@@ -115,8 +115,7 @@ if ($op eq "do_search" && $query) {
                 query => $input,
                 type => "intranet",
                 authnotrequired => 0,
-                flagsrequired => {serials => 1},
-                flagsrequired => {catalogue => 1},
+                flagsrequired => {catalogue => 1, serials => '*'},
                 debug => 1,
                 });
 
@@ -177,7 +176,7 @@ if ($op eq "do_search" && $query) {
                 query => $input,
                 type => "intranet",
                 authnotrequired => 0,
-                flagsrequired => {catalogue => 1, serials=>1},
+                flagsrequired => {catalogue => 1, serials => '*'},
                 debug => 1,
                 });
     # load the itemtypes
@@ -203,7 +202,7 @@ if ($op eq "do_search" && $query) {
                 query => $input,
                 type => "intranet",
                 authnotrequired => 0,
-                flagsrequired => {catalogue => 1, serials=>1},
+                flagsrequired => {catalogue => 1, serials => '*'},
                 debug => 1,
                 });
     # load the itemtypes

diff --git a/serials/subscription-detail.pl b/serials/subscription-detail.pl
index 87127e2..f04f3b1 100755 (executable)
--- a/serials/subscription-detail.pl
+++ b/serials/subscription-detail.pl
@@ -50,12 +50,16 @@ my ($totalissues,@serialslist) = GetSerials($subscriptionid);
 $totalissues-- if $totalissues; # the -1 is to have 0 if this is a new subscription (only 1 issue)
 # the subscription must be deletable if there is NO issues for a reason or another (should not happend, but...)
 
+# Permission needed if it is a deletion (del) : delete_subscription
+# Permission needed otherwise : *
+my $permission = ($op eq "del") ? "delete_subscription" : "*";
+
 ($template, $loggedinuser, $cookie)
 = get_template_and_user({template_name => "serials/subscription-detail.tmpl",
                 query => $query,
                 type => "intranet",
                 authnotrequired => 0,
-                flagsrequired => {serials => 1},
+                flagsrequired => {serials => $permission},
                 debug => 1,
                 });
 

diff --git a/serials/subscription-renew.pl b/serials/subscription-renew.pl
index 7402af7..219fca7 100755 (executable)
--- a/serials/subscription-renew.pl
+++ b/serials/subscription-renew.pl
@@ -68,7 +68,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,
-        flagsrequired   => { serials => 1 },
+        flagsrequired   => { serials => 'renew_subscription' },
         debug           => 1,
     }
 );

diff --git a/serials/viewalerts.pl b/serials/viewalerts.pl
index cf2278d..9aed02e 100755 (executable)
--- a/serials/viewalerts.pl
+++ b/serials/viewalerts.pl
@@ -38,7 +38,7 @@ my ($template, $loggedinuser, $cookie)
                  query => $input,
                  type => "intranet",
                  authnotrequired => 0,
-                 flagsrequired => {serials => 1},
+                 flagsrequired => {serials => '*'},
                  debug => 1,
                  });