Changeset 315 for trunk

Timestamp:

03/10/10 14:37:31 (11 years ago)

Author:

sander

Message:

Start of a new gallery layout for test suites

Location:

trunk/server/www/app

Files:

• controllers/galleries_controller.php (modified) (6 diffs)
• models/gallery.php (modified) (2 diffs)
• views/elements/testsuite.ctp (added)
• views/galleries/testsuite.ctp (added)

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

@@ -31 +31 @@
 
         /** The models this controller uses */
-        public $uses = array('Gallery', 'Request', 'User');
+        public $uses = array('Gallery', 'Request', 'User', 'Application');
 
         /**
@@ -139 +139 @@
                         'conditions' => array('Gallery.slug' => $slug),
                         'contain' => array(
-                                'Request',
+                                'Request' => array('order' => 'Request.filename ASC'),
                                 'Request.Validator' => array('order' => 'Validator.name ASC'),
                                 'Request.Job' => array('order' => array(
@@ -155 +155 @@
                 ));
 
-                // Find out how many requests this gallery has. This determins the type of view
+                // Find out if this test suite needs to be abbreviated
                 $requestCount = $this->Gallery->requestCount($gallery['Gallery']['id'], true);
-                $abbreviate = ($requestCount >= Configure::read('Gallery.abbreviate'));
+                $isTestsuite = $this->Gallery->isTestsuite($gallery['Gallery']['id']);
+                $abbreviate = ($requestCount >= Configure::read('Gallery.abbreviate') && !$isTestsuite);
 
                 // Get the children of this gallery
@@ -165 +166 @@
                                 'Gallery.rght <' => $gallery['Gallery']['rght'],
                         ),
-                        'contain' => array('Request'),
+                        'contain' => array('Request' => array('order' => 'Request.filename ASC')),
+                        'order' => array('Gallery.name ASC'),
                 ));
 
@@ -201 +203 @@
                                                 unset($job['Job']);
                                         }
+                                        unset($job);
                                 }
                         }
                 }
 
+                // If this is a Testsuite then we need some extra information
+                if ($isTestsuite) {
+                        $versions = array();
+                        $jobs = Set::extract('/Request/Job', $gallery);
+                        $jobs = array_merge(Set::extract('/Request/Job', $children), $jobs);
+
+                        foreach ($jobs as $job) {
+                                $application = $job['Job']['application_id'];
+                                if (!isset($versions[$application])) {
+                                        $versions[$application] = $job['Job']['version'];
+                                        continue;
+                                }
+
+                                if ($job['Job']['version'] > $versions[$application]) {
+                                        $versions[$application] = $job['Job']['version'];
+                                }
+                        }
+                        unset($application); // Because we're referencing below
+
+                        $applications = $this->Application->find('all', array(
+                                'conditions' => array('Application.id' => array_keys($versions)),
+                                'order' => array('Application.name'),
+                                'recursive' => -1,
+                        ));
+
+                        foreach ($applications as &$application) {
+                                $application['Application']['version'] = $versions[$application['Application']['id']];
+                        }
+                        unset($application); // Drop the reference
+
+                        $this->set(compact('applications'));
+                }
+
+                // Sort the subgalleries for display
                 $gallery['children'] = $this->_sortThreaded($children);
 
@@ -214 +251 @@
                 $access = $this->_checkAccess($slug);
                 $this->set(compact('gallery', 'path', 'access', 'abbreviate'));
+
+                // Render
+                if ($isTestsuite) {
+                        $this->render('testsuite');
+                }
         }
 

trunk/server/www/app/models/gallery.php

@@ -50 +50 @@
         public function checkAccess($user_id, $id = false)
         {
-                if ($id) {
+                if (!$id) {
                         $id = $this->id;
                 }
@@ -76 +76 @@
 
                 return false;
+        }
+
+        /**
+         * Determine if this gallery is a test suite gallery
+         * @param string $id The gallery ID
+         * @return boolean True or False
+         */
+        public function isTestsuite($id = null)
+        {
+                if (!$id) {
+                        $id = $this->id;
+                }
+
+                if (!$id) {
+                        return false;
+                }
+
+                $count = $this->Testsuite->find('count', array(
+                        'conditions' => array('Testsuite.gallery_id' => $id),
+                        'recursive' => -1,
+                ));
+
+                return ($count > 0);
         }