@@ -, +, @@ --- .../prog/en/includes/serials-toolbar.inc | 95 ++++++++++---------- .../prog/en/modules/serials/serials-collection.tt | 2 +- serials/serials-edit.pl | 1 + 3 files changed, 50 insertions(+), 48 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc @@ -34,58 +34,59 @@ }); //]]> -
- [% IF ( CAN_user_serials_create_subscription ) %] - [% IF ( biblionumber_for_new_subscription ) %] -
New subscription
- [% ELSE %] -
New subscription
+[% IF subscriptionid and ( CAN_user_serials_edit_subscription || CAN_user_serials_create_subscription || CAN_user_serials_delete_subscription || CAN_user_serials_receive_serials ) %] +
+ [% IF CAN_user_serials_create_subscription %] + [% IF biblionumber_for_new_subscription %] + + [% ELSE %] + + [% END %] [% END %] - [% END %] - [% IF ( CAN_user_serials_edit_subscription || CAN_user_serials_create_subscription || CAN_user_serials_delete_subscription ) %] - [% IF ( subscriptionid ) %] - - [% IF ( CAN_user_serials_edit_subscription || CAN_user_serials_create_subscription || CAN_user_serials_delete_subscription ) %] - [% UNLESS ( cannotedit ) %] -
- - -
- [% END %] + [% IF ( CAN_user_serials_edit_subscription || CAN_user_serials_create_subscription || CAN_user_serials_delete_subscription ) %] + [% UNLESS ( cannotedit ) %] +
+ + +
[% END %] + [% END %] - [% UNLESS ( cannotedit ) %] - [% UNLESS closed %] - [% IF ( CAN_user_serials_renew_subscription ) %] - - [% END %] - [% END %] - [% IF ( CAN_user_serials_receive_serials ) %] - [% UNLESS closed %] - - [% END %] - [% END %] - [% IF CAN_user_serials_edit_subscription %] - [% IF closed %] - - [% ELSE %] - - [% END %] + [% IF not cannotedit or CAN_user_serials_receive_serials %] + [% IF CAN_user_serials_renew_subscription and not closed %] + + [% END %] + [% IF CAN_user_serials_receive_serials and not closed %] + + [% END %] + [% UNLESS cannotedit %] + [% IF closed %] + + [% ELSE %] + [% END %] [% END %] [% END %] - [% END %] -
+
+[% ELSIF CAN_user_serials_create_subscription %] +
+ [% IF ( biblionumber_for_new_subscription ) %] +
New subscription
+ [% ELSE %] +
New subscription
+ [% END %] +
+[% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt @@ -219,7 +219,7 @@ $(document).ready(function() { [% UNLESS ( loop.odd ) %][% ELSE %][% END %] [% IF ( CAN_user_serials_receive_serials ) %] - [% IF ( serial.cannotedit ) %] + [% UNLESS CAN_user_serials_receive_serials %] disabled [% ELSE %] [% IF ( serial.subscriptionexpired ) %] --- a/serials/serials-edit.pl +++ a/serials/serials-edit.pl @@ -153,6 +153,7 @@ foreach my $serialid (@serialids) { ) || $serinfo->{'cannotedit'} ); + $serinfo->{editdisable} = 0 if C4::Auth::haspermission( C4::Context->userenv->{id}, { serials => 'receive_serials' } ); $serinfo->{editdisable} ||= ($serinfo->{status8} and $serinfo->{closed}); push @serialdatalist, $serinfo; $processedserialid{$serialid} = 1; --