From c9046ede6df7e90061d7c7aa8b7457143aa387ab Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Wed, 20 Jan 2021 08:20:25 +0800 Subject: [PATCH 1/9] * Finish task #8988. --- module/programplan/model.php | 3 ++- module/project/lang/zh-cn.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/module/programplan/model.php b/module/programplan/model.php index d02e830b11..5d7b7ff75f 100644 --- a/module/programplan/model.php +++ b/module/programplan/model.php @@ -896,10 +896,11 @@ class programplanModel extends model /* Remove the currently edited stage. */ if(isset($parentStage[$planID])) unset($parentStage[$planID]); + $plan = $this->getByID($planID); foreach($parentStage as $key => $stage) { $isCreate = $this->isCreateTask($key); - if($isCreate === false) unset($parentStage[$key]); + if($isCreate === false and $key != $plan->parent) unset($parentStage[$key]); } $parentStage[0] = $this->lang->programplan->emptyParent; ksort($parentStage); diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php index b364a873d2..26cde920ab 100644 --- a/module/project/lang/zh-cn.php +++ b/module/project/lang/zh-cn.php @@ -265,7 +265,7 @@ $lang->project->byPeriod = '按时间段'; $lang->project->byUser = '按用户'; $lang->project->noProject = "暂时没有{$lang->executionCommon}。"; $lang->project->noMembers = '暂时没有团队成员。'; -$lang->project->workloadTotal = "工作量占比累计不应当超过100%, 当前产品下的工作量之和为:%s"; +$lang->project->workloadTotal = "工作量占比累计不应当超过100, 当前产品下的工作量之和为%s"; $lang->project->linkPRJStoryTip = "(关联{$lang->SRCommon}来源于项目下所关联的{$lang->SRCommon})"; $lang->project->linkAllStoryTip = "(项目下还未关联{$lang->SRCommon}，可直接关联该迭代/阶段/冲刺所关联产品的{$lang->SRCommon})"; From df01cbe76a79ba203a577c31cba8f896459997ba Mon Sep 17 00:00:00 2001 From: qiyu-xie Date: Wed, 20 Jan 2021 09:26:07 +0800 Subject: [PATCH 2/9] * Finish task#8970. Change to use session to record URL. --- module/my/control.php | 1 + module/my/view/project.html.php | 4 ++-- module/personnel/control.php | 15 ++------------- module/personnel/view/addwhitelist.html.php | 2 +- module/personnel/view/whitelist.html.php | 5 ++--- module/program/control.php | 4 ++++ 6 files changed, 12 insertions(+), 19 deletions(-) diff --git a/module/my/control.php b/module/my/control.php index db1583b146..8e17a81ca5 100644 --- a/module/my/control.php +++ b/module/my/control.php @@ -468,6 +468,7 @@ class my extends control $this->app->session->set('programList', $this->app->getURI(true)); $this->app->session->set('PRJBrowse', $this->app->getURI(true)); + $this->app->session->set('whitelist', $this->app->getURI(true)); /* Set the pager. */ $this->app->loadClass('pager', $static = true); diff --git a/module/my/view/project.html.php b/module/my/view/project.html.php index 94e60918e0..d6c15cec4a 100644 --- a/module/my/view/project.html.php +++ b/module/my/view/project.html.php @@ -77,14 +77,14 @@ status != 'closed') common::printIcon('program', 'PRJActivate', "projectID=$project->id", $project, 'list', 'magic', '', 'iframe', true);?> - id&programID=$project->parent", $project, 'list', 'edit', '', '', false, "data-group='project'");?> + id&programID=$project->parent", $project, 'list', 'edit', '', '', false, "data-group='project'");?> id", $project, 'list', 'group', '', '', false, "data-group='project'");?> id", $project, 'list', 'lock', '', '', false, "data-group='project'");?>
diff --git a/module/personnel/control.php b/module/personnel/control.php index 83c9f05e2c..9bc52ccf58 100644 --- a/module/personnel/control.php +++ b/module/personnel/control.php @@ -114,11 +114,6 @@ class personnel extends control $this->app->loadClass('pager', true); $pager = pager::init($recTotal, $recPerPage, $pageID); - /* Set back link. */ - if($from == 'pgmbrowse') $goback = $this->createLink('program', 'PGMBrowse'); - if($from == 'pgmproject') $goback = $this->createLink('program', 'PGMProject', "programID=$programID"); - if($from == 'PRJ') $goback = $this->createLink('program', 'PRJBrowse'); - $this->view->title = $this->lang->personnel->whitelist; $this->view->position[] = $this->lang->personnel->whitelist; @@ -127,7 +122,6 @@ class personnel extends control $this->view->whitelist = $this->personnel->getWhitelist($objectID, $objectType, $orderBy, $pager); $this->view->depts = $this->loadModel('dept')->getOptionMenu(); $this->view->module = $module; - $this->view->goback = isset($goback) ? $goback : ''; $this->view->programID = $programID; $this->view->from = $from; @@ -156,13 +150,8 @@ class personnel extends control $this->personnel->addWhitelist($objectType, $objectID); if(dao::isError()) $this->send(array('result' => 'fail', 'message' => $this->getError())); - $locateLink = $this->createLink($module, 'whitelist', "objectID=$objectID"); - if($module == 'program') - { - $openModule = $from == 'PRJ' ? 'project' : 'program'; - $locateLink = $this->createLink('program', 'PRJWhitelist', "objectID=$objectID&programID=$programID&module=$module&from=$from") . "#open=$openModule"; - } - $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $locateLink)); + $openModule = $module == 'program' ? ($from == 'PRJ' || $from == 'my' ? '#open=project' : '#open=program') : ''; + $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->session->whitelistBrowse . $openModule)); } $this->loadModel('dept'); diff --git a/module/personnel/view/addwhitelist.html.php b/module/personnel/view/addwhitelist.html.php index 7cea5b0997..1b110d2de1 100644 --- a/module/personnel/view/addwhitelist.html.php +++ b/module/personnel/view/addwhitelist.html.php @@ -84,7 +84,7 @@ session->whitelistBrowse;?> - + goback, '', "class='btn btn-back btn-wide' $dataGroup");?> diff --git a/module/personnel/view/whitelist.html.php b/module/personnel/view/whitelist.html.php index 5431d5c401..88a1801d80 100644 --- a/module/personnel/view/whitelist.html.php +++ b/module/personnel/view/whitelist.html.php @@ -12,17 +12,16 @@ ?> diff --git a/module/program/control.php b/module/program/control.php index bb93d9c6b0..e3f40ce1bb 100644 --- a/module/program/control.php +++ b/module/program/control.php @@ -66,6 +66,7 @@ class program extends control if(common::hasPriv('program', 'pgmcreate')) $this->lang->pageActions = html::a($this->createLink('program', 'pgmcreate'), " " . $this->lang->program->PGMCreate, '', "class='btn btn-secondary'"); $this->app->session->set('programList', $this->app->getURI(true)); + $this->app->session->set('whitelist', $this->app->getURI(true)); $programType = $this->cookie->programType ? $this->cookie->programType : 'bylist'; @@ -417,6 +418,8 @@ class program extends control if(!$programID) $this->locate($this->createLink('program', 'PGMbrowse')); setCookie("lastPGM", $programID, $this->config->cookieLife, $this->config->webRoot, '', false, true); + $this->app->session->set('whitelist', $this->app->getURI(true)); + $this->lang->navGroup->program = 'program'; $this->lang->program->switcherMenu = $this->program->getPGMSwitcher($programID, true); $this->lang->program->mainMenuAction = $this->program->getPGMMainAction(); @@ -794,6 +797,7 @@ class program extends control { $this->lang->program->mainMenuAction = html::a('javascript:history.go(-1);', ' ' . $this->lang->goback, '', "class='btn btn-link'"); $this->app->session->set('PRJBrowse', $this->app->getURI(true)); + $this->app->session->set('whitelist', $this->app->getURI(true)); $this->loadModel('datatable'); /* Load pager and get tasks. */ From 7cdeb0630ea17d59c12ad57d2b6fee6c0a2c88c4 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Wed, 20 Jan 2021 09:45:03 +0800 Subject: [PATCH 3/9] * Finish task #8959. --- module/common/lang/de.php | 14 ++++++++------ module/common/lang/en.php | 12 +++++++----- module/common/lang/fr.php | 12 +++++++----- module/common/lang/vi.php | 12 +++++++----- module/program/view/prjview.html.php | 17 +++++++++-------- 5 files changed, 38 insertions(+), 29 deletions(-) diff --git a/module/common/lang/de.php b/module/common/lang/de.php index 05186d7ef1..3f7948f84c 100644 --- a/module/common/lang/de.php +++ b/module/common/lang/de.php @@ -924,7 +924,7 @@ $lang->menu->scrum->ci = 'Code|repo|browse'; $lang->menu->scrum->projectbuild = array('link' => 'Build|projectbuild|browse|project={PROJECT}'); $lang->menu->scrum->projectrelease = array('link' => 'Release|projectrelease|browse'); $lang->menu->scrum->other = array('link' => 'Other|project|other', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'issue,risk,stakeholder'); -$lang->menu->scrum->projectsetting = array('link' => 'Setting|project|setting', 'class' => 'dropdown dropdown-hover waterfall-list'); +$lang->menu->scrum->projectsetting = array('link' => 'Setting|program|prjview|project={PROJECT}'); $lang->scrum = new stdclass(); $lang->scrum->subMenu = new stdclass(); @@ -933,8 +933,8 @@ $lang->scrum->subMenu->other->issue = array('link' => 'Issue|issue|browse| $lang->scrum->subMenu->other->risk = array('link' => 'Risk|risk|browse|', 'subModule' => 'risk'); $lang->scrum->subMenu->other->stakeholder = array('link' => 'Stakeholder|stakeholder|browse|', 'subModule' => 'stakeholder'); -$lang->scrum->subMenu->projectsetting = new stdclass(); -$lang->scrum->subMenu->projectsetting->program = 'Project|program|PRJEdit|'; +$lang->scrum->setMenu = new stdclass(); +$lang->scrum->setMenu->view = array('link' => 'View|program|prjview|project={PROJECT}'); /* Waterfall menu. */ $lang->menu->waterfall = new stdclass(); @@ -959,9 +959,11 @@ $lang->waterfall->subMenu->other->issue = array('link' => 'Issue|issue|browse|', $lang->waterfall->subMenu->other->risk = array('link' => 'Risk|risk|browse|', 'subModule' => 'risk'); $lang->waterfall->subMenu->other->stakeholder = array('link' => 'Stakeholder|stakeholder|browse|', 'subModule' => 'stakeholder'); -$lang->waterfall->subMenu->projectsetting = new stdclass(); -$lang->waterfall->subMenu->projectsetting->workestimation = array('link' => 'Workestimation|workestimation|index|program=%s', 'subModule' => 'durationestimation,budget'); -$lang->waterfall->subMenu->projectsetting->program = 'Project|program|PRJEdit|'; +$lang->waterfall->setMenu = new stdclass(); +$lang->waterfall->setMenu->view = array('link' => 'View|program|prjview|project={PROJECT}'); +$lang->waterfall->setMenu->workestimation = 'Work Estimation|workestimation|index|project={PROJECT}'; +$lang->waterfall->setMenu->duration = array('link' => 'Duration|durationestimation|index|project={PROJECT}', 'subModule' => 'durationestimation'); +$lang->waterfall->setMenu->budget = array('link' => 'Budget|budget|summary|', 'subModule' => 'budget'); $lang->waterfallproduct = new stdclass(); $lang->workestimation = new stdclass(); diff --git a/module/common/lang/en.php b/module/common/lang/en.php index ed3464c02a..f01e971aab 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -933,8 +933,8 @@ $lang->scrum->subMenu->other->issue = array('link' => 'Issue|issue|browse| $lang->scrum->subMenu->other->risk = array('link' => 'Risk|risk|browse|', 'subModule' => 'risk'); $lang->scrum->subMenu->other->stakeholder = array('link' => 'Stakeholder|stakeholder|browse|', 'subModule' => 'stakeholder'); -$lang->scrum->subMenu->projectsetting = new stdclass(); -$lang->scrum->subMenu->projectsetting->program = 'Project|program|PRJEdit|'; +$lang->scrum->setMenu = new stdclass(); +$lang->scrum->setMenu->view = array('link' => 'View|program|prjview|project={PROJECT}'); /* Waterfall menu. */ $lang->menu->waterfall = new stdclass(); @@ -959,9 +959,11 @@ $lang->waterfall->subMenu->other->issue = array('link' => 'Issue|issue|bro $lang->waterfall->subMenu->other->risk = array('link' => 'Risk|risk|browse|', 'subModule' => 'risk'); $lang->waterfall->subMenu->other->stakeholder = array('link' => 'Stakeholder|stakeholder|browse|', 'subModule' => 'stakeholder'); -$lang->waterfall->subMenu->projectsetting = new stdclass(); -$lang->waterfall->subMenu->projectsetting->workestimation = array('link' => 'Workestimation|workestimation|index|program=%s', 'subModule' => 'durationestimation,budget'); -$lang->waterfall->subMenu->projectsetting->program = 'Project|program|PRJEdit|'; +$lang->waterfall->setMenu = new stdclass(); +$lang->waterfall->setMenu->view = array('link' => 'View|program|prjview|project={PROJECT}'); +$lang->waterfall->setMenu->workestimation = 'Work Estimation|workestimation|index|project={PROJECT}'; +$lang->waterfall->setMenu->duration = array('link' => 'Duration|durationestimation|index|project={PROJECT}', 'subModule' => 'durationestimation'); +$lang->waterfall->setMenu->budget = array('link' => 'Budget|budget|summary|', 'subModule' => 'budget'); $lang->waterfallproduct = new stdclass(); $lang->workestimation = new stdclass(); diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php index 3c5014c501..997645055b 100644 --- a/module/common/lang/fr.php +++ b/module/common/lang/fr.php @@ -933,8 +933,8 @@ $lang->scrum->subMenu->other->issue = array('link' => 'Issue|issue|browse| $lang->scrum->subMenu->other->risk = array('link' => 'Risk|risk|browse|', 'subModule' => 'risk'); $lang->scrum->subMenu->other->stakeholder = array('link' => 'Stakeholder|stakeholder|browse|', 'subModule' => 'stakeholder'); -$lang->scrum->subMenu->projectsetting = new stdclass(); -$lang->scrum->subMenu->projectsetting->program = 'Project|program|PRJEdit|'; +$lang->scrum->setMenu = new stdclass(); +$lang->scrum->setMenu->view = array('link' => 'View|program|prjview|project={PROJECT}'); /* Waterfall menu. */ $lang->menu->waterfall = new stdclass(); @@ -959,9 +959,11 @@ $lang->waterfall->subMenu->other->issue = array('link' => 'Issue|issue|bro $lang->waterfall->subMenu->other->risk = array('link' => 'Risk|risk|browse|', 'subModule' => 'risk'); $lang->waterfall->subMenu->other->stakeholder = array('link' => 'Stakeholder|stakeholder|browse|', 'subModule' => 'stakeholder'); -$lang->waterfall->subMenu->projectsetting = new stdclass(); -$lang->waterfall->subMenu->projectsetting->workestimation = array('link' => 'Workestimation|workestimation|index|program=%s', 'subModule' => 'durationestimation,budget'); -$lang->waterfall->subMenu->projectsetting->program = 'Project|program|PRJEdit|'; +$lang->waterfall->setMenu = new stdclass(); +$lang->waterfall->setMenu->view = array('link' => 'View|program|prjview|project={PROJECT}'); +$lang->waterfall->setMenu->workestimation = 'Work Estimation|workestimation|index|project={PROJECT}'; +$lang->waterfall->setMenu->duration = array('link' => 'Duration|durationestimation|index|project={PROJECT}', 'subModule' => 'durationestimation'); +$lang->waterfall->setMenu->budget = array('link' => 'Budget|budget|summary|', 'subModule' => 'budget'); $lang->waterfallproduct = new stdclass(); $lang->workestimation = new stdclass(); diff --git a/module/common/lang/vi.php b/module/common/lang/vi.php index 92472921d2..814e051270 100644 --- a/module/common/lang/vi.php +++ b/module/common/lang/vi.php @@ -933,8 +933,8 @@ $lang->scrum->subMenu->other->issue = array('link' => 'Issue|issue|browse| $lang->scrum->subMenu->other->risk = array('link' => 'Risk|risk|browse|', 'subModule' => 'risk'); $lang->scrum->subMenu->other->stakeholder = array('link' => 'Stakeholder|stakeholder|browse|', 'subModule' => 'stakeholder'); -$lang->scrum->subMenu->projectsetting = new stdclass(); -$lang->scrum->subMenu->projectsetting->program = 'Project|program|PRJEdit|'; +$lang->scrum->setMenu = new stdclass(); +$lang->scrum->setMenu->view = array('link' => 'View|program|prjview|project={PROJECT}'); /* Waterfall menu. */ $lang->menu->waterfall = new stdclass(); @@ -959,9 +959,11 @@ $lang->waterfall->subMenu->other->issue = array('link' => 'Issue|issue|bro $lang->waterfall->subMenu->other->risk = array('link' => 'Risk|risk|browse|', 'subModule' => 'risk'); $lang->waterfall->subMenu->other->stakeholder = array('link' => 'Stakeholder|stakeholder|browse|', 'subModule' => 'stakeholder'); -$lang->waterfall->subMenu->projectsetting = new stdclass(); -$lang->waterfall->subMenu->projectsetting->workestimation = array('link' => 'Workestimation|workestimation|index|program=%s', 'subModule' => 'durationestimation,budget'); -$lang->waterfall->subMenu->projectsetting->program = 'Project|program|PRJEdit|'; +$lang->waterfall->setMenu = new stdclass(); +$lang->waterfall->setMenu->view = array('link' => 'View|program|prjview|project={PROJECT}'); +$lang->waterfall->setMenu->workestimation = 'Work Estimation|workestimation|index|project={PROJECT}'; +$lang->waterfall->setMenu->duration = array('link' => 'Duration|durationestimation|index|project={PROJECT}', 'subModule' => 'durationestimation'); +$lang->waterfall->setMenu->budget = array('link' => 'Budget|budget|summary|', 'subModule' => 'budget'); $lang->waterfallproduct = new stdclass(); $lang->workestimation = new stdclass(); diff --git a/module/program/view/prjview.html.php b/module/program/view/prjview.html.php index 063d79b8bb..de0df67fdc 100644 --- a/module/program/view/prjview.html.php +++ b/module/program/view/prjview.html.php @@ -123,7 +123,7 @@
project->acl;?>
-

project->aclList[$project->acl];?>

+

program->PGMPRJAclList[$project->acl];?>

printExtendFields($project, 'div', "position=right&inForm=0&inCell=1");?> @@ -143,17 +143,18 @@ if(!$project->deleted) { echo "
"; - common::printIcon('project', 'start', "projectID=$project->id", $project, 'button', '', '', 'iframe', true); - common::printIcon('project', 'activate', "projectID=$project->id", $project, 'button', '', '', 'iframe', true); - common::printIcon('project', 'putoff', "projectID=$project->id", $project, 'button', '', '', 'iframe', true); - common::printIcon('project', 'suspend', "projectID=$project->id", $project, 'button', '', '', 'iframe', true); - common::printIcon('project', 'close', "projectID=$project->id", $project, 'button', '', '', 'iframe', true); + common::printIcon('program', 'PRJStart', "projectID=$project->id", $project, 'button', 'play', '', 'iframe', true); + common::printIcon('program', 'PRJManageMembers', "projectID=$project->id", $project, 'button', 'group', '', 'iframe', true); + common::printIcon('program', 'PRJGroup', "projectID=$project->id", $project, 'button', 'lock'); + common::printIcon('program', 'PRJActivate', "projectID=$project->id", $project, 'button', 'magic', '', 'iframe', true); + common::printIcon('program', 'PRJSuspend', "projectID=$project->id", $project, 'button', 'pause', '', 'iframe', true); + common::printIcon('program', 'PRJClose', "projectID=$project->id", $project, 'button', 'off', '', 'iframe', true); echo $this->buildOperateMenu($project, 'view'); echo "
"; - common::printIcon('project', 'edit', $params, $project); - common::printIcon('project', 'delete', $params, $project, 'button', 'trash', 'hiddenwin'); + common::printIcon('program', 'PRJEdit', $params, $project, 'button', 'edit'); + common::printIcon('program', 'PRJDelete', $params, $project, 'button', 'trash', 'hiddenwin'); } ?> From cebfbc62057b93c5429cb45c3f52e9d1a39762fc Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Wed, 20 Jan 2021 10:00:00 +0800 Subject: [PATCH 4/9] * Add group. --- module/group/lang/resource.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index d0acbcd36a..d3081852a2 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -191,6 +191,7 @@ $lang->resource->program->PRJSuspend = 'PRJSuspend'; $lang->resource->program->PRJClose = 'PRJClose'; $lang->resource->program->PRJActivate = 'PRJActivate'; $lang->resource->program->PRJDelete = 'PRJDelete'; +$lang->resource->program->PRJView = 'PRJView'; $lang->resource->program->PRJWhitelist = 'PRJWhitelist'; $lang->resource->program->PRJAddWhitelist = 'PRJAddWhitelist'; $lang->resource->program->unbindWhielist = 'unbindWhielist'; @@ -232,11 +233,12 @@ $lang->program->methodOrder[155] = 'PRJClose'; $lang->program->methodOrder[160] = 'PRJActivate'; $lang->program->methodOrder[165] = 'PRJUpdateOrder'; $lang->program->methodOrder[170] = 'PRJDelete'; -$lang->program->methodOrder[175] = 'PRJWhitelist'; -$lang->program->methodOrder[180] = 'PRJAddWhitelist'; -$lang->program->methodOrder[185] = 'unbindWhielist'; -$lang->program->methodOrder[190] = 'PRJManageProducts'; -$lang->program->methodOrder[195] = 'view'; +$lang->program->methodOrder[175] = 'PRJView'; +$lang->program->methodOrder[180] = 'PRJWhitelist'; +$lang->program->methodOrder[185] = 'PRJAddWhitelist'; +$lang->program->methodOrder[190] = 'unbindWhielist'; +$lang->program->methodOrder[195] = 'PRJManageProducts'; +$lang->program->methodOrder[200] = 'view'; /* Personnel . */ $lang->resource->personnel = new stdclass(); From 76baef16c096cf21cf6727f9d5af7753acab912d Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Wed, 20 Jan 2021 10:01:24 +0800 Subject: [PATCH 5/9] * Fix deny btn. --- module/user/view/deny.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/user/view/deny.html.php b/module/user/view/deny.html.php index 12cc084782..cda9e3ffa0 100644 --- a/module/user/view/deny.html.php +++ b/module/user/view/deny.html.php @@ -48,7 +48,7 @@ include '../../common/view/header.lite.html.php'; createLink('my', 'index'), $lang->my->common, ($isOnlybody ? '_parent' : ''), "class='btn'"); + echo html::a($this->createLink('my', 'index'), $lang->my->common, ($isOnlybody ? '_parent' : ''), "class='btn' data-group='my'"); if($refererBeforeDeny) echo html::a(helper::safe64Decode($refererBeforeDeny), $lang->user->goback, ($isOnlybody ? '_parent' : ''), "class='btn'"); echo html::a($this->createLink('user', 'logout', "referer=" . helper::safe64Encode($denyPage)), $lang->user->relogin, ($isOnlybody ? '_parent' : ''), "class='btn btn-primary'"); ?> From e774abce77527a39a601a87cb13fc85fb9ce2f58 Mon Sep 17 00:00:00 2001 From: hufangzhou <746775970@qq.com> Date: Wed, 20 Jan 2021 10:27:24 +0800 Subject: [PATCH 6/9] * Fix a bug. --- module/product/control.php | 7 +------ module/product/view/browse.html.php | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/module/product/control.php b/module/product/control.php index f180eae48f..c0a7ce0d76 100644 --- a/module/product/control.php +++ b/module/product/control.php @@ -199,11 +199,6 @@ class product extends control { $products = $this->product->getProductsByProject($this->session->PRJ); $productPlans = $this->loadModel('project')->getPlans($products); - $allPlans = array(); - foreach($productPlans as $productPlan) - { - foreach($productPlan as $id => $plan) $allPlans[$id] = $plan; - } if($projectStoryBrowseType == 'bybranch') $param = $branch; $stories = $this->story->getProjectStories($this->session->PRJ, $sort, $projectStoryBrowseType, $param, 'story', '', $pager, $productID, $branch); @@ -254,7 +249,7 @@ class product extends control $this->view->moduleID = $moduleID; $this->view->stories = $stories; $this->view->plans = $this->loadModel('productplan')->getPairs($productID, $branch, '', true); - $this->view->allPlans = isset($allPlans) ? $allPlans : array(); + $this->view->productPlans = isset($productPlans) ? $productPlans : array(); $this->view->summary = $this->product->summary($stories, $storyType); $this->view->moduleTree = $moduleTree; $this->view->parentModules = $this->tree->getParents($moduleID); diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php index 7a4c19b6b1..f43f7bad37 100644 --- a/module/product/view/browse.html.php +++ b/module/product/view/browse.html.php @@ -455,7 +455,7 @@ $lang->story->createCommon = $storyType == 'story' ? $lang->story->createStory :
- + project->linkStory, "id='toTaskButton'", 'btn btn-primary');?>
From 120d78c94239cf8ce0862c1ff0324999a4e11743 Mon Sep 17 00:00:00 2001 From: qiyu-xie Date: Wed, 20 Jan 2021 10:36:40 +0800 Subject: [PATCH 7/9] * Modify the problem of test list in contribution. --- module/my/view/testtask.html.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/module/my/view/testtask.html.php b/module/my/view/testtask.html.php index 9eabf844e7..d57eba9c36 100644 --- a/module/my/view/testtask.html.php +++ b/module/my/view/testtask.html.php @@ -35,11 +35,11 @@ idAB);?> testtask->name);?> testtask->project);?> - testtask->build);?> + testtask->build);?> testtask->begin);?> testtask->end);?> statusAB);?> - actions;?> + actions;?> @@ -48,7 +48,7 @@ id);?> createLink('testtask', 'view', "taskID=$task->id", '', '', $task->PRJ), $task->name, '', "data-group='project'");?> projectName?> - build == 'trunk' ? print($lang->trunk) : print(html::a($this->createLink('build', 'view', "buildID=$task->build", '', '', $task->PRJ), $task->buildName, '', "data-group='project'"));?> + build == 'trunk' ? print($lang->trunk) : print(html::a($this->createLink('build', 'view', "buildID=$task->build", '', '', $task->PRJ), $task->buildName, '', "data-group='project'"));?> begin?> end?> processStatus('testtask', $task);?> From d8dc42d6c8ae094c7d4d328df00c61760fc06a04 Mon Sep 17 00:00:00 2001 From: qiyu-xie Date: Wed, 20 Jan 2021 10:57:38 +0800 Subject: [PATCH 8/9] * Modify the milestone icon display of Gantt. --- module/programplan/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/programplan/model.php b/module/programplan/model.php index 5d7b7ff75f..67dff3c1c8 100644 --- a/module/programplan/model.php +++ b/module/programplan/model.php @@ -182,7 +182,7 @@ class programplanModel extends model $data = new stdclass(); $data->id = $plan->id; $data->type = 'plan'; - $data->text = empty($plan->milestone) ? $plan->name : $isMilestone . $plan->name; + $data->text = empty($plan->milestone) ? $plan->name : $plan->name . $isMilestone ; $data->percent = $plan->percent; $data->attribute = zget($this->lang->stage->typeList, $plan->attribute); $data->milestone = zget($this->lang->programplan->milestoneList, $plan->milestone); From 912f727bd3890f7cc37ddd5cbdc14dc0aeb5e2cd Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Wed, 20 Jan 2021 11:03:26 +0800 Subject: [PATCH 9/9] * Adjust the style. --- module/bug/css/create.css | 1 - 1 file changed, 1 deletion(-) diff --git a/module/bug/css/create.css b/module/bug/css/create.css index 1bb962b51b..33e62bf738 100644 --- a/module/bug/css/create.css +++ b/module/bug/css/create.css @@ -38,7 +38,6 @@ html[lang='en'] #deadlineTd .input-group-addon{padding: 5px 18px} .title-group .chosen-container {width: 1%!important; min-width: 70px;} .title-group #severity + .chosen-container > .chosen-single {border-radius: 0!important;} .title-group #pri + .chosen-container > .chosen-single {border-top-left-radius: 0!important; border-bottom-left-radius: 0!important;} -.title-group .has-icon-right{min-width:700px} #mainContent .center-block{padding-bottom:40px;} #typeBox {width:180px;}