Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'sunhuawei_fixbug_19239_19367' into 'devops21'

Browse Source 
Sunhuawei fixbug 19239 19367

See merge request easycorp/zentaopms!1758
This commit is contained in:
李玉春
2022-02-11 03:30:27 +00:00
parent 68d92f6b72 df27f7e149
commit 4190928759
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/datatable/view/ajaxcustom.html.php
+2 -2
View File
@@ -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 <sunhao@cnezsoft.com>
* @package datatable
* @package datatable
* @version $Id$
* @link http://www.zentao.net
*/
module/productplan/js/browse.js
+10 -2
View File
@@ -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']
}
}
}
module/story/config.php
+1 -1
View File
@@ -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';