From eccfad0ec63c9f1225520090c6b881050b14897b Mon Sep 17 00:00:00 2001 From: wangyidong Date: Thu, 9 Aug 2018 13:49:34 +0800 Subject: [PATCH 1/4] * finish task #4685. --- module/block/view/todoblock.html.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/module/block/view/todoblock.html.php b/module/block/view/todoblock.html.php index 0d340bdfe1..f8870df20c 100644 --- a/module/block/view/todoblock.html.php +++ b/module/block/view/todoblock.html.php @@ -170,7 +170,7 @@ { var $todoes = $(obj).closest('.block-todoes'); var $form = $(obj).closest('form'); - var $name = $("input[name='name']").val(); + var $name = $form.find("input[name='name']").val(); if($name == '') { $("input[name='name']").addClass('has-error'); @@ -188,6 +188,8 @@ success: function(todo) { $todoes.removeClass('show-form'); + $todoes.closest('.show-form').removeClass('show-form'); + $todoes.find('.show-form').removeClass('show-form'); refreshBlock($todoes.parents('div.panel[id^=block]')); } }); From 27ad6dae0b88e12dcc24f0ed8135a59c4ffca2df Mon Sep 17 00:00:00 2001 From: wangyidong Date: Thu, 9 Aug 2018 13:51:45 +0800 Subject: [PATCH 2/4] * add autocomplete='off' for todo block. --- module/block/view/todoblock.html.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/block/view/todoblock.html.php b/module/block/view/todoblock.html.php index f8870df20c..a439bfabb6 100644 --- a/module/block/view/todoblock.html.php +++ b/module/block/view/todoblock.html.php @@ -41,7 +41,7 @@

todo->create;?>

-
+
@@ -51,7 +51,7 @@
- +
From f799b5eb882e81dd5d1c5c887904610a66af9e54 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Thu, 9 Aug 2018 14:05:18 +0800 Subject: [PATCH 3/4] * finish task #4654. --- module/block/control.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/block/control.php b/module/block/control.php index d77fef5557..0bfb9728c6 100644 --- a/module/block/control.php +++ b/module/block/control.php @@ -904,7 +904,7 @@ class block extends control /* Get tasks. */ $yesterday = date('Y-m-d', strtotime('-1 day')); - $tasks = $this->dao->select("project, count(id) as totalTasks, count(status not in ('wait,doing,pause') or null) as undoneTasks, count(finishedDate like '{$yesterday}%' or null) as yesterdayFinished, sum(if(status != 'cancel', estimate, 0)) as totalEstimate, sum(consumed) as totalConsumed, sum(if(status != 'cancel', `left`, 0)) as totalLeft")->from(TABLE_TASK) + $tasks = $this->dao->select("project, count(id) as totalTasks, count(status in ('wait,doing,pause') or null) as undoneTasks, count(finishedDate like '{$yesterday}%' or null) as yesterdayFinished, sum(if(status != 'cancel', estimate, 0)) as totalEstimate, sum(consumed) as totalConsumed, sum(if(status != 'cancel', `left`, 0)) as totalLeft")->from(TABLE_TASK) ->where('project')->in($projectIDList) ->andWhere('deleted')->eq(0) ->andWhere('parent')->eq(0) From a20b31ba09e100d526119229dd2328bad14d141a Mon Sep 17 00:00:00 2001 From: wangyidong Date: Thu, 9 Aug 2018 14:15:31 +0800 Subject: [PATCH 4/4] add changelog for 10.3. --- doc/CHANGELOG | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/doc/CHANGELOG b/doc/CHANGELOG index 3d0cb50eb7..c0a407543b 100644 --- a/doc/CHANGELOG +++ b/doc/CHANGELOG @@ -1,3 +1,32 @@ +2018-08-09 10.3 +修复的Bug +1523 计划编辑结束日期有问题 +1994 添加待办时间控件异常 +2003 已保存的搜索历史页面显示异常 +2006 批量提需求时，多图上传后需求创建失败 +2010 记录工时页面显示异常 +2017 待办弹窗页，激活操作不生效 +2022 计划关联需求功能异常 +2024 提Bug页面无法删除已保存的模板 +2043 创建文档库时，所属产品或项目的下拉菜单显示不全 +2056 创建项目，有下拉菜单的2级导航被隐藏 +2057 我的地盘待办显示问题 +2058 为刚创建的任务指派人员时，提示错误消息 +2070 统计中项目偏差报表没有数据 +2071 文档列表增加分页功能 +2072 执行用例添加附件不显示 +2074 任务维护模块页面会列出非关联的平台模块信息 +2081 搜索日期无法选择 +2085 权限的成员维护sql显示2次查询日志 +2088 我的地盘项目统计区块数据统计不正确 +2096 文档页没有分页功能，最多显示20个文档 +2097 多人任务点击开始按钮开始后状态还是未开始 +2098 需求的多行录入无响应 +2099 创建文档库的时候无法选择所属项目 +2101 任务创建页面优先级没有设置默认值 +2102 上传附件的时候，数据库里附件名称包含了文件扩展名 +2109 任务批量指派会检查剩余工时是否为0 + 2018-07-11 10.1 完成的需求 3068 需求关联相关需求字段时，选择需求后页面没有及时刷新。