Changeset 396 for trunk

Timestamp:

07/23/10 11:14:26 (11 years ago)

Author:

sander

Message:

Set failures to zero when requeueing a job

File:

• trunk/server/www/app/controllers/jobs_controller.php (modified) (2 diffs)

trunk/server/www/app/controllers/jobs_controller.php

@@ -196 +196 @@
                 $this->Job->id = $id;
                 $this->Job->saveField('state', $state);
+        }
+
+        /**
+         * Manually mark job as failed
+         */
+        public function fail($id = null)
+        {
+                $this->_setState(Job::STATE_FAILED, $id);
                 $this->redirect(array('action' => 'view', $id));
         }
@@ -202 +210 @@
          * Manually mark job as failed
          */
-        public function fail($id = null)
-        {
-                $this->_setState(Job::STATE_FAILED, $id);
-        }
-
-        /**
-         * Manually mark job as failed
-         */
         public function requeue($id = null)
         {
                 $this->_setState(Job::STATE_QUEUED, $id);
+                $this->Job->saveField('failures', 0);
+                $this->redirect(array('action' => 'view', $id));
         }