Listenansicht in BackgroundJobHistory-Controller sortierbar gemacht

diff --git a/SL/Controller/BackgroundJobHistory.pm b/SL/Controller/BackgroundJobHistory.pm
index 54d7338085e918188d46e5f511b9a67f93dde5a7..0629edf8f4e7d0ab09fdef4ff22d1fc1a89d3ec3 100644 (file)
--- a/SL/Controller/BackgroundJobHistory.pm
+++ b/SL/Controller/BackgroundJobHistory.pm
@@ -4,6 +4,8 @@ use strict;
 
 use parent qw(SL::Controller::Base);
 
 
 use parent qw(SL::Controller::Base);
 

+use SL::Controller::Helper::GetModels;
+use SL::Controller::Helper::Sorted;

 use SL::DB::BackgroundJobHistory;
 use SL::Helper::Flash;
 use SL::System::TaskServer;
 use SL::DB::BackgroundJobHistory;
 use SL::Helper::Flash;
 use SL::System::TaskServer;


@@ -18,6 +20,20 @@ __PACKAGE__->run_before('check_auth');
 __PACKAGE__->run_before('add_stylesheet');
 __PACKAGE__->run_before('check_task_server');
 
 __PACKAGE__->run_before('add_stylesheet');
 __PACKAGE__->run_before('check_task_server');
 

+__PACKAGE__->make_sorted(
+  DEFAULT_BY   => 'run_at',
+  DEFAULT_DIR  => 1,
+  MODEL        => 'BackgroundJobHistory',
+  FORM_PARAMS  => [ qw(sort_by sort_dir) ],
+  ONLY         => [ qw(list) ],
+
+  package_name => $::locale->text('Package name'),
+  run_at       => $::locale->text('Run at'),
+  status       => $::locale->text('Execution status'),
+  result       => $::locale->text('Result'),
+  error        => $::locale->text('Error'),
+);
+

 #
 # actions
 #
 #
 # actions
 #


@@ -27,7 +43,7 @@ sub action_list {
 
   $self->render('background_job_history/list',
                 title   => $::locale->text('Background job history'),
 
   $self->render('background_job_history/list',
                 title   => $::locale->text('Background job history'),

-                ENTRIES => SL::DB::Manager::BackgroundJobHistory->get_all_sorted);
+                ENTRIES => $self->get_models);

 }
 
 sub action_show {
 }
 
 sub action_show {

diff --git a/templates/webpages/background_job_history/list.html b/templates/webpages/background_job_history/list.html
index 83c8dae1d2431d2c9a5d8e20c28f74a028ca596a..6086776d141aa701b4a3aea4704c775a5673a379 100644 (file)
--- a/templates/webpages/background_job_history/list.html
+++ b/templates/webpages/background_job_history/list.html
@@ -15,11 +15,11 @@
    <table id="background_job_history_list" class="background_job_list" width="100%">
     <thead>
      <tr class="listheading">
    <table id="background_job_history_list" class="background_job_list" width="100%">
     <thead>
      <tr class="listheading">

-      <th>[%- LxERP.t8('Package name') %]</th>
-      <th>[%- LxERP.t8('Run at') %]</th>
-      <th>[%- LxERP.t8('Execution status') %]</th>
-      <th>[%- LxERP.t8('Result') %]</th>
-      <th>[%- LxERP.t8('Error') %]</th>
+      <th>[% L.sortable_table_header('package_name') %]</th>
+      <th>[% L.sortable_table_header('run_at') %]</th>
+      <th>[% L.sortable_table_header('status') %]</th>
+      <th>[% L.sortable_table_header('result') %]</th>
+      <th>[% L.sortable_table_header('error') %]</th>

      </tr>
     </thead>
 
      </tr>
     </thead>
 


@@ -27,7 +27,7 @@
     [%- FOREACH entry = ENTRIES %]
     <tr class="listrow[% loop.count % 2 %]" id="background_job_history_id_[% entry.id %]">
      <td>
     [%- FOREACH entry = ENTRIES %]
     <tr class="listrow[% loop.count % 2 %]" id="background_job_history_id_[% entry.id %]">
      <td>

-      <a href="[% SELF.url_for(action => 'show', id => entry.id) %]">
+      <a href="[% SELF.url_for(action => 'show', id => entry.id, back_to => SELF.get_callback) %]">

        [%- HTML.escape(entry.package_name) %]
       </a>
      </td>
        [%- HTML.escape(entry.package_name) %]
       </a>
      </td>