From f1d9e3375fbe5c83e30f0cb1af444c1dee93c060 Mon Sep 17 00:00:00 2001 From: leiyong <1549684884@qq.com> Date: Thu, 23 Jun 2022 01:16:26 +0000 Subject: [PATCH 1/6] * Fix bug#24031. --- lib/feishuapi/feishuapi.class.php | 2 +- module/block/view/welcome.html.php | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/feishuapi/feishuapi.class.php b/lib/feishuapi/feishuapi.class.php index 2cfb53db53..d98a80fd76 100644 --- a/lib/feishuapi/feishuapi.class.php +++ b/lib/feishuapi/feishuapi.class.php @@ -158,7 +158,7 @@ class feishuapi $index = 0; while(true) { - $response = $this->queryAPI($this->apiUrl . "contact/v3/departments?parent_department_id={$departmentID}" . ($pageToken ? "&page_token={$pageToken}" : '') . "&fetch_child=true&page_size=50", '', array(CURLOPT_CUSTOMREQUEST => "GET")); + $response = $this->queryAPI($this->apiUrl . "contact/v3/departments?parent_department_id={$departmentID}" . ($pageToken ? "&page_token={$pageToken}" : '') . "&fetch_child=false&page_size=50", '', array(CURLOPT_CUSTOMREQUEST => "GET")); if(isset($response->data->items)) { foreach($response->data->items as $key => $dept) diff --git a/module/block/view/welcome.html.php b/module/block/view/welcome.html.php index 10ba85b7d3..db16fab972 100644 --- a/module/block/view/welcome.html.php +++ b/module/block/view/welcome.html.php @@ -24,7 +24,7 @@ .block-welcome.block-sm .col-right .tiles {border-left: none; padding-left: 0} .block-welcome.block-sm .tile-title {font-size: 12px; margin: 0 -10px;} .block-welcome .progress-group{margin-top: 42px;} -.block-welcome .progress{margin-top: 10px; width: 85%} +.block-welcome .progress{margin-top: 10px; width: 85%;} .block-welcome .user-welcome{margin-top: 28px !important;} .block-welcome .col-right{border-left: 1px solid #e5e8ec;} .block-welcome.block-sm .col-right {border: none;} @@ -32,6 +32,7 @@ .block-welcome .done-progress{display: inline-block; color: #5B606E; font-weight: 500;} .block-welcome .welcome-label{background: #ffebee; border: none;} .block-welcome.block-sm .left-today {margin-left: 0px;} +.block-welcome .progress-num{display: flex; justify-content: space-between; width: 85%;}
@@ -41,10 +42,12 @@

block->welcomeList[$welcomeType], $app->user->realname)?>

