From 7cc557e5283c0761eecd9c5ad2e65cac23f43bda Mon Sep 17 00:00:00 2001 From: liyuchun Date: Fri, 22 Apr 2022 09:01:32 +0800 Subject: [PATCH 01/12] * Fix bug #7008. --- module/common/view/footer.html.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/module/common/view/footer.html.php b/module/common/view/footer.html.php index 95e4a8db38..84ebd0b205 100755 --- a/module/common/view/footer.html.php +++ b/module/common/view/footer.html.php @@ -16,11 +16,12 @@ needPing = false; $(function() { var windowBlur = false; - if(window.Notification) + if(window.Notification && Notification.permission == 'granted') { window.onblur = function(){windowBlur = true;} window.onfocus = function(){windowBlur = false;} } + setInterval(function() { $.get(createLink('message', 'ajaxGetMessage', "windowBlur=" + (windowBlur ? '1' : '0')), function(data) From e8abf792f7f5546615ac7db026efefa32c3104f7 Mon Sep 17 00:00:00 2001 From: liyuchun Date: Fri, 22 Apr 2022 11:21:32 +0800 Subject: [PATCH 02/12] * Fix bug #11939. --- framework/base/helper.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/base/helper.class.php b/framework/base/helper.class.php index ac1dcb7f2e..3a645afe62 100644 --- a/framework/base/helper.class.php +++ b/framework/base/helper.class.php @@ -691,7 +691,7 @@ class baseHelper * @access public * @return string */ - public static function getRemoteIp($proxy = false) + public static function getRemoteIp($proxy = true) { $ip = ''; if(!empty($_SERVER["REMOTE_ADDR"])) $ip = $_SERVER["REMOTE_ADDR"]; From d9f452dc50e99e4e5d125370a80cc6dbb68b3802 Mon Sep 17 00:00:00 2001 From: liyuchun Date: Fri, 22 Apr 2022 12:49:40 +0800 Subject: [PATCH 03/12] * Fix bug #21629. --- module/mr/model.php | 1 + 1 file changed, 1 insertion(+) diff --git a/module/mr/model.php b/module/mr/model.php index 712740bb74..b60a9a3566 100644 --- a/module/mr/model.php +++ b/module/mr/model.php @@ -1392,6 +1392,7 @@ class mrModel extends model ->where('t1.AType')->eq('mr') ->andWhere('t1.BType')->eq($objectType) ->andWhere('t1.BID')->eq($objectID) + ->andWhere('t2.id')->ne(0) ->fetchPairs(); } From 3a533b72c945422d7e1da2e78048fe591dd111d7 Mon Sep 17 00:00:00 2001 From: xieqiyu Date: Sun, 24 Apr 2022 09:48:31 +0800 Subject: [PATCH 04/12] * Fix bug#21947. --- module/task/view/batchedit.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/task/view/batchedit.html.php b/module/task/view/batchedit.html.php index ecfdc202fa..4e8550cc2f 100755 --- a/module/task/view/batchedit.html.php +++ b/module/task/view/batchedit.html.php @@ -132,7 +132,7 @@ js::set('dittoNotice', $dittoNotice); >deadline) ? '' : $tasks[$taskID]->deadline, "class='form-control text-center form-date'");?> >pri, "class='form-control'");?> >estimate, "class='form-control text-center' {$disableHour}");?> - > + > >left, "class='form-control text-center' {$disableHour}");?> ' style='overflow:visible'>finishedBy, "class='form-control chosen'");?> ' style='overflow:visible'>canceledBy, "class='form-control chosen'");?> From 76c04621190673c6fd27ef5fb5efd085b7d0b5c8 Mon Sep 17 00:00:00 2001 From: tanghucheng Date: Sun, 24 Apr 2022 01:53:07 +0000 Subject: [PATCH 05/12] * Fix bug #21439. --- module/execution/view/treestory.html.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/module/execution/view/treestory.html.php b/module/execution/view/treestory.html.php index 8aa91ed49c..719c39b78d 100644 --- a/module/execution/view/treestory.html.php +++ b/module/execution/view/treestory.html.php @@ -199,6 +199,7 @@
+ config->vision != 'lite'):?> @@ -243,6 +244,7 @@ + - +
story->legendFromBug;?>
story->legendLinkStories;?> From 961e46d82090d706b702ffbe6dd7064931ad77f4 Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Sun, 24 Apr 2022 10:20:35 +0800 Subject: [PATCH 06/12] * Fix bug #17446. --- db/update16.5.sql | 2 ++ 1 file changed, 2 insertions(+) diff --git a/db/update16.5.sql b/db/update16.5.sql index 51518cb552..ae5b49e6c4 100644 --- a/db/update16.5.sql +++ b/db/update16.5.sql @@ -84,3 +84,5 @@ REPLACE INTO `zt_zoutput` (`id`, `activity`, `name`, `content`, `optional`, `sta (78,52,'禅道缺陷记录','','','','admin','2020-01-09 14:22:52','','0000-00-00 00:00:00',390,'0'), (89,58,'禅道缺陷跟踪系统记录项','','yes','','admin','2020-01-09 14:25:16','','0000-00-00 00:00:00',445,'0'), (99,64,'禅道缺陷记录项','','yes','','admin','2020-01-09 14:26:52','','0000-00-00 00:00:00',495,'0'); + +DELETE FROM `zt_config` WHERE `section` = 'customMenu'; From f5a269af8a5a4593df2b26f99bfcf67f0ca40046 Mon Sep 17 00:00:00 2001 From: xieqiyu Date: Sun, 24 Apr 2022 10:48:14 +0800 Subject: [PATCH 07/12] * Fix bug#1736. --- module/todo/control.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/todo/control.php b/module/todo/control.php index f34e92a214..1643aa1001 100644 --- a/module/todo/control.php +++ b/module/todo/control.php @@ -633,7 +633,7 @@ class todo extends control $this->post->set('fields', $fields); $this->post->set('rows', $todos); - $this->post->set('kind', $this->lang->todo->common); + $this->post->set('kind', 'todo'); $this->fetch('file', 'export2' . $this->post->fileType, $_POST); } From 1acb25fc6c72a27df4cf5d66ace68afb15a32b6a Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Sun, 24 Apr 2022 11:02:17 +0800 Subject: [PATCH 08/12] * Fix bug #17335. --- module/product/css/kanban.css | 0 module/product/css/kanban.en.css | 1 + module/product/css/kanban.zh-cn.css | 1 + 3 files changed, 2 insertions(+) delete mode 100644 module/product/css/kanban.css create mode 100644 module/product/css/kanban.en.css create mode 100644 module/product/css/kanban.zh-cn.css diff --git a/module/product/css/kanban.css b/module/product/css/kanban.css deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/product/css/kanban.en.css b/module/product/css/kanban.en.css new file mode 100644 index 0000000000..fdf8e681ab --- /dev/null +++ b/module/product/css/kanban.en.css @@ -0,0 +1 @@ +#kanbanList .kanban-lane {min-height: 140px !important;} diff --git a/module/product/css/kanban.zh-cn.css b/module/product/css/kanban.zh-cn.css new file mode 100644 index 0000000000..758037fd90 --- /dev/null +++ b/module/product/css/kanban.zh-cn.css @@ -0,0 +1 @@ +#kanbanList .kanban-lane {min-height: 115px !important;} From bc1a55d155d55a010f49680a030c7819a456dacb Mon Sep 17 00:00:00 2001 From: tanghucheng Date: Sun, 24 Apr 2022 13:39:19 +0800 Subject: [PATCH 09/12] * Fix bug #14850. --- extension/lite/task/ext/view/batchcreate.html.php | 2 +- module/execution/css/all.css | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/extension/lite/task/ext/view/batchcreate.html.php b/extension/lite/task/ext/view/batchcreate.html.php index 8907bf1f32..6f432d2625 100644 --- a/extension/lite/task/ext/view/batchcreate.html.php +++ b/extension/lite/task/ext/view/batchcreate.html.php @@ -135,7 +135,7 @@ style='overflow:visible'> style='overflow:visible'>task->typeList, $type, 'class=form-control');?>task->typeList, $type, "class='form-control chosen'");?> style='overflow:visible'> > > diff --git a/module/execution/css/all.css b/module/execution/css/all.css index c1ac7084d4..49211f1ddb 100644 --- a/module/execution/css/all.css +++ b/module/execution/css/all.css @@ -26,3 +26,5 @@ td.flex span.project-type-label {margin-left: 5px; min-width: 36px;} td.flex span.project-type-label {min-width: 40px;} .label-children {min-width:22px !important;} +.c-name > a, .table-children .text-left > a {padding-left: 5px;} +.has-child > span {margin-right: 5px;} From cbec52510243bc4d53932909cc82a23c45063740 Mon Sep 17 00:00:00 2001 From: tanghucheng Date: Sun, 24 Apr 2022 13:55:08 +0800 Subject: [PATCH 10/12] * Fix bug #17602. --- module/programplan/view/create.html.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/module/programplan/view/create.html.php b/module/programplan/view/create.html.php index 39ac93c799..c95a562a64 100644 --- a/module/programplan/view/create.html.php +++ b/module/programplan/view/create.html.php @@ -22,6 +22,7 @@ echo "{$title}"; ?> +
@@ -34,6 +35,7 @@ ?>
+ From 65a55d4fc8ee7025668fbcf82b17cb20f9edde16 Mon Sep 17 00:00:00 2001 From: liyuchun <563917701@qq.com> Date: Sun, 24 Apr 2022 06:26:15 +0000 Subject: [PATCH 11/12] * Fix bug #21960. --- module/gitlab/css/common.css | 1 + module/repo/css/common.css | 1 + 2 files changed, 2 insertions(+) diff --git a/module/gitlab/css/common.css b/module/gitlab/css/common.css index 162e6d9854..ad50c2a1d2 100644 --- a/module/gitlab/css/common.css +++ b/module/gitlab/css/common.css @@ -1 +1,2 @@ #publicTip {padding-left: 10px;} +.table-form>tbody>tr>th {width: 110px;} diff --git a/module/repo/css/common.css b/module/repo/css/common.css index afa3d5d369..be0378342c 100644 --- a/module/repo/css/common.css +++ b/module/repo/css/common.css @@ -16,6 +16,7 @@ h3 {font-size: 16px;} .versions {position: relative;} #diffRepo {position: absolute; left: 20px; z-index: 1000;} #repoID {display: inline-block; width: auto;} +.table-form>tbody>tr>th {width: 110px;} .repoCode a:hover {text-decoration: none;} .commentButton { From c72bd0a1df1416dd9171656852c789cf10d31dda Mon Sep 17 00:00:00 2001 From: tanghucheng Date: Sun, 24 Apr 2022 14:27:19 +0800 Subject: [PATCH 12/12] * Fix bug #18209. --- module/stage/model.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/module/stage/model.php b/module/stage/model.php index 9d4bd1e366..b25a0e7304 100644 --- a/module/stage/model.php +++ b/module/stage/model.php @@ -26,7 +26,11 @@ class stageModel extends model ->add('createdDate', helper::today()) ->get(); - $this->dao->insert(TABLE_STAGE)->data($stage)->autoCheck()->exec(); + $this->dao->insert(TABLE_STAGE) + ->data($stage) + ->autoCheck() + ->checkIF($stage->percent != '', 'percent', 'float') + ->exec(); if(!dao::isError()) return $this->dao->lastInsertID(); return false; @@ -54,7 +58,7 @@ class stageModel extends model $stage->createdBy = $this->app->user->account; $stage->createdDate = helper::today(); - $this->dao->insert(TABLE_STAGE)->data($stage)->autoCheck()->exec(); + $this->dao->insert(TABLE_STAGE)->data($stage)->autoCheck()->checkIF($stage->percent != '', 'percent', 'float')->exec(); $stageID = $this->dao->lastInsertID(); $this->action->create('stage', $stageID, 'Opened'); @@ -79,7 +83,7 @@ class stageModel extends model ->add('editedDate', helper::today()) ->get(); - $this->dao->update(TABLE_STAGE)->data($stage)->autoCheck()->where('id')->eq((int)$stageID)->exec(); + $this->dao->update(TABLE_STAGE)->data($stage)->autoCheck()->checkIF($stage->percent != '', 'percent', 'float')->where('id')->eq((int)$stageID)->exec(); if(!dao::isError()) return common::createChanges($oldStage, $stage); return false;