Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms

module/bug/js/common.js

@@ -629,7 +629,7 @@ function notice()
             productID   = $('#product').val();
             projectID   = $('#project').val();
             link = createLink('build', 'create','executionID=' + executionID + '&productID=' + productID + '&projectID=' + projectID);
-            link += config.requestType == 'GET' ? '&onlybody=yes' : '?onlybody=yes';
+            if(config.onlybody != 'yes') link += config.requestType == 'GET' ? '&onlybody=yes' : '?onlybody=yes';
             html += '<a href="' + link + '" data-toggle="modal" data-type="iframe" style="padding-right:5px">' + createBuild + '</a> ';
             html += '<a href="javascript:loadExecutionBuilds(' + executionID + ')">' + refresh + '</a>';
         }

module/build/control.php

@@ -44,6 +44,7 @@ class build extends control
         }
 
         /* Set menu. */
+        $executions = array();
         if($this->app->tab == 'project')
         {
             $this->loadModel('project')->setMenu($projectID);
@@ -64,7 +65,7 @@ class build extends control
             $executions = $this->execution->getPairs($execution->project);
         }
 
-        $executionList = $this->execution->getByIdList(array_keys($executions));
+        $executionList = empty($executions) ? array() : $this->execution->getByIdList(array_keys($executions));
         foreach($executionList as $execution)
         {
             if($execution->lifetime == 'ops') unset($executions[$execution->id]);

module/task/css/view.css

@@ -1,3 +1,5 @@
 .side-col .cell {padding: 0px;}
 .side-col #legendProjectAndTask .list-unstyled {padding: 10px; border: 1px solid #ddd; border-top: 0px; margin: 0px;}
 .tab-pane table {border: 1px solid #ddd; border-top: none;}
+.page-title{max-width: 80%; overflow: hidden; white-space: nowrap; text-overflow: ellipsis;}
+.pull-left{max-width: 80%;}