Merge branch feature/workflowgroup of zentao/zentaopms (#12779)
This commit is contained in:
刘刚
@@ -1389,11 +1389,11 @@ class execution extends control
|
||||
{
|
||||
if(!empty($execution->frozen))
|
||||
{
|
||||
$frozenStages .= "#{$execution->id},";
|
||||
$frozenStages .= "#{$execution->id} ";
|
||||
unset($executions[$key]);
|
||||
}
|
||||
}
|
||||
if(empty($executions) && !empty($frozenStages)) return $this->send(array('result' => 'fail', 'load' => array('alert' => sprintf($this->lang->execution->frozenTip, trim($frozenStages, ',')), 'load' => true)));
|
||||
if(empty($executions) && !empty($frozenStages)) return $this->send(array('result' => 'fail', 'load' => array('alert' => sprintf($this->lang->execution->frozenTip, $frozenStages), 'load' => true)));
|
||||
|
||||
list($pmUsers, $poUsers, $qdUsers, $rdUsers) = $this->executionZen->setUserMoreLink($executions);
|
||||
|
||||
|
||||
@@ -166,7 +166,7 @@ $lang->execution->limitedTip = "Limited users can only edit tasks that a
|
||||
$lang->execution->stageFrozenTip = 'After the stage are baselined, %s is not allowed.';
|
||||
$lang->execution->createChildStage = 'create child stage';
|
||||
$lang->execution->ganttDrag = 'Drag';
|
||||
$lang->execution->frozenTip = '%s has been frozen and will not be editable.';
|
||||
$lang->execution->frozenTip = 'Stage %s has been frozen and will not be editable.';
|
||||
|
||||
$lang->execution->start = 'Start';
|
||||
$lang->execution->activate = 'Aktivieren';
|
||||
|
||||
@@ -166,7 +166,7 @@ $lang->execution->limitedTip = "Limited users can only edit tasks that a
|
||||
$lang->execution->stageFrozenTip = 'After the stage are baselined, %s is not allowed.';
|
||||
$lang->execution->createChildStage = 'create child stage';
|
||||
$lang->execution->ganttDrag = 'Drag';
|
||||
$lang->execution->frozenTip = '%s has been frozen and will not be editable.';
|
||||
$lang->execution->frozenTip = 'Stage %s has been frozen and will not be editable.';
|
||||
|
||||
$lang->execution->start = 'Start';
|
||||
$lang->execution->activate = 'Activate';
|
||||
|
||||
@@ -166,7 +166,7 @@ $lang->execution->limitedTip = "Limited users can only edit tasks that a
|
||||
$lang->execution->stageFrozenTip = 'After the stage are baselined, %s is not allowed.';
|
||||
$lang->execution->createChildStage = 'create child stage';
|
||||
$lang->execution->ganttDrag = 'Drag';
|
||||
$lang->execution->frozenTip = '%s has been frozen and will not be editable.';
|
||||
$lang->execution->frozenTip = 'Stage %s has been frozen and will not be editable.';
|
||||
|
||||
$lang->execution->start = 'Démarrer';
|
||||
$lang->execution->activate = 'Activer';
|
||||
|
||||
@@ -166,7 +166,7 @@ $lang->execution->limitedTip = "受限用户只能编辑与自己相关
|
||||
$lang->execution->stageFrozenTip = '阶段打基线后不允许%s';
|
||||
$lang->execution->createChildStage = '创建子阶段';
|
||||
$lang->execution->ganttDrag = '拖拽';
|
||||
$lang->execution->frozenTip = '%s已冻结，将不会被编辑。';
|
||||
$lang->execution->frozenTip = '阶段：%s 已冻结，将不会被编辑。';
|
||||
|
||||
$lang->execution->start = "开始";
|
||||
$lang->execution->activate = "激活";
|
||||
|
||||
@@ -12,7 +12,7 @@ namespace zin;
|
||||
|
||||
if(!empty($frozenStages))
|
||||
{
|
||||
$frozenTip = sprintf($lang->execution->frozenTip, trim($frozenStages, ','));
|
||||
$frozenTip = sprintf($lang->execution->frozenTip, $frozenStages);
|
||||
pageJS("zui.Modal.alert({message: '{$frozenTip}', icon: 'icon-exclamation-sign', iconClass: 'warning-pale rounded-full icon-2x'});\n");
|
||||
}
|
||||
|
||||
|
||||
@@ -369,7 +369,7 @@ class story extends control
|
||||
}
|
||||
|
||||
$stories = $this->storyZen->getStoriesByChecked();
|
||||
if(!$stories) return $this->send(array('result' => 'fail', 'load' => array('alert' => $this->lang->story->batchEditError, 'load' => true)));
|
||||
if(!$stories) return $this->send(array('result' => 'fail', 'load' => array('alert' => $this->lang->story->batchEditError, 'locate' => $this->session->storyList)));
|
||||
|
||||
/* Set Custom*/
|
||||
foreach(explode(',', $this->config->story->list->customBatchEditFields) as $field) $customFields[$field] = $this->lang->story->$field;
|
||||
|
||||
@@ -550,7 +550,8 @@ $lang->story->categoryList['experience'] = 'Experience';
|
||||
$lang->story->categoryList['improve'] = 'Improve';
|
||||
$lang->story->categoryList['other'] = 'Other';
|
||||
|
||||
$lang->story->frozenTip = "After the stories are baselined, %s is not allowed.";
|
||||
$lang->story->frozenTip = "After the stories are baselined, %s is not allowed.";
|
||||
$lang->story->frozenTips = "Story %s has been frozen and will not be %s.";
|
||||
|
||||
$lang->story->changeTip = 'Only active can be changed.';
|
||||
|
||||
|
||||
@@ -550,7 +550,8 @@ $lang->story->categoryList['experience'] = 'Experience';
|
||||
$lang->story->categoryList['improve'] = 'Improve';
|
||||
$lang->story->categoryList['other'] = 'Other';
|
||||
|
||||
$lang->story->frozenTip = "After the stories are baselined, %s is not allowed.";
|
||||
$lang->story->frozenTip = "After the stories are baselined, %s is not allowed.";
|
||||
$lang->story->frozenTips = "Story %s has been frozen and will not be %s.";
|
||||
|
||||
$lang->story->changeTip = 'Only active can be changed.';
|
||||
|
||||
|
||||
@@ -550,7 +550,8 @@ $lang->story->categoryList['experience'] = 'Experience';
|
||||
$lang->story->categoryList['improve'] = 'Improve';
|
||||
$lang->story->categoryList['other'] = 'Other';
|
||||
|
||||
$lang->story->frozenTip = "After the stories are baselined, %s is not allowed.";
|
||||
$lang->story->frozenTip = "After the stories are baselined, %s is not allowed.";
|
||||
$lang->story->frozenTips = "Story %s has been frozen and will not be %s.";
|
||||
|
||||
$lang->story->changeTip = "Seules les exigences de l'état actif peuvent être modifiées.";
|
||||
|
||||
|
||||
@@ -550,7 +550,8 @@ $lang->story->categoryList['experience'] = '体验';
|
||||
$lang->story->categoryList['improve'] = '改进';
|
||||
$lang->story->categoryList['other'] = '其他';
|
||||
|
||||
$lang->story->frozenTip = "需求打基线后不允许%s";
|
||||
$lang->story->frozenTip = "需求打基线后不允许%s";
|
||||
$lang->story->frozenTips = "需求：%s 已冻结，将不会被%s。";
|
||||
|
||||
$lang->story->changeTip = "只有激活状态的需求，才能进行变更";
|
||||
|
||||
|
||||
@@ -21,6 +21,7 @@ jsVar('storyType', $storyType);
|
||||
jsVar('urStageOptions', $urStageOptions);
|
||||
|
||||
if(!empty($twinsTip)) pageJS("zui.Modal.alert({message: '{$twinsTip}', icon: 'icon-exclamation-sign', iconClass: 'warning-pale rounded-full icon-2x'});\n");
|
||||
if(!empty($frozenTips)) pageJS("zui.Modal.alert({message: '{$frozenTips}', icon: 'icon-exclamation-sign', iconClass: 'warning-pale rounded-full icon-2x'});\n");
|
||||
|
||||
$items = array();
|
||||
$items['storyIdList'] = array('name' => 'storyIdList', 'label' => '', 'control' => 'hidden', 'hidden' => true);
|
||||
|
||||
@@ -1004,10 +1004,12 @@ class storyZen extends story
|
||||
|
||||
/* Filter twins. */
|
||||
$twins = '';
|
||||
$frozenStories = '';
|
||||
foreach($stories as $id => $story)
|
||||
{
|
||||
if(!empty($story->frozen))
|
||||
{
|
||||
$frozenStories .= "#$id ";
|
||||
unset($stories[$id]);
|
||||
continue;
|
||||
}
|
||||
@@ -1017,6 +1019,7 @@ class storyZen extends story
|
||||
unset($stories[$id]);
|
||||
}
|
||||
if(!empty($twins)) $this->view->twinsTip = sprintf($this->lang->story->batchEditTip, $twins);
|
||||
if(!empty($frozenStories)) $this->view->frozenTips = sprintf($this->lang->story->frozenTips, $frozenStories, $this->lang->story->edit);
|
||||
|
||||
return $stories;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user