Merge pull request jenkins-khan#69 from bobey/master

Fatal error on index when having no jenkinsgrouprun at all
pmsipilot · Apr 4, 2012 · 15594b2 · 15594b2
2 parents 262d45b + 9baf309
commit 15594b2
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 18 deletions.
diff --git a/apps/front/modules/jenkins/actions/indexAction.class.php b/apps/front/modules/jenkins/actions/indexAction.class.php
@@ -76,29 +76,35 @@ function execute($request)
     }
 
     $currentGroupRun = JenkinsGroupRunPeer::retrieveByPK($currentGroupId);
-
+
-    $sortMenu = array(
+    $sortMenu = $partial_url_for_sort_direction = $branch_view_url = null;
-      'label'  => array(
+    if (null !== $currentGroupRun)
-        'label' => 'Name',
+    {
-        'url'   => $this->generateUrl('branch_view', $currentGroupRun) . '/sort/label_' . $sortDirection,
+      $sortMenu = array(
-      ),
+        'label'  => array(
-      'date'   => array(
+          'label' => 'Name',
-        'label' => 'Creation date',
+          'url'   => $this->generateUrl('branch_view', $currentGroupRun) . '/sort/label_' . $sortDirection,
-        'url'   => $this->generateUrl('branch_view', $currentGroupRun) . '/sort/date_' . $sortDirection,
+        ),
-      ),
+        'date'   => array(
-      'result' => array(
+          'label' => 'Creation date',
-        'label' => 'Status',
+          'url'   => $this->generateUrl('branch_view', $currentGroupRun) . '/sort/date_' . $sortDirection,
-        'url'   => $this->generateUrl('branch_view', $currentGroupRun) . '/sort/result_' . $sortDirection,
+        ),
-      ),
+        'result' => array(
-    );
+          'label' => 'Status',
-
+          'url'   => $this->generateUrl('branch_view', $currentGroupRun) . '/sort/result_' . $sortDirection,
+        ),
+      );
+      $branch_view_url = $this->generateUrl('branch_view', $currentGroupRun);
+      $partial_url_for_sort_direction = sprintf('%s/sort/%s_', $this->generateUrl('branch_view', $currentGroupRun), $sortType);
+    }
+
     $this->setVar('group_runs', $dataGroupRuns);
     $this->setVar('current_group_run_id', $currentGroupId);
     $this->setVar('sort_type', $sortType);
     $this->setVar('sort_direction', $sortDirection);
     $this->setVar('sort_menu', $sortMenu);
-    $this->setVar('branch_view_url', $this->generateUrl('branch_view', $currentGroupRun));
+    $this->setVar('branch_view_url', $branch_view_url);
-    $this->setVar('partial_url_for_sort_direction', sprintf('%s/sort/%s_', $this->generateUrl('branch_view', $currentGroupRun), $sortType));
+    $this->setVar('partial_url_for_sort_direction', $partial_url_for_sort_direction);
   }
 
   /**

diff --git a/apps/front/modules/jenkins/templates/indexSuccess.php b/apps/front/modules/jenkins/templates/indexSuccess.php
@@ -18,6 +18,7 @@
   <?php endif; ?>
   <div class="sidebar">
     <ul>
+      <?php if (null !== $sort_menu): ?>
       <li class="sidebar-actions">
         <div class="btn-group">
           <a class="btn dropdown-toggle btn-primary" data-toggle="dropdown" href="#">
@@ -36,6 +37,7 @@
           </div>
         </div>
       </li>
+      <?php endif ?>
       <li>
         <?php if ($jenkins->isAvailable()): ?>
           <?php echo link_to('Create a build branch', 'jenkins/createGroupRun', array('class' => 'add-run')); ?>