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

Merge branch 'master' into zenops_46

Browse Source
This commit is contained in:
caoyanyi
2022-11-16 13:00:45 +08:00
parent 6d47ea0f8f f2acb4f648
commit e60b21e1b6
113 changed files with 859 additions and 452 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/config.php
+4
View File
@@ -213,6 +213,10 @@ $config->task->datatable->fieldList['execution']['title'] = 'idAB';
$config->task->datatable->fieldList['execution']['control'] = 'hidden';
$config->task->datatable->fieldList['execution']['dataSource'] = array('module' => 'execution', 'method' => 'getPairs');
$config->task->datatable->fieldList['project']['title'] = 'idAB';
$config->task->datatable->fieldList['project']['control'] = 'hidden';
$config->task->datatable->fieldList['project']['dataSource'] = array('module' => 'project', 'method' => 'getPairs');
$config->task->datatable->fieldList['mode']['title'] = 'idAB';
$config->task->datatable->fieldList['mode']['control'] = 'hidden';
module/task/css/create.css
+1 -1
View File
@@ -28,7 +28,7 @@
.c-modulel {width: 110px;}
.keep-row-height {height: 32px;}
#modalTeam .modal-dialog {min-height: 120px; width: 520px; color: #3c4353;}
#modalTeam .modal-dialog {min-height: 120px; width: 570px; color: #3c4353;}
#taskTeamEditor .hourBox {padding-bottom: 7px; width: 135px;}
#taskTeamEditor .estimateBox {width: 120px;}
#modalTeam .modal-content {padding: 0;}
module/task/js/create.js
+1 -1
View File
@@ -343,7 +343,7 @@ function setStories(moduleID, executionID)
$("#story").addClass('filled').chosen();
/* If there is no story option, select will be hidden and text will be displayed; otherwise, the opposite is true */
if($('#story option').length > 1)
if($('#story option').length > 1 || parseInt(hasProduct) == 0)
{
$('#story').parent().removeClass('hidden');
$('#storyBox').addClass('hidden');
module/task/view/create.html.php
+1
View File
@@ -23,6 +23,7 @@
<?php js::set('estimateNotEmpty', sprintf($lang->error->gt, $lang->task->estimate, '0'))?>
<?php js::set('lifetime', $execution->lifetime);?>
<?php js::set('lifetimeList', $lifetimeList);?>
<?php js::set('hasProduct', $execution->hasProduct);?>
<?php
$requiredFields = array();
foreach(explode(',', $config->task->create->requiredFields) as $field)