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

* Fix bug #42379.

Browse Source
This commit is contained in:
sunguangming
2023-12-25 09:55:17 +08:00
parent e8317769e4
commit 3ddaa7e8ac
4 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/config/dtable.php
+1 -1
View File
@@ -282,7 +282,7 @@ $config->execution->linkStory->dtable->fieldList['module']['group'] = 6;
$config->execution->linkStory->dtable->fieldList['planTitle']['title'] = $lang->story->plan;
$config->execution->linkStory->dtable->fieldList['planTitle']['type'] = 'text';
$config->execution->linkStory->dtable->fieldList['planTitle']['sortType'] = true;
$config->execution->linkStory->dtable->fieldList['planTitle']['sortType'] = false;
$config->execution->linkStory->dtable->fieldList['planTitle']['group'] = 7;
$config->execution->linkStory->dtable->fieldList['branch']['title'] = '';
module/execution/control.php
+6 -10
View File
@@ -2129,13 +2129,14 @@ class execution extends control
* @param int $objectID
* @param string $browseType
* @param int $param
* @param string $orderBy
* @param int $recPerPage
* @param int $pageID
* @param string $extra
* @access public
* @return void
*/
public function linkStory(int $objectID = 0, string $browseType = '', int $param = 0, int $recPerPage = 50, int $pageID = 1, string $extra = '')
public function linkStory(int $objectID = 0, string $browseType = '', int $param = 0, string $orderBy = 'id_desc', int $recPerPage = 50, int $pageID = 1, string $extra = '')
{
$this->loadModel('story');
$this->loadModel('product');
@@ -2171,13 +2172,7 @@ class execution extends control
if($object->type != 'project' and $object->project != 0) $this->execution->linkStory($object->project, $this->post->stories ? $this->post->stories : array());
$this->execution->linkStory($objectID, $this->post->stories ? $this->post->stories : array(), $extra);
if(isInModal())
{
$execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
$execGroupBy = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
if($object->type == 'kanban') return $this->sendSuccess(array('closeModal' => true, 'load' => true, 'callback' => "refreshKanban()"));
return $this->sendSuccess(array('closeModal' => true, 'load' => true, 'callback' => "refreshKanban()"));
}
if(isInModal()) return $this->sendSuccess(array('closeModal' => true, 'load' => true, 'callback' => "refreshKanban()"));
return $this->sendSuccess(array('load' => $browseLink));
}
@@ -2221,8 +2216,8 @@ class execution extends control
$queryID = ($browseType == 'bySearch') ? (int)$param : 0;
$this->execution->buildStorySearchForm($products, $branchGroups, $modules, $queryID, $actionURL, 'linkStory', $object);
if($browseType == 'bySearch') $allStories = $this->story->getBySearch(implode(',', array_keys($products)), '', $queryID, 'id_desc', $objectID);
if($browseType != 'bySearch') $allStories = $this->story->getProductStories(implode(',', array_keys($products)), $branchIDList, '0', 'active', 'story', 'id_desc', false, '', null);
if($browseType == 'bySearch') $allStories = $this->story->getBySearch(implode(',', array_keys($products)), '', $queryID, $orderBy, $objectID);
if($browseType != 'bySearch') $allStories = $this->story->getProductStories(implode(',', array_keys($products)), $branchIDList, '0', 'active', 'story', $orderBy, false, '', null);
$linkedStories = $this->story->getExecutionStoryPairs($objectID);
foreach($allStories as $id => $story)
{
@@ -2253,6 +2248,7 @@ class execution extends control
$this->view->param = $param;
$this->view->extra = $extra;
$this->view->object = $object;
$this->view->orderBy = $orderBy;
$this->view->productPairs = $productPairs;
$this->view->allStories = empty($allStories) ? $allStories : $allStories[$pageID - 1];
$this->view->pager = $pager;
module/execution/js/kanban.ui.js
+1 -1
View File
@@ -91,7 +91,7 @@ window.buildColCardActions = function(col)
{
if(priv.canCreateStory) actions.push({text: storyLang.create, url: $.createLink('story', 'create', 'productID=' + productID + '&branch=0&moduleID=0&storyID=0&objectID=' + executionID + '&bugID=0&planID=0&todoID=0&extra=regionID=' + col.region + ',laneID=' + 0 + ',columnID=' + col.id), 'data-toggle': 'modal', 'data-size' : 'lg'});
if(priv.canBatchCreateStory) actions.push({text: storyLang.batchCreate, url: productCount > 1 ? '#batchCreateStory' : $.createLink('story', 'batchCreate', 'productID=' + productID + '&branch=0&moduleID=0&storyID=0&objectID=' + executionID + '&bugID=0&planID=0&todoID=0&extra=regionID=' + col.region + ',laneID=' + 0 + ',columnID=' + col.id), 'data-toggle': 'modal', 'data-size' : 'lg'});
if(priv.canLinkStory) actions.push({text: executionLang.linkStory, url: $.createLink('execution', 'linkStory', 'executionID=' + executionID + '&browseType=&param=0&recPerPage=50,&pageID=1&extra=laneID=0,columnID=' + col.id), 'data-toggle': 'modal', 'data-size' : 'lg'});
if(priv.canLinkStory) actions.push({text: executionLang.linkStory, url: $.createLink('execution', 'linkStory', 'executionID=' + executionID + '&browseType=&param=0&orderBy=id_desc&recPerPage=50&pageID=1&extra=laneID=0,columnID=' + col.id), 'data-toggle': 'modal', 'data-size' : 'lg'});
if(priv.canLinkStoryByPlan) actions.push({text: executionLang.linkStoryByPlan, url: '#linkStoryByPlan', 'data-toggle': 'modal'});
}
else if(col.type == 'unconfirmed')
module/execution/ui/linkstory.html.php
+3 -1
View File
@@ -56,12 +56,14 @@ dtable
set::userMap($users),
set::cols($cols),
set::data($allStories),
set::orderBy($orderBy),
set::sortLink(createLink($objectType, 'linkStory', "objectID={$object->id}&browseType={$browseType}&param={$param}&orderBy={name}_{sortType}")),
set::checkable(true),
set::onRenderCell(jsRaw('window.onRenderLinkStoryCell')),
set::showToolbarOnChecked(false),
set::footToolbar($footToolbar),
set::footPager(usePager(array(
'linkCreator' => helper::createLink($objectType, 'linkStory', "objectID={$object->id}&browseType={$browseType}&param={$param}&recPerPage={recPerPage}&page={page}&extra=$extra")
'linkCreator' => helper::createLink($objectType, 'linkStory', "objectID={$object->id}&browseType={$browseType}&param={$param}&orderBy=$orderBy&recPerPage={recPerPage}&page={page}&extra=$extra")
)))
);