- - block->assignToMe;?> +
+
+ block->assignToMe;?> +
block->done . " $progress" . '%';?>
- +
From f5071a43ebd733cc07a1c11a3e5cdabdbb2b28ad Mon Sep 17 00:00:00 2001 From: zenggang Date: Thu, 23 Jun 2022 01:26:21 +0000 Subject: [PATCH 2/6] * Code for task#57907 --- module/install/css/step5.css | 2 +- module/install/view/step5.html.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module/install/css/step5.css b/module/install/css/step5.css index 77c4b08ec7..3c386f8331 100644 --- a/module/install/css/step5.css +++ b/module/install/css/step5.css @@ -1,4 +1,4 @@ -.c-company {width: 80px !important;} +.c-company {width: 85px !important;} .c-company-value {width: 300px !important;} .mw-table {max-width: 650px !important;} diff --git a/module/install/view/step5.html.php b/module/install/view/step5.html.php index 3747b57c69..e482b9c959 100644 --- a/module/install/view/step5.html.php +++ b/module/install/view/step5.html.php @@ -61,7 +61,7 @@ install->password;?> - + install->placeholder->password;?> From 67f88f01772a433ed081903a7a036875f3559c52 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Thu, 23 Jun 2022 09:50:44 +0800 Subject: [PATCH 3/6] * Fix bug. --- module/doc/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/doc/model.php b/module/doc/model.php index 23a850d051..31685d0609 100644 --- a/module/doc/model.php +++ b/module/doc/model.php @@ -2792,7 +2792,7 @@ EOT; { $libs = $this->getLibsByObject('custom', 0, '', $appendLib); $this->app->rawMethod = 'custom'; - if($libID == 0) $libID = key($libs); + if($libID == 0) $libID = reset($libs)->id; $this->lang->modulePageNav = $this->select($type, $objects, $objectID, $libs, $libID); $object = new stdclass(); From a57ab674d9d706678991b44b6b5ed83625553f6d Mon Sep 17 00:00:00 2001 From: liumengyi Date: Thu, 23 Jun 2022 09:52:10 +0800 Subject: [PATCH 4/6] * Fix bug. --- module/doc/model.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/doc/model.php b/module/doc/model.php index 31685d0609..e9251f2343 100644 --- a/module/doc/model.php +++ b/module/doc/model.php @@ -2792,7 +2792,7 @@ EOT; { $libs = $this->getLibsByObject('custom', 0, '', $appendLib); $this->app->rawMethod = 'custom'; - if($libID == 0) $libID = reset($libs)->id; + if($libID == 0 and !empty($libs)) $libID = reset($libs)->id; $this->lang->modulePageNav = $this->select($type, $objects, $objectID, $libs, $libID); $object = new stdclass(); @@ -2814,7 +2814,7 @@ EOT; $table = $this->config->objectTables[$type]; $libs = $this->getLibsByObject($type, $objectID, '', $appendLib); - if($libID == 0) $libID = reset($libs)->id; + if($libID == 0 and !empty($libs)) $libID = reset($libs)->id; $this->lang->modulePageNav = $this->select($type, $objects, $objectID, $libs, $libID); if($this->app->tab == 'doc') $this->app->rawMethod = $type; From d7107251553b8f11af092770f67f936d8607ff41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B9=BF=E6=98=8E?= Date: Thu, 23 Jun 2022 10:00:48 +0800 Subject: [PATCH 5/6] * Add set wip. --- db/update17.1.sql | 5 ++++- module/kanban/js/view.js | 1 + module/kanban/lang/zh-cn.php | 4 ++++ module/kanban/view/create.html.php | 5 +++++ module/kanban/view/edit.html.php | 5 +++++ 5 files changed, 19 insertions(+), 1 deletion(-) diff --git a/db/update17.1.sql b/db/update17.1.sql index 743e36008e..fd0d6f1fae 100644 --- a/db/update17.1.sql +++ b/db/update17.1.sql @@ -3,4 +3,7 @@ CREATE TABLE `zt_riskissue` ( `risk` mediumint(8) unsigned NOT NULL, `issue` mediumint(8) unsigned NOT NULL, UNIQUE KEY `risk_issue` (`risk`,`issue`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; \ No newline at end of file +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + +ALTER TABLE `zt_kanban` +ADD `showWIP` enum('0','1') NOT NULL DEFAULT '1' AFTER `displayCards`; diff --git a/module/kanban/js/view.js b/module/kanban/js/view.js index 4707cb8abb..dc53db4ab4 100644 --- a/module/kanban/js/view.js +++ b/module/kanban/js/view.js @@ -1344,6 +1344,7 @@ function initKanban($kanban) onRenderLaneName: renderLaneName, onRenderHeaderCol: renderHeaderCol, onRenderCount: renderCount, + showCount: kanban.showWIP == '1' ? true : false, sortable: handleSortCards, virtualize: true, virtualRenderOptions: {container: $(window).add($('#kanbanContainer'))}, diff --git a/module/kanban/lang/zh-cn.php b/module/kanban/lang/zh-cn.php index 41ead183c4..f63492f532 100644 --- a/module/kanban/lang/zh-cn.php +++ b/module/kanban/lang/zh-cn.php @@ -198,6 +198,7 @@ $lang->kanban->fullScreen = '全屏'; $lang->kanban->setting = '设置'; $lang->kanban->my = '我的看板'; $lang->kanban->other = '其他'; +$lang->kanban->showWIP = '显示在制品限制'; $lang->kanban->error = new stdclass(); $lang->kanban->error->mustBeInt = '在制品数量必须是正整数。'; @@ -217,6 +218,9 @@ $lang->kanban->importObjectList['builds'] = '版本'; $lang->kanban->importObjectList['executions'] = $lang->execution->common; $lang->kanban->importObjectList['cards'] = '其他看板卡片'; +$lang->kanban->showWIPList[1] = '显示'; +$lang->kanban->showWIPList[0] = '不显示'; + $lang->kanban->defaultColumn = array(); $lang->kanban->defaultColumn['wait'] = '未开始'; $lang->kanban->defaultColumn['doing'] = '进行中'; diff --git a/module/kanban/view/create.html.php b/module/kanban/view/create.html.php index 624b95b5ac..4af174b6ec 100644 --- a/module/kanban/view/create.html.php +++ b/module/kanban/view/create.html.php @@ -24,6 +24,11 @@ + + kanban->WIPCount;?> + kanban->showWIPList, 1);?> + + kanban->space;?> diff --git a/module/kanban/view/edit.html.php b/module/kanban/view/edit.html.php index 7fc39ab025..0c3cf4ed9f 100644 --- a/module/kanban/view/edit.html.php +++ b/module/kanban/view/edit.html.php @@ -22,6 +22,11 @@ kanban->space;?> space, "class='form-control chosen'");?> + + kanban->WIPCount;?> + kanban->showWIPList, $kanban->showWIP);?> + + kanban->name;?> name, "class='form-control'");?> From 3eb9719ad242f0fbf715d918e03e2bde91f8fb45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B9=BF=E6=98=8E?= Date: Thu, 23 Jun 2022 11:16:55 +0800 Subject: [PATCH 6/6] * Finish task #58241. --- module/kanban/lang/en.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/module/kanban/lang/en.php b/module/kanban/lang/en.php index 7e0fe7b3a9..39be563202 100644 --- a/module/kanban/lang/en.php +++ b/module/kanban/lang/en.php @@ -217,6 +217,9 @@ $lang->kanban->importObjectList['builds'] = 'Build'; $lang->kanban->importObjectList['executions'] = 'Execution'; $lang->kanban->importObjectList['cards'] = 'Other Kanban Cards'; +$lang->kanban->showWIPList[1] = 'Show'; +$lang->kanban->showWIPList[0] = 'Hide'; + $lang->kanban->defaultColumn = array(); $lang->kanban->defaultColumn['wait'] = 'wait'; $lang->kanban->defaultColumn['doing'] = 'doing';