From 19f7a8948609b73905552eac7d0f922f5eeb9a83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B9=BF=E6=98=8E?= Date: Thu, 17 Feb 2022 10:41:12 +0800 Subject: [PATCH 1/3] * Finish task #49429. --- extension/lite/product/ext/view/browse.html.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/extension/lite/product/ext/view/browse.html.php b/extension/lite/product/ext/view/browse.html.php index fcaa1d5269..4734be72ee 100644 --- a/extension/lite/product/ext/view/browse.html.php +++ b/extension/lite/product/ext/view/browse.html.php @@ -589,10 +589,6 @@ $(function() checkedEstimate += data.estimate; if(data.cases > 0) checkedCase += 1; }); - var rate = Math.round(checkedCase / checkedTotal * 10000 / 100) + '' + '%'; - return checkedSummary.replace('%total%', checkedTotal) - .replace('%estimate%', checkedEstimate.toFixed(1)) - .replace('%rate%', rate); } }); }); From 4ec144c99e5cea56d90666c92fd9be860a983eeb Mon Sep 17 00:00:00 2001 From: Wenrui LI Date: Thu, 17 Feb 2022 10:42:11 +0800 Subject: [PATCH 2/3] * fix bad merge. --- db/update16.4.sql | 1 - 1 file changed, 1 deletion(-) diff --git a/db/update16.4.sql b/db/update16.4.sql index 934ce65547..45130417d1 100644 --- a/db/update16.4.sql +++ b/db/update16.4.sql @@ -1,4 +1,3 @@ -======= ALTER TABLE `zt_project` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `order`; ALTER TABLE `zt_product` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `order`; ALTER TABLE `zt_task` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `deleted`; From f05ad59be356a91a1c04a0880360ddcad2e3700d Mon Sep 17 00:00:00 2001 From: tanghucheng Date: Thu, 17 Feb 2022 11:04:10 +0800 Subject: [PATCH 3/3] * fix bug. --- extension/lite/todo/ext/lang/zh-cn/lite.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/extension/lite/todo/ext/lang/zh-cn/lite.php b/extension/lite/todo/ext/lang/zh-cn/lite.php index 34e05cbbc0..7b162f90ef 100644 --- a/extension/lite/todo/ext/lang/zh-cn/lite.php +++ b/extension/lite/todo/ext/lang/zh-cn/lite.php @@ -1,7 +1,5 @@ todo->typeList['task'] = '任务'; -$lang->effort->common = '日志'; - unset($lang->todo->typeList['bug']); unset($lang->todo->typeList['testtask']);