Changeset 298 for trunk/server/www/app/controllers/galleries_controller.php

Timestamp:

02/23/10 14:09:15 (11 years ago)

Author:

sander

Message:

Show abbreviated tree on large galleries

File:

• trunk/server/www/app/controllers/galleries_controller.php (modified) (3 diffs)

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

@@ -155 +155 @@
                 ));
 
+                // Find out how many requests this gallery has. This determins the type of view
+                $requestCount = $this->Gallery->requestCount($gallery['Gallery']['id'], true);
+                $abbreviate = ($requestCount >= Configure::read('Gallery.abbreviate'));
+
                 // Get the children of this gallery
-                // TODO: Do this without recursion below Request because it generates ridiculous amounts of
-                // duplicate queries that slow the system *a lot*
                 $children = $this->Gallery->find('all', array(
                         'conditions' => array(
@@ -174 +176 @@
                                 ));
 
-                                $request['Job'] = $this->Request->Job->find('all', array(
-                                        'conditions' => array('Job.request_id' => $request['id']),
-                                        'contain' => array(
-                                                'Application',
-                                                'Format',
-                                                'Platform',
-                                                'Result',
-                                                'Result.Validator'
-                                        ),
-                                        'order' => array(
-                                                'Application.name ASC',
-                                                'Job.version ASC',
-                                                'Platform.name ASC',
-                                                'Format.name ASC',
-                                        ),
-                                ));
-
-                                // Fix array layout to match a regular query layout
-                                foreach ($request['Job'] as &$job) {
-                                        foreach ($job['Job'] as $attr => $value) {
-                                                $job[$attr] = $value;
+                                if (!$abbreviate) {
+                                        $request['Job'] = $this->Request->Job->find('all', array(
+                                                'conditions' => array('Job.request_id' => $request['id']),
+                                                'contain' => array(
+                                                        'Application',
+                                                        'Format',
+                                                        'Platform',
+                                                        'Result',
+                                                        'Result.Validator'
+                                                ),
+                                                'order' => array(
+                                                        'Application.name ASC',
+                                                        'Job.version ASC',
+                                                        'Platform.name ASC',
+                                                        'Format.name ASC',
+                                                ),
+                                        ));
+
+                                        // Fix array layout to match a regular query layout
+                                        foreach ($request['Job'] as &$job) {
+                                                foreach ($job['Job'] as $attr => $value) {
+                                                        $job[$attr] = $value;
+                                                }
+                                                unset($job['Job']);
                                         }
-                                        unset($job['Job']);
                                 }
                         }
@@ -209 +213 @@
                 // Check access
                 $access = $this->_checkAccess($slug);
-                $this->set(compact('gallery', 'path', 'access'));
+                $this->set(compact('gallery', 'path', 'access', 'abbreviate'));
         }