From e37faa0008df38088a55932786955e68ee1f955f Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Mon, 9 Mar 2009 07:28:19 +0000 Subject: More tasks cleanup. Don't join through to the users table; that won't work in embedded mode. Instead, add Tasks_Model::owner() that calls user::lookup() and refer to the object directly in the view. Add Admin_Maintenance:remove_finished_tasks() so that we can easily do old task cleanup. Hide Running / Finished sections if there aren't any running or finished tasks. --- core/controllers/admin_maintenance.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'core/controllers') diff --git a/core/controllers/admin_maintenance.php b/core/controllers/admin_maintenance.php index c98251bc..80403906 100644 --- a/core/controllers/admin_maintenance.php +++ b/core/controllers/admin_maintenance.php @@ -42,12 +42,8 @@ class Admin_Maintenance_Controller extends Admin_Controller { $view->content = new View("admin_maintenance.html"); $view->content->task_definitions = task::get_definitions("admin"); $view->content->running_tasks = ORM::factory("task") - ->select("tasks.*", "users.name as user_name") - ->join("users", "tasks.owner_id", "users.id") ->where("done", 0)->orderby("updated", "DESC")->find_all(); $view->content->finished_tasks = ORM::factory("task") - ->select("tasks.*", "users.name as user_name") - ->join("users", "tasks.owner_id", "users.id") ->where("done", 1)->orderby("updated", "DESC")->find_all(); $view->content->csrf = access::csrf_token(); print $view; @@ -119,6 +115,13 @@ class Admin_Maintenance_Controller extends Admin_Controller { url::redirect("admin/maintenance"); } + public function remove_finished_tasks() { + access::verify_csrf(); + Database::instance()->delete("tasks", array("done" => 1)); + message::success(t("All finished tasks removed")); + url::redirect("admin/maintenance"); + } + /** * Run a task. This will trigger the task to do a small amount of work, then it will report * back with status on the task. -- cgit v1.2.3