Changeset 413

Timestamp:

07/15/11 09:47:46 (10 years ago)

Author:

sander

Message:

Fixed a job selection bug in jobs:rerun colsole task

Location:

trunk/server/www/app

Files:

• models/behaviors/file.php (modified) (1 diff)
• vendors/shells/jobs.php (modified) (3 diffs)

trunk/server/www/app/models/behaviors/file.php

@@ -395 +395 @@
         {
                 $path = $this->getPath($model);
-                if (file_exists($path)) {
-                        if (!unlink($path)) {
+                if ($path && file_exists($path)) {
+                        if (!@unlink($path)) {
                                 $this->errors[] = __('The file could not be deleted.', true);
                         }

trunk/server/www/app/vendors/shells/jobs.php

@@ -25 +25 @@
 {
         /** @var array The models to use */
-        public $uses = array('GalleriesRequest', 'Job', 'Testsuite');
+        public $uses = array('Gallery', 'GalleriesRequest', 'Job', 'Testsuite');
 
         /**
@@ -73 +73 @@
                         $this->Testsuite->id = $suite_id;
                         $gallery_id = $this->Testsuite->field('gallery_id');
+                        $galleries = Set::extract('/Gallery/id', $this->Gallery->children($gallery_id));
+                        $galleries[] = $gallery_id;
 
                         $count = count($jobs);
@@ -79 +81 @@
                                         'conditions' => array(
                                                 'request_id' => $jobs[$i]['Request']['id'],
-                                                'gallery_id' => $gallery_id,
+                                                'gallery_id' => $galleries,
                                         ),
                                         'recursive' => -1,
                                 ));
 
-                                if ($inGallery) {
+                                if (!$inGallery) {
                                         unset($jobs[$i]);
                                 }