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

Merge branch 'master' of github.com:easysoft/zentaopms

Browse Source
This commit is contained in:
wangyidong
2019-07-26 17:49:18 +08:00
parent 5ace83db9a 8e0f54cf6e
commit 6c66211714
12 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/control.class.php
+16
View File
@@ -211,6 +211,22 @@ class control extends baseControl
if($flow && $action) $this->loadModel('workflowhook')->execute($flow, $action, $objectID);
}
/**
* Build operate menu of a method.
*
* @param object $object product|project|productplan|release|build|story|task|bug|testtask|testcase|testsuite
* @param string $displayOn view|browse
* @access public
* @return void
*/
public function buildOperateMenu($object, $displayOn = 'view')
{
if(!isset($this->config->bizVersion)) return false;
$flow = $this->loadModel('workflow')->getByModule($this->moduleName);
return $this->loadModel('flow')->buildOperateMenu($flow, $object, $displayOn);
}
/**
* Print extend fields.
*
module/bug/view/view.html.php
+1 -2
View File
@@ -80,8 +80,7 @@
if($config->global->flow != 'onlyTest') common::printIcon('bug', 'toStory', "product=$bug->product&branch=$bug->branch&module=0&story=0&project=0&bugID=$bug->id", $bug, 'button', $lang->icons['story']);
common::printIcon('bug', 'createCase', $convertParams, $bug, 'button', 'sitemap');
$flow = $this->loadModel('workflow')->getByModule('bug');
echo $this->loadModel('flow')->buildOperateMenu($flow, $bug, 'view');
echo $this->buildOperateMenu($bug, 'view');
echo "<div class='divider'></div>";
common::printIcon('bug', 'edit', $params, $bug);
module/build/view/view.html.php
+1 -2
View File
@@ -50,8 +50,7 @@ tbody tr td:first-child input{display:none;}
<?php
if(!$build->deleted)
{
$flow = $this->loadModel('workflow')->getByModule('build');
echo $this->loadModel('flow')->buildOperateMenu($flow, $build, 'view');
echo $this->buildOperateMenu($build, 'view');
if(common::hasPriv('build', 'edit')) echo html::a($this->createLink('build', 'edit', "buildID=$build->id"), "<i class='icon-common-edit icon-edit'></i> " . $this->lang->edit, '', "class='btn btn-link' title='{$this->lang->edit}'");
if(common::hasPriv('build', 'delete')) echo html::a($this->createLink('build', 'delete', "buildID=$build->id"), "<i class='icon-common-delete icon-trash'></i> " . $this->lang->delete, '', "class='btn btn-link' title='{$this->lang->delete}' target='hiddenwin'");
module/product/view/view.html.php
+1 -2
View File
@@ -90,8 +90,7 @@
common::printBack($browseLink);
if(!$product->deleted)
{
$flow = $this->loadModel('workflow')->getByModule('product');
echo $this->loadModel('flow')->buildOperateMenu($flow, $product, 'view');
echo $this->buildOperateMenu($product, 'view');
echo "<div class='divider'></div>";
module/productplan/view/view.html.php
+1 -2
View File
@@ -37,8 +37,7 @@
<?php
if(!$plan->deleted)
{
$flow = $this->loadModel('workflow')->getByModule('productplan');
echo $this->loadModel('flow')->buildOperateMenu($flow, $plan, 'view');
echo $this->buildOperateMenu($plan, 'view');
if(common::hasPriv('productplan', 'create') and $plan->parent <= '0') echo html::a($this->createLink('productplan', 'create', "product={$plan->product}&branch={$plan->branch}&parent={$plan->id}"), "<i class='icon-treemap-alt'></i> " . $this->lang->productplan->children , '', "class='btn btn-link' title='{$this->lang->productplan->children}'");
if(common::hasPriv('productplan', 'edit')) echo html::a($this->createLink('productplan', 'edit', "planID=$plan->id"), "<i class='icon-common-edit icon-edit'></i> " . $this->lang->edit, '', "class='btn btn-link' title='{$this->lang->edit}'");
module/project/view/view.html.php
+1 -2
View File
@@ -162,8 +162,7 @@
common::printIcon('project', 'suspend', "projectID=$project->id", $project, 'button', '', '', 'iframe', true);
common::printIcon('project', 'close', "projectID=$project->id", $project, 'button', '', '', 'iframe', true);
$flow = $this->loadModel('workflow')->getByModule('project');
echo $this->loadModel('flow')->buildOperateMenu($flow, $project, 'view');
echo $this->buildOperateMenu($project, 'view');
echo "<div class='divider'></div>";
common::printIcon('project', 'edit', $params, $project);
module/release/view/view.html.php
+1 -2
View File
@@ -33,8 +33,7 @@
<?php
if(!$release->deleted)
{
$flow = $this->loadModel('workflow')->getByModule('release');
echo $this->loadModel('flow')->buildOperateMenu($flow, $release, 'view');
echo $this->buildOperateMenu($release, 'view');
if(common::hasPriv('release', 'changeStatus', $release))
{
module/story/view/view.html.php
+1 -2
View File
@@ -104,8 +104,7 @@
if($from == 'project') common::printIcon('task', 'create', "project=$param&storyID=$story->id&moduleID=$story->module", $story, 'button', 'plus', '', 'showinonlybody');
$flow = $this->loadModel('workflow')->getByModule('story');
echo $this->loadModel('flow')->buildOperateMenu($flow, $story, 'view');
echo $this->buildOperateMenu($story, 'view');
echo "<div class='divider'></div>";
common::printIcon('story', 'edit', "storyID=$story->id", $story);
module/task/view/view.html.php
+1 -2
View File
@@ -164,8 +164,7 @@
common::printIcon('task', 'close', "taskID=$task->id", $task, 'button', '', '', 'iframe showinonlybody', true);
common::printIcon('task', 'cancel', "taskID=$task->id", $task, 'button', '', '', 'iframe showinonlybody', true);
$flow = $this->loadModel('workflow')->getByModule('task');
echo $this->loadModel('flow')->buildOperateMenu($flow, $task, 'view');
echo $this->buildOperateMenu($task, 'view');
if(!isonlybody()) echo "<div class='divider'></div>";
common::printIcon('task', 'edit', "taskID=$task->id", $task, 'button', '', '', 'showinonlybody');
module/testcase/view/view.html.php
+1 -4
View File
@@ -115,10 +115,7 @@
if($config->testcase->needReview or !empty($config->testcase->forceReview)) common::printIcon('testcase', 'review', "caseID=$case->id", $case, 'button', '', '', 'iframe', '', '', $lang->testcase->reviewAB);
?>
<?php
$flow = $this->loadModel('workflow')->getByModule('testcase');
echo $this->loadModel('flow')->buildOperateMenu($flow, $case, 'view');
?>
<?php echo $this->buildOperateMenu($case, 'view');?>
<?php
common::printIcon('testcase', 'edit',"caseID=$case->id", $case);
module/testsuite/view/view.html.php
+1 -2
View File
@@ -31,8 +31,7 @@
<?php
if(!$suite->deleted)
{
$flow = $this->loadModel('workflow')->getByModule('testsuite');
echo $this->loadModel('flow')->buildOperateMenu($flow, $suite, 'view');
echo $this->buildOperateMenu($suite, 'view');
common::printIcon('testsuite', 'linkCase', "suiteID=$suite->id", $suite, 'button', 'link');
common::printIcon('testsuite', 'edit', "suiteID=$suite->id");
module/testtask/view/view.html.php
+1 -4
View File
@@ -57,10 +57,7 @@
common::printIcon('testtask', 'linkCase', "taskID=$task->id", $task, 'button', 'link');
?>
<?php
$flow = $this->loadModel('workflow')->getByModule('testtask');
echo $this->loadModel('flow')->buildOperateMenu($flow, $task, 'view');
?>
<?php echo $this->buildOperateMenu($task, 'view');?>
<div class='divider'></div>
<?php