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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt (-1 / +15 lines)
Lines 76-81 Link Here
76
<form name="f" action="batchMod.pl" method="post">
76
<form name="f" action="batchMod.pl" method="post">
77
     <input type="hidden" name="biblionumber" id="biblionumber" value="[% biblionumber | html %]" />
77
     <input type="hidden" name="biblionumber" id="biblionumber" value="[% biblionumber | html %]" />
78
     <input type="hidden" name="op" value="[% op | html %]" />
78
     <input type="hidden" name="op" value="[% op | html %]" />
79
     <input type="hidden" name="searchid" value="[% searchid | html %]" />
79
     <input type="hidden" name="uploadedfileid" id="uploadedfileid" value="" />
80
     <input type="hidden" name="uploadedfileid" id="uploadedfileid" value="" />
80
     <input type="hidden" name="completedJobID" id="completedJobID" value="" />
81
     <input type="hidden" name="completedJobID" id="completedJobID" value="" />
81
     <input type="hidden" name="src" id="src" value="[% src | html %]" />
82
     <input type="hidden" name="src" id="src" value="[% src | html %]" />
Lines 221-229 Link Here
221
            [% IF delete_records %] <p>[% deleted_records | html %] record(s) deleted.</p> [% END %]
222
            [% IF delete_records %] <p>[% deleted_records | html %] record(s) deleted.</p> [% END %]
222
            [% IF src == 'CATALOGUING' # from catalogue/detail.pl > Delete items in a batch%]
223
            [% IF src == 'CATALOGUING' # from catalogue/detail.pl > Delete items in a batch%]
223
                [% IF biblio_deleted %]
224
                [% IF biblio_deleted %]
225
                    [% IF searchid %]
226
                        <div id="previous_search_link"></div>
227
                    [% END %]
224
                    <a href="/cgi-bin/koha/cataloguing/addbooks.pl">Return to the cataloging module</a>
228
                    <a href="/cgi-bin/koha/cataloguing/addbooks.pl">Return to the cataloging module</a>
225
                [% ELSE %]
229
                [% ELSE %]
226
                    <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]">Return to the record</a>
230
                    [% IF searchid %]
231
                        <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]&searchid=[% searchid | uri %]">Return to the record</a>
232
                    [% ELSE %]
233
                        <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]">Return to the record</a>
234
                    [% END %]
227
                [% END %]
235
                [% END %]
228
            [% ELSIF src %]
236
            [% ELSIF src %]
229
                <a href="[% src | url %]">Return to where you were</a>
237
                <a href="[% src | url %]">Return to where you were</a>
Lines 289-294 Link Here
289
    [% INCLUDE 'datatables.inc' %]
297
    [% INCLUDE 'datatables.inc' %]
290
    [% Asset.js("js/pages/batchMod.js") | $raw %]
298
    [% Asset.js("js/pages/batchMod.js") | $raw %]
291
    [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") | $raw %]
299
    [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") | $raw %]
300
    [% Asset.js("js/browser.js") | $raw %]
292
    <script type="text/javascript">
301
    <script type="text/javascript">
293
        // Prepare array of all column headers, incrementing each index by
302
        // Prepare array of all column headers, incrementing each index by
294
        // two to accommodate control and title columns
303
        // two to accommodate control and title columns
Lines 301-306 Link Here
301
                return submitBackgroundJob(this.form);
310
                return submitBackgroundJob(this.form);
302
            });
311
            });
303
        });
312
        });
313
314
        [% IF searchid %]
315
            browser = KOHA.browser('[% searchid | html %]');
316
            browser.show_back_link();
317
        [% END %]
304
    </script>
318
    </script>
