control == 'select' or $extendField->control == 'multi-select') ? " style='overflow:visible'" : '') . ">" . $this->flow->getFieldControl($extendField, '', $extendField->field . "[%s]") . "";
?>
diff --git a/module/build/control.php b/module/build/control.php
index b918fdf58e..1105dc34a3 100644
--- a/module/build/control.php
+++ b/module/build/control.php
@@ -38,7 +38,8 @@ class build extends control
if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
$this->loadModel('action')->create('build', $buildID, 'opened');
- $this->executeHooks($buildID);
+ $message = $this->executeHooks($buildID);
+ if($message) $this->lang->saveSuccess = $message;
if($this->viewType == 'json') return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'id' => $buildID));
if(isonlybody()) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => "parent.loadExecutionBuilds($executionID, $buildID)")); // Code for task #5126.
@@ -130,7 +131,8 @@ class build extends control
if(!empty($changes)) $this->action->logHistory($actionID, $changes);
}
- $this->executeHooks($buildID);
+ $message = $this->executeHooks($buildID);
+ if($message) $this->lang->saveSuccess = $message;
return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('view', "buildID=$buildID")));
}
@@ -316,7 +318,8 @@ class build extends control
$build = $this->build->getById($buildID);
$this->build->delete(TABLE_BUILD, $buildID);
- $this->executeHooks($buildID);
+ $message = $this->executeHooks($buildID);
+ if($message) $response['message'] = $message;
/* if ajax request, send result. */
if($this->server->ajax)
diff --git a/module/build/model.php b/module/build/model.php
index 2f10fc4067..3283ec5786 100644
--- a/module/build/model.php
+++ b/module/build/model.php
@@ -526,20 +526,47 @@ class buildModel extends model
*
* @param object $build
* @param string $type
+ * @param string $extra
* @access public
* @return string
*/
- public function buildOperateMenu($build, $type = 'view')
+ public function buildOperateMenu($build, $type = 'view', $extra = '')
{
- $canBeChanged = common::canBeChanged('build', $build);
- if($build->deleted || !$canBeChanged) return '';
+ $extraParams = array();
+ if($extra) parse_str($extra, $extraParams);
$menu = '';
$params = "buildID=$build->id";
- $menu .= $this->buildFlowMenu('build', $build, 'view', 'direct');
- $menu .= $this->buildMenu('build', 'edit', $params, $build, $type);
- $menu .= $this->buildMenu('build', 'delete', $params, $build, $type, 'trash', 'hiddenwin');
+ global $app;
+ $tab = $app->tab;
+
+ if($type == 'browse')
+ {
+ $executionID = $tab == 'execution' ? $extraParams['executionID'] : $build->execution;
+
+ if(common::hasPriv('build', 'linkstory') and common::canBeChanged('build', $build)) $menu .= $this->buildMenu('build', 'view', "{$params}&type=story&link=true", $build, $type, 'link', '', '', '', "data-app={$tab}", $this->lang->build->linkStory);
+
+ $menu .= $this->buildMenu('testtask', 'create', "product=$build->product&execution={$executionID}&build=$build->id", $build, $type, 'bullhorn', '', '', '', "data-app='{$tab}'");
+
+ if($tab == 'execution') $menu .= $this->buildMenu('execution', 'bug', "execution={$extraParams['executionID']}&productID={$extraParams['productID']}&orderBy=status&build=$build->id", $build, $type, '', '', '', '', $this->lang->execution->viewBug);
+ if($tab == 'project') $menu .= $this->buildMenu('build', 'view', "{$params}&type=generatedBug", $build, $type, 'bug', '', '', '', "data-app='project'", $this->lang->project->bug);
+
+ $menu .= $this->buildMenu('build', 'edit', $params, $build, $type);
+ $menu .= $this->buildMenu('build', 'delete', $params, $build, $type, 'trash', 'hiddenwin');
+ }
+ else
+ {
+ $canBeChanged = common::canBeChanged('build', $build);
+ if($build->deleted || !$canBeChanged) return '';
+
+ $menu .= $this->buildFlowMenu('build', $build, 'view', 'direct');
+
+ $editClickable = $this->buildMenu('build', 'edit', $params, $build, $type, '', '', '', '', '', '', false);
+ $deleteClickable = $this->buildMenu('build', 'delete', $params, $build, $type, '', '', '', '', '', '', false);
+ if(common::hasPriv('build', 'edit') and $editClickable) $menu .= html::a(helper::createLink('build', 'edit', $params), " " . $this->lang->edit, '', "class='btn btn-link' title='{$this->lang->build->edit}' data-app='{$app->tab}'");
+ if(common::hasPriv('build', 'delete') and $deleteClickable) $menu .= html::a(helper::createLink('build', 'delete', $params), " " . $this->lang->delete, '', "class='btn btn-link' title='{$this->lang->build->delete}' target='hiddenwin' data-app='{$app->tab}'");
+ }
return $menu;
}
diff --git a/module/caselib/control.php b/module/caselib/control.php
index c6766c3411..8d31fe904e 100644
--- a/module/caselib/control.php
+++ b/module/caselib/control.php
@@ -92,7 +92,8 @@ class caselib extends control
$this->action->logHistory($actionID, $changes);
}
- $this->executeHooks($libID);
+ $message = $this->executeHooks($libID);
+ if($message) $response['message'] = $message;
$response['locate'] = inlink('view', "libID=$libID");
return $this->send($response);
@@ -130,7 +131,8 @@ class caselib extends control
{
$this->caselib->delete($libID);
- $this->executeHooks($libID);
+ $message = $this->executeHooks($libID);
+ if($message) $response['message'] = $message;
/* if ajax request, send result. */
if($this->server->ajax)
diff --git a/module/caselib/model.php b/module/caselib/model.php
index 9e19a18c39..c087eb1974 100644
--- a/module/caselib/model.php
+++ b/module/caselib/model.php
@@ -647,10 +647,13 @@ class caselibModel extends model
$menu .= $this->buildMenu('testcase', 'review', $params, $case, 'browse', 'glasses', '', 'iframe');
}
$menu .= $this->buildMenu('testcase', 'edit', $params, $case, 'browse');
+ $clickable = $this->buildMenu('testcase', 'delete', $params, $case, 'browse', '', '', '', '', '', '', false);
if(common::hasPriv('testcase', 'delete'))
{
$deleteURL = helper::createLink('testcase', 'delete', "$params&confirm=yes");
- $menu .= html::a("javascript:ajaxDelete(\"$deleteURL\", \"caseList\", confirmDelete)", '', '', "title='{$this->lang->testcase->delete}' class='btn'");
+ $class = 'btn';
+ if(!$clickable) $class .= ' disabled';
+ $menu .= html::a("javascript:ajaxDelete(\"$deleteURL\", \"caseList\", confirmDelete)", '', '', "title='{$this->lang->testcase->delete}' class='{$class}'");
}
return $menu;
diff --git a/module/common/model.php b/module/common/model.php
index 97f1010422..27e2443cc6 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -918,6 +918,9 @@ class commonModel extends model
public static function getMainNavList($moduleName)
{
global $lang;
+ global $app;
+
+ $app->loadLang('my');
$menuOrder = $lang->mainNav->menuOrder;
ksort($menuOrder);
@@ -963,8 +966,24 @@ class commonModel extends model
}
}
+ /* Check whether other preference item under the module have permissions. If yes, point to other methods. */
+ $moduleLinkList = $currentModule . 'LinkList';
+ if(!$display and isset($lang->my->$moduleLinkList))
+ {
+ foreach($lang->my->$moduleLinkList as $key => $linkList)
+ {
+ $method = explode('-', $key)[1];
+ if(common::hasPriv($currentModule, $method))
+ {
+ $display = true;
+ $currentMethod = $method;
+ break;
+ }
+ }
+ }
+
/* Check whether other methods under the module have permissions. If yes, point to other methods. */
- if($display == false and isset($lang->$currentModule->menu))
+ if($display == false and isset($lang->$currentModule->menu) and !in_array($currentModule, array('program', 'product', 'project', 'execution')))
{
foreach($lang->$currentModule->menu as $menu)
{
@@ -1529,7 +1548,7 @@ class commonModel extends model
{$lang->action->create}
';
}
diff --git a/module/execution/config.php b/module/execution/config.php
index a0d653269c..fb00ff4e8f 100644
--- a/module/execution/config.php
+++ b/module/execution/config.php
@@ -7,7 +7,7 @@ $config->execution->weekend = '2';
$config->execution->ownerFields = array('PO', 'PM', 'QD', 'RD');
$config->execution->list = new stdclass();
-$config->execution->list->exportFields = 'id,name,projectName,code,PM,end,status,totalEstimate,totalConsumed,totalLeft,progress';
+$config->execution->list->exportFields = 'id,name,projectName,code,PM,begin,end,status,totalEstimate,totalConsumed,totalLeft,progress';
$config->execution->modelList['scrum'] = 'sprint';
$config->execution->modelList['waterfall'] = 'stage';
diff --git a/module/execution/control.php b/module/execution/control.php
index 89b484c60e..629c8af8f0 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -679,7 +679,7 @@ class execution extends control
* @access public
* @return void
*/
- public function story($executionID = 0, $orderBy = 'order_asc', $type = 'all', $param = 0, $recTotal = 0, $recPerPage = 50, $pageID = 1)
+ public function story($executionID = 0, $orderBy = 'order_desc', $type = 'all', $param = 0, $recTotal = 0, $recPerPage = 50, $pageID = 1)
{
/* Load these models. */
$this->loadModel('story');
@@ -1419,7 +1419,8 @@ class execution extends control
$this->loadModel('action')->create($this->objectType, $executionID, 'opened', '', join(',', $_POST['products']));
- $this->executeHooks($executionID);
+ $message = $this->executeHooks($executionID);
+ if($message) $this->lang->saveSuccess = $message;
if($this->viewType == 'json') return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'id' => $executionID));
@@ -1593,7 +1594,9 @@ class execution extends control
$this->productplan->linkProject($projectID, $newPlans);
}
- $this->executeHooks($executionID);
+ $message = $this->executeHooks($executionID);
+ if($message) $this->lang->saveSuccess = $message;
+
if($_POST['status'] == 'doing') $this->loadModel('common')->syncPPEStatus($executionID);
if($execution->type == 'kanban') return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent'));
return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('view', "executionID=$executionID")));
@@ -2593,7 +2596,8 @@ class execution extends control
$this->execution->updateUserView($executionID);
$this->session->set('execution', '');
- $this->executeHooks($executionID);
+ $message = $this->executeHooks($executionID);
+ if($message) $this->lang->saveSuccess = $message;
if($this->viewType == 'json') return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess));
return print(js::reload('parent'));
@@ -3291,6 +3295,7 @@ class execution extends control
$orderBy = $this->post->orderBy;
$order = $this->dao->select('*')->from(TABLE_PROJECTSTORY)->where('story')->in($idList)->andWhere('project')->eq($executionID)->orderBy('order_asc')->fetch('order');
+ if(strpos($orderBy, 'order_desc') !== false) $idList = array_reverse($idList);
foreach($idList as $storyID)
{
$this->dao->update(TABLE_PROJECTSTORY)->set('`order`')->eq($order)->where('story')->eq($storyID)->andWhere('project')->eq($executionID)->exec();
diff --git a/module/execution/css/create.css b/module/execution/css/create.css
index d482356317..f3544e54ed 100644
--- a/module/execution/css/create.css
+++ b/module/execution/css/create.css
@@ -1,4 +1,5 @@
-#tipsModal {margin-top: 10%;}
+[lang^='en'] #tipsModal {margin-top: 10%; max-width: 620px;}
+[lang^='zh-cn'] #tipsModal {margin-top: 10%; max-width: 530px;}
.chosen-container-single .chosen-single > span {max-width: 100%;}
#copyProjectModal {padding: 0;}
diff --git a/module/execution/js/common.js b/module/execution/js/common.js
index 52736ceca1..250b57fc8b 100644
--- a/module/execution/js/common.js
+++ b/module/execution/js/common.js
@@ -184,7 +184,7 @@ function loadPlans(product, branchID)
var branchID = typeof(branchID) == 'undefined' ? 0 : branchID;
var index = $(product).attr('id').replace('products', '');
- $.get(createLink('product', 'ajaxGetPlans', "productID=" + productID + '&branch=0,' + branchID + '&planID=0&fieldID&needCreate=&expired=noclosed|' + (config.currentMethod == 'create' ? 'unexpired' : '') + '¶m=skipParent'), function(data)
+ $.get(createLink('product', 'ajaxGetPlans', "productID=" + productID + '&branch=0,' + branchID + '&planID=0&fieldID&needCreate=&expired=noclosed,' + (config.currentMethod == 'create' ? 'unexpired' : '') + '¶m=skipParent'), function(data)
{
if(data)
{
diff --git a/module/execution/js/kanban.js b/module/execution/js/kanban.js
index ccf3d875bb..9d26eab02d 100644
--- a/module/execution/js/kanban.js
+++ b/module/execution/js/kanban.js
@@ -233,15 +233,14 @@ $('.c-group').change(function()
*/
function createLaneMenu(options)
{
- var lane = options.$trigger.closest('.kanban-lane').data('lane');
- var laneCount = options.$trigger.closest('.kanban-board').children('.kanban-lane').length;
+ var lane = options.$trigger.closest('.kanban-lane').data('lane');
var privs = lane.actions;
if(!privs.length) return [];
var items = [];
if(privs.includes('setLane')) items.push({label: kanbanLang.setLane, icon: 'edit', url: createLink('kanban', 'setLane', 'laneID=' + lane.id + '&executionID=0&from=kanban'), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '635px'}});
- if(privs.includes('deleteLane') && laneCount > 1) items.push({label: kanbanLang.deleteLane, icon: 'trash', url: createLink('kanban', 'deleteLane', 'lane=' + lane.id), attrs: {'target': 'hiddenwin'}});
+ if(privs.includes('deleteLane')) items.push({label: kanbanLang.deleteLane, icon: 'trash', url: createLink('kanban', 'deleteLane', 'lane=' + lane.id), attrs: {'target': 'hiddenwin'}});
var bounds = options.$trigger[0].getBoundingClientRect();
items.$options = {x: bounds.right, y: bounds.top};
diff --git a/module/execution/js/story.js b/module/execution/js/story.js
index 85903c09fb..d7d80f5096 100644
--- a/module/execution/js/story.js
+++ b/module/execution/js/story.js
@@ -9,7 +9,7 @@ $(function()
var $target = $(data.element[0]);
$target.hide();
$target.fadeIn(1000);
- order = 'order_asc'
+ order = 'order_desc'
history.pushState({}, 0, createLink('execution', 'story', "executionID=" + executionID + '&orderBy=' + order));
});
});
diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php
index 8bd05725fe..f9bb7c45d1 100644
--- a/module/execution/lang/en.php
+++ b/module/execution/lang/en.php
@@ -17,9 +17,29 @@ $lang->execution->type = $lang->executionCommon . 'Type';
$lang->execution->name = "{$lang->executionCommon} Name";
$lang->execution->code = "{$lang->executionCommon} Code";
$lang->execution->projectName = 'Project';
+$lang->execution->project = 'Project';
$lang->execution->execName = "{$lang->execution->common} Name";
$lang->execution->execCode = "{$lang->execution->common} Code";
$lang->execution->execType = 'Execution Type';
+$lang->execution->lifetime = 'Project Cycle';
+$lang->execution->attribute = 'Stage Type';
+$lang->execution->percent = 'Workload %';
+$lang->execution->milestone = 'Milestone';
+$lang->execution->parent = 'Project';
+$lang->execution->path = 'Path';
+$lang->execution->grade = 'Grade';
+$lang->execution->output = 'Output';
+$lang->execution->version = 'Version';
+$lang->execution->parentVersion = 'Parent Version';
+$lang->execution->planDuration = 'Plan Duration';
+$lang->execution->realDuration = 'Real Duration';
+$lang->execution->openedVersion = 'Opened Version';
+$lang->execution->lastEditedBy = 'Last EditedBy';
+$lang->execution->lastEditedDate = 'Last EditedDate';
+$lang->execution->suspendedDate = 'Suspended Date';
+$lang->execution->vision = 'Vision';
+$lang->execution->displayCards = 'Max cards per column';
+$lang->execution->fluidBoard = 'Column Width';
$lang->execution->stage = 'Stage';
$lang->execution->pri = 'Priority';
$lang->execution->openedBy = 'OpenedBy';
@@ -55,6 +75,7 @@ $lang->execution->QD = 'Test Manager';
$lang->execution->RD = 'Release Manager';
$lang->execution->release = 'Release';
$lang->execution->acl = 'Access Control';
+$lang->execution->auth = 'Privileges';
$lang->execution->teamname = 'Team Name';
$lang->execution->updateOrder = 'Rank';
$lang->execution->order = "Rank {$lang->executionCommon}";
diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php
index ca0c943c14..5d248f81f0 100644
--- a/module/execution/lang/zh-cn.php
+++ b/module/execution/lang/zh-cn.php
@@ -17,9 +17,29 @@ $lang->execution->type = $lang->executionCommon . '类型';
$lang->execution->name = $lang->executionCommon . '名称';
$lang->execution->code = $lang->executionCommon . '代号';
$lang->execution->projectName = '所属项目';
+$lang->execution->project = '所属项目';
$lang->execution->execName = "{$lang->execution->common}名称";
$lang->execution->execCode = "{$lang->execution->common}代号";
$lang->execution->execType = "{$lang->execution->common}类型";
+$lang->execution->lifetime = '项目周期';
+$lang->execution->attribute = '阶段类型';
+$lang->execution->percent = '工作量占比';
+$lang->execution->milestone = '里程碑';
+$lang->execution->parent = '所属项目';
+$lang->execution->path = '路径';
+$lang->execution->grade = '层级';
+$lang->execution->output = '输出';
+$lang->execution->version = '版本';
+$lang->execution->parentVersion = '父版本';
+$lang->execution->planDuration = '计划周期天数';
+$lang->execution->realDuration = '实际周期天数';
+$lang->execution->openedVersion = '创建版本';
+$lang->execution->lastEditedBy = '最后编辑人';
+$lang->execution->lastEditedDate = '最后编辑日期';
+$lang->execution->suspendedDate = '暂停日期';
+$lang->execution->vision = '界面';
+$lang->execution->displayCards = '每列最大卡片数';
+$lang->execution->fluidBoard = '列宽度';
$lang->execution->stage = '阶段';
$lang->execution->pri = '优先级';
$lang->execution->openedBy = '由谁创建';
@@ -55,6 +75,7 @@ $lang->execution->QD = '测试负责人';
$lang->execution->RD = '发布负责人';
$lang->execution->release = '发布';
$lang->execution->acl = '访问控制';
+$lang->execution->auth = '权限控制';
$lang->execution->teamname = '团队名称';
$lang->execution->updateOrder = '排序';
$lang->execution->order = $lang->executionCommon . '排序';
diff --git a/module/execution/model.php b/module/execution/model.php
index 108f02118b..38257a2002 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -369,12 +369,12 @@ class executionModel extends model
$this->lang->project->code = $this->lang->execution->execCode;
}
- $sprintProject = isset($sprint->project) ? $sprint->project : '';
+ $sprintProject = isset($sprint->project) ? $sprint->project : '0';
$this->dao->insert(TABLE_EXECUTION)->data($sprint)
->autoCheck($skipFields = 'begin,end')
->batchcheck($this->config->execution->create->requiredFields, 'notempty')
->checkIF((!empty($sprint->name) and $this->config->systemMode == 'new'), 'name', 'unique', "`type` in ('sprint','stage', 'kanban') and `project` = $sprintProject")
- ->checkIF(!empty($sprint->code), 'code', 'unique', "`type` in ('sprint','stage')")
+ ->checkIF(!empty($sprint->code), 'code', 'unique', "`type` in ('sprint','stage', 'kanban')")
->checkIF($sprint->begin != '', 'begin', 'date')
->checkIF($sprint->end != '', 'end', 'date')
->checkIF($sprint->end != '', 'end', 'ge', $sprint->begin)
@@ -511,18 +511,17 @@ class executionModel extends model
}
/* Update data. */
- $executionProject = isset($execution->project) ? $execution->project : '';
+ $executionProject = isset($execution->project) ? $execution->project : '0';
$this->dao->update(TABLE_EXECUTION)->data($execution)
->autoCheck($skipFields = 'begin,end')
->batchcheck($this->config->execution->edit->requiredFields, 'notempty')
->checkIF($execution->begin != '', 'begin', 'date')
->checkIF($execution->end != '', 'end', 'date')
->checkIF($execution->end != '', 'end', 'ge', $execution->begin)
- ->checkIF((!empty($execution->name) and $this->config->systemMode == 'new'), 'name', 'unique', "id != $executionID and type in ('sprint','stage') and `project` = $executionProject")
- ->checkIF(!empty($execution->code), 'code', 'unique', "id != $executionID and type in ('sprint','stage')")
+ ->checkIF((!empty($execution->name) and $this->config->systemMode == 'new'), 'name', 'unique', "id != $executionID and type in ('sprint','stage', 'kanban') and `project` = $executionProject")
+ ->checkIF(!empty($execution->code), 'code', 'unique', "id != $executionID and type in ('sprint','stage', 'kanban')")
->checkFlow()
->where('id')->eq($executionID)
- ->checkFlow()
->limit(1)
->exec();
@@ -961,6 +960,16 @@ class executionModel extends model
}
}
+ /* Update the status of the parent stage. */
+ if($oldExecution->type == 'stage')
+ {
+ $parent = $this->getByID($oldExecution->parent);
+ if($parent->type == 'stage' and $parent->status == 'closed')
+ {
+ $this->dao->update(TABLE_EXECUTION)->set('status')->eq('doing')->where('id')->eq($parent->id)->exec();
+ }
+ }
+
if(!dao::isError()) return common::createChanges($oldExecution, $execution);
}
@@ -1002,6 +1011,23 @@ class executionModel extends model
if(!dao::isError())
{
+ /* Update the status of the parent stage. */
+ if($oldExecution->type == 'stage')
+ {
+ $parent = $this->getByID($oldExecution->parent);
+ if($parent->type == 'stage')
+ {
+ $isClosed = true;
+ $children = $this->getChildExecutions($oldExecution->parent);
+ foreach($children as $childID => $childExecution)
+ {
+ if($childExecution->status != 'closed') $isClosed = false;
+ }
+
+ if($isClosed) $this->dao->update(TABLE_EXECUTION)->set('status')->eq('closed')->where('id')->eq($parent->id)->exec();
+ }
+ }
+
$this->loadModel('score')->create('execution', 'close', $oldExecution);
return common::createChanges($oldExecution, $execution);
}
@@ -1575,7 +1601,7 @@ class executionModel extends model
*/
public function getChildExecutions($executionID)
{
- return $this->dao->select('id, name')->from(TABLE_EXECUTION)->where('parent')->eq((int)$executionID)->fetchPairs();
+ return $this->dao->select('id, name, status')->from(TABLE_EXECUTION)->where('deleted')->eq(0)->andWhere('parent')->eq((int)$executionID)->fetchAll('id');
}
/**
diff --git a/module/execution/view/all.html.php b/module/execution/view/all.html.php
index 102388d861..c3f27fc413 100644
--- a/module/execution/view/all.html.php
+++ b/module/execution/view/all.html.php
@@ -185,12 +185,21 @@
echo common::hasPriv('programplan', 'create') ? html::a('javascript:alert("' . $this->lang->programplan->error->createdTask . '");', '', '', 'class="btn ' . $disabled . '"') : '';
}
- common::printIcon('programplan', 'edit', "planID=$execution->id&projectID=$projectID", $execution, 'list', '', '', 'iframe', true);
+ common::printIcon('programplan', 'edit', "stageID=$execution->id&projectID=$projectID", $execution, 'list', '', '', 'iframe', true);
$disabled = !empty($execution->children) ? ' disabled' : '';
+ if($execution->status != 'closed' and common::hasPriv('execution', 'close', $execution))
+ {
+ common::printIcon('execution', 'close', "stageID=$execution->id", $execution, 'list', 'off', 'hiddenwin' , $disabled . ' iframe', true, '', $this->lang->programplan->close);
+ }
+ elseif($execution->status == 'closed' and common::hasPriv('execution', 'activate', $execution))
+ {
+ common::printIcon('execution', 'activate', "stageID=$execution->id", $execution, 'list', 'magic', 'hiddenwin' , $disabled . ' iframe', true, '', $this->lang->programplan->activate);
+ }
+
if(common::hasPriv('execution', 'delete', $execution))
{
- common::printIcon('execution', 'delete', "planID=$execution->id&confirm=no", $execution, 'list', 'trash', 'hiddenwin' , $disabled, '', '', $this->lang->programplan->delete);
+ common::printIcon('execution', 'delete', "stageID=$execution->id&confirm=no", $execution, 'list', 'trash', 'hiddenwin' , $disabled, '', '', $this->lang->programplan->delete);
}
?>
@@ -257,7 +266,7 @@
if($child->grade == 1 && $this->loadModel('programplan')->isCreateTask($child->id))
{
- common::printIcon('programplan', 'create', "program={$child->parent}&productID=$productID&planID=$child->id", $child, 'list', 'split', '', '', '', '', $this->lang->programplan->createSubPlan);
+ common::printIcon('programplan', 'create', "program={$child->parent}&productID=$productID&stageID=$child->id", $child, 'list', 'split', '', '', '', '', $this->lang->programplan->createSubPlan);
}
else
{
@@ -265,12 +274,21 @@
echo html::a('javascript:alert("' . $this->lang->programplan->error->createdTask . '");', '', '', 'class="btn ' . $disabled . '"');
}
- common::printIcon('programplan', 'edit', "planID=$child->id&projectID=$projectID", $child, 'list', '', '', 'iframe', true);
+ common::printIcon('programplan', 'edit', "stageID=$child->id&projectID=$projectID", $child, 'list', '', '', 'iframe', true);
$disabled = !empty($child->children) ? ' disabled' : '';
+ if(common::hasPriv('execution', 'close', $child) and $execution->status != 'closed')
+ {
+ common::printIcon('execution', 'close', "stageID=$child->id", $child, 'list', 'off', '' , $disabled . ' iframe', true, '', $this->lang->programplan->close);
+ }
+ elseif(common::hasPriv('execution', 'activate', $child) and $execution->status == 'closed')
+ {
+ common::printIcon('execution', 'activate', "stageID=$child->id", $child, 'list', 'magic', 'hiddenwin' , $disabled . ' iframe', true, '', $this->lang->programplan->activate);
+ }
+
if(common::hasPriv('execution', 'delete', $child))
{
- common::printIcon('execution', 'delete', "planID=$child->id&confirm=no", $child, 'list', 'trash', 'hiddenwin' , $disabled, '', '', $this->lang->programplan->delete);
+ common::printIcon('execution', 'delete', "stageID=$child->id&confirm=no", $child, 'list', 'trash', 'hiddenwin' , $disabled, '', '', $this->lang->programplan->delete);
}
?>
diff --git a/module/execution/view/build.html.php b/module/execution/view/build.html.php
index 8f39edef65..b74accd8c1 100644
--- a/module/execution/view/build.html.php
+++ b/module/execution/view/build.html.php
@@ -72,19 +72,7 @@
filePath, 'http') === 0 ? html::a($build->filePath) : $build->filePath;?> |
date?> |
builder);?> |
-
- createLink('build', 'view', "buildID=$build->id&type=story&link=true"), "", '', "class='btn' title='{$lang->build->linkStory}'");
- }
- common::printIcon('testtask', 'create', "product=$build->product&execution=$execution->id&build=$build->id", $build, 'list', 'bullhorn');
- $lang->execution->bug = $lang->execution->viewBug;
- common::printIcon('execution', 'bug', "execution=$execution->id&productID=$productID&orderBy=status&build=$build->id", $build, 'list');
- common::printIcon('build', 'edit', "buildID=$build->id", $build, 'list');
- common::printIcon('build', 'delete', "buildID=$build->id", $build, 'list', 'trash', 'hiddenwin');
- ?>
- |
+ build->buildOperateMenu($build, 'browse', "executionID={$execution->id}&productID={$productID}");?> |
diff --git a/module/execution/view/create.html.php b/module/execution/view/create.html.php
index 92bcc82447..8f162c33b6 100644
--- a/module/execution/view/create.html.php
+++ b/module/execution/view/create.html.php
@@ -15,7 +15,7 @@
createLink('execution', 'task', "execution=$executionID");?>
-