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

(-)a/circ/circulation.pl (+4 lines)
Lines 176-181 my $print = $query->param('print') || q{}; Link Here
176
my $debt_confirmed = $query->param('debt_confirmed') || 0; # Don't show the debt error dialog twice
176
my $debt_confirmed = $query->param('debt_confirmed') || 0; # Don't show the debt error dialog twice
177
my $charges        = $query->param('charges') || q{};
177
my $charges        = $query->param('charges') || q{};
178
178
179
my $flags = C4::Auth::getuserflags($patron->flags, $patron->userid);
180
if (ref $flags->{reserveforothers} && $flags->{reserveforothers}){
181
    $template->param( has_reserveforothers_permission => 1 )}
182
179
# Check if stickyduedate is turned off
183
# Check if stickyduedate is turned off
180
if ( @$barcodes ) {
184
if ( @$barcodes ) {
181
    # was stickyduedate loaded from session?
185
    # was stickyduedate loaded from session?
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-2 / +4 lines)
Lines 934-940 No patron matched <span class="ex">[% message | html %]</span> Link Here
934
    [% IF relatives_issues_count %]
934
    [% IF relatives_issues_count %]
935
        <li><a id="relatives-issues-tab" href="#relatives-issues">Relatives' checkouts</a></li>
935
        <li><a id="relatives-issues-tab" href="#relatives-issues">Relatives' checkouts</a></li>
936
    [% END %]
936
    [% END %]
937
937
    [% IF has_reserveforothers_permission %]
938
    <li>
938
    <li>
939
        [% IF ( holds_count ) %]
939
        [% IF ( holds_count ) %]
940
            <a href="#reserves" id="holds-tab">[% holds_count %] Hold(s)</a>
940
            <a href="#reserves" id="holds-tab">[% holds_count %] Hold(s)</a>
Lines 942-947 No patron matched <span class="ex">[% message | html %]</span> Link Here
942
            <a href="#reserves" id="holds-tab">0 Holds</a>
942
            <a href="#reserves" id="holds-tab">0 Holds</a>
943
        [% END %]
943
        [% END %]
944
    </li>
944
    </li>
945
    [% END %]
945
946
946
    [% IF Koha.Preference('ArticleRequests') %]
947
    [% IF Koha.Preference('ArticleRequests') %]
947
        <li>
948
        <li>
Lines 998-1003 No patron matched <span class="ex">[% message | html %]</span> Link Here
998
999
999
[% INCLUDE borrower_debarments.inc %]
1000
[% INCLUDE borrower_debarments.inc %]
1000
1001
1002
[% IF has_reserveforothers_permission %]
1001
<div id="reserves">
1003
<div id="reserves">
1002
[% IF ( holds_count ) %]
1004
[% IF ( holds_count ) %]
1003
    <form action="/cgi-bin/koha/reserve/modrequest.pl" method="post">
1005
    <form action="/cgi-bin/koha/reserve/modrequest.pl" method="post">
Lines 1052-1058 No patron matched <span class="ex">[% message | html %]</span> Link Here
1052
	<p>Patron has nothing on hold.</p>
1054
	<p>Patron has nothing on hold.</p>
1053
[% END %]
1055
[% END %]
1054
</div> <!-- reservesloop -->
1056
</div> <!-- reservesloop -->
1055
1057
[% END %]
1056
[% IF Koha.Preference('ArticleRequests') %]
1058
[% IF Koha.Preference('ArticleRequests') %]
1057
    [% INCLUDE 'patron-article-requests.inc' %]
1059
    [% INCLUDE 'patron-article-requests.inc' %]
1058
[% END %]
1060
[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-10 / +14 lines)
Lines 65-71 $(document).ready(function() { Link Here
65
            $('#'+ui.newTab.context.id).click();
65
            $('#'+ui.newTab.context.id).click();
66
        }
66
        }
67
    } );
67
    } );
