From 92ecab90711c72289870b061eb61554f9f3faf26 Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Wed, 20 Jan 2021 15:38:40 +0800 Subject: [PATCH 1/3] * Fix bug of no executing sql. --- module/release/model.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/module/release/model.php b/module/release/model.php index 71f3cf75ce..dec27c785a 100644 --- a/module/release/model.php +++ b/module/release/model.php @@ -171,7 +171,8 @@ class releaseModel extends model $this->dao->insert(TABLE_RELEASE)->data($release) ->autoCheck() ->batchCheck($this->config->release->create->requiredFields, 'notempty') - ->check('name', 'unique', "product = {$release->product} AND branch = {$release->branch} AND deleted = '0'"); + ->check('name', 'unique', "product = {$release->product} AND branch = {$release->branch} AND deleted = '0'") + ->exec(); if(dao::isError()) { From 36067c51cc3cac7d9c35641d0fc571b0a2cca0a8 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Wed, 20 Jan 2021 15:40:27 +0800 Subject: [PATCH 2/3] * Code for project menu link. --- .../block/view/productoverviewblock.html.php | 6 +- module/block/view/recentprojectblock.html.php | 6 +- module/block/view/welcome.html.php | 6 +- module/common/lang/zh-cn.php | 18 +++-- module/common/model.php | 12 +--- module/program/control.php | 71 ++++++++++++++++--- module/program/model.php | 13 ++-- module/program/view/pgmbrowsebylist.html.php | 10 +-- module/program/view/prjview.html.php | 2 - 9 files changed, 92 insertions(+), 52 deletions(-) diff --git a/module/block/view/productoverviewblock.html.php b/module/block/view/productoverviewblock.html.php index 6e5f5221a2..9d7b18bb1b 100644 --- a/module/block/view/productoverviewblock.html.php +++ b/module/block/view/productoverviewblock.html.php @@ -24,14 +24,14 @@
product->all;?> - createLink('product', 'all', "program=0&browseType=all"), $total);?> + createLink('product', 'all', "browseType=all"), $total);?>
diff --git a/module/block/view/recentprojectblock.html.php b/module/block/view/recentprojectblock.html.php index 649a5e0833..575f824fa7 100644 --- a/module/block/view/recentprojectblock.html.php +++ b/module/block/view/recentprojectblock.html.php @@ -49,10 +49,10 @@
  • - id&programID=$program->parent&from=pgmbrowse", $program, 'list', 'edit', '', '', '', "data-group='program'");?> - id", $program, 'list', 'group', '', '', '', 'data-group="program"');?> - id", $program, 'list', 'lock', '', '', '', 'data-group="program"');?> + id&programID=$program->parent&from=pgmbrowse", $program, 'list', 'edit', '', '', '', "data-group='program'", '', $program->id);?> + id", $program, 'list', 'group', '', '', '', 'data-group="program"', '', $program->id);?> + id", $program, 'list', 'lock', '', '', '', 'data-group="program"', '', $program->id);?>
    diff --git a/module/program/view/prjview.html.php b/module/program/view/prjview.html.php index de0df67fdc..7d0dbbf5dc 100644 --- a/module/program/view/prjview.html.php +++ b/module/program/view/prjview.html.php @@ -144,8 +144,6 @@ { echo "
    "; 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); From d03194717db5f58df222e2e8012ca64edc1c6d0d Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Wed, 20 Jan 2021 15:48:58 +0800 Subject: [PATCH 3/3] * Remove hourunit. --- module/block/view/programblock.html.php | 2 +- module/block/view/scrumlistblock.html.php | 6 +++--- module/block/view/taskblock.html.php | 2 +- module/my/view/task.html.php | 6 +++--- module/program/config.php | 4 ++-- module/program/model.php | 7 ++----- module/task/config.php | 6 +++--- module/task/model.php | 6 +++--- 8 files changed, 18 insertions(+), 21 deletions(-) diff --git a/module/block/view/programblock.html.php b/module/block/view/programblock.html.php index ac8589e48c..0308d121d2 100644 --- a/module/block/view/programblock.html.php +++ b/module/block/view/programblock.html.php @@ -35,7 +35,7 @@ teamCount;?> - consumed . ' ' . $config->hourUnit;?> + consumed;?> budget . ' ' . zget($lang->program->unitList, $project->budgetUnit);?> leftStories;?> leftTasks;?> diff --git a/module/block/view/scrumlistblock.html.php b/module/block/view/scrumlistblock.html.php index eeb84d76c3..1ef46160d8 100644 --- a/module/block/view/scrumlistblock.html.php +++ b/module/block/view/scrumlistblock.html.php @@ -51,9 +51,9 @@ - hours->totalEstimate . ' ' . $config->hourUnit;?> - hours->totalConsumed . ' ' . $config->hourUnit;?> - hours->totalLeft . ' ' . $config->hourUnit;?> + hours->totalEstimate;?> + hours->totalConsumed;?> + hours->totalLeft;?>
    diff --git a/module/block/view/taskblock.html.php b/module/block/view/taskblock.html.php index 0455314f1a..814fa2bca1 100644 --- a/module/block/view/taskblock.html.php +++ b/module/block/view/taskblock.html.php @@ -46,7 +46,7 @@ task->priList, $task->pri, $task->pri)?> createLink('task', 'view', "taskID=$task->id", '', '', $task->PRJ), $task->name)?> - estimate . ' ' . $config->hourUnit;?> + estimate;?> deadline, 0, 4) > 0) echo $task->deadline;?> processStatus('task', $task);?> diff --git a/module/my/view/task.html.php b/module/my/view/task.html.php index c36ac5e04d..ddca0e8fb7 100644 --- a/module/my/view/task.html.php +++ b/module/my/view/task.html.php @@ -99,9 +99,9 @@ finishedBy);?> - estimate, 1) . ' ' . $config->hourUnit;?> - consumed, 1) . ' ' . $config->hourUnit;?> - left, 1) . ' ' . $config->hourUnit;?> + estimate, 1);?> + consumed, 1);?> + left, 1);?> storyStatus) and $task->storyStatus == 'active' and $task->latestStoryVersion > $task->storyVersion and !in_array($task->status, array('cancel', 'closed')));?> {$this->lang->my->storyChanged}") : print(" " . $this->processStatus('task', $task) . "");?> diff --git a/module/program/config.php b/module/program/config.php index 13fefe21ce..e597c769fe 100644 --- a/module/program/config.php +++ b/module/program/config.php @@ -94,13 +94,13 @@ $config->program->datatable->fieldList['teamCount']['sort'] = 'no'; $config->program->datatable->fieldList['PRJEstimate']['title'] = 'PRJEstimate'; $config->program->datatable->fieldList['PRJEstimate']['fixed'] = 'no'; -$config->program->datatable->fieldList['PRJEstimate']['width'] = '70'; +$config->program->datatable->fieldList['PRJEstimate']['width'] = '60'; $config->program->datatable->fieldList['PRJEstimate']['required'] = 'no'; $config->program->datatable->fieldList['PRJEstimate']['sort'] = 'no'; $config->program->datatable->fieldList['PRJConsume']['title'] = 'PRJConsume'; $config->program->datatable->fieldList['PRJConsume']['fixed'] = 'no'; -$config->program->datatable->fieldList['PRJConsume']['width'] = '70'; +$config->program->datatable->fieldList['PRJConsume']['width'] = '60'; $config->program->datatable->fieldList['PRJConsume']['required'] = 'no'; $config->program->datatable->fieldList['PRJConsume']['sort'] = 'no'; diff --git a/module/program/model.php b/module/program/model.php index 26ab0fc724..fd032eb4e9 100644 --- a/module/program/model.php +++ b/module/program/model.php @@ -1729,9 +1729,6 @@ class programModel extends model $title = "title='{$PRJProgram}'"; } - if($id == 'PRJEstimate') $title = "title={$project->hours->totalEstimate}{$this->config->hourUnit}"; - if($id == 'PRJConsume') $title = "title={$project->hours->totalConsumed}{$this->config->hourUnit}"; - echo ""; switch($id) { @@ -1769,10 +1766,10 @@ class programModel extends model echo $project->teamCount; break; case 'PRJEstimate': - echo $project->hours->totalEstimate . ' ' . $this->config->hourUnit; + echo $project->hours->totalEstimate; break; case 'PRJConsume': - echo $project->hours->totalConsumed . ' ' . $this->config->hourUnit; + echo $project->hours->totalConsumed; break; case 'PRJSurplus': echo $project->hours->totalLeft; diff --git a/module/task/config.php b/module/task/config.php index 70d3942a39..72529462d7 100644 --- a/module/task/config.php +++ b/module/task/config.php @@ -77,17 +77,17 @@ $config->task->datatable->fieldList['status']['required'] = 'no'; $config->task->datatable->fieldList['estimate']['title'] = 'estimateAB'; $config->task->datatable->fieldList['estimate']['fixed'] = 'no'; -$config->task->datatable->fieldList['estimate']['width'] = '80'; +$config->task->datatable->fieldList['estimate']['width'] = '60'; $config->task->datatable->fieldList['estimate']['required'] = 'no'; $config->task->datatable->fieldList['consumed']['title'] = 'consumedAB'; $config->task->datatable->fieldList['consumed']['fixed'] = 'no'; -$config->task->datatable->fieldList['consumed']['width'] = '80'; +$config->task->datatable->fieldList['consumed']['width'] = '60'; $config->task->datatable->fieldList['consumed']['required'] = 'no'; $config->task->datatable->fieldList['left']['title'] = 'leftAB'; $config->task->datatable->fieldList['left']['fixed'] = 'no'; -$config->task->datatable->fieldList['left']['width'] = '80'; +$config->task->datatable->fieldList['left']['width'] = '60'; $config->task->datatable->fieldList['left']['required'] = 'no'; $config->task->datatable->fieldList['progress']['title'] = 'progressAB'; diff --git a/module/task/model.php b/module/task/model.php index 0e9d4e7189..85a54feb54 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -2963,13 +2963,13 @@ class taskModel extends model $storyChanged ? print("{$this->lang->story->changed}") : print(" " . $this->processStatus('task', $task) . ""); break; case 'estimate': - echo round($task->estimate, 1) . ' ' . $this->config->hourUnit; + echo round($task->estimate, 1); break; case 'consumed': - echo round($task->consumed, 1) . ' ' . $this->config->hourUnit; + echo round($task->consumed, 1); break; case 'left': - echo round($task->left, 1) . ' ' . $this->config->hourUnit; + echo round($task->left, 1); break; case 'progress': echo "{$task->progress}%";