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

* fix bug #20640

Browse Source
This commit is contained in:
Zongjun Lan
2022-03-11 14:58:39 +08:00
parent 1c518b7a9b
commit b51e39e69f
3 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extension/lite/task/ext/view/create.html.php
+1 -1
View File
@@ -95,7 +95,7 @@
<tr>
<th><?php echo $lang->task->story;?></th>
<td colspan='3'>
<span id='storyBox' class="<?php if(!empty($stories)) echo 'hidden';?> "><?php printf($lang->task->noticeLinkStory, html::a($this->createLink('execution', 'linkStory', "executionID=$execution->project"), $lang->execution->linkStory, '_blank', 'class="text-primary"'), html::a("javascript:loadStories($execution->id)", $lang->refresh, '', 'class="text-primary"'));?></span>
<span id='storyBox' class="<?php if(!empty($stories)) echo 'hidden';?> "><?php printf($lang->task->noticeLinkStory, html::a($this->createLink('execution', 'linkStory', "executionID=$execution->id"), $lang->execution->linkStory, '_blank', 'class="text-primary"'), html::a("javascript:loadStories($execution->id)", $lang->refresh, '', 'class="text-primary"'));?></span>
<div class='input-group <?php if(empty($stories)) echo "hidden";?>'>
<?php echo html::select('story', array($task->story => empty($stories) ? '': $stories[$task->story]), $task->story, "class='form-control chosen' onchange='setStoryRelated();'");?>
<span class='input-group-btn' id='preview'><a href='#' class='btn iframe'><?php echo $lang->preview;?></a></span>
module/execution/control.php
+14 -4
View File
@@ -2718,6 +2718,16 @@ class execution extends control
$this->loadModel('story');
$this->loadModel('product');
/* Init objectID */
$originObjectID = $objectID;
/* Transfer object id when version lite */
if($this->config->vision == 'lite')
{
$kanban = $this->project->getByID($objectID, 'kanban');
$objectID = $kanban->project;
}
/* Get projects, executions and products. */
$object = $this->project->getByID($objectID, $this->app->tab == 'project' ? 'project' : 'sprint,stage,kanban');
$products = $this->product->getProducts($objectID);
@@ -2825,10 +2835,10 @@ class execution extends control
$allStories = array_chunk($allStories, $pager->recPerPage);
/* Assign. */
$this->view->title = $object->name . $this->lang->colon . $this->lang->execution->linkStory;
$this->view->position[] = html::a($browseLink, $object->name);
$this->view->position[] = $this->lang->execution->linkStory;
$this->view->title = $object->name . $this->lang->colon . $this->lang->execution->linkStory;
$this->view->position[] = html::a($browseLink, $object->name);
$this->view->position[] = $this->lang->execution->linkStory;
$this->view->objectID = $originObjectID;
$this->view->object = $object;
$this->view->products = $products;
$this->view->allStories = empty($allStories) ? $allStories : $allStories[$pageID - 1];
module/execution/view/linkstory.html.php
+1 -1
View File
@@ -20,7 +20,7 @@
<span class='btn btn-link btn-active-text'><span class='text'><?php echo $lang->execution->linkStory;?></span></span>
</div>
<div class='btn-toolbar pull-right'>
<?php common::printBack($this->createLink($this->app->rawModule, 'story', "objectID=$object->id"), 'btn btn-link');?>
<?php common::printBack($this->createLink($this->app->rawModule, 'story', "objectID=$objectID"), 'btn btn-link');?>
</div>
</div>
<div id="mainContent">