diff options
author | Tim Almdal <tnalmdal@shaw.ca> | 2010-02-07 21:38:51 -0800 |
---|---|---|
committer | Tim Almdal <tnalmdal@shaw.ca> | 2010-02-07 21:38:51 -0800 |
commit | 316b0583b374a5754ea112c00464d118917cdbc1 (patch) | |
tree | d750e60c0bfc234c576ded4a3cb9630e68595a5d /modules/gallery/controllers/admin_maintenance.php | |
parent | 9695041a86ffeb1bfc5ced654cb04a9833eb9288 (diff) |
Revert "Refactor the admin maintenance screen so that events are used to
populate the action buttons and other content such as the list of scheduled
tasks."
Leaving this api out of RC1.
This reverts commit 19fee6b5e4ceb8a5f90cafe4ad770856ece108ef.
Conflicts:
modules/gallery/views/admin_maintenance.html.php
Diffstat (limited to 'modules/gallery/controllers/admin_maintenance.php')
-rw-r--r-- | modules/gallery/controllers/admin_maintenance.php | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/modules/gallery/controllers/admin_maintenance.php b/modules/gallery/controllers/admin_maintenance.php index 8e4845a9..487e77a6 100644 --- a/modules/gallery/controllers/admin_maintenance.php +++ b/modules/gallery/controllers/admin_maintenance.php @@ -44,17 +44,10 @@ class Admin_Maintenance_Controller extends Admin_Controller { $view->content->task_definitions = task::get_definitions(); $view->content->running_tasks = ORM::factory("task") ->where("done", "=", 0)->order_by("updated", "DESC")->find_all(); + $view->content->schedule_definitions = + module::is_active("scheduler") ? scheduler::get_definitions() : ""; $view->content->finished_tasks = ORM::factory("task") ->where("done", "=", 1)->order_by("updated", "DESC")->find_all(); - $task_buttons = - new ArrayObject(array((object)array("text" => t("run"), - "url" =>url::site("admin/maintenance/start")))); - module::event("admin_maintenance_task_buttons", $task_buttons); - $view->content->task_buttons = $task_buttons; - - $maintenance_content = new ArrayObject(); - module::event("admin_maintenance_content", $maintenance_content); - $view->content->task_maintenance_content = $maintenance_content; print $view; } |