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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc (-2 / +4 lines)
Lines 41-48 Link Here
41
                            <input type="checkbox" name="override_limit" id="override_limit" value="1" />
41
                            <input type="checkbox" name="override_limit" id="override_limit" value="1" />
42
                        [% END %]
42
                        [% END %]
43
                    [% END %]
43
                    [% END %]
44
                    <button class="btn" id="RenewCheckinChecked"><i class="fa fa-check"></i> Renew or check in selected items</button>
44
                    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
45
                    <button class="btn" id="RenewAll"><i class="fa fa-book"></i> Renew all</button>
45
                        <button class="btn" id="RenewCheckinChecked"><i class="fa fa-check"></i> Renew or check in selected items</button>
46
                        <button class="btn" id="RenewAll"><i class="fa fa-book"></i> Renew all</button>
47
                    [% END %]
46
                </fieldset>
48
                </fieldset>
47
49
48
                [% IF ( exports_enabled ) %]
50
                [% IF ( exports_enabled ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc (-1 / +1 lines)
Lines 4-10 Link Here
4
    [%- CASE 'circulate' -%]<span>Check out and check in items</span>
4
    [%- CASE 'circulate' -%]<span>Check out and check in items</span>
5
    [%- CASE 'catalogue' -%]<span><b>Required for staff login.</b> Staff access, allows viewing of catalogue in staff client.</span>
5
    [%- CASE 'catalogue' -%]<span><b>Required for staff login.</b> Staff access, allows viewing of catalogue in staff client.</span>
6
    [%- CASE 'parameters' -%]<span>Manage Koha system settings (Administration panel)</span>
6
    [%- CASE 'parameters' -%]<span>Manage Koha system settings (Administration panel)</span>
7
    [%- CASE 'borrowers' -%]<span>Add or modify patrons</span>
7
    [%- CASE 'borrowers' -%]<span>Add, modify and view patrons information</span>
8
    [%- CASE 'permissions' -%]<span>Set user permissions</span>
8
    [%- CASE 'permissions' -%]<span>Set user permissions</span>
9
    [%- CASE 'reserveforothers' -%]<span>Place and modify holds for patrons</span>
9
    [%- CASE 'reserveforothers' -%]<span>Place and modify holds for patrons</span>
10
    [%- CASE 'editcatalogue' -%]<span>Edit catalog (Modify bibliographic/holdings data)</span>
10
    [%- CASE 'editcatalogue' -%]<span>Edit catalog (Modify bibliographic/holdings data)</span>
(-)a/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js (+2 lines)
Lines 295-300 $(document).ready(function() { Link Here
295
                },
295
                },
296
                {
296
                {
297
                    "bSortable": false,
297
                    "bSortable": false,
298
                    "bVisible": AllowCirculate ? true : false,
298
                    "mDataProp": function ( oObj ) {
299
                    "mDataProp": function ( oObj ) {
299
                        var content = "";
300
                        var content = "";
300
                        var span_style = "";
301
                        var span_style = "";
Lines 388-393 $(document).ready(function() { Link Here
388
                },
389
                },
389
                {
390
                {
390
                    "bSortable": false,
391
                    "bSortable": false,
392
                    "bVisible": AllowCirculate ? true : false,
391
                    "mDataProp": function ( oObj ) {
393
                    "mDataProp": function ( oObj ) {
392
                        if ( oObj.can_renew_error == "on_reserve" ) {
394
                        if ( oObj.can_renew_error == "on_reserve" ) {
393
                            return "<a href='/cgi-bin/koha/reserve/request.pl?biblionumber=" + oObj.biblionumber + "'>" + ON_HOLD + "</a>";
395
                            return "<a href='/cgi-bin/koha/reserve/request.pl?biblionumber=" + oObj.biblionumber + "'>" + ON_HOLD + "</a>";
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (+1 lines)
Lines 33-38 var theme = "[% theme %]"; Link Here
33
var borrowernumber = "[% borrowernumber %]";
33
var borrowernumber = "[% borrowernumber %]";
34
var branchcode = "[% branch %]";
34
var branchcode = "[% branch %]";
35
var exports_enabled = "[% exports_enabled %]";
35
var exports_enabled = "[% exports_enabled %]";
36
var AllowCirculate = [% (CAN_user_circulate_circulate_remaining_permissions)? 1 : 0 %]
36
var AllowRenewalLimitOverride = [% (CAN_user_circulate_override_renewals && AllowRenewalLimitOverride)? 1: 0 %];
37
var AllowRenewalLimitOverride = [% (CAN_user_circulate_override_renewals && AllowRenewalLimitOverride)? 1: 0 %];
37
var script = "moremember";
38
var script = "moremember";
38
var relatives_borrowernumbers = new Array();
39
var relatives_borrowernumbers = new Array();
(-)a/svc/checkouts (-5 / +7 lines)
Lines 23-29 use warnings; Link Here
23
use CGI;
23
use CGI;
24
use JSON qw(to_json);
24
use JSON qw(to_json);
25
25
26
use C4::Auth qw(check_cookie_auth);
26
use C4::Auth qw(check_cookie_auth haspermission get_session);
27
use C4::Biblio qw(GetMarcBiblio GetFrameworkCode GetRecordValue );
27
use C4::Biblio qw(GetMarcBiblio GetFrameworkCode GetRecordValue );
28
use C4::Circulation qw(GetIssuingCharges CanBookBeRenewed GetRenewCount GetSoonestRenewDate);
28
use C4::Circulation qw(GetIssuingCharges CanBookBeRenewed GetRenewCount GetSoonestRenewDate);
29
use C4::Koha qw(GetAuthorisedValueByCode);
29
use C4::Koha qw(GetAuthorisedValueByCode);
Lines 35-44 use Koha::DateUtils; Link Here
35
my $input = new CGI;
35
my $input = new CGI;
36
36
37
my ( $auth_status, $sessionID ) =
37
my ( $auth_status, $sessionID ) =
38
  check_cookie_auth( $input->cookie('CGISESSID'),
38
  check_cookie_auth( $input->cookie('CGISESSID'));
39
    { circulate => 'circulate_remaining_permissions' } );
40
39
41
if ( $auth_status ne "ok" ) {
40
my $session   = get_session($sessionID);
41
my $userid   = $session->param('id');
42
43
unless (haspermission($userid, { circulate => 'circulate_remaining_permissions' })
44
    || haspermission($userid, { borrowers => '*' })) {
42
    exit 0;
45
    exit 0;
43
}
46
}
44
47
45
- 

Return to bug 15289