Merge branch 'sgm_fixbug' into 'master'

* Fix bug #19356.

See merge request easycorp/zentaopms!1746

module/execution/lang/en.php

@@ -97,7 +97,7 @@ $lang->execution->burnYUnit           = '(Hours)';
 $lang->execution->waitTasks           = 'Waiting Tasks';
 $lang->execution->viewByUser          = 'By User';
 $lang->execution->oneProduct          = "Only one stage can be linked {$lang->productCommon}";
-$lang->execution->noLinkProduct       = "Stage not linked {$lang->productCommon}";
+$lang->execution->noLinkProduct       = "Not linked {$lang->productCommon}!";
 $lang->execution->recent              = 'Recent visits: ';
 $lang->execution->copyNoExecution     = 'There are no ' . $lang->executionCommon . 'available to copy.';
 $lang->execution->noTeam              = 'No team members at the moment';

module/execution/lang/zh-cn.php

@@ -97,7 +97,7 @@ $lang->execution->burnYUnit           = '(工时)';
 $lang->execution->waitTasks           = '待处理';
 $lang->execution->viewByUser          = '按用户查看';
 $lang->execution->oneProduct          = "阶段只能关联一个{$lang->productCommon}";
-$lang->execution->noLinkProduct       = "阶段没有关联{$lang->productCommon}";
+$lang->execution->noLinkProduct       = "关联{$lang->productCommon}不能为空！";
 $lang->execution->recent              = '近期访问：';
 $lang->execution->copyNoExecution     = '没有可用的' . $lang->executionCommon . '来复制';
 $lang->execution->noTeam              = '暂时没有团队成员';

module/execution/model.php

@@ -303,18 +303,12 @@ class executionModel extends model
 
             /* If the execution model is a stage, determine whether the product is linked. */
             $products = array_filter($this->post->products);
-            if($type == 'stage' and empty($products))
+            if(empty($products))
             {
                 dao::$errors['message'][] = $this->lang->execution->noLinkProduct;
                 return false;
             }
 
-            if($type == 'kanban' and empty($products))
-            {
-                dao::$errors['message'][] = $this->lang->execution->kanbanNoLinkProduct;
-                return false;
-            }
-
             $this->config->execution->create->requiredFields .= ',project';
         }
 

module/story/model.php

@@ -2923,6 +2923,7 @@ class storyModel extends model
             ->where('deleted')->eq(0)
             ->andWhere('type')->eq($type)
             ->andWhere('assignedTo')->eq($account)
+            ->andWhere('product')->ne(0)
             ->beginIF(!empty($skipProductIDList))->andWhere('product')->notin($skipProductIDList)->fi()
             ->orderBy('id_desc')
             ->limit($limit)