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

* Fix bug#3533.

Browse Source
This commit is contained in:
qiyu-xie
2020-09-28 10:32:40 +08:00
parent 45aa11af9b
commit 5c57d79a84
9 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/story/lang/de.php
+1
View File
@@ -255,6 +255,7 @@ $lang->story->noStory = 'Keine Storys. ';
$lang->story->ignoreChangeStage = 'Story %s is in Draft or Closed status. Please review it..';
$lang->story->cannotDeleteParent = "Can not delete parent {$lang->storyCommon}";
$lang->story->moveChildrenTips = "Its Child {$lang->storyCommon} will be moved to the selected product when editing the linked product of Parent {$lang->storyCommon}.";
$lang->story->changeBranchTips = "Its Child {$lang->storyCommon} will be moved to the selected branch when editing the linked branch of Parent {$lang->storyCommon}.";
$lang->story->changeTips = 'The story associated with the requirements to change, click "Cancel" ignore this change, click "Confirm" to change the story.';
$lang->story->form = new stdclass();
module/story/lang/en.php
+1
View File
@@ -255,6 +255,7 @@ $lang->story->noStory = 'No stories yet. ';
$lang->story->ignoreChangeStage = 'Story %s is in Draft or Closed status. Please review it..';
$lang->story->cannotDeleteParent = "Can not delete parent {$lang->storyCommon}";
$lang->story->moveChildrenTips = "Its Child {$lang->storyCommon} will be moved to the selected product when editing the linked product of Parent {$lang->storyCommon}.";
$lang->story->changeBranchTips = "Its Child {$lang->storyCommon} will be moved to the selected branch when editing the linked branch of Parent {$lang->storyCommon}.";
$lang->story->changeTips = 'The story associated with the requirements to change, click "Cancel" ignore this change, click "Confirm" to change the story.';
$lang->story->form = new stdclass();
module/story/lang/fr.php
+1
View File
@@ -255,6 +255,7 @@ $lang->story->noStory = "Aucune story pour l'instant. ";
$lang->story->ignoreChangeStage = 'Story %s is in Draft or Closed status. Please review it..';
$lang->story->cannotDeleteParent = "Impossible de supprimer {$lang->storyCommon} parent";
$lang->story->moveChildrenTips = "Its Child {$lang->storyCommon} will be moved to the selected product when editing the linked product of Parent {$lang->storyCommon}.";
$lang->story->changeBranchTips = "Its Child {$lang->storyCommon} will be moved to the selected branch when editing the linked branch of Parent {$lang->storyCommon}.";
$lang->story->changeTips = 'The story associated with the requirements to change, click "Cancel" ignore this change, click "Confirm" to change the story.';
$lang->story->form = new stdclass();
module/story/lang/vi.php
+1
View File
@@ -255,6 +255,7 @@ $lang->story->noStory = '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->cannotDeleteParent = "Không thể xóa {$lang->storyCommon} mẹ";
$lang->story->moveChildrenTips = "Its Child {$lang->storyCommon} will be moved to the selected product when editing the linked product of Parent {$lang->storyCommon}.";
$lang->story->changeBranchTips = "Its Child {$lang->storyCommon} will be moved to the selected branch when editing the linked branch of Parent {$lang->storyCommon}.";
$lang->story->changeTips = 'The story associated with the requirements to change, click "Cancel" ignore this change, click "Confirm" to change the story.';
$lang->story->form = new stdclass();
module/story/lang/zh-cn.php
+1
View File
@@ -255,6 +255,7 @@ $lang->story->noStory = "暂时没有{$lang->storyCommon}。";
$lang->story->ignoreChangeStage = "{$lang->storyCommon} %s 为草稿状态或已关闭状态，没有修改其阶段。";
$lang->story->cannotDeleteParent = "不能删除父{$lang->storyCommon}";
$lang->story->moveChildrenTips = "修改父{$lang->storyCommon}的所属产品会将其下的子{$lang->storyCommon}也移动到所选产品下。";
$lang->story->changeBranchTips = "修改父{$lang->storyCommon}的所属分支会将其下的子{$lang->storyCommon}也移动到所选分支下。";
$lang->story->changeTips = '该软件需求关联的用户需求有变更，点击“不变更”忽略此条变更，点击“变更”来进行该软件需求的变更。';
$lang->story->form = new stdclass();
module/story/lang/zh-tw.php
+1
View File
@@ -228,6 +228,7 @@ $lang->story->noStory = "暫時沒有{$lang->storyCommon}。";
$lang->story->ignoreChangeStage = "{$lang->storyCommon} %s 為草稿狀態或已關閉狀態，沒有修改其階段。";
$lang->story->cannotDeleteParent = "不能刪除父{$lang->storyCommon}";
$lang->story->moveChildrenTips = "修改父{$lang->storyCommon}的所屬產品會將其下的子{$lang->storyCommon}也移動到所選產品下。";
$lang->story->changeBranchTips = "修改父{$lang->storyCommon}的所屬分支會將其下的子{$lang->storyCommon}也移動到所選分支下。";
$lang->story->form = new stdclass();
$lang->story->form->area = "該{$lang->storyCommon}所屬範圍";
module/story/model.php
+5
View File
@@ -676,6 +676,11 @@ class storyModel extends model
}
}
if($oldStory->parent == '-1' and $story->branch != $oldStory->branch)
{
$this->dao->update(TABLE_STORY)->set('branch')->eq($story->branch)->where('parent')->eq($storyID)->exec();
}
$this->loadModel('action');
$changed = $story->parent != $oldStory->parent;
if($oldStory->parent > 0)
module/story/view/edit.html.php
+2
View File
@@ -12,8 +12,10 @@
?>
<?php include './header.html.php';?>
<?php js::set('oldProductID', $story->product);?>
<?php js::set('oldBranch', $story->branch);?>
<?php js::set('parentStory', !empty($story->children));?>
<?php js::set('moveChildrenTips', $lang->story->moveChildrenTips);?>
<?php js::set('changeBranchTips', $lang->story->changeBranchTips);?>
<div class='main-content' id='mainContent'>
<form method='post' enctype='multipart/form-data' target='hiddenwin' id='dataform'>
<div class='main-header'>
module/story/view/header.html.php
+11
View File
@@ -34,6 +34,17 @@ function loadProduct(productID)
function loadBranch()
{
if(typeof parentStory != 'undefined' && parentStory)
{
confirmLoadBranch = confirm(changeBranchTips);
if(!confirmLoadBranch)
{
$('#branch').val(oldBranch);
$('#branch').trigger("chosen:updated");
return false;
}
}
var branch = $('#branch').val();
if(typeof(branch) == 'undefined') branch = 0;
loadProductModules($('#product').val(), branch);