From 586af4b5deedec834ec5b1cb7dda321ed1afe8de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=8D=8E=E4=BC=9F?= Date: Thu, 10 Feb 2022 13:58:16 +0800 Subject: [PATCH 1/4] *Fix bug #48663. --- module/productplan/js/browse.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/module/productplan/js/browse.js b/module/productplan/js/browse.js index 1f30442904..9844e51fd4 100644 --- a/module/productplan/js/browse.js +++ b/module/productplan/js/browse.js @@ -371,6 +371,10 @@ function renderKanbanItem(item, $item) { $time.text($.zui.formatDate(begin, 'MM-dd') + ' ' + productplanLang.to + ' ' + $.zui.formatDate(end, 'MM-dd')).attr('title', $.zui.formatDate(begin, 'yyyy-MM-dd') + productplanLang.to + $.zui.formatDate(end, 'yyyy-MM-dd')).show(); } + else if(item.begin != '2030-01-01' && item.end == '2030-01-01') + { + $time.text($.zui.formatDate(begin, 'MM-dd') + ' ' + productplanLang.to + ' ' + productplanLang.future).attr('title', $.zui.formatDate(begin, 'yyyy-MM-dd') + productplanLang.to).show(); + } else { $time.text(productplanLang.future).attr('title', productplanLang.future).show(); @@ -425,10 +429,10 @@ function getPlanID(obj, branch) if(!window.kanbanDropRules) { window.kanbanDropRules = - { + { wait: ['doing'], doing: ['done'], done: ['doing', 'closed'], closed: ['doing'] - } + } } From 06f9338fad3c3e6a55fe61cdc29391ee9de74077 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=8D=8E=E4=BC=9F?= Date: Fri, 11 Feb 2022 08:54:47 +0800 Subject: [PATCH 2/4] *Fix bug #19239 #19367. --- module/product/lang/zh-cn.php | 1 + module/product/view/browse.html.php | 6 ++++++ module/productplan/js/browse.js | 4 ++++ 3 files changed, 11 insertions(+) diff --git a/module/product/lang/zh-cn.php b/module/product/lang/zh-cn.php index 40a51df27b..c7ff93ce03 100644 --- a/module/product/lang/zh-cn.php +++ b/module/product/lang/zh-cn.php @@ -80,6 +80,7 @@ $lang->product->assignToNullBugsTitle = '未指派Bug'; $lang->product->closedBugs = '关闭Bug'; $lang->product->bugFixedRate = 'Bug修复率'; $lang->product->unfoldClosed = '展开已关闭'; +$lang->product->assigned = '指派'; $lang->product->confirmDelete = " 您确定删除该{$lang->productCommon}吗？"; $lang->product->errorNoProduct = "还没有创建{$lang->productCommon}！"; diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php index 6f4793f2fc..b576abf398 100644 --- a/module/product/view/browse.html.php +++ b/module/product/view/browse.html.php @@ -309,6 +309,7 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : ''; app->getViewType() == 'xhtml'):?> $value) { if($value->id == 'title' || $value->id == 'id' || $value->id == 'pri' || $value->id == 'status') @@ -324,12 +325,17 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : ''; }?> $value) { if($storyType == 'requirement' and (in_array($value->id, array('plan', 'stage')))) $value->show = false; if($value->show) { + if($value->title == $lang->product->assigned) + { + $value->width = 90; + } $this->datatable->printHead($value, $orderBy, $vars, $canBatchAction); $columns ++; } diff --git a/module/productplan/js/browse.js b/module/productplan/js/browse.js index 9844e51fd4..f89348c816 100644 --- a/module/productplan/js/browse.js +++ b/module/productplan/js/browse.js @@ -375,6 +375,10 @@ function renderKanbanItem(item, $item) { $time.text($.zui.formatDate(begin, 'MM-dd') + ' ' + productplanLang.to + ' ' + productplanLang.future).attr('title', $.zui.formatDate(begin, 'yyyy-MM-dd') + productplanLang.to).show(); } + else if(item.begin == '2030-01-01' && item.end != '2030-01-01') + { + $time.text(productplanLang.future + ' ' + productplanLang.to + ' ' + $.zui.formatDate(end, 'MM-dd')).attr('title', $.zui.formatDate(end, 'yyyy-MM-dd') + productplanLang.to).show(); + } else { $time.text(productplanLang.future).attr('title', productplanLang.future).show(); From 341ee9d8ddb6f3973bb97849034f70bb859970ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=8D=8E=E4=BC=9F?= Date: Fri, 11 Feb 2022 08:59:06 +0800 Subject: [PATCH 3/4] Fix bug #19367 #19239 #18741 . --- module/product/view/browse.html.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php index b576abf398..5bdd1c6997 100644 --- a/module/product/view/browse.html.php +++ b/module/product/view/browse.html.php @@ -309,7 +309,6 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : ''; app->getViewType() == 'xhtml'):?> $value) { if($value->id == 'title' || $value->id == 'id' || $value->id == 'pri' || $value->id == 'status') @@ -325,7 +324,6 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : ''; }?> $value) { if($storyType == 'requirement' and (in_array($value->id, array('plan', 'stage')))) $value->show = false; From df27f7e149eb3ca6936723e4ecc259509d1949b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=8D=8E=E4=BC=9F?= Date: Fri, 11 Feb 2022 10:49:02 +0800 Subject: [PATCH 4/4] *Fix bug #19367 #19239. --- module/datatable/view/ajaxcustom.html.php | 4 ++-- module/product/lang/zh-cn.php | 1 - module/product/view/browse.html.php | 4 ---- module/story/config.php | 2 +- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/module/datatable/view/ajaxcustom.html.php b/module/datatable/view/ajaxcustom.html.php index 5bab1aea2c..c7b46c5889 100644 --- a/module/datatable/view/ajaxcustom.html.php +++ b/module/datatable/view/ajaxcustom.html.php @@ -3,9 +3,9 @@ * The view file of datatable module of ZenTaoPMS. * * @copyright Copyright 2014-2014 青岛易软天创网络科技有限公司 (QingDao Nature Easy Soft Network Technology Co,LTD www.cnezsoft.com) - * @license business(商业软件) + * @license business(商业软件) * @author Hao sun - * @package datatable + * @package datatable * @version $Id$ * @link http://www.zentao.net */ diff --git a/module/product/lang/zh-cn.php b/module/product/lang/zh-cn.php index c7ff93ce03..40a51df27b 100644 --- a/module/product/lang/zh-cn.php +++ b/module/product/lang/zh-cn.php @@ -80,7 +80,6 @@ $lang->product->assignToNullBugsTitle = '未指派Bug'; $lang->product->closedBugs = '关闭Bug'; $lang->product->bugFixedRate = 'Bug修复率'; $lang->product->unfoldClosed = '展开已关闭'; -$lang->product->assigned = '指派'; $lang->product->confirmDelete = " 您确定删除该{$lang->productCommon}吗？"; $lang->product->errorNoProduct = "还没有创建{$lang->productCommon}！"; diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php index 5bdd1c6997..6f4793f2fc 100644 --- a/module/product/view/browse.html.php +++ b/module/product/view/browse.html.php @@ -330,10 +330,6 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : ''; if($value->show) { - if($value->title == $lang->product->assigned) - { - $value->width = 90; - } $this->datatable->printHead($value, $orderBy, $vars, $canBatchAction); $columns ++; } diff --git a/module/story/config.php b/module/story/config.php index ce53769963..67bec65085 100644 --- a/module/story/config.php +++ b/module/story/config.php @@ -123,7 +123,7 @@ $config->story->datatable->fieldList['openedDate']['required'] = 'no'; $config->story->datatable->fieldList['assignedTo']['title'] = 'assignedToAB'; $config->story->datatable->fieldList['assignedTo']['fixed'] = 'no'; -$config->story->datatable->fieldList['assignedTo']['width'] = '86'; +$config->story->datatable->fieldList['assignedTo']['width'] = '90'; $config->story->datatable->fieldList['assignedTo']['required'] = 'no'; $config->story->datatable->fieldList['assignedDate']['title'] = 'assignedDate';