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/productplan/js/browse.js b/module/productplan/js/browse.js
index 1f30442904..f89348c816 100644
--- a/module/productplan/js/browse.js
+++ b/module/productplan/js/browse.js
@@ -371,6 +371,14 @@ 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 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();
@@ -425,10 +433,10 @@ function getPlanID(obj, branch)
if(!window.kanbanDropRules)
{
window.kanbanDropRules =
- {
+ {
wait: ['doing'],
doing: ['done'],
done: ['doing', 'closed'],
closed: ['doing']
- }
+ }
}
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';