Merge branch 'fixbug_liumengyi_32592' into 'master'

* Fix bug 32592 32603.

See merge request easycorp/zentaopms!7132

module/execution/lang/de.php

@@ -282,7 +282,7 @@ $lang->execution->treeViewTask              = 'Tree View Task';
 $lang->execution->treeViewStory             = 'Tree View Story';
 $lang->execution->storyKanban               = 'Story Kanban';
 $lang->execution->storySort                 = 'Story sortieren';
-$lang->execution->importPlanStory           = $lang->executionCommon . ' is created!\nDo you want to import stories that have been linked to the plan? The stories in the draft will be automatically filtered out when imported.';
+$lang->execution->importPlanStory           = $lang->executionCommon . ' is created!\nDo you want to import stories that have been linked to the plan? Only active ' . $lang->SRCommon . ' can be imported.';
 $lang->execution->importEditPlanStory       = $lang->executionCommon . ' is edited!\nDo you want to import stories that have been linked to the plan? The stories in the draft will be automatically filtered out when imported.';
 $lang->execution->importBranchPlanStory     = $lang->executionCommon . ' is created!\nDo you want to import stories that have been linked to the plan? Only the activation stories of the branch associated with this ' .$lang->executionCommon. ' will be associated with the import';
 $lang->execution->importBranchEditPlanStory = $lang->executionCommon . ' is edited!\nDo you want to import stories that have been linked to the plan? Only the activation stories of the branch associated with this ' .$lang->executionCommon. ' will be associated with the import';

module/execution/lang/en.php

@@ -282,7 +282,7 @@ $lang->execution->treeViewTask              = 'Tree View Task';
 $lang->execution->treeViewStory             = 'Tree View Story';
 $lang->execution->storyKanban               = 'Story Kanban';
 $lang->execution->storySort                 = 'Rank Story';
-$lang->execution->importPlanStory           = $lang->executionCommon . ' is created!\nDo you want to import stories that have been linked to the plan? The stories in the draft will be automatically filtered out when imported.';
+$lang->execution->importPlanStory           = $lang->executionCommon . ' is created!\nDo you want to import stories that have been linked to the plan? Only active ' . $lang->SRCommon . ' can be imported.';
 $lang->execution->importEditPlanStory       = $lang->executionCommon . ' is edited!\nDo you want to import stories that have been linked to the plan? The stories in the draft will be automatically filtered out when imported.';
 $lang->execution->importBranchPlanStory     = $lang->executionCommon . ' is created!\nDo you want to import stories that have been linked to the plan? Only the activation stories of the branch associated with this ' .$lang->executionCommon. ' will be associated with the import';
 $lang->execution->importBranchEditPlanStory = $lang->executionCommon . ' is edited!\nDo you want to import stories that have been linked to the plan? Only the activation stories of the branch associated with this ' .$lang->executionCommon. ' will be associated with the import';

module/execution/lang/fr.php

@@ -282,7 +282,7 @@ $lang->execution->treeViewTask              = 'Tree View Task';
 $lang->execution->treeViewStory             = 'Tree View Story';
 $lang->execution->storyKanban               = 'Story Kanban';
 $lang->execution->storySort                 = 'Rank Story';
-$lang->execution->importPlanStory           = $lang->executionCommon . ' is created!\nDo you want to import stories that have been linked to the plan? The stories in the draft will be automatically filtered out when imported.';
+$lang->execution->importPlanStory           = $lang->executionCommon . ' is created!\nDo you want to import stories that have been linked to the plan? Only active ' . $lang->SRCommon . ' can be imported.';
 $lang->execution->importEditPlanStory       = $lang->executionCommon . ' is edited!\nDo you want to import stories that have been linked to the plan? The stories in the draft will be automatically filtered out when imported.';
 $lang->execution->importBranchPlanStory     = $lang->executionCommon . ' is created!\nDo you want to import stories that have been linked to the plan? Only the activation stories of the branch associated with this ' .$lang->executionCommon. ' will be associated with the import';
 $lang->execution->importBranchEditPlanStory = $lang->executionCommon . ' is edited!\nDo you want to import stories that have been linked to the plan? Only the activation stories of the branch associated with this ' .$lang->executionCommon. ' will be associated with the import';

module/execution/lang/zh-cn.php

@@ -282,7 +282,7 @@ $lang->execution->treeViewTask              = '树状图查看任务';
 $lang->execution->treeViewStory             = "树状图查看{$lang->SRCommon}";
 $lang->execution->storyKanban               = "{$lang->SRCommon}看板";
 $lang->execution->storySort                 = "{$lang->SRCommon}排序";
-$lang->execution->importPlanStory           = '创建' . $lang->executionCommon . '成功！\n是否导入计划关联的相关' . $lang->SRCommon . '？导入时将自动过滤掉草稿状态的' . $lang->SRCommon . '。';
+$lang->execution->importPlanStory           = '创建' . $lang->executionCommon . '成功！\n是否导入计划关联的相关' . $lang->SRCommon . '？导入时只能导入激活状态的' . $lang->SRCommon . '。';
 $lang->execution->importEditPlanStory       = '编辑' . $lang->executionCommon . '成功！\n是否导入计划关联的相关' . $lang->SRCommon . '？导入时将自动过滤掉草稿状态的' . $lang->SRCommon . '。';
 $lang->execution->importBranchPlanStory     = '创建' . $lang->executionCommon . '成功！\n是否导入计划关联的相关' . $lang->SRCommon . '？导入时将只关联本' . $lang->executionCommon . '所关联分支的激活需求。';
 $lang->execution->importBranchEditPlanStory = '编辑' . $lang->executionCommon . '成功！\n是否导入计划关联的相关' . $lang->SRCommon . '？导入时将只关联本' . $lang->executionCommon . '所关联分支的激活需求。';

module/execution/model.php

@@ -1463,7 +1463,7 @@ class executionModel extends model
             $oldPercentTotal = $this->dao->select('SUM(t2.percent) as total')->from(TABLE_PROJECTPRODUCT)->alias('t1')
                 ->leftJoin(TABLE_EXECUTION)->alias('t2')->on('t1.project=t2.id')
                 ->where('t1.product')->eq($this->post->products[0])
-                ->beginIF(!empty($_POST['branch']))->andWhere('t1.branch')->eq(current($this->post->branch[0]))->fi()
+                ->beginIF(!empty($_POST['branch'][0]))->andWhere('t1.branch')->eq(current($this->post->branch[0]))->fi()
                 ->andWhere('t2.type')->eq('stage')
                 ->andWhere('t2.grade')->eq(1)
                 ->andWhere('t2.deleted')->eq(0)

module/project/model.php

@@ -1250,6 +1250,7 @@ class projectModel extends model
             ->setDefault('team', $this->post->name)
             ->setDefault('lastEditedBy', $this->app->user->account)
             ->setDefault('lastEditedDate', helper::now())
+            ->setDefault('days', '0')
             ->add('type', 'project')
             ->join('whitelist', ',')
             ->stripTags($this->config->project->editor->create['id'], $this->config->allowedTags)