From c43dfdad099c99a5540f0b4d4dcb1336bc8c5797 Mon Sep 17 00:00:00 2001 From: guanxiying Date: Wed, 20 Nov 2019 16:57:54 +0800 Subject: [PATCH 01/10] * Add concept menu. --- module/custom/lang/zh-cn.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/custom/lang/zh-cn.php b/module/custom/lang/zh-cn.php index 34623f1b36..b5f554ddbc 100644 --- a/module/custom/lang/zh-cn.php +++ b/module/custom/lang/zh-cn.php @@ -79,7 +79,7 @@ $lang->custom->user->fields['statusList'] = '状态'; $lang->custom->user->fields['contactField'] = '可用联系方式'; $lang->custom->user->fields['deleted'] = '列出已删除用户'; -$lang->custom->system = array('flow', 'working', 'required', 'score'); +$lang->custom->system = array('concept', 'flow', 'working', 'required', 'score'); $lang->custom->block->fields['closed'] = '关闭的区块'; From 4c9b1d2d4daf1d0b349628568bffa06826cdb72b Mon Sep 17 00:00:00 2001 From: guanxiying Date: Wed, 20 Nov 2019 16:59:23 +0800 Subject: [PATCH 02/10] * Fix style of concept page. --- module/custom/view/concept.html.php | 53 +++++++++++++++-------------- 1 file changed, 28 insertions(+), 25 deletions(-) diff --git a/module/custom/view/concept.html.php b/module/custom/view/concept.html.php index 20c2533d16..371fb4be94 100644 --- a/module/custom/view/concept.html.php +++ b/module/custom/view/concept.html.php @@ -8,46 +8,49 @@ * @package ZenTaoPMS * @version $Id: deny.html.php 4129 2013-01-18 01:58:14Z wwccss $ */ -include '../../common/view/header.lite.html.php'; ?> config->conceptSetted):?> - + +config->conceptSetted):?> +
+
+
+ custom->concept?> +
+
+
-
custom->notice->conceptResult, $lang->productCommon, $lang->projectCommon, $lang->storyCommon, $lang->hourCommon);?>
- +
-
-
custom->concept;?>
-
-
- -
custom->productProject->relation, zget($this->config->custom, 'productProject', '0_0'))?>
-
- -
- -
custom->conceptOptions->story, zget($this->config->custom, 'storyRequirement', '0'));?>
-
- -
- -
custom->conceptOptions->hourPoint, '0')?>
-
-
-
-
+
+
+ +
custom->productProject->relation, zget($this->config->custom, 'productProject', '0_0'))?>
+
+ +
+ +
custom->conceptOptions->story, zget($this->config->custom, 'storyRequirement', '0'));?>
+
+ +
+ +
custom->conceptOptions->hourPoint, '0')?>
+
+
+ +
- config->conceptSetted):?> From e899334745ce6c64a0f8ed499fae592a4992fb95 Mon Sep 17 00:00:00 2001 From: guanxiying Date: Wed, 20 Nov 2019 16:59:49 +0800 Subject: [PATCH 03/10] * Highlight concept menu. --- module/custom/js/concept.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/module/custom/js/concept.js b/module/custom/js/concept.js index e2d0786d69..705c0bb8d3 100644 --- a/module/custom/js/concept.js +++ b/module/custom/js/concept.js @@ -1,5 +1,6 @@ $(document).ready(function() -{ +{ + $('#mainMenu #conceptTab').addClass('btn-active-text'); $('#ajaxForm').ajaxForm( { finish:function(response) From 3c5c094b9fe2e63caaccbd579f0238faeda7bb81 Mon Sep 17 00:00:00 2001 From: guanxiying Date: Wed, 20 Nov 2019 17:10:19 +0800 Subject: [PATCH 04/10] * Fix style when concept not setted. --- module/custom/view/concept.html.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/module/custom/view/concept.html.php b/module/custom/view/concept.html.php index 371fb4be94..e839a6c646 100644 --- a/module/custom/view/concept.html.php +++ b/module/custom/view/concept.html.php @@ -9,12 +9,12 @@ * @version $Id: deny.html.php 4129 2013-01-18 01:58:14Z wwccss $ */ ?> -config->conceptSetted):?> +config->conceptSetted)):?> -config->conceptSetted):?> +config->conceptSetted)):?>
@@ -24,10 +24,9 @@
-
- custom->notice->conceptResult, $lang->productCommon, $lang->projectCommon, $lang->storyCommon, $lang->hourCommon);?> +
+ custom->concept?>
-
@@ -51,10 +50,11 @@
-config->conceptSetted):?> +config->conceptSetted)):?>
+
From 84b7c6caf5d6a98e3ba6e9f67e2bbafabc60f490 Mon Sep 17 00:00:00 2001 From: guanxiying Date: Wed, 20 Nov 2019 17:23:39 +0800 Subject: [PATCH 05/10] * Add call of fix bug type list functon. --- module/upgrade/model.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 4323f31353..098c565c44 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -536,6 +536,8 @@ class upgradeModel extends model $this->execSQL($this->getUpgradeFile('11.6.5')); $this->fixGroupAcl(); $this->appendExec('11_6_5'); + case '11_6_6': + $this->fixBugTypeList(); } $this->deletePatch(); From 97a65c43a7de5a23f5bd57f35c10bf612a37ad99 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Thu, 21 Nov 2019 09:13:31 +0800 Subject: [PATCH 06/10] * Finish task #6489. --- module/action/control.php | 2 +- module/common/view/action.html.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module/action/control.php b/module/action/control.php index 39694d6531..4066303c92 100755 --- a/module/action/control.php +++ b/module/action/control.php @@ -134,7 +134,7 @@ class action extends control */ public function editComment($actionID) { - if(trim(strip_tags($this->post->lastComment, ''))) + if(strlen(trim(strip_tags($this->post->lastComment, ''))) != 0) { $this->action->updateComment($actionID); } diff --git a/module/common/view/action.html.php b/module/common/view/action.html.php index d53d4df94d..c4fc9f8164 100755 --- a/module/common/view/action.html.php +++ b/module/common/view/action.html.php @@ -61,7 +61,7 @@ action->printChanges($action->objectType, $action->history);?>
- comment)):?> + comment))) != 0):?> ', "title='{$lang->action->editComment}'", 'btn btn-link btn-icon btn-sm btn-edit-comment');?> From 9720ffcf60d93b7c4ea6e498afcaf7c7f97d5ce2 Mon Sep 17 00:00:00 2001 From: guanxiying Date: Thu, 21 Nov 2019 10:06:57 +0800 Subject: [PATCH 07/10] * Create index.html to every folder. --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index 2dd791442a..cb782c8d7d 100644 --- a/Makefile +++ b/Makefile @@ -32,6 +32,9 @@ common: mv zentaopms/www/install.php.tmp zentaopms/www/install.php mv zentaopms/www/upgrade.php.tmp zentaopms/www/upgrade.php cp VERSION zentaopms/ + # create index.html of each folder. + for path in `find zentaopms/ -type d`; do touch "$$path/index.html"; done + rm zentaopms/www/index.html # combine js and css files. cp -fr tools zentaopms/tools && cd zentaopms/tools/ && php ./minifyfront.php rm -fr zentaopms/tools From 274be9c592910a84a3ceddd86f3a5054eba534d1 Mon Sep 17 00:00:00 2001 From: guanxiying Date: Thu, 21 Nov 2019 11:07:16 +0800 Subject: [PATCH 08/10] * Fix story type typeList of todo. --- module/todo/lang/zh-cn.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/todo/lang/zh-cn.php b/module/todo/lang/zh-cn.php index 48a5918019..4c090f8688 100644 --- a/module/todo/lang/zh-cn.php +++ b/module/todo/lang/zh-cn.php @@ -89,7 +89,7 @@ $lang->todo->typeList['custom'] = '自定义'; $lang->todo->typeList['cycle'] = '周期'; $lang->todo->typeList['bug'] = 'Bug'; $lang->todo->typeList['task'] = $lang->projectCommon . '任务'; -$lang->todo->typeList['story'] = $lang->projectCommon . '{$lang->storyCommon}'; +$lang->todo->typeList['story'] = $lang->projectCommon . $lang->storyCommon; global $config; if($config->global->flow == 'onlyTest' or $config->global->flow == 'onlyStory') unset($lang->todo->typeList['task']); From 3945b01696b559124cd5783dd06ee31667ec54c4 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Thu, 21 Nov 2019 11:12:05 +0800 Subject: [PATCH 09/10] * Fix js error. --- module/block/view/productstatisticblock.html.php | 7 +++++-- module/block/view/projectstatisticblock.html.php | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/module/block/view/productstatisticblock.html.php b/module/block/view/productstatisticblock.html.php index e00a04f25b..71c17ad717 100644 --- a/module/block/view/productstatisticblock.html.php +++ b/module/block/view/productstatisticblock.html.php @@ -91,8 +91,11 @@ $(function() }); var $productLi = $('#activeProduct'); - var productLi = $productLi[0]; - $(".col ul.nav").animate({scrollTop: productLi.offsetTop}, "slow"); + if($productLi.length) + { + var productLi = $productLi[0]; + $(".col ul.nav").animate({scrollTop: productLi.offsetTop}, "slow"); + } });
diff --git a/module/block/view/projectstatisticblock.html.php b/module/block/view/projectstatisticblock.html.php index 95a0fc5657..c485517904 100644 --- a/module/block/view/projectstatisticblock.html.php +++ b/module/block/view/projectstatisticblock.html.php @@ -75,8 +75,11 @@ $(function() }); var $projectLi = $('#activeProject'); - var projectLi = $projectLi[0]; - $(".col ul.nav").animate({scrollTop: projectLi.offsetTop}, "slow"); + if($projectLi.length) + { + var projectLi = $projectLi[0]; + $(".col ul.nav").animate({scrollTop: projectLi.offsetTop}, "slow"); + } });
From 716643379699e5670926423b6f69ec5264f19fbb Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Thu, 21 Nov 2019 13:15:08 +0800 Subject: [PATCH 10/10] * Fix task #6489. --- module/common/view/action.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/common/view/action.html.php b/module/common/view/action.html.php index c4fc9f8164..3648df474c 100755 --- a/module/common/view/action.html.php +++ b/module/common/view/action.html.php @@ -47,7 +47,7 @@
    - comment and $this->methodName == 'view' and $action->actor == $this->app->user->account and common::hasPriv('action', 'editComment'));?> + comment))) != 0 and $this->methodName == 'view' and $action->actor == $this->app->user->account and common::hasPriv('action', 'editComment'));?>
  1. actor = zget($users, $action->actor);