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

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

Browse Source
This commit is contained in:
Yagami
2023-04-19 15:30:12 +08:00
parent 62a2b9bebd 1941e292c1
commit e9c6b5b9ed
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/model.php
+1 -1
View File
@@ -627,7 +627,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,linkur,unlinkur,', ",$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/product/model.php
+2 -2
View File
@@ -2365,7 +2365,7 @@ class productModel extends model
public function getProductLink($module, $method, $extra, $branch = false)
{
$link = '';
if(strpos(',programplan,product,roadmap,bug,testcase,testtask,story,qa,testsuite,testreport,build,projectrelease,projectstory,', ',' . $module . ',') !== false)
if(strpos(',programplan,product,bug,testcase,testtask,story,qa,testsuite,testreport,build,projectrelease,projectstory,', ',' . $module . ',') !== false)
{
if($module == 'product' && $method == 'project')
{
@@ -2450,7 +2450,7 @@ class productModel extends model
$link = helper::createLink($module, $method, "productID=%s" . ($branch ? "&branch=%s" : ''));
}
}
else if($module == 'productplan' || $module == 'release')
else if($module == 'productplan' || $module == 'release' || $module == 'roadmap')
{
if($method != 'browse' && $method != 'create') $method = 'browse';
$link = helper::createLink($module, $method, "productID=%s" . ($branch ? "&branch=%s" : ''));