From 6b7e5520fb6d5464bded7c604c0f1e99588cdb72 Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Fri, 31 Jul 2020 15:52:49 +0800 Subject: [PATCH 1/5] * Finish task #7580. --- doc/CHANGELOG | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/doc/CHANGELOG b/doc/CHANGELOG index c428a20238..aaf9285680 100644 --- a/doc/CHANGELOG +++ b/doc/CHANGELOG @@ -521,7 +521,25 @@ 2744 添加用户页面和修改密码页面存在密码明文传输 2748 禅道翻译功能，翻译日语时， 当翻译结果与原文一致时，无法保存。 2754 翻译功能，新手教程中，创建账号，创建产品与创建需求，对照翻译时，复制到所翻译语言中的变量没有作用 +2756 测试单新关联的用例无法执行 +2757 创建项目关联产品计划会把未关联产品的需求关联到项目中 +2758 开始、完成任务时添加的备注无法在历史记录中显示 +2760 批量创建用户时密码无法使用 +2761 路线图名称显示优化 +2762 后台-二次开-发数据库 喧喧相关表显示异常 +2763 关闭测试单页面报错 +2764 批量创建任务及任务编辑页面没有检查起止日期是否合法 +2765 添加链接文档访问报错 2767 翻译功能限制打开无效 +2768 我的地盘待办和组织用户待办状态正好相反 +2769 产品-需求编辑页面无法修改需求所处阶段 +2771 免密登录未进行时间戳的校验 +2772 未关闭的产品列表下展示的当前项目名称有误 +2773 产品同步到bug中的模块无法设置模块负责人 +2774 通过免密登录禅道不会记录登录系统的动态 +2776 测试报告导出后用例的链接错误 +2778 11.6.3版本上传.csv批量用例导入，提示没有数据错误 +2781 后台的数据备份显示大小错误 2019-09-24 11.6.3 修复的Bug: From c351b21b76781fef0a1985276a701c30ac71fb1e Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Fri, 31 Jul 2020 15:53:40 +0800 Subject: [PATCH 2/5] * Finish task #7571. --- 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 bcbbfb7e5e..8f4aac9f9e 100755 --- a/module/task/view/batchedit.html.php +++ b/module/task/view/batchedit.html.php @@ -58,7 +58,7 @@ '>task->status;?> '>task->pri;?> '>task->estimateAB;?> - '>task->consumedThisTime?> + '>task->consumed;?> '>task->leftAB?> '>task->estStarted?> '>task->deadline?> From 99aa236209e11c0df71b199bdbba6f583f044a16 Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Mon, 3 Aug 2020 15:41:26 +0800 Subject: [PATCH 3/5] #Finish task #7562. --- module/my/lang/zh-cn.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/module/my/lang/zh-cn.php b/module/my/lang/zh-cn.php index 923d395663..879b741550 100644 --- a/module/my/lang/zh-cn.php +++ b/module/my/lang/zh-cn.php @@ -32,10 +32,10 @@ $lang->my->taskMenu->closedByMe = '由我关闭'; $lang->my->taskMenu->canceledByMe = '由我取消'; $lang->my->storyMenu = new stdclass(); -$lang->my->storyMenu->assignedToMe = '指派给我'; -$lang->my->storyMenu->openedByMe = '由我创建'; -$lang->my->storyMenu->reviewedByMe = '由我评审'; -$lang->my->storyMenu->closedByMe = '由我关闭'; +$lang->my->storyMenu->assignedToMe = '指给我'; +$lang->my->storyMenu->openedByMe = '我创建'; +$lang->my->storyMenu->reviewedByMe = '我评审'; +$lang->my->storyMenu->closedByMe = '我关闭'; $lang->my->home = new stdclass(); $lang->my->home->latest = '最新动态'; From e1fc3eed58810559141c035129d7b3c3b76bb864 Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Mon, 3 Aug 2020 15:48:15 +0800 Subject: [PATCH 4/5] * Finish task #7575. --- module/block/view/todoblock.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/block/view/todoblock.html.php b/module/block/view/todoblock.html.php index ba177013e6..44b71b7384 100644 --- a/module/block/view/todoblock.html.php +++ b/module/block/view/todoblock.html.php @@ -19,7 +19,7 @@ if(!$selfCall) die(include('./todolist.html.php')); .block-todoes .todoes-input .form-control:-ms-input-placeholder {font-size: 12px; line-height: 20px;color: #a4a8b6;} .block-todoes .todoes-input .form-control::placeholder {font-size: 12px; line-height: 20px; color: #a4a8b6;} .block-todoes .todoes {padding: 0 10px 10px 10px; margin: 0 -20px; max-height: 350px; overflow: auto; overflow-x:hidden} -.block-todoes .todoes > li {position: relative; padding: 5px 10px 5px 35px; list-style: none; white-space:nowrap; overflow: auto; overflow-x:hidden;} +.block-todoes .todoes > li {position: relative; padding: 5px 10px 5px 35px; list-style: none; white-space:nowrap; overflow: auto; overflow-x:hidden; width: 410px;} .block-todoes .todoes > li:hover {background-color: #e9f2fb;} .block-todoes .todo-title {padding: 5px 15px 5px 5px;} .block-todoes .todo-pri {margin: 0 5px;} From c92cc316d0992f708ab84494cc11e5a4cde1191c Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Mon, 3 Aug 2020 15:48:52 +0800 Subject: [PATCH 5/5] * Finish task #7568. --- module/bug/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/bug/model.php b/module/bug/model.php index 7274b663bc..7609983bac 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -2534,7 +2534,7 @@ class bugModel extends model if($bug->assignedTo == $account) $class .= ' red'; } if($id == 'deadline' && isset($bug->delay)) $class .= ' delayed'; - if(strpos(',project,story,plan,task,openedBuild,', ",{$id},") !== false) $class .= ' text-ellipsis'; + if(strpos(',type,project,story,plan,task,openedBuild,', ",{$id},") !== false) $class .= ' text-ellipsis'; echo ""; if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFlowCell('bug', $bug, $id);