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

Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms

Browse Source
This commit is contained in:
wangyidong
2022-11-08 08:41:50 +08:00
parent 9761648d59 2de5c636ed
commit bd18396178
4 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/model.php
+1 -1
View File
@@ -581,7 +581,7 @@ class actionModel extends model
if($history->field == 'git') $history->diff = str_replace('+', '%2B', $history->diff);
}
}
elseif(strpos('linkstory,unlinkstory,createchildrenstory', $actionName) !== false)
elseif(strpos(',linkstory,unlinkstory,createchildrenstory,', ",$actionName,") !== false)
{
$extra = '';
foreach(explode(',', $action->extra) as $id) $extra .= common::hasPriv('story', 'view') ? html::a(helper::createLink('story', 'view', "storyID=$id"), "#$id ") . ', ' : "#$id, ";
module/design/control.php
+1 -1
View File
@@ -162,7 +162,7 @@ class design extends control
$this->view->position[] = $this->lang->design->create;
$this->view->users = $this->loadModel('user')->getPairs('noclosed');
$this->view->stories = $this->loadModel('story')->getProductStoryPairs($productID);
$this->view->stories = $this->loadModel('story')->getProductStoryPairs($productID, 'all', 0, 'active');
$this->view->productID = $productID;
$this->view->type = $type;
$this->view->project = $this->loadModel('project')->getByID($projectID);
module/design/js/common.js
+2 -1
View File
@@ -6,11 +6,12 @@ $(document).on('click', '.ajaxPager', function()
$('#product').change(function()
{
productID = $(this).val();
var link = createLink('story', 'ajaxGetProductStories', 'productID=' + productID);
var link = createLink('story', 'ajaxGetProductStories', 'productID=' + productID + '&branch=all&moduleID=0&storyID=0&onlyOption=false&status=active');
$.post(link, function(data)
{
$('#story').replaceWith(data);
$('#story_chosen').remove();
$('#story').next('.picker').remove();
$('#story').chosen();
})
})
module/story/control.php
+2
View File
@@ -2496,6 +2496,8 @@ class story extends control
$storyStatus = array_keys($storyStatus);
}
if($status == 'active') $storyStatus = $status;
if($executionID)
{
$stories = $this->story->getExecutionStoryPairs($executionID, $productID, $branch, $moduleID, $type);