Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* finish task #75318

Browse Source
This commit is contained in:
lanzongjun
2022-11-08 09:49:17 +08:00
parent c4a69d61df
commit bdfb04fabf
5 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/story/lang/de.php
+1
View File
@@ -321,6 +321,7 @@ $lang->story->errorDuplicateStory = $lang->SRCommon . '%s not exist';
$lang->story->confirmRecallChange = "After undo the change, the story content will revert to the version before the change. Are you sure you want to undo?";
$lang->story->confirmRecallReview = "Are you sure you want to withdraw the review?";
$lang->story->noStoryToTask = "Only the activated {$lang->SRCommon} can be converted into a task!";
$lang->story->ignoreClosedStory = "{$lang->SRCommon} %s status is closed, and the operation has been filtered.";
$lang->story->form = new stdclass();
$lang->story->form->area = 'Story Bereich';
module/story/lang/en.php
+1
View File
@@ -321,6 +321,7 @@ $lang->story->errorDuplicateStory = $lang->SRCommon . '%s not exist';
$lang->story->confirmRecallChange = "After undo the change, the story content will revert to the version before the change. Are you sure you want to undo?";
$lang->story->confirmRecallReview = "Are you sure you want to withdraw the review?";
$lang->story->noStoryToTask = "Only the activated {$lang->SRCommon} can be converted into a task!";
$lang->story->ignoreClosedStory = "{$lang->SRCommon} %s status is closed, and the operation has been filtered.";
$lang->story->form = new stdclass();
$lang->story->form->area = 'Scope';
module/story/lang/fr.php
+1
View File
@@ -321,6 +321,7 @@ $lang->story->errorDuplicateStory = $lang->SRCommon . '%s not exist';
$lang->story->confirmRecallChange = "After undo the change, the story content will revert to the version before the change. Are you sure you want to undo?";
$lang->story->confirmRecallReview = "Are you sure you want to withdraw the review?";
$lang->story->noStoryToTask = "Only the activated {$lang->SRCommon} can be converted into a task!";
$lang->story->ignoreClosedStory = "{$lang->SRCommon} %s status is closed, and the operation has been filtered.";
$lang->story->form = new stdclass();
$lang->story->form->area = 'Périmètre';
module/story/lang/zh-cn.php
+1
View File
@@ -321,6 +321,7 @@ $lang->story->errorDuplicateStory = $lang->SRCommon . '%s不存在';
$lang->story->confirmRecallChange = "撤销变更后，需求内容会回退至变更前的版本，您确定要撤销吗？";
$lang->story->confirmRecallReview = "您确定要撤回评审吗？";
$lang->story->noStoryToTask = "只有激活的{$lang->SRCommon}才能转为任务！";
$lang->story->ignoreClosedStory = "{$lang->SRCommon} %s 状态为已关闭，本次操作已被过滤。";
$lang->story->form = new stdclass();
$lang->story->form->area = "该{$lang->SRCommon}所属范围";
module/story/model.php
+11
View File
@@ -2512,9 +2512,15 @@ class storyModel extends model
$storyIdList = $this->post->storyIdList;
$assignedTo = $this->post->assignedTo;
$oldStories = $this->getByList($storyIdList);
$ignoreStories = '';
foreach($storyIdList as $storyID)
{
$oldStory = $oldStories[$storyID];
if($oldStory->status == 'closed')
{
$ignoreStories .= "#{$storyID},";
continue;
}
if($assignedTo == $oldStory->assignedTo) continue;
$story = new stdclass();
@@ -2527,6 +2533,11 @@ class storyModel extends model
$allChanges[$storyID] = common::createChanges($oldStory, $story);
}
if($ignoreStories)
{
$ignoreStories = trim($ignoreStories, ',');
echo js::alert(sprintf($this->lang->story->ignoreClosedStory, $ignoreStories));
}
return $allChanges;
}