305
[% END %]
319
[% END %]
306
320
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt (-2 / +11 lines)
Lines 98-104 $(document).ready(function(){ Link Here
98
                [% END %]
98
                [% END %]
99
              <fieldset class="action">
99
              <fieldset class="action">
100
                  [% IF src == 'CATALOGUING' # from catalogue/detail.pl > Edit items in a batch%]
100
                  [% IF src == 'CATALOGUING' # from catalogue/detail.pl > Edit items in a batch%]
101
                      <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]">Return to the record</a>
101
                      [% IF searchid %]
102
                          <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]&searchid=[% searchid | uri %]">Return to the record</a>
103
                      [% ELSE %]
104
                          <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]">Return to the record</a>
105
                      [% END %]
102
                  [% ELSIF src %]
106
                  [% ELSIF src %]
103
                      <a href="[% src | url %]">Return to where you were</a>
107
                      <a href="[% src | url %]">Return to where you were</a>
104
                  [% ELSE %]
108
                  [% ELSE %]
Lines 150-155 $(document).ready(function(){ Link Here
150
154
151
<form name="f" action="batchMod.pl" method="post">
155
<form name="f" action="batchMod.pl" method="post">
152
     <input type="hidden" name="op" value="[% op | html %]" />
156
     <input type="hidden" name="op" value="[% op | html %]" />
157
     <input type="hidden" name="searchid" value="[% searchid | html %]" />
153
     <input type="hidden" name="uploadedfileid" id="uploadedfileid" value="" />
158
     <input type="hidden" name="uploadedfileid" id="uploadedfileid" value="" />
154
     <input type="hidden" name="runinbackground" id="runinbackground" value="" />
159
     <input type="hidden" name="runinbackground" id="runinbackground" value="" />
155
     <input type="hidden" name="completedJobID" id="completedJobID" value="" />
160
     <input type="hidden" name="completedJobID" id="completedJobID" value="" />
Lines 350-356 $(document).ready(function(){ Link Here
350
[% ELSE %] <!-- // show -->
355
[% ELSE %] <!-- // show -->
351
<fieldset class="action">
356
<fieldset class="action">
352
[% IF src == 'CATALOGUING' # from catalogue/detail.pl > Edit items in a batch%]
357
[% IF src == 'CATALOGUING' # from catalogue/detail.pl > Edit items in a batch%]
353
   <a class="btn btn-default" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | html %]"><i class="fa fa-check-square-o"></i> Return to the record</a>
358
    [% IF searchid %]
359
        <a class="btn btn-default" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]&searchid=[% searchid | uri %]"><i class="fa fa-check-square-o"></i> Return to the record</a>
360
    [% ELSE %]
361
        <a class="btn btn-default" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]"><i class="fa fa-check-square-o"></i> Return to the record</a>
362
    [% END %]
354
[% ELSIF src %]
363
[% ELSIF src %]
355
   <a class="btn btn-default" href="[% src | url %]"><i class="fa fa-check-square-o"></i> Return to where you were</a>
364
   <a class="btn btn-default" href="[% src | url %]"><i class="fa fa-check-square-o"></i> Return to where you were</a>
356
[% ELSE %]
365
[% ELSE %]
(-)a/tools/batchMod.pl (-2 / +2 lines)
Lines 69-75 if (!defined $op) { Link Here
69
    $template_flag = ($del) ? { tools => 'items_batchdel' }   : { tools => 'items_batchmod' };
69
    $template_flag = ($del) ? { tools => 'items_batchdel' }   : { tools => 'items_batchmod' };
70
}
70
}
71
71
72
73
my ($template, $loggedinuser, $cookie)
72
my ($template, $loggedinuser, $cookie)
74
    = get_template_and_user({template_name => $template_name,
73
    = get_template_and_user({template_name => $template_name,
75
                 query => $input,
74
                 query => $input,
Lines 78-83 my ($template, $loggedinuser, $cookie) Link Here
78
                 flagsrequired => $template_flag,
77
                 flagsrequired => $template_flag,
79
                 });
78
                 });
80
79
80
$template->param( searchid => scalar $input->param('searchid'), );
81
81
# Does the user have a restricted item edition permission?
82
# Does the user have a restricted item edition permission?
82
my $uid = $loggedinuser ? Koha::Patrons->find( $loggedinuser )->userid : undef;
83
my $uid = $loggedinuser ? Koha::Patrons->find( $loggedinuser )->userid : undef;
83
my $restrictededition = $uid ? haspermission($uid,  {'tools' => 'items_batchmod_restricted'}) : undef;
84
my $restrictededition = $uid ? haspermission($uid,  {'tools' => 'items_batchmod_restricted'}) : undef;
84
- 

Return to bug 5428