68
    $("#holdst").dataTable($.extend(true, {}, dataTablesDefaults, {
68
    $(CAN_user_reserveforothers("#holdst").dataTable($.extend(true, {}, dataTablesDefaults, {
69
        "sDom": 't',
69
        "sDom": 't',
70
        "aoColumnDefs": [
70
        "aoColumnDefs": [
71
            { "aTargets": [ -1,-2 ], "bSortable": false, "bSearchable": false }
71
            { "aTargets": [ -1,-2 ], "bSortable": false, "bSearchable": false }
Lines 74-80 $(document).ready(function() { Link Here
74
            { "sType": "title-string" },{ "sType": "anti-the" },null,null,null,null,null,null
74
            { "sType": "title-string" },{ "sType": "anti-the" },null,null,null,null,null,null
75
        ],
75
        ],
76
        "bPaginate": false
76
        "bPaginate": false
77
    }));
77
    })));
78
    [% IF ( picture ) %]
78
    [% IF ( picture ) %]
79
    // new YAHOO.widget.Button("delpicture");   // FIXME: formatting mismatch between YUI and normal button
79
    // new YAHOO.widget.Button("delpicture");   // FIXME: formatting mismatch between YUI and normal button
80
	$('#delpicture').click(function(){
80
	$('#delpicture').click(function(){
Lines 446-452 function validate1(date) { Link Here
446
    [% IF ( Koha.Preference('CheckPrevCheckout') == 'softyes' || Koha.Preference('CheckPrevCheckout') == 'softno' ) %]
446
    [% IF ( Koha.Preference('CheckPrevCheckout') == 'softyes' || Koha.Preference('CheckPrevCheckout') == 'softno' ) %]
447
      <li><span class="label">Check previous checkouts: </span>
447
      <li><span class="label">Check previous checkouts: </span>
448
        [% IF ( checkprevcheckout == 'yes' ) %]
448
        [% IF ( checkprevcheckout == 'yes' ) %]
449
        Yes
449
 Yes
450
        [% ELSIF ( checkprevcheckout == 'no' ) %]
450
        [% ELSIF ( checkprevcheckout == 'no' ) %]
451
        No
451
        No
452
        [% ELSE %]
452
        [% ELSE %]
Lines 508-520 function validate1(date) { Link Here
508
            <li><a href="#relatives-issues" id="relatives-issues-tab">Relatives' checkouts</a></li>
508
            <li><a href="#relatives-issues" id="relatives-issues-tab">Relatives' checkouts</a></li>
509
        [% END %]
509
        [% END %]
510
        <li><a href="#finesandcharges">Fines &amp; Charges</a></li>
510
        <li><a href="#finesandcharges">Fines &amp; Charges</a></li>
511
        [% IF has_reserveforothers_permission %]
511
        <li>
512
        <li>
512
            [% IF ( holds_count ) %]
513
                [% IF ( holds_count ) %]
513
                <a href="#reserves" id="holds-tab">[% holds_count %] Hold(s)</a>
514
                    <a href="#reserves" id="holds-tab">[% holds_count %] Hold(s)</a>
514
            [% ELSE %]
515
                [% ELSE %]
515
                <a href="#reserves" id="holds-tab">0 Holds</a>
516
                    <a href="#reserves" id="holds-tab">0 Holds</a>
516
            [% END %]
517
                [% END %]
517
        </li>
518
        </li>
519
        [% END %]
518
        [% IF Koha.Preference('ArticleRequests') %]
520
        [% IF Koha.Preference('ArticleRequests') %]
519
            <li>
521
            <li>
520
                <a href="#article-requests" id="article-requests-tab"> [% patron.article_requests_current.count %] Article requests</a>
522
                <a href="#article-requests" id="article-requests-tab"> [% patron.article_requests_current.count %] Article requests</a>
Lines 574-579 function validate1(date) { Link Here
574
576
575
[% INCLUDE borrower_debarments.inc %]
577
[% INCLUDE borrower_debarments.inc %]
576
578
579
[% IF has_reserveforothers_permission %]
577
<div id="reserves">
580
<div id="reserves">
578
[% IF ( holds_count ) %]
581
[% IF ( holds_count ) %]
579
    <form action="/cgi-bin/koha/reserve/modrequest.pl" method="post">
582
    <form action="/cgi-bin/koha/reserve/modrequest.pl" method="post">
Lines 620-631 function validate1(date) { Link Here
620
            <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
623
            <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
621
            <input type="hidden" name="suspend" value="0" />
624
            <input type="hidden" name="suspend" value="0" />
622
            <input type="submit" value="Resume all suspended holds" />
625
            <input type="submit" value="Resume all suspended holds" />
623
	</form>
626
</form>
624
    </fieldset>
627
    </fieldset>
625
    [% END # IF SuspendHoldsIntranet %]
628
    [% END # IF SuspendHoldsIntranet %]
626
629
627
    [% ELSE %]<p>Patron has nothing on hold.</p>[% END %]
630
    [% ELSE %]<p>Patron has nothing on hold.</p>[% END %]
628
	</div>
631
</div>
632
[% END %]
629
633
630
634
631
[% IF Koha.Preference('ArticleRequests') %]
635
[% IF Koha.Preference('ArticleRequests') %]
(-)a/members/moremember.pl (-1 / +5 lines)
Lines 167-172 if ( $patron->is_debarred ) { Link Here
167
    }
167
    }
168
}
168
}
169
169
170
my $flags = C4::Auth::getuserflags($patron->flags, $patron->userid);
171
if (ref $flags->{reserveforothers} && $flags->{reserveforothers}){
172
    $template->param( has_reserveforothers_permission => 1);
173
}
174
170
$data->{ "sex_".$data->{'sex'}."_p" } = 1 if defined $data->{sex};
175
$data->{ "sex_".$data->{'sex'}."_p" } = 1 if defined $data->{sex};
171
176
172
if ( $category_type eq 'C') {
177
if ( $category_type eq 'C') {
173
- 

Return to bug 17765