* [task#123696,done,1h,0h] add processStoryChange for Upstream Demand change.
This commit is contained in:
@@ -80,6 +80,7 @@ class storyBasicInfo extends wg
|
||||
$users = $this->prop('users', data('users'));
|
||||
$gradePairs = $this->prop('gradePairs', data('gradePairs'));
|
||||
$roadmaps = $this->prop('roadmaps', data('roadmaps'));
|
||||
$demand = $this->prop('demand', data('demand'));
|
||||
$showGrade = $this->prop('showGrade', data('showGrade'));
|
||||
$items = array();
|
||||
|
||||
@@ -96,6 +97,38 @@ class storyBasicInfo extends wg
|
||||
'control' => 'breadcrumb',
|
||||
'items' => $this->getModuleItems($story, $product)
|
||||
);
|
||||
if(!empty($story->demand) && !empty($demand) && $story->parent <= 0)
|
||||
{
|
||||
$demandHtml = hasPriv('demand', 'view') ? div
|
||||
(
|
||||
a
|
||||
(
|
||||
$demand->title,
|
||||
set::href(helper::createLink('demand', 'view', "demandID=$story->demand")),
|
||||
setData('toggle', 'modal'),
|
||||
setData('size', 'lg')
|
||||
),
|
||||
$story->demandVersion < $demand->version && common::hasPriv($story->type, 'processStoryChange') ? span
|
||||
(
|
||||
' (',
|
||||
$lang->story->storyChange . ' ',
|
||||
a
|
||||
(
|
||||
setClass('btn primary-pale border-primary size-xs'),
|
||||
set::href(createLink($story->type, 'processStoryChange', "storyID={$story->id}")),
|
||||
$lang->confirm,
|
||||
),
|
||||
')'
|
||||
) : null,
|
||||
) : $demand->title;
|
||||
|
||||
$items[$lang->story->upstreamDemand] = array
|
||||
(
|
||||
'control' => 'div',
|
||||
'content' => $demandHtml
|
||||
);
|
||||
|
||||
}
|
||||
if(isset($story->parentName))
|
||||
{
|
||||
|
||||
@@ -108,14 +141,14 @@ class storyBasicInfo extends wg
|
||||
setData('toggle', 'modal'),
|
||||
setData('size', 'lg')
|
||||
),
|
||||
$story->parentChanged && common::hasPriv('story', 'processStoryChange') ? span
|
||||
$story->parentChanged && common::hasPriv($story->type, 'processStoryChange') ? span
|
||||
(
|
||||
' (',
|
||||
$lang->story->storyChange . ' ',
|
||||
a
|
||||
(
|
||||
setClass('btn primary-pale border-primary size-xs'),
|
||||
set::href(createLink('story', 'processStoryChange', "storyID={$story->id}")),
|
||||
set::href(createLink($story->type, 'processStoryChange', "storyID={$story->id}")),
|
||||
$lang->confirm,
|
||||
),
|
||||
')'
|
||||
|
||||
@@ -591,6 +591,7 @@ class story extends control
|
||||
$this->view->maxGradeGroup = $this->story->getMaxGradeGroup();
|
||||
$this->view->gradePairs = $this->story->getGradePairs($story->type, 'all');
|
||||
$this->view->roadmaps = $this->config->edition == 'ipd' ? array(0 => '') + $this->loadModel('roadmap')->getPairs() : array();
|
||||
$this->view->demand = $this->config->edition == 'ipd' ? $this->loadModel('demand')->getByID($story->demand) : new stdclass();
|
||||
$this->view->showGrade = $this->config->edition == 'ipd';
|
||||
$this->view->actions = $this->action->getList('story', $storyID);
|
||||
$this->view->branch = $story->branch;
|
||||
|
||||
@@ -41,6 +41,7 @@ $lang->story->track = 'Track';
|
||||
$lang->story->trackAB = 'Track';
|
||||
$lang->story->processStoryChange = 'Confirm Story Change';
|
||||
$lang->story->storyChange = 'Story Change';
|
||||
$lang->story->upstreamDemand = 'Upstream Demand';
|
||||
$lang->story->split = 'Decompose';
|
||||
$lang->story->close = 'Schließen';
|
||||
$lang->story->batchClose = 'Mehere schließen';
|
||||
|
||||
@@ -41,6 +41,7 @@ $lang->story->track = 'Track';
|
||||
$lang->story->trackAB = 'Track';
|
||||
$lang->story->processStoryChange = 'Confirm Story Change';
|
||||
$lang->story->storyChange = 'Story Change';
|
||||
$lang->story->upstreamDemand = 'Upstream Demand';
|
||||
$lang->story->split = 'Decompose';
|
||||
$lang->story->close = 'Close';
|
||||
$lang->story->batchClose = 'Batch Close';
|
||||
|
||||
@@ -41,6 +41,7 @@ $lang->story->track = 'Track';
|
||||
$lang->story->trackAB = 'Track';
|
||||
$lang->story->processStoryChange = 'Confirm Story Change';
|
||||
$lang->story->storyChange = 'Story Change';
|
||||
$lang->story->upstreamDemand = 'Upstream Demand';
|
||||
$lang->story->split = 'Décompose';
|
||||
$lang->story->close = 'Fermer';
|
||||
$lang->story->batchClose = 'Fermer par Lot';
|
||||
|
||||
@@ -41,6 +41,7 @@ $lang->story->track = '跟踪矩阵';
|
||||
$lang->story->trackAB = '矩阵';
|
||||
$lang->story->processStoryChange = '确认父需求变更';
|
||||
$lang->story->storyChange = '需求变更';
|
||||
$lang->story->upstreamDemand = '上游需求';
|
||||
$lang->story->split = '拆分';
|
||||
$lang->story->close = '关闭';
|
||||
$lang->story->batchClose = '批量关闭';
|
||||
|
||||
Reference in New Issue
Block a user