Sortierung im BackgroundJob-Controller

diff --git a/SL/Controller/BackgroundJob.pm b/SL/Controller/BackgroundJob.pm
index 57ec5c377bac1876bdcbbddacd12665037ca430b..dc97e1861d8060127aedfbde81afcfc288cea3e3 100644 (file)
--- a/SL/Controller/BackgroundJob.pm
+++ b/SL/Controller/BackgroundJob.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::BackgroundJob;
 use SL::Helper::Flash;
 use SL::System::TaskServer;
 use SL::DB::BackgroundJob;
 use SL::Helper::Flash;
 use SL::System::TaskServer;


@@ -11,13 +13,24 @@ use SL::System::TaskServer;
 use Rose::Object::MakeMethods::Generic
 (
   scalar                  => [ qw(background_job) ],
 use Rose::Object::MakeMethods::Generic
 (
   scalar                  => [ qw(background_job) ],

-  'scalar --get_set_init' => [ qw(task_server) ],
+  'scalar --get_set_init' => [ qw(task_server back_to) ],

 );
 
 __PACKAGE__->run_before('check_auth');
 __PACKAGE__->run_before('check_task_server');
 __PACKAGE__->run_before('load_background_job', only => [ qw(edit update destroy execute) ]);
 
 );
 
 __PACKAGE__->run_before('check_auth');
 __PACKAGE__->run_before('check_task_server');
 __PACKAGE__->run_before('load_background_job', only => [ qw(edit update destroy execute) ]);
 

+__PACKAGE__->make_sorted(
+  ONLY         => [ qw(list) ],
+
+  package_name => $::locale->text('Package name'),
+  type         => $::locale->text('Execution type'),
+  active       => $::locale->text('Active'),
+  cron_spec    => $::locale->text('Execution schedule'),
+  last_run_at  => $::locale->text('Last run at'),
+  next_run_at  => $::locale->text('Next run at'),
+);
+

 #
 # actions
 #
 #
 # actions
 #


@@ -27,7 +40,7 @@ sub action_list {
 
   $self->render('background_job/list',
                 title           => $::locale->text('Background jobs'),
 
   $self->render('background_job/list',
                 title           => $::locale->text('Background jobs'),

-                BACKGROUND_JOBS => SL::DB::Manager::BackgroundJob->get_all_sorted);
+                BACKGROUND_JOBS => $self->get_models);

 }
 
 sub action_new {
 }
 
 sub action_new {


@@ -63,7 +76,7 @@ sub action_destroy {
     flash_later('error', $::locale->text('The background job could not be destroyed.'));
   }
 
     flash_later('error', $::locale->text('The background job could not be destroyed.'));
   }
 

-  $self->redirect_to(action => 'list');
+  $self->redirect_to($self->back_to);

 }
 
 sub action_save_and_execute {
 }
 
 sub action_save_and_execute {


@@ -123,7 +136,7 @@ sub create_or_update {
   flash_later('info', $is_new ? $::locale->text('The background job has been created.') : $::locale->text('The background job has been saved.'));
   return if $return;
 
   flash_later('info', $is_new ? $::locale->text('The background job has been created.') : $::locale->text('The background job has been saved.'));
   return if $return;
 

-  $self->redirect_to(action => 'list');
+  $self->redirect_to($self->back_to);

 }
 
 sub load_background_job {
 }
 
 sub load_background_job {


@@ -140,4 +153,9 @@ sub check_task_server {
   flash('warning', $::locale->text('The task server does not appear to be running.')) if !$self->task_server->is_running;
 }
 
   flash('warning', $::locale->text('The task server does not appear to be running.')) if !$self->task_server->is_running;
 }
 

+sub init_back_to {
+  my ($self) = @_;
+  return $::form->{back_to} || $self->url_for(action => 'list');
+}
+

 1;
 1;

diff --git a/templates/webpages/background_job/form.html b/templates/webpages/background_job/form.html
index a4753bb41e04a69cf3955d6235f21177c653c95a..e7e364010c19f49cd514dffb01449d31c0625c58 100644 (file)
--- a/templates/webpages/background_job/form.html
+++ b/templates/webpages/background_job/form.html
@@ -37,6 +37,7 @@
 
   <p>
    [% L.hidden_tag("id", SELF.background_job.id) %]
 
   <p>
    [% L.hidden_tag("id", SELF.background_job.id) %]

+   [% L.hidden_tag("back_to", SELF.back_to) %]

    [% L.hidden_tag("action", "BackgroundJob/dispatch") %]
    [% L.submit_tag("action_" _  (SELF.background_job.id ? "update" : "create"), LxERP.t8('Save')) %]
    [%- IF SELF.background_job.id %]
    [% L.hidden_tag("action", "BackgroundJob/dispatch") %]
    [% L.submit_tag("action_" _  (SELF.background_job.id ? "update" : "create"), LxERP.t8('Save')) %]
    [%- IF SELF.background_job.id %]

diff --git a/templates/webpages/background_job/list.html b/templates/webpages/background_job/list.html
index 6ccef1c2041ccb146055c0233dde25fbc1b5130b..060c35d435f59f05a01e9d6229807115be7d72ee 100644 (file)
--- a/templates/webpages/background_job/list.html
+++ b/templates/webpages/background_job/list.html
@@ -15,12 +15,12 @@
    <table id="background_job_list" width="100%">
     <thead>
      <tr class="listheading">
    <table id="background_job_list" width="100%">
     <thead>
      <tr class="listheading">

-      <th>[%- LxERP.t8('Package name') %]</th>
-      <th>[%- LxERP.t8('Execution type') %]</th>
-      <th>[%- LxERP.t8('Active') %]</th>
-      <th>[%- LxERP.t8('Execution schedule') %]</th>
-      <th>[%- LxERP.t8('Last run at') %]</th>
-      <th>[%- LxERP.t8('Next run at') %]</th>
+      <th>[% L.sortable_table_header('package_name') %]</th>
+      <th>[% L.sortable_table_header('type') %]</th>
+      <th>[% L.sortable_table_header('active') %]</th>
+      <th>[% L.sortable_table_header('cron_spec') %]</th>
+      <th>[% L.sortable_table_header('last_run_at') %]</th>
+      <th>[% L.sortable_table_header('next_run_at') %]</th>

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


@@ -28,7 +28,7 @@
     [%- FOREACH background_job = BACKGROUND_JOBS %]
     <tr class="listrow[% loop.count % 2 %]" id="background_job_id_[% background_job.id %]">
      <td>
     [%- FOREACH background_job = BACKGROUND_JOBS %]
     <tr class="listrow[% loop.count % 2 %]" id="background_job_id_[% background_job.id %]">
      <td>

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

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


@@ -67,7 +67,7 @@
   <hr size="3" noshade>
 
   <p>
   <hr size="3" noshade>
 
   <p>

-   <a href="[% SELF.url_for(action => 'new') %]">[%- LxERP.t8('Create new background job') %]</a>
+   <a href="[% SELF.url_for(action => 'new', back_to => SELF.get_callback) %]">[%- LxERP.t8('Create new background job') %]</a>

    |
    <a href="[% SELF.url_for(controller => 'BackgroundJobHistory', action => 'list') %]">[%- LxERP.t8('View background job history') %]</a>
    |
    |
    <a href="[% SELF.url_for(controller => 'BackgroundJobHistory', action => 'list') %]">[%- LxERP.t8('View background job history') %]</a>
    |