From 89a542e350db3780b1459901ecee3a8369f6273e Mon Sep 17 00:00:00 2001 From: z Date: Wed, 26 Aug 2020 16:46:12 +0800 Subject: [PATCH 1/4] * finish task #7697. --- module/program/view/create.html.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/program/view/create.html.php b/module/program/view/create.html.php index 7e067c6ff7..61cf852ac5 100644 --- a/module/program/view/create.html.php +++ b/module/program/view/create.html.php @@ -143,7 +143,7 @@ id); + echo html::hidden('parent', isset($parentProgram->id) ? $parentProgram->id : 0); ?> @@ -181,5 +181,5 @@ -id);?> +id) ? $parentProgram->id : 0);?> From 4a3e5fcaf1d942b1cc04d1aa40144bb9060a5742 Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Wed, 26 Aug 2020 16:49:30 +0800 Subject: [PATCH 2/4] * Finish Task #7694. --- module/block/view/cmmireportblock.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/block/view/cmmireportblock.html.php b/module/block/view/cmmireportblock.html.php index 1a882dbcc1..92dd8e82fb 100644 --- a/module/block/view/cmmireportblock.html.php +++ b/module/block/view/cmmireportblock.html.php @@ -9,7 +9,7 @@ .block-cmmireport .col-right .tile .tile-title{font-weight: 700;} .block-cmmireport .progress {position: absolute; left: 45px; top: 90px; right: 40px;} .block-cmmireport .progress-num{font-size: 26px; font-weight: 700} -.block-cmmireport .col-right .tile-amount{font-size: 26px; font-weight: 700} +.block-cmmireport .col-right .tile-amount{font-size: 22px; font-weight: 700}
From 744dc06baa1b50d35fa08f5eb492a8bf488b3772 Mon Sep 17 00:00:00 2001 From: leiyong <1549684884@qq.com> Date: Wed, 26 Aug 2020 16:56:53 +0800 Subject: [PATCH 3/4] * Add scrum roadmap block. --- module/block/view/scrumroadmapblock.html.php | 54 +++++++++----------- 1 file changed, 24 insertions(+), 30 deletions(-) diff --git a/module/block/view/scrumroadmapblock.html.php b/module/block/view/scrumroadmapblock.html.php index 28680d4c86..dfc6b844e0 100644 --- a/module/block/view/scrumroadmapblock.html.php +++ b/module/block/view/scrumroadmapblock.html.php @@ -36,36 +36,30 @@
From 9062b7e438b46722a2c99ce53c60ddd56f7774fe Mon Sep 17 00:00:00 2001 From: leiyong <1549684884@qq.com> Date: Wed, 26 Aug 2020 18:24:35 +0800 Subject: [PATCH 4/4] * Adjust issue module code. --- module/block/control.php | 19 +++++++++++++++---- module/block/lang/zh-cn.php | 4 ++-- module/issue/control.php | 4 ++-- module/issue/lang/en.php | 8 ++++---- module/issue/lang/zh-cn.php | 17 +++++------------ module/issue/view/browse.html.php | 6 +++--- module/issue/view/view.html.php | 18 ++++++++++++++++++ module/risk/control.php | 2 +- 8 files changed, 50 insertions(+), 28 deletions(-) diff --git a/module/block/control.php b/module/block/control.php index e8799b10e2..bc46511b6a 100644 --- a/module/block/control.php +++ b/module/block/control.php @@ -1304,11 +1304,22 @@ class block extends control */ public function printScrumdynamicBlock() { - /* Load pager. */ - $this->app->loadClass('pager', $static = true); - $pager = new pager(0, 30, 1); + $projects = $this->loadModel('project')->getPairs(); + $products = $this->loadModel('product')->getPairs(); - $this->view->actions = $this->loadModel('action')->getDynamic('all', 'today', 'date_desc', $pager); + $actions = array(); + if(!empty($projects) || !empty($products)) + { + $actions = $this->dao->select('*')->from(TABLE_ACTION) + ->beginIF($projects && $products)->where('project')->in(array_keys($projects))->orWhere('product')->in(array_keys($products))->fi() + ->beginIF($projects && empty($products))->where('project')->in(array_keys($projects))->fi() + ->beginIF(empty($projects) && $products)->where('product')->in(array_keys($products))->fi() + ->orderBy('id_desc') + ->limit(30) + ->fetchAll(); + } + + $this->view->actions = empty($actions) ? array() : $this->loadModel('action')->transformActions($actions); $this->view->users = $this->loadModel('user')->getPairs('noletter'); } diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php index ec7fb178b2..39cc1e9376 100644 --- a/module/block/lang/zh-cn.php +++ b/module/block/lang/zh-cn.php @@ -119,9 +119,9 @@ $lang->block->default['cmmi']['program']['5']['params']['num'] = '15'; $lang->block->default['cmmi']['program']['5']['params']['orderBy'] = 'id_desc'; $lang->block->default['cmmi']['program']['6']['title'] = '最新动态'; -$lang->block->default['cmmi']['program']['6']['block'] = 'dynamic'; +$lang->block->default['cmmi']['program']['6']['block'] = 'scrumdynamic'; $lang->block->default['cmmi']['program']['6']['grid'] = 4; -$lang->block->default['cmmi']['program']['6']['source'] = ''; +$lang->block->default['cmmi']['program']['6']['source'] = 'program'; $lang->block->default['cmmi']['program']['7']['title'] = '项目风险'; $lang->block->default['cmmi']['program']['7']['block'] = 'cmmirisk'; diff --git a/module/issue/control.php b/module/issue/control.php index 6bcae8d780..45dc822d6d 100644 --- a/module/issue/control.php +++ b/module/issue/control.php @@ -117,7 +117,7 @@ class issue extends control else { $this->issue->delete($issueID); - die(js::reload('parent')); + die(js::locate(inLink('browse'), 'parent')); } } @@ -306,7 +306,7 @@ class issue extends control $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('browse'))); } - $this->view->title = $this->lang->issue->resolved; + $this->view->title = $this->lang->issue->resolve; $this->view->issue = $this->issue->getByID($issue); $this->view->users = $this->loadModel('user')->getPairs('noletter'); diff --git a/module/issue/lang/en.php b/module/issue/lang/en.php index d24dc0f1d2..ad99e6e3ee 100644 --- a/module/issue/lang/en.php +++ b/module/issue/lang/en.php @@ -27,15 +27,15 @@ $lang->issue->closedDate = 'ClosedDate'; $lang->issue->assignedTo = 'AssignedTo'; $lang->issue->assignedBy = 'AssignedBy'; $lang->issue->assignedDate = 'AssignedDate'; -$lang->issue->resolved = 'Resolved'; +$lang->issue->resolve = 'Resolved'; $lang->issue->id = 'ID'; $lang->issue->delete = 'Delete'; $lang->issue->search = 'Search'; $lang->issue->basicInfo = 'Basic Information'; -$lang->issue->active = 'Activate'; -$lang->issue->assign = 'Assign'; -$lang->issue->create = 'Create Issue'; +$lang->issue->activate = 'Activate'; +$lang->issue->assignTo = 'Assign'; +$lang->issue->create = 'Create'; $lang->issue->edit = 'Edit'; $lang->issue->batchCreate = 'Batch Create'; diff --git a/module/issue/lang/zh-cn.php b/module/issue/lang/zh-cn.php index 26925301c4..e41b20a0c9 100644 --- a/module/issue/lang/zh-cn.php +++ b/module/issue/lang/zh-cn.php @@ -27,24 +27,17 @@ $lang->issue->closedDate = '关闭日期'; $lang->issue->assignedTo = '指派给'; $lang->issue->assignedBy = '由谁指派'; $lang->issue->assignedDate = '指派时间'; -$lang->issue->resolved = '解决'; +$lang->issue->resolve = '解决'; $lang->issue->id = '编号'; $lang->issue->delete = '删除'; $lang->issue->search = '搜索'; $lang->issue->basicInfo = '基本信息'; -$lang->issue->active = '激活'; -$lang->issue->assign = '指派'; -$lang->issue->assignTo = '指派问题'; -$lang->issue->create = '新建问题'; -$lang->issue->edit = '编辑问题'; +$lang->issue->activate = '激活'; +$lang->issue->assignTo = '指派'; +$lang->issue->create = '新建'; +$lang->issue->edit = '编辑'; $lang->issue->batchCreate = '批量新建'; -$lang->issue->close = '关闭问题'; -$lang->issue->cancel = '取消问题'; -$lang->issue->activate = '激活问题'; -$lang->issue->resolve = '解决问题'; -$lang->issue->resolve = '解决问题'; -$lang->issue->view = '问题概况'; $lang->issue->labelList['all'] = '全部'; $lang->issue->labelList['open'] = '开放'; diff --git a/module/issue/view/browse.html.php b/module/issue/view/browse.html.php index 86f6f7af26..ac7bce7c11 100644 --- a/module/issue/view/browse.html.php +++ b/module/issue/view/browse.html.php @@ -62,11 +62,11 @@ createdDate;?> id", $issue, 'list', 'checked', '', 'iframe', 'yes', '', $lang->issue->resolved); - echo common::printIcon('issue', 'assignTo', "issueID=$issue->id", $issue, 'list', 'hand-right', '', 'iframe', 'yes', '', $lang->issue->assignedTo); + echo common::printIcon('issue', 'resolve', "issueID=$issue->id", $issue, 'list', 'checked', '', 'iframe', 'yes', '', $lang->issue->resolve); + echo common::printIcon('issue', 'assignTo', "issueID=$issue->id", $issue, 'list', 'hand-right', '', 'iframe', 'yes', '', $lang->issue->assignTo); echo common::printIcon('issue', 'close', "issueID=$issue->id", $issue, 'list', 'off', '', 'iframe', 'yes'); echo common::printIcon('issue', 'cancel', "issueID=$issue->id", $issue, 'list', 'ban-circle', '', 'iframe', 'yes'); - echo common::printIcon('issue', 'activate', "issueID=$issue->id", $issue, 'list', 'magic', '', 'iframe', 'yes', '', $lang->issue->active); + echo common::printIcon('issue', 'activate', "issueID=$issue->id", $issue, 'list', 'magic', '', 'iframe', 'yes', '', $lang->issue->activate); echo common::printIcon('issue', 'edit', "issueID=$issue->id", $issue, 'list', 'edit'); $deleteClass = common::hasPriv('issue', 'delete') ? 'btn' : 'btn disabled'; echo html::a($this->createLink('issue', 'delete', "issueID=$issue->id"), '', 'hiddenwin', "title='{$lang->issue->delete}' class='$deleteClass'"); diff --git a/module/issue/view/view.html.php b/module/issue/view/view.html.php index 6b0e035887..69dd8f2c63 100644 --- a/module/issue/view/view.html.php +++ b/module/issue/view/view.html.php @@ -49,6 +49,24 @@ foreach($issue as $field => $value) createLink('action', 'comment', "objectType=issue&objectID=$issue->id");?>
+
+
+ +
";?> + deleted):?> + id", $issue, 'button', 'checked', '', 'showinonlybody'); + common::printIcon('issue', 'assignTo', "issueID=$issue->id", $issue, 'button', '', '', 'iframe showinonlybody', true); + common::printIcon('issue', 'cancel', "issueID=$issue->id", $issue, 'button', '', '', 'iframe showinonlybody', true); + common::printIcon('issue', 'close', "issueID=$issue->id", $issue, 'button', '', '', 'iframe showinonlybody', true); + common::printIcon('issue', 'activate', "issueID=$issue->id", $issue, 'button', '', '', 'iframe showinonlybody', true); + echo "
"; + common::printIcon('issue', 'edit', "issueID=$issue->id", $issue); + common::printIcon('issue', 'delete', "issueID=$issue->id", $issue, 'button', 'trash', 'hiddenwin'); + ?> + +
+
diff --git a/module/risk/control.php b/module/risk/control.php index 21a37ffc06..bdfeb64926 100644 --- a/module/risk/control.php +++ b/module/risk/control.php @@ -178,7 +178,7 @@ class risk extends control public function delete($riskID, $confirm = 'no') { $risk = $this->risk->getById($riskID); - + if($confirm == 'no') { echo js::confirm($this->lang->risk->confirmDelete, $this->createLink('risk', 'delete', "risk=$riskID&confirm=yes"), '');