From f65074717c45ad2554875ee8a3aa4f83fc7c20c5 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 12 Nov 2012 14:15:42 +0100 Subject: [PATCH] Bug 8435: If IndependantBranches is on, Serials can't be manage from others libraries In the serial module, we want to hide serials from others libraries. New permission 'superserials'. If a patron have this permission, he can override this restriction. Test plan: - Switch on the IndependantBranches syspref - Add the permission 'superserials' for a patron and test you can navigate and see all serials - Remove this permission and test you cannot manage/view subscriptions from others libraries --- C4/Auth.pm | 4 +- C4/Serials.pm | 112 ++++++++------------ .../data/mysql/de-DE/mandatory/userpermissions.sql | 1 + .../data/mysql/en/mandatory/userpermissions.sql | 1 + .../data/mysql/es-ES/mandatory/userpermissions.sql | 1 + .../mysql/fr-FR/1-Obligatoire/userpermissions.sql | 1 + .../data/mysql/it-IT/necessari/userpermissions.sql | 1 + .../mysql/nb-NO/1-Obligatorisk/userpermissions.sql | 1 + .../data/mysql/pl-PL/mandatory/userpermissions.sql | 1 + installer/data/mysql/updatedatabase.pl | 7 ++ .../prog/en/modules/serials/serials-search.tt | 8 +- serials/serials-collection.pl | 4 +- serials/serials-edit.pl | 1 + serials/serials-search.pl | 1 + serials/subscription-add.pl | 3 +- serials/subscription-detail.pl | 33 ++---- 16 files changed, 80 insertions(+), 100 deletions(-) diff --git a/C4/Auth.pm b/C4/Auth.pm index ca061b5..e5cefa7 100644 --- a/C4/Auth.pm +++ b/C4/Auth.pm @@ -1573,7 +1573,6 @@ sub getuserflags { $userflags->{$flag} = 0; } } - # get subpermissions and merge with top-level permissions my $user_subperms = get_user_subpermissions($userid); foreach my $module (keys %$user_subperms) { @@ -1669,7 +1668,8 @@ sub haspermission { my ($userid, $flagsrequired) = @_; my $sth = C4::Context->dbh->prepare("SELECT flags FROM borrowers WHERE userid=?"); $sth->execute($userid); - my $flags = getuserflags($sth->fetchrow(), $userid); + my $row = $sth->fetchrow(); + my $flags = getuserflags($row, $userid); if ( $userid eq C4::Context->config('user') ) { # Super User Account from /etc/koha.conf $flags->{'superlibrarian'} = 1; diff --git a/C4/Serials.pm b/C4/Serials.pm index 0b31a2b..d820c21 100644 --- a/C4/Serials.pm +++ b/C4/Serials.pm @@ -20,6 +20,7 @@ package C4::Serials; use strict; use warnings; +use C4::Context; use C4::Dates qw(format_date format_date_in_iso); use Date::Calc qw(:all); use POSIX qw(strftime); @@ -214,15 +215,7 @@ sub GetSerialInformation { my ($serialid) = @_; my $dbh = C4::Context->dbh; my $query = qq| - SELECT serial.*, serial.notes as sernotes, serial.status as serstatus,subscription.*,subscription.subscriptionid as subsid |; - if ( C4::Context->preference('IndependantBranches') - && C4::Context->userenv - && C4::Context->userenv->{'flags'} != 1 - && C4::Context->userenv->{'branch'} ) { - $query .= " - , ((subscription.branchcode <>\"" . C4::Context->userenv->{'branch'} . "\") and subscription.branchcode <>\"\" and subscription.branchcode IS NOT NULL) as cannotedit "; - } - $query .= qq| + SELECT serial.*, serial.notes as sernotes, serial.status as serstatus,subscription.*,subscription.subscriptionid as subsid FROM serial LEFT JOIN subscription ON subscription.subscriptionid=serial.subscriptionid WHERE serialid = ? |; @@ -261,6 +254,7 @@ sub GetSerialInformation { $data->{ "status" . $data->{'serstatus'} } = 1; $data->{'subscriptionexpired'} = HasSubscriptionExpired( $data->{'subscriptionid'} ) && $data->{'status'} == 1; $data->{'abouttoexpire'} = abouttoexpire( $data->{'subscriptionid'} ); + $data->{cannotedit} = not can_edit_subscription( $data ); return $data; } @@ -319,15 +313,7 @@ sub GetSubscription { subscriptionhistory.*, aqbooksellers.name AS aqbooksellername, biblio.title AS bibliotitle, - subscription.biblionumber as bibnum); - if ( C4::Context->preference('IndependantBranches') - && C4::Context->userenv - && C4::Context->userenv->{'flags'} != 1 - && C4::Context->userenv->{'branch'} ) { - $query .= " - , ((subscription.branchcode <>\"" . C4::Context->userenv->{'branch'} . "\") and subscription.branchcode <>\"\" and subscription.branchcode IS NOT NULL) as cannotedit "; - } - $query .= qq( + subscription.biblionumber as bibnum FROM subscription LEFT JOIN subscriptionhistory ON subscription.subscriptionid=subscriptionhistory.subscriptionid LEFT JOIN aqbooksellers ON subscription.aqbooksellerid=aqbooksellers.id @@ -335,16 +321,12 @@ sub GetSubscription { WHERE subscription.subscriptionid = ? ); - # if (C4::Context->preference('IndependantBranches') && - # C4::Context->userenv && - # C4::Context->userenv->{'flags'} != 1){ - # # $debug and warn "flags: ".C4::Context->userenv->{'flags'}; - # $query.=" AND subscription.branchcode IN ('".C4::Context->userenv->{'branch'}."',\"\")"; - # } $debug and warn "query : $query\nsubsid :$subscriptionid"; my $sth = $dbh->prepare($query); $sth->execute($subscriptionid); - return $sth->fetchrow_hashref; + my $subscription = $sth->fetchrow_hashref; + $subscription->{cannotedit} = not can_edit_subscription( $subscription ); + return $subscription; } =head2 GetFullSubscription @@ -368,15 +350,7 @@ sub GetFullSubscription { aqbooksellers.name as aqbooksellername, biblio.title as bibliotitle, subscription.branchcode AS branchcode, - subscription.subscriptionid AS subscriptionid |; - if ( C4::Context->preference('IndependantBranches') - && C4::Context->userenv - && C4::Context->userenv->{'flags'} != 1 - && C4::Context->userenv->{'branch'} ) { - $query .= " - , ((subscription.branchcode <>\"" . C4::Context->userenv->{'branch'} . "\") and subscription.branchcode <>\"\" and subscription.branchcode IS NOT NULL) as cannotedit "; - } - $query .= qq| + subscription.subscriptionid AS subscriptionid FROM serial LEFT JOIN subscription ON (serial.subscriptionid=subscription.subscriptionid ) @@ -390,7 +364,11 @@ sub GetFullSubscription { $debug and warn "GetFullSubscription query: $query"; my $sth = $dbh->prepare($query); $sth->execute($subscriptionid); - return $sth->fetchall_arrayref( {} ); + my $subscriptions = $sth->fetchall_arrayref( {} ); + for my $subscription ( @$subscriptions ) { + $subscription->{cannotedit} = not can_edit_subscription( $subscription ); + } + return $subscriptions; } =head2 PrepareSerialsData @@ -488,13 +466,6 @@ sub GetSubscriptionsFromBiblionumber { $subs->{ "periodicity" . $subs->{periodicity} } = 1; $subs->{ "numberpattern" . $subs->{numberpattern} } = 1; $subs->{ "status" . $subs->{'status'} } = 1; - $subs->{'cannotedit'} = - ( C4::Context->preference('IndependantBranches') - && C4::Context->userenv - && C4::Context->userenv->{flags} % 2 != 1 - && C4::Context->userenv->{branch} - && $subs->{branchcode} - && ( C4::Context->userenv->{branch} ne $subs->{branchcode} ) ); if ( $subs->{enddate} eq '0000-00-00' ) { $subs->{enddate} = ''; @@ -503,6 +474,7 @@ sub GetSubscriptionsFromBiblionumber { } $subs->{'abouttoexpire'} = abouttoexpire( $subs->{'subscriptionid'} ); $subs->{'subscriptionexpired'} = HasSubscriptionExpired( $subs->{'subscriptionid'} ); + $subs->{cannotedit} = not can_edit_subscription( $subs ); push @res, $subs; } return \@res; @@ -528,16 +500,7 @@ sub GetFullSubscriptionsFromBiblionumber { year(IF(serial.publisheddate="00-00-0000",serial.planneddate,serial.publisheddate)) as year, biblio.title as bibliotitle, subscription.branchcode AS branchcode, - subscription.subscriptionid AS subscriptionid|; - if ( C4::Context->preference('IndependantBranches') - && C4::Context->userenv - && C4::Context->userenv->{'flags'} != 1 - && C4::Context->userenv->{'branch'} ) { - $query .= " - , ((subscription.branchcode <>\"" . C4::Context->userenv->{'branch'} . "\") and subscription.branchcode <>\"\" and subscription.branchcode IS NOT NULL) as cannotedit "; - } - - $query .= qq| + subscription.subscriptionid AS subscriptionid FROM serial LEFT JOIN subscription ON (serial.subscriptionid=subscription.subscriptionid) @@ -550,7 +513,11 @@ sub GetFullSubscriptionsFromBiblionumber { |; my $sth = $dbh->prepare($query); $sth->execute($biblionumber); - return $sth->fetchall_arrayref( {} ); + my $subscriptions = $sth->fetchall_arrayref( {} ); + for my $subscription ( @$subscriptions ) { + $subscription->{cannotedit} = not can_edit_subscription( $subscription ); + } + return $subscriptions; } =head2 GetSubscriptions @@ -625,19 +592,11 @@ sub GetSubscriptions { $debug and warn "GetSubscriptions query: $sql params : ", join( " ", @bind_params ); $sth = $dbh->prepare($sql); $sth->execute(@bind_params); - my @results; - - while ( my $line = $sth->fetchrow_hashref ) { - $line->{'cannotedit'} = - ( C4::Context->preference('IndependantBranches') - && C4::Context->userenv - && C4::Context->userenv->{flags} % 2 != 1 - && C4::Context->userenv->{branch} - && $line->{branchcode} - && ( C4::Context->userenv->{branch} ne $line->{branchcode} ) ); - push @results, $line; - } - return @results; + my $subscriptions = $sth->fetchall_arrayref( {} ); + for my $subscription ( @$subscriptions ) { + $subscription->{cannotedit} = not can_edit_subscription( $subscription ); + } + return @$subscriptions; } =head2 SearchSubscriptions @@ -715,6 +674,10 @@ sub SearchSubscriptions { my $results = $sth->fetchall_arrayref( {} ); $sth->finish; + for my $subscription ( @$results ) { + $subscription->{cannotedit} = not can_edit_subscription( $subscription ); + } + return @$results; } @@ -2532,6 +2495,23 @@ sub ReopenSubscription { $sth->execute( $subscriptionid ); } +sub can_edit_subscription { + my ( $subscription, $userid ) = @_; + my $flags = C4::Context->userenv->{flags}; + $userid ||= C4::Context->userenv->{'id'}; + my $independant_branches = C4::Context->preference('IndependantBranches'); + return 1 unless $independant_branches; + if( $flags % 2 == 1 + or C4::Auth::haspermission( $userid, {serials => 'superserials'}), + or not defined $subscription->{branchcode} + or $subscription->{branchcode} eq '' + or $subscription->{branchcode} eq C4::Context->userenv->{'branch'} + ) { + return 1; + } + return 0; +} + 1; __END__ diff --git a/installer/data/mysql/de-DE/mandatory/userpermissions.sql b/installer/data/mysql/de-DE/mandatory/userpermissions.sql index 65cd635..0b2edde 100644 --- a/installer/data/mysql/de-DE/mandatory/userpermissions.sql +++ b/installer/data/mysql/de-DE/mandatory/userpermissions.sql @@ -51,6 +51,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES (15, 'receive_serials', 'Zugang von Heften'), (15, 'renew_subscription', 'Abonnements verlängern'), (15, 'routing', 'Umlauflisten verwalten'), + (15, 'superserials', 'Manage subscriptions from any branch'), (16, 'execute_reports', 'SQL-Reports ausführen'), (16, 'create_reports', 'SQL-Reports erstellen'), (19, 'manage', 'Manage plugins ( install / uninstall )'), diff --git a/installer/data/mysql/en/mandatory/userpermissions.sql b/installer/data/mysql/en/mandatory/userpermissions.sql index 124e030..674d767 100644 --- a/installer/data/mysql/en/mandatory/userpermissions.sql +++ b/installer/data/mysql/en/mandatory/userpermissions.sql @@ -51,6 +51,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES (15, 'receive_serials', 'Serials receiving'), (15, 'renew_subscription', 'Renew a subscription'), (15, 'routing', 'Routing'), + (15, 'superserials', 'Manage subscriptions from any branch'), (16, 'execute_reports', 'Execute SQL reports'), (16, 'create_reports', 'Create SQL Reports'), (19, 'manage', 'Manage plugins ( install / uninstall )'), diff --git a/installer/data/mysql/es-ES/mandatory/userpermissions.sql b/installer/data/mysql/es-ES/mandatory/userpermissions.sql index 124e030..674d767 100644 --- a/installer/data/mysql/es-ES/mandatory/userpermissions.sql +++ b/installer/data/mysql/es-ES/mandatory/userpermissions.sql @@ -51,6 +51,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES (15, 'receive_serials', 'Serials receiving'), (15, 'renew_subscription', 'Renew a subscription'), (15, 'routing', 'Routing'), + (15, 'superserials', 'Manage subscriptions from any branch'), (16, 'execute_reports', 'Execute SQL reports'), (16, 'create_reports', 'Create SQL Reports'), (19, 'manage', 'Manage plugins ( install / uninstall )'), diff --git a/installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql b/installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql index 0c4a61b..58c1b36 100644 --- a/installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql +++ b/installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql @@ -51,6 +51,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES (15, 'receive_serials', 'Bulletiner les périodiques'), (15, 'renew_subscription', 'Renouveler les abonnements'), (15, 'routing', 'Mettre en circulation'), + (15, 'superserials', 'Manage subscriptions from any branch'), (16, 'execute_reports', 'Lancer les rapports SQL'), (16, 'create_reports', 'Créer les rapports SQL Reports'), (19, 'manage', 'Manage plugins ( install / uninstall )'), diff --git a/installer/data/mysql/it-IT/necessari/userpermissions.sql b/installer/data/mysql/it-IT/necessari/userpermissions.sql index c0244f6..054d3c7 100644 --- a/installer/data/mysql/it-IT/necessari/userpermissions.sql +++ b/installer/data/mysql/it-IT/necessari/userpermissions.sql @@ -53,6 +53,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES (15, 'receive_serials', 'Ricevi fascicoli'), (15, 'renew_subscription', 'Rinnova un abbonamento'), (15, 'routing', 'Crea/Manipola liste di distribuzione dei fascicoli ( routing list)'), + (15, 'superserials', 'Manage subscriptions from any branch'), (16, 'execute_reports', 'Esegui reports SQL'), (16, 'create_reports', 'Crea reports SQL'), (19, 'manage', 'Manage plugins ( install / uninstall )'), diff --git a/installer/data/mysql/nb-NO/1-Obligatorisk/userpermissions.sql b/installer/data/mysql/nb-NO/1-Obligatorisk/userpermissions.sql index 0b3c34f..f9163a5 100644 --- a/installer/data/mysql/nb-NO/1-Obligatorisk/userpermissions.sql +++ b/installer/data/mysql/nb-NO/1-Obligatorisk/userpermissions.sql @@ -71,6 +71,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES (15, 'receive_serials', 'Heftemottak'), (15, 'renew_subscription', 'Fornye abonnementer'), (15, 'routing', 'Sirkulasjon'), + (15, 'superserials', 'Manage subscriptions from any branch'), (16, 'execute_reports', 'Kjøre SQL-rapporter'), (16, 'create_reports', 'Opprette SQL-rapporter'), (19, 'manage', 'Manage plugins ( install / uninstall )'), diff --git a/installer/data/mysql/pl-PL/mandatory/userpermissions.sql b/installer/data/mysql/pl-PL/mandatory/userpermissions.sql index a51e20b..92884d8 100644 --- a/installer/data/mysql/pl-PL/mandatory/userpermissions.sql +++ b/installer/data/mysql/pl-PL/mandatory/userpermissions.sql @@ -52,6 +52,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES (15, 'receive_serials', 'Serials receiving'), (15, 'renew_subscription', 'Renew a subscription'), (15, 'routing', 'Routing'), + (15, 'superserials', 'Manage subscriptions from any branch'), (16, 'execute_reports', 'Execute SQL reports'), (16, 'create_reports', 'Create SQL Reports'), (19, 'manage', 'Manage plugins ( install / uninstall )'), diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 4e207a7..87d5f5d 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -6723,6 +6723,13 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) { SetVersion ($DBversion); } +$DBversion = "3.09.00.XXX"; +if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { + $dbh->do("INSERT INTO permissions (module_bit, code, description) VALUES(15, 'superserials', 'Manage subscriptions from any branch')"); + print "Upgrade to $DBversion done (Add superserials permission)\n"; + SetVersion($DBversion); +} + =head1 FUNCTIONS =head2 TableExists($table) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt index 0c937bf..60d1231 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt @@ -141,6 +141,7 @@ [% FOREACH subscription IN openedsubscriptions %] + [% UNLESS subscription.cannotedit %] [% IF ( subscription.issn ) %][% subscription.issn %] @@ -177,13 +178,12 @@ Issue history - [% IF ( subscription.cannotedit ) %] -   - [% ELSE %] - [% IF ( CAN_user_serials_receive_serials ) %]Serial receive[% END %] + [% IF ( CAN_user_serials_receive_serials ) %] + Serial receive [% END %] + [% END %] [% END %] diff --git a/serials/serials-collection.pl b/serials/serials-collection.pl index ad57e07..7e53a3b 100755 --- a/serials/serials-collection.pl +++ b/serials/serials-collection.pl @@ -37,8 +37,7 @@ my $op = $query->param('op') || q{}; my $nbissues=$query->param('nbissues'); my $dbh = C4::Context->dbh; -my ($template, $loggedinuser, $cookie); -($template, $loggedinuser, $cookie) +my ($template, $loggedinuser, $cookie) = get_template_and_user({template_name => "serials/serials-collection.tmpl", query => $query, type => "intranet", @@ -105,6 +104,7 @@ if (@subscriptionid){ foreach my $subscriptionid (@subscriptionid){ my $subs= GetSubscription($subscriptionid); $closed = 1 if $subs->{closed}; + $subs->{opacnote} =~ s/\n/\/g; $subs->{missinglist} =~ s/\n/\/g; $subs->{recievedlist} =~ s/\n/\/g; diff --git a/serials/serials-edit.pl b/serials/serials-edit.pl index 66d3a4e..89bab3e 100755 --- a/serials/serials-edit.pl +++ b/serials/serials-edit.pl @@ -134,6 +134,7 @@ foreach my $serialid (@serialids) { && !$processedserialid{$serialid} ) { my $serinfo = GetSerialInformation($serialid); #TODO duplicates work done by GetSerials2 above + for my $d ( qw( publisheddate planneddate )){ if ( $serinfo->{$d} =~m/^00/ ) { $serinfo->{$d} = q{}; diff --git a/serials/serials-search.pl b/serials/serials-search.pl index aaf64e6..465c1a5 100755 --- a/serials/serials-search.pl +++ b/serials/serials-search.pl @@ -127,6 +127,7 @@ $template->param( branches_loop => \@branches_loop, done_searched => $searched, routing => $routing, + size => scalar ( map {$_->{cannotedit} ? () : 1} @subscriptions ), marcflavour => (uc(C4::Context->preference("marcflavour"))) ); diff --git a/serials/subscription-add.pl b/serials/subscription-add.pl index 10bccd1..39efa9e 100755 --- a/serials/subscription-add.pl +++ b/serials/subscription-add.pl @@ -69,7 +69,8 @@ if ($op eq 'modify' || $op eq 'dup' || $op eq 'modsubscription') { my $subscriptionid = $query->param('subscriptionid'); $subs = GetSubscription($subscriptionid); -## FIXME : Check rights to edit if mod. Could/Should display an error message. + + ## FIXME : Check rights to edit if mod. Could/Should display an error message. if ($subs->{'cannotedit'} && $op eq 'modify'){ carp "Attempt to modify subscription $subscriptionid by ".C4::Context->userenv->{'id'}." not allowed"; print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid"); diff --git a/serials/subscription-detail.pl b/serials/subscription-detail.pl index 009360b..bafea15 100755 --- a/serials/subscription-detail.pl +++ b/serials/subscription-detail.pl @@ -32,7 +32,6 @@ my $query = new CGI; my $op = $query->param('op') || q{}; my $issueconfirmed = $query->param('issueconfirmed'); my $dbh = C4::Context->dbh; -my ($template, $loggedinuser, $cookie, $hemisphere); my $subscriptionid = $query->param('subscriptionid'); if ( $op and $op eq "close" ) { @@ -41,29 +40,13 @@ if ( $op and $op eq "close" ) { C4::Serials::ReopenSubscription( $subscriptionid ); } -my $subs = GetSubscription($subscriptionid); - -$subs->{enddate} = GetExpirationDate($subscriptionid); - -if ($op && $op eq 'del') { - if ($subs->{'cannotedit'}){ - carp "Attempt to delete subscription $subscriptionid by ".C4::Context->userenv->{'id'}." not allowed"; - print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid"); - } - DelSubscription($subscriptionid); - print "Content-Type: text/html\n\n"; - exit; -} - -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) +my ($template, $loggedinuser, $cookie) = get_template_and_user({template_name => "serials/subscription-detail.tmpl", query => $query, type => "intranet", @@ -72,7 +55,12 @@ my $permission = ($op eq "del") ? "delete_subscription" : "*"; debug => 1, }); -$$subs{enddate} ||= GetExpirationDate($subscriptionid); + +my $subs = GetSubscription($subscriptionid); +$subs->{enddate} ||= GetExpirationDate($subscriptionid); + +my ($totalissues,@serialslist) = GetSerials($subscriptionid); +$totalissues-- if $totalissues; # the -1 is to have 0 if this is a new subscription (only 1 issue) if ($op eq 'del') { if ($$subs{'cannotedit'}){ @@ -160,12 +148,7 @@ $template->param( hasRouting => $hasRouting, routing => C4::Context->preference("RoutingSerials"), totalissues => $totalissues, - hemisphere => $hemisphere, - cannotedit =>(C4::Context->preference('IndependantBranches') && - C4::Context->userenv && - C4::Context->userenv->{flags} % 2 !=1 && - C4::Context->userenv->{branch} && $subs->{branchcode} && - (C4::Context->userenv->{branch} ne $subs->{branchcode})), + cannotedit => (not C4::Serials::can_edit_subscription( $subs )), 'periodicity' . $subs->{periodicity} => 1, 'arrival' . $subs->{dow} => 1, 'numberpattern' . $subs->{numberpattern} => 1, -- 1.7.9.5