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

module/bug/model.php

@@ -2089,6 +2089,7 @@ class bugModel extends model
             ->leftJoin(TABLE_BUILD)->alias('t2')->on('t1.id = t2.execution')
             ->where('t2.id')->in($buildID)
             ->fetchAll('id');
+        if(empty($executions)) return array();
 
         $condition = 'execution NOT ' . helper::dbIN(array_keys($executions));
         $minBegin  = '';

module/project/css/create.css

@@ -28,3 +28,4 @@
 .futureBox {vertical-align: top !important; padding-top: 13px !important;}
 #linkPlan {padding-top: 25px !important;}
 #projectType {padding-top: 7px !important;}
+.division .icon-help {margin-left: 15px}

module/project/lang/de.php

@@ -358,6 +358,7 @@ $lang->project->begigLetterExecution = 'The start date of project should be ≤
 $lang->project->endGreateExecution   = 'The finish date of the project should be ≥ the maximum finish date of the execution: %s.';
 $lang->project->childLongTime        = "If a child as long-term projects, the parent should be long-term too.";
 $lang->project->confirmUnlinkMember  = "Do you want to remove this user from project?";
+$lang->project->divisionTips         = "The current project is a single set stage, click [Enable] to change to multiple sets of stages, each set of stages is only associated with one product.";
 
 $lang->project->action = new stdclass();
 $lang->project->action->managed = '$date, managed by <strong>$actor</strong>. $extra' . "\n";

module/project/lang/en.php

@@ -365,6 +365,7 @@ $lang->project->begigLetterExecution = 'The start date of project should be ≤
 $lang->project->endGreateExecution   = 'The finish date of the project should be ≥ the maximum finish date of the execution: %s.';
 $lang->project->childLongTime        = "There are long-term projects in the child project, and the parent project should also be a long-term project.";
 $lang->project->confirmUnlinkMember  = "Do you want to remove this user from project?";
+$lang->project->divisionTips         = "The current project is a single set stage, click [Enable] to change to multiple sets of stages, each set of stages is only associated with one product.";
 
 $lang->project->action = new stdclass();
 $lang->project->action->managed = '$date, managed by <strong>$actor</strong>. $extra' . "\n";

module/project/lang/fr.php

@@ -365,6 +365,7 @@ $lang->project->begigLetterExecution = 'La date de début du projet "%s" doit ê
 $lang->project->endGreateExecution   = 'La date de fin du projet "%s" doit être ≥ à la date de fin maximale d\'exécution: %s.';
 $lang->project->childLongTime        = "If a child as long-term projects, the parent should be long-term too.";
 $lang->project->confirmUnlinkMember  = "Do you want to remove this user from project?";
+$lang->project->divisionTips         = "The current project is a single set stage, click [Enable] to change to multiple sets of stages, each set of stages is only associated with one product.";
 
 $lang->project->action = new stdclass();
 $lang->project->action->managed = '$date, managed by <strong>$actor</strong>. $extra' . "\n";

module/project/lang/vi.php

@@ -244,6 +244,7 @@ $lang->project->endGreaterParent  = "The end date of the parent project: %s. It
 $lang->project->beginGreateChild  = "The minimum start date of the project set: %s. The start date of the project cannot be less than the minimum start date of the project set.";
 $lang->project->endLetterChild    = "The maximum finish date for the project set: %s. The completion date of a project cannot be greater than the maximum completion date of the project set.";
 $lang->project->childLongTime     = "There are long-term projects in the child project, and the parent project should also be a long-term project.";
+$lang->project->divisionTips      = "The current project is a single set stage, click [Enable] to change to multiple sets of stages, each set of stages is only associated with one product.";
 
 $lang->project->action = new stdclass();
 $lang->project->action->managed = '$date, managed by <strong>$actor</strong>. $extra' . "\n";

module/project/lang/zh-cn.php

@@ -365,6 +365,7 @@ $lang->project->begigLetterExecution = '项目的开始日期应小于等于执
 $lang->project->endGreateExecution   = '项目的完成日期应大于等于执行的最大完成日期：%s';
 $lang->project->childLongTime        = "子项目中有长期项目，父项目也应该是长期项目";
 $lang->project->confirmUnlinkMember  = "您确定从该项目中移除该用户吗？";
+$lang->project->divisionTips         = "当前项目为单套阶段，点击[开启]可以变为多套阶段，每套阶段只关联一个{$lang->productCommon}。";
 
 $lang->project->action = new stdclass();
 $lang->project->action->managed = '$date, 由 <strong>$actor</strong> 维护。$extra' . "\n";

module/project/view/create.html.php

@@ -199,7 +199,10 @@
         <?php if($model == 'waterfall'):?>
         <tr class='hide division'>
           <th><?php echo $lang->project->division;?></th>
-          <td colspan='3'><?php echo html::radio('division', $lang->project->divisionList, '0');?></td>
+          <td>
+            <?php echo html::radio('division', $lang->project->divisionList, '0');?>
+            <icon class='icon icon-help' data-toggle='popover' data-trigger='focus hover' data-placement='right' data-tip-class='text-muted popover-sm' data-content="<?php echo $lang->project->divisionTips;?>"></icon>
+          </td>
         </tr>
         <?php endif;?>
         <?php if($model == 'kanban'):?>