From 1d9e0a8bf57ed8e43192a7f356629a1b10425b0c Mon Sep 17 00:00:00 2001 From: zhujinyong Date: Wed, 24 Mar 2021 16:14:22 +0800 Subject: [PATCH 1/2] * Fix action buttion bug. --- module/program/view/browsebylist.html.php | 6 +++--- module/project/control.php | 5 ++++- module/project/view/managemembers.html.php | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/module/program/view/browsebylist.html.php b/module/program/view/browsebylist.html.php index 2c0aad6249..aff3f8db0b 100644 --- a/module/program/view/browsebylist.html.php +++ b/module/program/view/browsebylist.html.php @@ -79,7 +79,7 @@ id", '', 'list', 'edit');?> - id", '', 'list', 'split', '', '', '', '', $this->lang->program->children);?> + id", '', 'list', 'split', '', '', '', $program->status == 'closed' ? 'disabled' : '', $this->lang->program->children);?> createLink("program", "delete", "programID=$program->id"), "", 'hiddenwin', "class='btn' title='{$this->lang->program->delete}'");?> @@ -103,8 +103,8 @@
diff --git a/module/project/control.php b/module/project/control.php index f39054bba7..4cbd536876 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -530,6 +530,7 @@ class project extends control */ public function group($projectID = 0, $programID = 0) { + $this->loadModel('group'); $this->project->setMenu($projectID); $title = $this->lang->company->orgView . $this->lang->colon . $this->lang->group->browse; @@ -559,6 +560,8 @@ class project extends control */ public function createGroup($projectID = 0) { + $this->loadModel('group'); + if(!empty($_POST)) { $_POST['project'] = $projectID; @@ -1292,7 +1295,7 @@ class project extends control $this->user->updateUserView($projectID, 'project'); /* Delete the execution under the project. */ - $executionIdList = $this->execution->getByProject($projectID); + $executionIdList = $this->loadModel('execution')->getByProject($projectID); if(empty($executionIdList)) die(js::reload('parent')); $this->dao->update(TABLE_EXECUTION)->set('deleted')->eq(1)->where('id')->in(array_keys($executionIdList))->exec(); diff --git a/module/project/view/managemembers.html.php b/module/project/view/managemembers.html.php index f24988a2bf..213f17e447 100644 --- a/module/project/view/managemembers.html.php +++ b/module/project/view/managemembers.html.php @@ -54,7 +54,7 @@ - + team->limitedList, 'no');?> From c7782fdefdc100dd5557c33a61b1b3a47e3c0289 Mon Sep 17 00:00:00 2001 From: leiyong <1549684884@qq.com> Date: Wed, 24 Mar 2021 16:14:36 +0800 Subject: [PATCH 2/2] * Adjust block module. --- module/action/control.php | 2 +- module/block/control.php | 64 +++++++++++-------- module/block/view/buildblock.html.php | 11 ++-- module/block/view/caseblock.html.php | 10 +-- module/block/view/executionblock.html.php | 4 +- module/block/view/planblock.html.php | 9 +-- module/block/view/productblock.html.php | 12 ++-- module/block/view/projectblock.html.php | 10 +-- module/block/view/recentprojectblock.html.php | 11 ++-- module/block/view/releaseblock.html.php | 14 ++-- module/block/view/scrumlistblock.html.php | 2 +- module/block/view/scrumproductblock.html.php | 4 +- module/block/view/scrumtestblock.html.php | 17 +++-- module/block/view/storyblock.html.php | 12 +--- module/block/view/testtaskblock.html.php | 14 ++-- module/block/view/todolist.html.php | 6 +- module/productplan/control.php | 2 +- 17 files changed, 105 insertions(+), 99 deletions(-) diff --git a/module/action/control.php b/module/action/control.php index 6220eac8c6..daae09f2bc 100755 --- a/module/action/control.php +++ b/module/action/control.php @@ -31,7 +31,7 @@ class action extends control $this->session->set('productList', $uri, 'product'); $this->session->set('productPlanList', $uri, 'product'); $this->session->set('storyList', $uri, 'product'); - $this->session->set('releaseList', $uri, 'execution'); + $this->session->set('releaseList', $uri, 'product'); $this->session->set('programList', $uri, 'program'); $this->session->set('projectList', $uri, 'project'); $this->session->set('executionList', $uri, 'execution'); diff --git a/module/block/control.php b/module/block/control.php index db47998338..f68ea1c030 100644 --- a/module/block/control.php +++ b/module/block/control.php @@ -562,10 +562,12 @@ class block extends control $limit = $this->viewType == 'json' ? 0 : (int)$this->params->count; $todos = $this->loadModel('todo')->getList('all', $this->app->user->account, 'wait, doing', $limit, $pager = null, $orderBy = 'date, begin'); $uri = $this->app->getURI(true); - $this->session->set('todoList', $uri); - $this->session->set('bugList', $uri); - $this->session->set('taskList', $uri); - $this->session->set('riskList', $uri); + + $this->session->set('todoList', $uri, 'my'); + $this->session->set('bugList', $uri, 'qa'); + $this->session->set('taskList', $uri, 'execution'); + $this->session->set('storyList', $uri, 'product'); + $this->session->set('testtaskList', $uri, 'qa'); foreach($todos as $key => $todo) { @@ -583,13 +585,13 @@ class block extends control */ public function printTaskBlock() { - $uri = $this->app->getURI(true); - $this->session->set('taskList', $uri); - $this->session->set('storyList', $uri); + $this->session->set('taskList', $this->app->getURI(true), 'execution'); if(preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) die(); - $projectID = $this->view->block->module == 'my' ? 0 : (int)$this->session->project; - $this->view->tasks = $this->loadModel('task')->getUserTasks($this->app->user->account, $this->params->type, $this->viewType == 'json' ? 0 : (int)$this->params->count, null, $this->params->orderBy, $projectID); + $account = $this->app->user->account; + $type = $this->params->type; + + $this->view->tasks = $this->loadModel('task')->getUserTasks($account, $type, $this->viewType == 'json' ? 0 : (int)$this->params->count, null, $this->params->orderBy); } /** @@ -600,7 +602,7 @@ class block extends control */ public function printBugBlock() { - $this->session->set('bugList', $this->app->getURI(true)); + $this->session->set('bugList', $this->app->getURI(true), 'qa'); if(preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) die(); $projectID = $this->lang->navGroup->qa == 'project' ? $this->session->project : 0; @@ -616,7 +618,7 @@ class block extends control */ public function printCaseBlock() { - $this->session->set('caseList', $this->app->getURI(true)); + $this->session->set('caseList', $this->app->getURI(true), 'qa'); $this->app->loadLang('testcase'); $this->app->loadLang('testtask'); @@ -661,19 +663,17 @@ class block extends control { $this->app->loadLang('testtask'); - $this->session->set('testtaskList', $this->app->getURI(true)); + $this->session->set('productList', $this->app->getURI(true), 'product'); + $this->session->set('testtaskList', $this->app->getURI(true), 'qa'); + $this->session->set('buildList', $this->app->getURI(true), 'execution'); if(preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) die(); - $projectID = $this->lang->navGroup->qa == 'project' ? $this->session->project : 0; - $projectID = $this->view->block->module == 'my' ? 0 : $projectID; - $this->view->testtasks = $this->dao->select('t1.*,t2.name as productName,t3.name as buildName,t4.name as projectName')->from(TABLE_TESTTASK)->alias('t1') ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product=t2.id') ->leftJoin(TABLE_BUILD)->alias('t3')->on('t1.build=t3.id') - ->leftJoin(TABLE_PROJECT)->alias('t4')->on('t1.project=t4.id') - ->leftJoin(TABLE_PROJECTPRODUCT)->alias('t5')->on('t1.project=t5.project') + ->leftJoin(TABLE_PROJECT)->alias('t4')->on('t1.execution=t4.id') + ->leftJoin(TABLE_PROJECTPRODUCT)->alias('t5')->on('t1.execution=t5.project') ->where('t1.deleted')->eq('0') - ->beginIF($projectID)->andWhere('t1.project')->eq($projectID)->fi() ->beginIF(!$this->app->user->admin)->andWhere('t1.product')->in($this->app->user->view->products)->fi() ->andWhere('t1.product = t5.product') ->beginIF($this->params->type != 'all')->andWhere('t1.status')->eq($this->params->type)->fi() @@ -690,15 +690,16 @@ class block extends control */ public function printStoryBlock() { - $this->session->set('storyList', $this->app->getURI(true)); + $this->session->set('storyList', $this->app->getURI(true), 'product'); if(preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) die(); + $this->app->loadClass('pager', $static = true); $count = isset($this->params->count) ? (int)$this->params->count : 0; $pager = pager::init(0, $count , 1); $type = isset($this->params->type) ? $this->params->type : 'assignedTo'; $orderBy = isset($this->params->type) ? $this->params->orderBy : 'id_asc'; - $this->view->stories = $this->loadModel('story')->getUserStories($this->app->user->account, $type, $orderBy, $this->viewType != 'json' ? $pager : '', 'story'); + $this->view->stories = $this->loadModel('story')->getUserStories($this->app->user->account, $type, $orderBy, $this->viewType != 'json' ? $pager : '', 'story'); } /** @@ -709,7 +710,9 @@ class block extends control */ public function printPlanBlock() { - $this->session->set('productPlanList', $this->app->getURI(true)); + $this->session->set('productList', $this->app->getURI(true), 'product'); + $this->session->set('productPlanList', $this->app->getURI(true), 'product'); + $this->app->loadLang('productplan'); $this->view->plans = $this->dao->select('t1.*,t2.name as productName')->from(TABLE_PRODUCTPLAN)->alias('t1') ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product=t2.id') @@ -728,7 +731,9 @@ class block extends control */ public function printReleaseBlock() { - $this->session->set('releaseList', $this->app->getURI(true)); + $this->session->set('releaseList', $this->app->getURI(true), 'product'); + $this->session->set('buildList', $this->app->getURI(true), 'execution'); + $this->app->loadLang('release'); $this->view->releases = $this->dao->select('t1.*,t2.name as productName,t3.name as buildName')->from(TABLE_RELEASE)->alias('t1') ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product=t2.id') @@ -749,7 +754,7 @@ class block extends control */ public function printBuildBlock() { - $this->session->set('buildList', $this->app->getURI(true)); + $this->session->set('buildList', $this->app->getURI(true), 'execution'); $this->app->loadLang('build'); $builds = $this->dao->select('t1.*, t2.name as productName')->from(TABLE_BUILD)->alias('t1') @@ -1215,7 +1220,7 @@ class block extends control public function printWaterfallIssueBlock() { $uri = $this->app->getURI(true); - $this->session->set('issueList', $uri); + $this->session->set('issueList', $uri, 'project'); if(preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) die(); $this->view->users = $this->loadModel('user')->getPairs('noletter'); $this->view->issues = $this->loadModel('issue')->getBlockIssues($this->session->project, $this->params->type, $this->viewType == 'json' ? 0 : (int)$this->params->count, $this->params->orderBy); @@ -1230,7 +1235,7 @@ class block extends control public function printWaterfallRiskBlock() { $uri = $this->app->getURI(true); - $this->session->set('riskList', $uri); + $this->session->set('riskList', $uri, 'project'); $this->view->users = $this->loadModel('user')->getPairs('noletter'); $this->view->risks = $this->loadModel('risk')->getBlockRisks($this->session->project, $this->params->type, $this->viewType == 'json' ? 0 : (int)$this->params->count, $this->params->orderBy); } @@ -1422,8 +1427,8 @@ class block extends control */ public function printScrumRoadMapBlock($productID = 0, $roadMapID = 0) { - $this->session->set('releaseList', $this->app->getURI(true)); - $this->session->set('productPlanList', $this->app->getURI(true)); + $this->session->set('releaseList', $this->app->getURI(true), 'product'); + $this->session->set('productPlanList', $this->app->getURI(true), 'product'); $products = $this->loadModel('product')->getPairs('', $this->session->project); if(!is_numeric($productID)) $productID = key($products); @@ -1449,7 +1454,10 @@ class block extends control */ public function printScrumTestBlock() { - $this->session->set('testtaskList', $this->app->getURI(true)); + $this->session->set('testtaskList', $this->app->getURI(true), 'qa'); + $this->session->set('productList', $this->app->getURI(true), 'product'); + $this->session->set('projectList', $this->app->getURI(true), 'project'); + $this->session->set('buildList', $this->app->getURI(true), 'execution'); $this->app->loadLang('testtask'); $count = zget($this->params, 'count', 10); diff --git a/module/block/view/buildblock.html.php b/module/block/view/buildblock.html.php index ed71ec61a2..c304755ddd 100644 --- a/module/block/view/buildblock.html.php +++ b/module/block/view/buildblock.html.php @@ -28,15 +28,16 @@ get->entry}'" : ''; - $viewLink = $this->createLink('build', 'view', "buildID={$build->id}"); + $appid = isset($_GET['entry']) ? "class='app-btn' data-id='{$this->get->entry}'" : ''; + $buildViewLink = $this->createLink('build', 'view', "buildID={$build->id}"); + $productViewLink = $this->createLink('product', 'browse', "productID={$build->product}"); ?> - > + > id);?> - productName?> + productName);?> - name?> + name);?> date?> diff --git a/module/block/view/caseblock.html.php b/module/block/view/caseblock.html.php index cf9299d997..e794f2e14e 100644 --- a/module/block/view/caseblock.html.php +++ b/module/block/view/caseblock.html.php @@ -25,16 +25,14 @@ '> - - - + @@ -43,22 +41,20 @@ $appid = isset($_GET['entry']) ? "class='app-btn' data-id='{$this->get->entry}'" : ''; $viewLink = $this->createLink('testcase', 'view', "caseID={$case->id}"); ?> - > - + > - - processStatus('testcase', $case);?> + diff --git a/module/block/view/executionblock.html.php b/module/block/view/executionblock.html.php index e6d36bc492..c2195be134 100644 --- a/module/block/view/executionblock.html.php +++ b/module/block/view/executionblock.html.php @@ -39,8 +39,8 @@ $appid = isset($_GET['entry']) ? "class='app-btn text-center' data-id='{$this->get->entry}'" : "class='text-center'"; $viewLink = $this->createLink('execution', 'task', 'executionID=' . $execution->id); ?> - > - + > + > + > - + - + diff --git a/module/block/view/productblock.html.php b/module/block/view/productblock.html.php index 1e447f6469..148eb41cd0 100644 --- a/module/block/view/productblock.html.php +++ b/module/block/view/productblock.html.php @@ -14,7 +14,7 @@
" . $lang->product->create, '', "class='btn btn-primary'") ?>
idAB?> priAB?> case->title;?> testtask->lastRunTime;?> testtask->lastRunResult;?> statusAB;?>
id);?> case->priList, $case->pri, $case->pri)?> title?> lastRunDate)) echo date(DT_MONTHTIME1, strtotime($case->lastRunDate));?> lastRunResult) echo $lang->testcase->resultList[$case->lastRunResult];?>
createLink('execution', 'task', 'executionID=' . $execution->id), $execution->name, '', "title='$execution->name'");?>
name, '', "title='$execution->name'");?> end;?> diff --git a/module/block/view/planblock.html.php b/module/block/view/planblock.html.php index cbae6c89f4..646a6bd57c 100644 --- a/module/block/view/planblock.html.php +++ b/module/block/view/planblock.html.php @@ -30,14 +30,15 @@ get->entry}'" : ''; - $viewLink = $this->createLink('productplan', 'view', "planID={$plan->id}"); + $planViewLink = $this->createLink('productplan', 'view', "planID={$plan->id}"); + $productViewLink = $this->createLink('product', 'view', "productID={$plan->product}"); ?> -
id;?>productName?>productName);?> title?>title);?> begin?> end?>
@@ -22,7 +22,7 @@ - + @@ -36,11 +36,11 @@ $appid = isset($_GET['entry']) ? "class='app-btn' data-id='{$this->get->entry}'" : ""; $viewLink = $this->createLink('product', 'browse', 'productID=' . $product->id); ?> - > - + > + - id, '');?> - + id, '');?> + diff --git a/module/block/view/projectblock.html.php b/module/block/view/projectblock.html.php index 93862595ea..7829dff885 100644 --- a/module/block/view/projectblock.html.php +++ b/module/block/view/projectblock.html.php @@ -10,12 +10,12 @@ - - + + - + - + @@ -34,7 +34,7 @@ - app->getClientLang(), ['zh-cn','zh-tw']) && $project->budget >= 10000 ? number_format($project->budget / 10000, 1) . $this->lang->program->tenThousand : number_format((float)$project->budget, 1);?> + app->getClientLang(), ['zh-cn','zh-tw']) && $project->budget >= 10000 ? number_format($project->budget / 10000, 1) . $this->lang->project->tenThousand : number_format((float)$project->budget, 1);?> diff --git a/module/block/view/recentprojectblock.html.php b/module/block/view/recentprojectblock.html.php index b7e084b4e0..cedb54a95b 100644 --- a/module/block/view/recentprojectblock.html.php +++ b/module/block/view/recentprojectblock.html.php @@ -6,8 +6,8 @@ #cards {margin: 0; padding: 0 10px 10px 10px;} #cards > .col {width: 33.33%;} .col-side #cards > .col {width: 100%;} -#cards .panel {margin: 10px 0; border: 1px solid #DCDCDC; border-radius: 2px; box-shadow: none; height: 146px; cursor: pointer;} -#cards .panel:hover {border-color: #006AF1; box-shadow: 0 0 10px 0 rgba(0,0,100,.25);} +#cards .panel-content {margin: 10px 0; border: 1px solid #DCDCDC; border-radius: 2px; box-shadow: none; height: 146px; cursor: pointer;} +#cards .panel-content:hover {border-color: #006AF1; box-shadow: 0 0 10px 0 rgba(0,0,100,.25);} #cards .panel-heading {padding: 12px 24px 10px 16px;} #cards .panel-body {padding: 0 16px 16px;} #cards .panel-actions {padding: 7px 0; z-index: 0} @@ -36,10 +36,11 @@
$project):?> -
-
id");?>'> + createLink('project', 'index', "projectID=$project->id");?> +
+
- createLink('project', 'index', "projectID=$project->id", '', '', $project->id), $project->name);?> + name);?> model === 'waterfall'): ?> project->waterfall; ?> diff --git a/module/block/view/releaseblock.html.php b/module/block/view/releaseblock.html.php index d492a787bc..f8e37278d5 100644 --- a/module/block/view/releaseblock.html.php +++ b/module/block/view/releaseblock.html.php @@ -32,17 +32,19 @@
get->entry}'" : ''; - $viewLink = $this->createLink('release', 'view', "releaseID={$release->id}"); + $appid = isset($_GET['entry']) ? "class='app-btn' data-id='{$this->get->entry}'" : ''; + $productViewLink = $this->createLink('product', 'browse', "productID={$release->product}"); + $buildViewLink = $this->createLink('build', 'view', "buildID={$release->build}"); + $releaseViewLink = $this->createLink('release', 'view', "releaseID={$release->id}"); ?> - > + > - + - + - + > + > diff --git a/module/block/view/scrumproductblock.html.php b/module/block/view/scrumproductblock.html.php index 850648e266..5140e8146b 100644 --- a/module/block/view/scrumproductblock.html.php +++ b/module/block/view/scrumproductblock.html.php @@ -30,8 +30,8 @@ $appid = isset($_GET['entry']) ? "class='app-btn' data-id='{$this->get->entry}'" : ""; $viewLink = $this->createLink('product', 'browse', 'productID=' . $id); ?> - > - + > + diff --git a/module/block/view/scrumtestblock.html.php b/module/block/view/scrumtestblock.html.php index 5dde0ec7ba..17491ab35e 100644 --- a/module/block/view/scrumtestblock.html.php +++ b/module/block/view/scrumtestblock.html.php @@ -31,18 +31,21 @@ get->entry}'" : ''; - $viewLink = $this->createLink('testtask', 'view', "testtaskID={$testtask->id}"); + $appid = isset($_GET['entry']) ? "class='app-btn' data-id='{$this->get->entry}'" : ''; + $productViewLink = $this->createLink('product', 'browse', "productID={$testtask->product}"); + $projectViewLink = $this->createLink('project', 'view', "projectID={$testtask->project}"); + $testtaskViewLink = $this->createLink('testtask', 'view', "testtaskID={$testtask->id}"); + $buildViewLink = $this->createLink('build', 'view', "buildID={$testtask->build}"); ?> - > - + > + - + - + - + diff --git a/module/block/view/storyblock.html.php b/module/block/view/storyblock.html.php index c26ecfef5e..3c0ffc9374 100644 --- a/module/block/view/storyblock.html.php +++ b/module/block/view/storyblock.html.php @@ -27,16 +27,12 @@
product->name;?> product->currentExecution;?>product->currentExecution;?> product->plans;?> product->releases;?>
name?>
name);?> plans?> releases?>
project->name;?>program->PM;?>program->status;?>project->PM;?>project->status;?> program->teamCount;?>project->teamCount;?> task->consumed;?>program->budget;?>project->budget;?> project->leftStories;?> project->leftTasks;?> project->leftBugs;?> teamCount;?> consumed . ' ' . $lang->execution->workHourUnit;?>budget != 0 ? zget($lang->project->currencySymbol, $project->budgetUnit) . ' ' . $programBudget : $lang->project->future;?> leftStories;?> leftTasks;?>
id);?>productName?>productName);?> name?>name);?> buildName?>buildName);?> date?> diff --git a/module/block/view/scrumlistblock.html.php b/module/block/view/scrumlistblock.html.php index f3710d44a8..b3ef31c7f8 100644 --- a/module/block/view/scrumlistblock.html.php +++ b/module/block/view/scrumlistblock.html.php @@ -39,7 +39,7 @@ $appid = isset($_GET['entry']) ? "class='app-btn text-center' data-id='{$this->get->entry}'" : "class='text-center'"; $viewLink = $this->createLink('execution', 'task', 'executionID=' . $execution->id); ?> -
name, '', "title='$execution->name'");?> end;?>
name?>
name);?> productName?>productName);?> projectName?>projectName);?> buildName?>buildName);?> testtask->statusList, $testtask->status)?>
'> - - - - @@ -47,20 +43,16 @@ $appid = isset($_GET['entry']) ? "class='app-btn' data-id='{$this->get->entry}'" : ''; $viewLink = $this->createLink('story', 'view', "storyID={$story->id}"); ?> - > - + > - - + - processStatus('story', $story);?> - get->entry}'" : ''; - $viewLink = $this->createLink('testtask', 'view', "testtaskID={$testtask->id}"); + $appid = isset($_GET['entry']) ? "class='app-btn' data-id='{$this->get->entry}'" : ''; + $productViewLink = $this->createLink('product', 'browse', "productID={$testtask->product}"); + $buildViewLink = $this->createLink('build', 'view', "buildID={$testtask->execution}"); + $testtaskViewLink = $this->createLink('testtask', 'view', "testtaskID={$testtask->id}"); ?> - > + > - + - + - + diff --git a/module/block/view/todolist.html.php b/module/block/view/todolist.html.php index 4738582b66..90238ebbb7 100644 --- a/module/block/view/todolist.html.php +++ b/module/block/view/todolist.html.php @@ -28,10 +28,10 @@ get->entry}'" : ''; + $appid = isset($_GET['entry']) ? "class='app-btn' data-id='{$this->get->entry}'" : ''; $viewLink = $this->createLink('todo', 'view', "todo={$todo->id}"); ?> - > + > - + diff --git a/module/productplan/control.php b/module/productplan/control.php index f148bc55f9..d85b316313 100644 --- a/module/productplan/control.php +++ b/module/productplan/control.php @@ -213,8 +213,8 @@ class productplan extends control /* Append id for secend sort. */ $sort = $this->loadModel('common')->appendOrder($orderBy); + $this->session->set('productPlanList', $this->app->getURI(true), 'product'); - $this->session->set('productPlanList', $this->app->getURI(true)); $this->commonAction($productID, $branch); $products = $this->product->getPairs(); $this->view->title = $products[$productID] . $this->lang->colon . $this->lang->productplan->browse;
idAB?> priAB?> SRCommon;?> story->estimateAB;?> statusAB;?> story->stageAB;?>
id);?> story->priList, $story->pri, $story->pri)?>title?>title);?> estimate . ' ' . $config->hourUnit?> story->stageList, $story->stage, $story->stage);?> diff --git a/module/block/view/testtaskblock.html.php b/module/block/view/testtaskblock.html.php index a4748ced96..08e85a4c0c 100644 --- a/module/block/view/testtaskblock.html.php +++ b/module/block/view/testtaskblock.html.php @@ -32,17 +32,19 @@
id);?>productName?>productName);?> name?>name);?> buildName?>'>projectName . '/' . $testtask->buildName?>buildName?>'>projectName . '/' . $testtask->buildName);?> begin?> end?>
date == '2030-01-01') :?> todo->periods['future'];?> @@ -40,7 +40,7 @@ todo->priList, $todo->pri);?>name;?>name);?> todo->statusList, $todo->status);?>