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

(-)a/circ/circulation.pl (-25 / +26 lines)
Lines 177-188 for my $barcode (@$barcodes) { Link Here
177
    $barcode = barcodedecode($barcode) if $barcode;
177
    $barcode = barcodedecode($barcode) if $barcode;
178
}
178
}
179
179
180
# Check if stickyduedate is turned off
181
if (@$barcodes) {
182
183
    # was stickyduedate loaded from session?
184
    if ( $session->param('stickyduedate') && !$query->param("stickyduedate") ) {
185
        $session->clear('stickyduedate');
186
    }
187
188
    $session->param( 'auto_renew', scalar $query->param('auto_renew') );
189
190
} else {
191
    $session->clear('auto_renew');
192
}
193
180
my $stickyduedate      = $query->param('stickyduedate')      || $session->param('stickyduedate');
194
my $stickyduedate      = $query->param('stickyduedate')      || $session->param('stickyduedate');
181
my $duedatespec        = $query->param('duedatespec')        || $session->param('stickyduedate');
195
my $duedatespec        = $query->param('duedatespec')        || $session->param('stickyduedate');
182
my $restoreduedatespec = $query->param('restoreduedatespec') || $duedatespec || $session->param('stickyduedate');
196
my $restoreduedatespec = $query->param('restoreduedatespec') || $duedatespec || $session->param('stickyduedate');
183
if ( $restoreduedatespec && $restoreduedatespec eq "highholds_empty" ) {
197
if ( $restoreduedatespec && $restoreduedatespec eq "highholds_empty" ) {
184
    undef $restoreduedatespec;
198
    undef $restoreduedatespec;
185
}
199
}
200
201
# Restore date if changed by holds and/or save stickyduedate to session
202
if ( $restoreduedatespec || $stickyduedate ) {
203
    $duedatespec = $restoreduedatespec || $duedatespec;
204
205
    if ($stickyduedate) {
206
        $session->param( 'stickyduedate', $duedatespec );
207
    }
208
} elsif ( defined($duedatespec) && !defined($restoreduedatespec) ) {
209
    undef $duedatespec;
210
}
211
186
my $issueconfirmed = $query->param('issueconfirmed');
212
my $issueconfirmed = $query->param('issueconfirmed');
187
my $cancelreserve  = $query->param('cancelreserve');
213
my $cancelreserve  = $query->param('cancelreserve');
188
my $cancel_recall  = $query->param('cancel_recall');
214
my $cancel_recall  = $query->param('cancel_recall');
Lines 190-209 my $recall_id = $query->param('recall_id'); Link Here
190
my $debt_confirmed = $query->param('debt_confirmed') || 0;     # Don't show the debt error dialog twice
216
my $debt_confirmed = $query->param('debt_confirmed') || 0;     # Don't show the debt error dialog twice
191
my $charges        = $query->param('charges')        || q{};
217
my $charges        = $query->param('charges')        || q{};
192
218
193
# Check if stickyduedate is turned off
194
if (@$barcodes) {
195
196
    # was stickyduedate loaded from session?
197
    if ( $stickyduedate && !$query->param("stickyduedate") ) {
198
        $session->clear('stickyduedate');
199
        $stickyduedate = $query->param('stickyduedate');
200
        $duedatespec   = $query->param('duedatespec');
201
    }
202
    $session->param( 'auto_renew', scalar $query->param('auto_renew') );
203
} else {
204
    $session->clear('auto_renew');
205
}
206
207
$template->param( auto_renew => $session->param('auto_renew') );
219
$template->param( auto_renew => $session->param('auto_renew') );
208
220
209
my ( $datedue, $invalidduedate );
221
my ( $datedue, $invalidduedate );
Lines 733-749 if ($patron) { Link Here
733
    );
745
    );
734
}
746
}
735
747
736
# Restore date if changed by holds and/or save stickyduedate to session
737
if ( $restoreduedatespec || $stickyduedate ) {
738
    $duedatespec = $restoreduedatespec || $duedatespec;
739
740
    if ($stickyduedate) {
741
        $session->param( 'stickyduedate', $duedatespec );
742
    }
743
} elsif ( defined($duedatespec) && !defined($restoreduedatespec) ) {
744
    undef $duedatespec;
745
}
746
747
$template->param(
748
$template->param(
748
    borrowernumber            => $borrowernumber,
749
    borrowernumber            => $borrowernumber,
749
    branch                    => $branch,
750
    branch                    => $branch,
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-2 / +1 lines)
Lines 231-237 Link Here
231
                                [% END %]
231
                                [% END %]
232
232
233
                                [% IF HIGHHOLDS %]
233
                                [% IF HIGHHOLDS %]
234
                                    <li class="needsconfirm highholds">High demand item. Loan period shortened to [% HIGHHOLDS.duration | html %] days (due [% HIGHHOLDS.returndate | $KohaDates %]). Check out anyway?</li>
234
                                    <li class="needsconfirm highholds">High demand item. WHY THE FUCK IS THIS SHSHOW. Loan period shortened to [% HIGHHOLDS.duration | html %] days (due [% HIGHHOLDS.returndate | $KohaDates %]). Check out anyway?</li>
235
                                [% END %]
235
                                [% END %]
236
236
237
                                [% IF PREVISSUE %]
237
                                [% IF PREVISSUE %]
238
- 

Return to bug 39267