diff --git a/module/execution/model.php b/module/execution/model.php index ce7d32ce74..3c2ff6c461 100755 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -4744,21 +4744,10 @@ class executionModel extends model if($execution->type == 'stage') { - if($execution->grade == 1 && $this->loadModel('programplan')->isCreateTask($execution->id)) - { - common::printIcon('programplan', 'create', "program={$execution->parent}&productID=$productID&planID=$execution->id", $execution, 'list', 'split', '', '', '', '', $this->lang->programplan->createSubPlan); - } - else - { - if($execution->grade == 2) - { - echo ""; - } - else - { - echo common::hasPriv('programplan', 'create') ? html::a('javascript:alert("' . $this->lang->programplan->error->createdTask . '");', '', '', 'class="btn"') : ''; - } - } + $isCreateTask = $this->loadModel('programplan')->isCreateTask($execution->id); + $disabled = ($execution->grade == 1 && $isCreateTask) ? '' : ' disabled'; + $title = !$isCreateTask ? $this->lang->programplan->error->createdTask : $this->lang->programplan->createSubPlan; + common::printIcon('programplan', 'create', "program={$execution->parent}&productID=$productID&planID=$execution->id", $execution, 'list', 'split', '', $disabled, '', '', $title); } if($execution->type == 'stage') diff --git a/module/story/lang/de.php b/module/story/lang/de.php index 4f04b53756..ec9d91e7b3 100644 --- a/module/story/lang/de.php +++ b/module/story/lang/de.php @@ -296,7 +296,7 @@ $lang->story->mustChooseResult = 'Ergebnis wählen'; $lang->story->mustChoosePreVersion = 'Version wählen um es umzukhren.'; $lang->story->noStory = 'Keine Storys. '; $lang->story->noRequirement = 'No Requirements'; -$lang->story->ignoreChangeStage = 'Story %s is in Draft or Closed status. Please review it..'; +$lang->story->ignoreChangeStage = 'Story %s is in Draft or Closed status. This operation has been filtered.'; $lang->story->cannotDeleteParent = "Can not delete parent {$lang->SRCommon}"; $lang->story->moveChildrenTips = "Its Child {$lang->SRCommon} will be moved to the selected product when editing the linked product of Parent {$lang->SRCommon}."; $lang->story->changeTips = 'The story associated with the requirements to change, click "Cancel" ignore this change, click "Confirm" to change the story.'; diff --git a/module/story/lang/en.php b/module/story/lang/en.php index 6c6f80768e..e7562321ce 100644 --- a/module/story/lang/en.php +++ b/module/story/lang/en.php @@ -296,7 +296,7 @@ $lang->story->mustChooseResult = 'Select Result'; $lang->story->mustChoosePreVersion = 'Select a version to revert to.'; $lang->story->noStory = 'No stories yet. '; $lang->story->noRequirement = 'No requirements yet. '; -$lang->story->ignoreChangeStage = 'Story %s is in Draft or Closed status. Please review it..'; +$lang->story->ignoreChangeStage = 'Story %s is in Draft or Closed status. This operation has been filtered.'; $lang->story->cannotDeleteParent = "Can not delete parent {$lang->SRCommon}"; $lang->story->moveChildrenTips = "Its Child {$lang->SRCommon} will be moved to the selected product when editing the linked product of Parent {$lang->SRCommon}."; $lang->story->changeTips = 'The story associated with the requirements to change, click "Cancel" ignore this change, click "Confirm" to change the story.'; diff --git a/module/story/lang/fr.php b/module/story/lang/fr.php index 331e412da5..814ddbf0e6 100644 --- a/module/story/lang/fr.php +++ b/module/story/lang/fr.php @@ -296,7 +296,7 @@ $lang->story->mustChooseResult = 'Sélect Résultat'; $lang->story->mustChoosePreVersion = 'Sélect une version pour revenir en arrière.'; $lang->story->noStory = "Aucune story pour l'instant. "; $lang->story->noRequirement = 'No Requirements'; -$lang->story->ignoreChangeStage = 'Story %s is in Draft or Closed status. Please review it..'; +$lang->story->ignoreChangeStage = 'Story %s is in Draft or Closed status. This operation has been filtered.'; $lang->story->cannotDeleteParent = "Impossible de supprimer {$lang->SRCommon} parent"; $lang->story->moveChildrenTips = "Its Child {$lang->SRCommon} will be moved to the selected product when editing the linked product of Parent {$lang->SRCommon}."; $lang->story->changeTips = 'The story associated with the requirements to change, click "Cancel" ignore this change, click "Confirm" to change the story.'; diff --git a/module/story/lang/vi.php b/module/story/lang/vi.php index 526ee9d8bc..79611df990 100644 --- a/module/story/lang/vi.php +++ b/module/story/lang/vi.php @@ -288,7 +288,7 @@ $lang->story->mustChooseResult = 'Chọn kết quả'; $lang->story->mustChoosePreVersion = 'Chọn một phiên bản để chuyển thành.'; $lang->story->noStory = 'Không có câu chuyện nào'; $lang->story->noRequirement = 'Không có câu chuyện nào'; -$lang->story->ignoreChangeStage = 'Story %s is in Draft or Closed status. Please review it..'; +$lang->story->ignoreChangeStage = 'Story %s is in Draft or Closed status. This operation has been filtered.'; $lang->story->cannotDeleteParent = "Không thể xóa {$lang->SRCommon} mẹ"; $lang->story->moveChildrenTips = "Its Child {$lang->SRCommon} will be moved to the selected product when editing the linked product of Parent {$lang->SRCommon}."; $lang->story->changeTips = 'The story associated with the requirements to change, click "Cancel" ignore this change, click "Confirm" to change the story.'; diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php index 79fb2c9da4..51cc761f4b 100644 --- a/module/story/lang/zh-cn.php +++ b/module/story/lang/zh-cn.php @@ -296,7 +296,7 @@ $lang->story->mustChooseResult = '必须选择评审意见'; $lang->story->mustChoosePreVersion = '必须选择回溯的版本'; $lang->story->noStory = "暂时没有{$lang->SRCommon}。"; $lang->story->noRequirement = "暂时没有{$lang->URCommon}。"; -$lang->story->ignoreChangeStage = "{$lang->SRCommon} %s 为草稿状态或已关闭状态,没有修改其阶段。"; +$lang->story->ignoreChangeStage = "{$lang->SRCommon} %s 为草稿状态或已关闭状态,本次操作已被过滤。"; $lang->story->cannotDeleteParent = "不能删除父{$lang->SRCommon}"; $lang->story->moveChildrenTips = "修改父{$lang->SRCommon}的所属产品会将其下的子{$lang->SRCommon}也移动到所选产品下。"; $lang->story->changeTips = '该软件需求关联的用户需求有变更,点击“不变更”忽略此条变更,点击“变更”来进行该软件需求的变更。'; diff --git a/module/story/lang/zh-tw.php b/module/story/lang/zh-tw.php index 68027736c7..d6882f57d3 100644 --- a/module/story/lang/zh-tw.php +++ b/module/story/lang/zh-tw.php @@ -275,7 +275,7 @@ $lang->story->mustChooseResult = '必須選擇評審意見'; $lang->story->mustChoosePreVersion = '必須選擇回溯的版本'; $lang->story->noStory = "暫時沒有{$lang->SRCommon}。"; $lang->story->noRequirement = "暫時沒有{$lang->URCommon}。"; -$lang->story->ignoreChangeStage = "{$lang->SRCommon} %s 為草稿狀態或已關閉狀態,沒有修改其階段。"; +$lang->story->ignoreChangeStage = "{$lang->SRCommon} %s 為草稿狀態或已關閉狀態,本次操作已被過濾。"; $lang->story->cannotDeleteParent = "不能刪除父{$lang->SRCommon}"; $lang->story->moveChildrenTips = "修改父{$lang->SRCommon}的所屬產品會將其下的子{$lang->SRCommon}也移動到所選產品下。"; $lang->story->changeTips = '該軟件需求關聯的用戶需求有變更,點擊“不變更”忽略此條變更,點擊“變更”來進行該軟件需求的變更。';