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

module/doc/css/objectlibs.css

@@ -16,6 +16,7 @@
 .main-col .doc-title .actions a + a {margin-left: 8px;}
 .main-col .doc-title .actions i {font-size: 15px; color: #8c8c8c;}
 #content .title {max-width: 54%; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
+#content .detail-content {padding-left: 10px;}
 #mainContent .scrollbar-hover {max-height: 2000px; overflow: scroll;}
 #sidebar {width: 275px;}
 #sidebar>.cell {width: 100%;}

module/execution/css/common.css

@@ -27,4 +27,3 @@
 
 #whitelistBox .checkbox-inline, #whitelistBox .radio-inline {margin-left: 10px; display: inline-block; padding-left: 0px; padding-right: 10px;}
 .main-table > .table-responsive {padding: 0 1px; background: #fff;}
-#teams_chosen ul li:first-child {max-width:256px; display: inline-block; vertical-align: middle;}

module/execution/css/create.css

@@ -14,5 +14,4 @@
 .checkbox input[type=checkbox], .checkbox-inline input[type=checkbox], .radio input[type=radio], .radio-inline input[type=radio] {margin-top: 1px;}
 
 #lifeTimeTips {display: none;}
-#teams_chosen ul > li:first-child {max-width: 425px;}
 #teams_chosen ul .label {margin-top: 3px;}

module/execution/js/create.js

@@ -48,8 +48,11 @@ $(function()
     {
         if(systemMode == 'new')
         {
+            var maxWidth = $('.chosen-container .chosen-drop.chosen-auto-max-width.in').width() - 70;
+
             $('#teams_chosen ul .label').remove();
             $('#teams_chosen ul li:first').after(' <label class="label">' + projectCommon + '</label>');
+            $('#teams_chosen ul > li:first').attr('style', 'display: inline-block; vertical-align: middle; max-width: ' + maxWidth + 'px');
         }
     })
 

module/execution/model.php

@@ -2465,7 +2465,7 @@ class executionModel extends model
      */
     public function getTeamPairsByProject($projectID = 0)
     {
-        if(empty($projectID)) return array();
+        if(empty($projectID) and $this->config->systemMode == 'new') return array();
 
         $teams = $this->dao->select('id,name,type')->from(TABLE_PROJECT)
             ->where('deleted')->eq(0)