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

* code for task #74178.

Browse Source
This commit is contained in:
wangyidong
2022-11-01 10:22:13 +08:00
parent 3a8ef27bec
commit 40e20fa112
6 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/model.php
+4
View File
@@ -853,6 +853,10 @@ class actionModel extends model
{
$desc = $this->lang->$objectType->action->rejectreviewed;
}
elseif($action->objectType == 'story' and $action->action == 'closed' and $action->extra === 'autoclosed')
{
$desc = $this->lang->$objectType->action->autoclosed;
}
elseif($action->objectType == 'productplan' and in_array($action->action, array('startedbychild','finishedbychild','closedbychild','activatedbychild', 'createchild')))
{
$desc = $this->lang->$objectType->action->changebychild;
module/story/lang/de.php
+2 -1
View File
@@ -320,8 +320,9 @@ $lang->story->action->reviewed = array('main' => '$date, geprüft v
$lang->story->action->rejectreviewed = array('main' => '$date, geprüft von <strong>$actor</strong>. Das Ergebnis ist <strong>$extra</strong>, Der Grund ist <strong>$reason</strong>.', 'extra' => 'reviewResultList', 'reason' => 'reasonList');
$lang->story->action->recalled = array('main' => '$date, recalled by <strong>$actor</strong>.');
$lang->story->action->closed = array('main' => '$date, geschlossen von <strong>$actor</strong>. Der Grund ist <strong>$extra</strong> $appendLink.', 'extra' => 'reasonList');
$lang->story->action->autoclosed = array('main' => '$date, The system determines that the parent story is automatically closed because all child stories are closed.');
$lang->story->action->reviewpassed = array('main' => '$date, determined by the <strong>System</strong>. The result is <strong>Pass</strong>.');
$lang->story->action->reviewrejected = array('main' => '$date, closed by <strong>System</strong>. The reasion is <strong>Rejection</strong>.');
$lang->story->action->reviewrejected = array('main' => '$date, closed by <strong>System</strong>. The reason is <strong>Rejection</strong>.');
$lang->story->action->reviewclarified = array('main' => '$date, determined by the <strong>System</strong>. The result is <strong>To Be Clarified</strong>. Please re-initiate the review after edit.');
$lang->story->action->reviewreverted = array('main' => '$date, determined by the <strong>System</strong>. The result is <strong>Undo Change</strong>.');
$lang->story->action->linked2plan = array('main' => '$date, verknüpft von <strong>$actor</strong> mit Plan <strong>$extra</strong>');
module/story/lang/en.php
+4 -3
View File
@@ -317,11 +317,12 @@ $lang->story->form->file = 'If any file that is linked to a story, please cl
$lang->story->action = new stdclass();
$lang->story->action->reviewed = array('main' => '$date, recorded by <strong>$actor</strong>. The result is <strong>$extra</strong>.', 'extra' => 'reviewResultList');
$lang->story->action->rejectreviewed = array('main' => '$date, recorded by <strong>$actor</strong>. The result is <strong>$extra</strong>. The reasion is <strong>$reason</strong>.', 'extra' => 'reviewResultList', 'reason' => 'reasonList');
$lang->story->action->rejectreviewed = array('main' => '$date, recorded by <strong>$actor</strong>. The result is <strong>$extra</strong>. The reason is <strong>$reason</strong>.', 'extra' => 'reviewResultList', 'reason' => 'reasonList');
$lang->story->action->recalled = array('main' => '$date, recalled by <strong>$actor</strong>.');
$lang->story->action->closed = array('main' => '$date, closed by <strong>$actor</strong>. The reasion is <strong>$extra</strong> $appendLink.', 'extra' => 'reasonList');
$lang->story->action->closed = array('main' => '$date, closed by <strong>$actor</strong>. The reason is <strong>$extra</strong> $appendLink.', 'extra' => 'reasonList');
$lang->story->action->autoclosed = array('main' => '$date, The system determines that the parent story is automatically closed because all child stories are closed.');
$lang->story->action->reviewpassed = array('main' => '$date, determined by the <strong>System</strong>. The result is <strong>Pass</strong>.');
$lang->story->action->reviewrejected = array('main' => '$date, closed by <strong>System</strong>. The reasion is <strong>Rejection</strong>.');
$lang->story->action->reviewrejected = array('main' => '$date, closed by <strong>System</strong>. The reason is <strong>Rejection</strong>.');
$lang->story->action->reviewclarified = array('main' => '$date, determined by the <strong>System</strong>. The result is <strong>To Be Clarified</strong>. Please re-initiate the review after edit.');
$lang->story->action->reviewreverted = array('main' => '$date, determined by the <strong>System</strong>. The result is <strong>Undo Change</strong>.');
$lang->story->action->linked2plan = array('main' => '$date, linked by <strong>$actor</strong> to Plan <strong>$extra</strong>');
module/story/lang/fr.php
+2 -1
View File
@@ -320,8 +320,9 @@ $lang->story->action->reviewed = array('main' => '$date, validée p
$lang->story->action->rejectreviewed = array('main' => '$date, validée par <strong>$actor</strong>. Le résultat est <strong>$extra</strong>. La raison est <strong>$reason</strong>.', 'extra' => 'reviewResultList', 'reason' => 'reasonList');
$lang->story->action->recalled = array('main' => '$date, recalled by <strong>$actor</strong>.');
$lang->story->action->closed = array('main' => '$date, Fermée par <strong>$actor</strong>. La raison est <strong>$extra</strong> $appendLink.', 'extra' => 'reasonList');
$lang->story->action->autoclosed = array('main' => '$date, The system determines that the parent story is automatically closed because all child stories are closed.');
$lang->story->action->reviewpassed = array('main' => '$date, determined by the <strong>System</strong>. The result is <strong>Pass</strong>.');
$lang->story->action->reviewrejected = array('main' => '$date, closed by <strong>System</strong>. The reasion is <strong>Rejection</strong>.');
$lang->story->action->reviewrejected = array('main' => '$date, closed by <strong>System</strong>. The reason is <strong>Rejection</strong>.');
$lang->story->action->reviewclarified = array('main' => '$date, determined by the <strong>System</strong>. The result is <strong>To Be Clarified</strong>. Please re-initiate the review after edit.');
$lang->story->action->reviewreverted = array('main' => '$date, determined by the <strong>System</strong>. The result is <strong>Undo Change</strong>.');
$lang->story->action->linked2plan = array('main' => '$date, planifiée par <strong>$actor</strong> au Plan <strong>$extra</strong>');
module/story/lang/zh-cn.php
+1
View File
@@ -320,6 +320,7 @@ $lang->story->action->reviewed = array('main' => '$date, 由 <stron
$lang->story->action->rejectreviewed = array('main' => '$date, 由 <strong>$actor</strong> 记录评审意见，评审意见为 <strong>$extra</strong>，原因为 <strong>$reason</strong>。', 'extra' => 'reviewResultList', 'reason' => 'reasonList');
$lang->story->action->recalled = array('main' => '$date, 由 <strong>$actor</strong> 撤销评审。');
$lang->story->action->closed = array('main' => '$date, 由 <strong>$actor</strong> 关闭，原因为 <strong>$extra</strong> $appendLink。', 'extra' => 'reasonList');
$lang->story->action->autoclosed = array('main' => '$date, 系统判定由于关闭了所有子需求，自动关闭父需求。');
$lang->story->action->reviewpassed = array('main' => '$date, 由 <strong>系统</strong> 判定，结果为 <strong>确认通过</strong>。');
$lang->story->action->reviewrejected = array('main' => '$date, 由 <strong>系统</strong> 关闭，原因为 <strong>拒绝</strong>。');
$lang->story->action->reviewclarified = array('main' => '$date, 由 <strong>系统</strong> 判定，结果为 <strong>有待明确</strong>，请编辑后重新发起评审。');
module/story/model.php
+7 -2
View File
@@ -1159,11 +1159,16 @@ class storyModel extends model
$newParentStory = $this->dao->select('*')->from(TABLE_STORY)->where('id')->eq($parentID)->fetch();
$changes = common::createChanges($oldParentStory, $newParentStory);
$action = '';
$extra = '';
if($status == 'active') $action = 'Activated';
if($status == 'closed') $action = 'Closed';
if($status == 'closed')
{
$action = 'Closed';
$extra = 'autoclosed';
}
if($action)
{
$actionID = $this->loadModel('action')->create('story', $parentID, $action, '', '', '', false);
$actionID = $this->loadModel('action')->create('story', $parentID, $action, '', $extra, '', false);
$this->action->logHistory($actionID, $changes);
}