Rename Task to Task_Definition to avoid confusion with Task_Model.

Order the finished tasks by update time in the task list.

3 files changed, 8 insertions, 6 deletions

diff --git a/core/controllers/admin_maintenance.php b/core/controllers/admin_maintenance.php
index 077bf098..cd1682cc 100644
--- a/core/controllers/admin_maintenance.php
+++ b/core/controllers/admin_maintenance.php
@@ -59,8 +59,10 @@ class Admin_Maintenance_Controller extends Admin_Controller {
     $view = new Admin_View("admin.html");
     $view->content = new View("admin_maintenance.html");
     $view->content->task_definitions = $this->_get_task_definitions();
-    $view->content->running_tasks = ORM::factory("task")->where("done", 0)->find_all();
-    $view->content->finished_tasks = ORM::factory("task")->where("done", 1)->find_all();
+    $view->content->running_tasks =
+      ORM::factory("task")->where("done", 0)->orderby("updated", "desc")->find_all();
+    $view->content->finished_tasks =
+      ORM::factory("task")->where("done", 1)->orderby("updated", "desc")->find_all();
     $view->content->csrf = access::csrf_token();
     print $view;
   }
diff --git a/core/helpers/core_task.php b/core/helpers/core_task.php
index 6e90035a..8ec3363e 100644
--- a/core/helpers/core_task.php
+++ b/core/helpers/core_task.php
@@ -20,7 +20,7 @@
 class core_task_Core {
   static function available_tasks() {
     $dirty_count = graphics::find_dirty_images_query()->count();
-    return array(Task::factory()
+    return array(Task_Definition::factory()
                  ->callback("core_task::rebuild_dirty_images")
                  ->name(t("Rebuild Images"))
                  ->description($dirty_count ?
diff --git a/core/libraries/Task.php b/core/libraries/Task_Definition.php
index 8145c512..454b39ad 100644
--- a/core/libraries/Task.php
+++ b/core/libraries/Task_Definition.php
@@ -18,14 +18,14 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-class Task_Core {
+class Task_Definition_Core {
   public $callback;
   public $description;
   public $name;
   public $severity;
 
-  static function factory($id) {
-    return new Task();
+  static function factory() {
+    return new Task_Definition();
   }
 
   function callback($callback) {