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

* Adjust data-app for mr linked object.

Browse Source
This commit is contained in:
caoyanyi
2023-12-20 20:01:03 +08:00
parent 9a061ee1d4
commit 94fd39dae8
4 changed files with 39 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/mr/control.php
+3 -3
View File
@@ -771,7 +771,7 @@ class mr extends control
$queryID = ($browseType == 'bySearch') ? (int) $param : 0;
unset($this->config->product->search['fields']['product']);
$this->config->product->search['actionURL'] = $this->createLink('mr', 'linkStory', "MRID={$MRID}&productID={$productID}&browseType=bySearch&param=myQueryID&orderBy={$orderBy}");
$this->config->product->search['actionURL'] = $this->createLink('mr', 'linkStory', "MRID={$MRID}&productID={$productID}&browseType=bySearch&param=myQueryID&orderBy={$orderBy}") . "#app={$this->app->tab}";
$this->config->product->search['queryID'] = $queryID;
$this->config->product->search['style'] = 'simple';
$this->config->product->search['params']['product']['values'] = array($product) + array('all' => $this->lang->product->allProductsOfProject);
@@ -858,7 +858,7 @@ class mr extends control
$pager = new pager($recTotal, $recPerPage, $pageID);
/* Build search form. */
$this->config->bug->search['actionURL'] = $this->createLink('mr', 'linkBug', "MRID={$MRID}&productID={$productID}&browseType=bySearch&param=myQueryID&orderBy={$orderBy}");
$this->config->bug->search['actionURL'] = $this->createLink('mr', 'linkBug', "MRID={$MRID}&productID={$productID}&browseType=bySearch&param=myQueryID&orderBy={$orderBy}") . "#app={$this->app->tab}";
$this->config->bug->search['queryID'] = $queryID;
$this->config->bug->search['style'] = 'simple';
$this->config->bug->search['params']['plan']['values'] = $this->loadModel('productplan')->getForProducts(array($productID => $productID));
@@ -950,7 +950,7 @@ class mr extends control
$pager = new pager($recTotal, $recPerPage, $pageID);
/* Build search form. */
$this->config->execution->search['actionURL'] = $this->createLink('mr', 'linkTask', "MRID={$MRID}&productID={$productID}&browseType=bySearch&param=myQueryID&orderBy={$orderBy}");
$this->config->execution->search['actionURL'] = $this->createLink('mr', 'linkTask', "MRID={$MRID}&productID={$productID}&browseType=bySearch&param=myQueryID&orderBy={$orderBy}") . "#app={$this->app->tab}";
$this->config->execution->search['queryID'] = $queryID;
$this->config->execution->search['params']['module']['values'] = $modules;
$this->config->execution->search['params']['execution']['values'] = $this->product->getExecutionPairsByProduct($productID);
module/mr/ui/linkbug.html.php
+12 -4
View File
@@ -13,10 +13,18 @@ namespace zin;
jsVar('orderBy', $orderBy);
jsVar('sortLink', createLink('mr', 'linkBug', "MRID=$MRID&productID=$product->id&browseType=$browseType&param=$param&orderBy={orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}"));
$footToolbar = array('items' => array
(
array('text' => $lang->productplan->linkBug, 'className' => 'batch-btn ajax-btn', 'data-url' => helper::createLink('mr', 'linkBug', "MRID=$MRID&productID=$product->id&browseType=$browseType&param=$param&orderBy=$orderBy"))
), 'btnProps' => array('size' => 'sm', 'btnType' => 'secondary', 'data-type' => 'bugs'));
$footToolbar = array(
'items' => array
(
array(
'text' => $lang->productplan->linkBug,
'className' => 'batch-btn ajax-btn',
'data-app' => $app->tab,
'data-url' => helper::createLink('mr', 'linkBug', "MRID=$MRID&productID=$product->id&browseType=$browseType&param=$param&orderBy=$orderBy")
)
),
'btnProps' => array('size' => 'sm', 'btnType' => 'secondary', 'data-type' => 'bugs')
);
searchForm
(
module/mr/ui/linkstory.html.php
+12 -4
View File
@@ -13,10 +13,18 @@ namespace zin;
jsVar('orderBy', $orderBy);
jsVar('sortLink', createLink('mr', 'linkStory', "MRID=$MRID&productID=$product->id&browseType=$browseType&param=$param&orderBy={orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}"));
$footToolbar = array('items' => array
(
array('text' => $lang->mr->linkStory, 'className' => 'batch-btn ajax-btn', 'data-url' => helper::createLink('mr', 'linkStory', "MRID=$MRID&productID=$product->id&browseType=$browseType&param=$param&orderBy=$orderBy"))
), 'btnProps' => array('size' => 'sm', 'btnType' => 'secondary', 'data-type' => 'stories'));
$footToolbar = array(
'items' => array
(
array(
'text' => $lang->mr->linkStory,
'className' => 'batch-btn ajax-btn',
'data-app' => $app->tab,
'data-url' => helper::createLink('mr', 'linkStory', "MRID=$MRID&productID=$product->id&browseType=$browseType&param=$param&orderBy=$orderBy")
)
),
'btnProps' => array('size' => 'sm', 'btnType' => 'secondary', 'data-type' => 'stories')
);
searchForm
(
module/mr/ui/linktask.html.php
+12 -4
View File
@@ -22,10 +22,18 @@ detailHeader
)
);
$footToolbar = array('items' => array
(
array('text' => $lang->repo->linkTask, 'className' => 'batch-btn ajax-btn', 'data-url' => helper::createLink('mr', 'linkTask', "MRID=$MRID&productID=$product->id&browseType=$browseType&param=$param&orderBy=$orderBy"))
), 'btnProps' => array('size' => 'sm', 'btnType' => 'secondary', 'data-type' => 'tasks'));
$footToolbar = array(
'items' => array
(
array(
'text' => $lang->repo->linkTask,
'className' => 'batch-btn ajax-btn',
'data-app' => $app->tab,
'data-url' => helper::createLink('mr', 'linkTask', "MRID=$MRID&productID=$product->id&browseType=$browseType&param=$param&orderBy=$orderBy")
)
),
'btnProps' => array('size' => 'sm', 'btnType' => 'secondary', 'data-type' => 'tasks')
);
searchForm
(