View | Details | Raw Unified | Return to bug 13662
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc (-47 / +48 lines)
Lines 34-91 Link Here
34
	 });
34
	 });
35
	//]]>
35
	//]]>
36
	</script>
36
	</script>
37
<div id="toolbar" class="btn-toolbar">
38
37
39
    [% IF ( CAN_user_serials_create_subscription ) %]
38
[% IF subscriptionid and ( CAN_user_serials_edit_subscription || CAN_user_serials_create_subscription || CAN_user_serials_delete_subscription || CAN_user_serials_receive_serials ) %]
40
        [% IF ( biblionumber_for_new_subscription ) %]
39
    <div id="toolbar" class="btn-toolbar">
41
            <div class="btn-group"><a id="newsubscription" class="btn btn-small" href="/cgi-bin/koha/serials/subscription-add.pl?biblionumber_for_new_subscription=[% biblionumber_for_new_subscription %]"><i class="icon-plus"></i> New subscription</a></div>
40
        [% IF CAN_user_serials_create_subscription %]
42
        [% ELSE %]
41
            [% IF biblionumber_for_new_subscription %]
43
            <div class="btn-group"><a id="newsubscription" class="btn btn-small" href="/cgi-bin/koha/serials/subscription-add.pl"><i class="icon-plus"></i> New subscription</a></div>
42
                <div class="btn-group"><a id="newsubscription" class="btn btn-small" href="/cgi-bin/koha/serials/subscription-add.pl?biblionumber_for_new_subscription=[% biblionumber_for_new_subscription %]"><i class="icon-plus"></i> New subscription</a></div>
43
            [% ELSE %]
44
                <div class="btn-group"><a id="newsubscription" class="btn btn-small" href="/cgi-bin/koha/serials/subscription-add.pl"><i class="icon-plus"></i> New subscription</a></div>
45
            [% END %]
44
        [% END %]
46
        [% END %]
45
    [% END %]
46
47
47
    [% IF ( CAN_user_serials_edit_subscription || CAN_user_serials_create_subscription || CAN_user_serials_delete_subscription ) %]
48
        [% IF ( CAN_user_serials_edit_subscription || CAN_user_serials_create_subscription || CAN_user_serials_delete_subscription ) %]
48
        [% IF ( subscriptionid ) %]
49
            [% UNLESS ( cannotedit ) %]
49
50
                <div class="btn-group">
50
            [% IF ( CAN_user_serials_edit_subscription || CAN_user_serials_create_subscription || CAN_user_serials_delete_subscription ) %]
51
                    <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="icon-pencil"></i> Edit <span class="caret"></span></button>
51
                [% UNLESS ( cannotedit ) %]
52
                        <ul class="dropdown-menu">
52
                    <div class="btn-group">
53
                            [% IF ( cannotedit ) %] <li class="disabled"> [% ELSE %]
53
                        <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="icon-pencil"></i> Edit <span class="caret"></span></button>
54
                            <li> [% END %]
54
                            <ul class="dropdown-menu">
55
                            <a href="/cgi-bin/koha/serials/subscription-add.pl?op=modify&amp;subscriptionid=[% subscriptionid %]">Edit subscription</a></li>
55
                                [% IF ( cannotedit ) %] <li class="disabled"> [% ELSE %]
56
                            [% IF ( cannotedit ) %] <li class="disabled"> [% ELSE %]
56
                                <li> [% END %]
57
                            <li> [% END %]
57
                                <a href="/cgi-bin/koha/serials/subscription-add.pl?op=modify&amp;subscriptionid=[% subscriptionid %]">Edit subscription</a></li>
58
                            <a href="/cgi-bin/koha/serials/subscription-add.pl?op=dup&amp;subscriptionid=[% subscriptionid %]">Edit as new (duplicate)</a></li>
58
                                [% IF ( cannotedit ) %] <li class="disabled"> [% ELSE %]
59
                            [% IF ( CAN_user_serials_delete_subscription ) %]
59
                                <li> [% END %]
60
                            [% IF ( cannotedit ) %] <li class="disabled"> [% ELSE %]
60
                                <a href="/cgi-bin/koha/serials/subscription-add.pl?op=dup&amp;subscriptionid=[% subscriptionid %]">Edit as new (duplicate)</a></li>
61
                            <li> [% END %]
61
                                [% IF ( CAN_user_serials_delete_subscription ) %]
62
                            <a href="#" id="deletesub">Delete subscription</a></li>[% END %]
62
                                [% IF ( cannotedit ) %] <li class="disabled"> [% ELSE %]
63
                        </ul>
63
                                <li> [% END %]
64
                </div>
64
                                <a href="#" id="deletesub">Delete subscription</a></li>[% END %]
65
                            </ul>
66
                    </div>
67
                [% END %]
68
            [% END %]
65
            [% END %]
66
        [% END %]
69
67
70
            [% UNLESS ( cannotedit ) %]
68
        [% IF not cannotedit or CAN_user_serials_receive_serials %]
