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

(-)a/admin/background_jobs.pl (-4 / +15 lines)
Lines 19-24 use Modern::Perl; Link Here
19
use CGI qw ( -utf8 );
19
use CGI qw ( -utf8 );
20
20
21
use C4::Context;
21
use C4::Context;
22
use Koha::DateUtils qw( dt_from_string );
22
use C4::Auth qw( get_template_and_user );
23
use C4::Auth qw( get_template_and_user );
23
use C4::Output qw( output_html_with_http_headers );
24
use C4::Output qw( output_html_with_http_headers );
24
25
Lines 86-98 if ( $op eq 'list' ) { Link Here
86
      );
87
      );
87
    $template->param( queued => $queued_jobs );
88
    $template->param( queued => $queued_jobs );
88
89
90
    my $ended_since = dt_from_string->subtract( minutes => '60' );
91
    my $dtf = Koha::Database->new->schema->storage->datetime_parser;
92
89
    my $complete_jobs =
93
    my $complete_jobs =
90
      $can_manage_background_jobs
94
      $can_manage_background_jobs
91
      ? Koha::BackgroundJobs->search( { ended_on => { '!=' => undef } },
95
      ? Koha::BackgroundJobs->search(
92
        { order_by => { -desc => 'enqueued_on' } } )
96
        {
97
            ended_on => { '>=' => $dtf->format_date($ended_since) }
98
        },
99
        { order_by => { -desc => 'enqueued_on' } }
100
      )
93
      : Koha::BackgroundJobs->search(
101
      : Koha::BackgroundJobs->search(
94
        { borrowernumber => $logged_in_user->borrowernumber, ended_on => { '!=' => undef } },
102
        {
95
        { order_by       => { -desc => 'enqueued_on' } }
103
            borrowernumber => $logged_in_user->borrowernumber,
104
            ended_on       => { '>=' => $dtf->format_date($ended_since) }
105
        },
106
        { order_by => { -desc => 'enqueued_on' } }
96
      );
107
      );
97
    $template->param( complete => $complete_jobs );
108
    $template->param( complete => $complete_jobs );
98
}
109
}
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt (-7 / +3 lines)
Lines 164-171 Link Here
164
164
165
        <div class="tab-content">
165
        <div class="tab-content">
166
            <div role="tabpanel" class="tab-pane active" id="queued">
166
            <div role="tabpanel" class="tab-pane active" id="queued">
167
                <h2>Queued jobs</h2>
168
169
                [% IF queued.count %]
167
                [% IF queued.count %]
170
                    <table id="table_queued_jobs">
168
                    <table id="table_queued_jobs">
171
                        <thead>
169
                        <thead>
Lines 211-220 Link Here
211
                [% END %]
209
                [% END %]
212
            </div>
210
            </div>
213
211
214
            <div role="tabpanel" class="tab-pane active" id="complete">
212
            <div role="tabpanel" class="tab-pane" id="complete">
215
                <h2>Complete jobs</h2>
216
217
                [% IF complete.count %]
213
                [% IF complete.count %]
214
                    <p>Jobs completed in the last 60 minutes.</p>
218
                    <table id="table_complete_jobs">
215
                    <table id="table_complete_jobs">
219
                        <thead>
216
                        <thead>
220
                            <tr>
217
                            <tr>
Lines 254-260 Link Here
254
                    </table>
251
                    </table>
255
                [% ELSE %]
252
                [% ELSE %]
256
                    <div class="dialog message">
253
                    <div class="dialog message">
257
                        There are no completed background jobs yet.
254
                        There were no completed background jobs completed in the last 60 minutes.
258
                    </div>
255
                    </div>
259
                [% END %]
256
                [% END %]
260
            </div>
257
            </div>
261
- 

Return to bug 30462