71
                [% UNLESS closed %]
69
            [% IF CAN_user_serials_renew_subscription and not closed %]
72
                    [% IF ( CAN_user_serials_renew_subscription ) %]
70
                <div class="btn-group"><a id="renew" class="btn btn-small" href="#" onclick="popup([% subscriptionid %])"><i class="icon-refresh"></i> Renew</a></div>
73
                        <div class="btn-group"><a id="renew" class="btn btn-small" href="#" onclick="popup([% subscriptionid %])"><i class="icon-refresh"></i> Renew</a></div>
71
            [% END %]
74
                    [% END %]
72
            [% IF CAN_user_serials_receive_serials and not closed %]
75
                [% END %]
73
                <div class="btn-group"><a id="receive" class="btn btn-small" href="/cgi-bin/koha/serials/serials-edit.pl?subscriptionid=[% subscriptionid %]&amp;serstatus=1,3"><i class="icon-inbox"></i> Receive</a></div>
76
                [% IF ( CAN_user_serials_receive_serials ) %]
74
            [% END %]
77
                    [% UNLESS closed %]
75
            [% UNLESS cannotedit %]
78
                        <div class="btn-group"><a id="receive" class="btn btn-small" href="/cgi-bin/koha/serials/serials-edit.pl?subscriptionid=[% subscriptionid %]&amp;serstatus=1,3"><i class="icon-inbox"></i> Receive</a></div>
76
                [% IF closed %]
79
                    [% END %]
77
                    <div class="btn-group"><a id="reopen" class="btn btn-small" href="#"><i class="icon-repeat"></i> Reopen</a></div>
80
                [% END %]
78
                [% ELSE %]
81
                [% IF CAN_user_serials_edit_subscription %]
79
                    <div class="btn-group"><a id="close" class="btn btn-small" href="#"><i class="icon-remove-circle"></i> Close</a></div>
82
                    [% IF closed %]
83
                        <div class="btn-group"><a id="reopen" class="btn btn-small" href="#"><i class="icon-repeat"></i> Reopen</a></div>
84
                    [% ELSE %]
85
                        <div class="btn-group"><a id="close" class="btn btn-small" href="#"><i class="icon-remove-circle"></i> Close</a></div>
86
                    [% END %]
87
                [% END %]
80
                [% END %]
88
            [% END %]
81
            [% END %]
89
        [% END %]
82
        [% END %]
90
    [% END %]
83
    </div>
91
</div>
84
[% ELSIF CAN_user_serials_create_subscription %]
85
    <div id="toolbar" class="btn-toolbar">
86
        [% IF ( biblionumber_for_new_subscription ) %]
87
            <div class="btn-group"><a id="newsubscription" class="btn btn-small" href="/cgi-bin/koha/serials/subscription-add.pl?biblionumber_for_new_subscription=[% biblionumber_for_new_subscription %]"><i class="icon-plus"></i> New subscription</a></div>
88
        [% ELSE %]
89
            <div class="btn-group"><a id="newsubscription" class="btn btn-small" href="/cgi-bin/koha/serials/subscription-add.pl"><i class="icon-plus"></i> New subscription</a></div>
90
        [% END %]
91
    </div>
92
[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt (-1 / +1 lines)
Lines 219-225 $(document).ready(function() { Link Here
219
    [% UNLESS ( loop.odd ) %]<tr class="highlight">[% ELSE %]<tr>[% END %]
219
    [% UNLESS ( loop.odd ) %]<tr class="highlight">[% ELSE %]<tr>[% END %]
220
            [% IF ( CAN_user_serials_receive_serials ) %]
220
            [% IF ( CAN_user_serials_receive_serials ) %]
221
                <td>
221
                <td>
222
                  [% IF ( serial.cannotedit ) %]
222
                  [% UNLESS CAN_user_serials_receive_serials %]
223
                    disabled
223
                    disabled
224
                  [% ELSE %]
224
                  [% ELSE %]
225
                    [% IF ( serial.subscriptionexpired ) %]
225
                    [% IF ( serial.subscriptionexpired ) %]
(-)a/serials/serials-edit.pl (-1 / +1 lines)
Lines 153-158 foreach my $serialid (@serialids) { Link Here
153
            )
153
            )
154
            || $serinfo->{'cannotedit'}
154
            || $serinfo->{'cannotedit'}
155
        );
155
        );
156
        $serinfo->{editdisable} = 0 if C4::Auth::haspermission( C4::Context->userenv->{id}, { serials => 'receive_serials' } );
156
        $serinfo->{editdisable} ||= ($serinfo->{status8} and $serinfo->{closed});
157
        $serinfo->{editdisable} ||= ($serinfo->{status8} and $serinfo->{closed});
157
        push @serialdatalist, $serinfo;
158
        push @serialdatalist, $serinfo;
158
        $processedserialid{$serialid} = 1;
159
        $processedserialid{$serialid} = 1;
159
- 

Return to bug 13662