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

* Fix merge data bug. bug #45403.

Browse Source
This commit is contained in:
wangyuting
2024-01-29 14:06:31 +08:00
parent 9b4cf00504
commit ebe39ef940
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/upgrade/js/mergeprogram.ui.js
+8 -2
View File
@@ -84,7 +84,7 @@ window.changeProjectType = function()
{
const projectType = $('input[name=projectType]:checked').val();
$('.programForm').toggleClass('hidden', projectType == 'project' && mode == 'light');
$('.programForm, .formTitle').toggleClass('hidden', projectType == 'project' && mode == 'light');
$('.createProjectTip').toggleClass('hidden', projectType == 'project');
$('.createExecutionTip').toggleClass('hidden', projectType == 'execution');
$('[name=projectAcl]').closest('.check-list').toggleClass('hidden', projectType == 'project');
@@ -386,7 +386,7 @@ window.setProgramStatus = function(projectStatus)
window.initFormData = function()
{
$('#programBox').toggleClass('hidden', mode == 'light');
$('#programBox').toggleClass('hidden', $('[name^=sprints]:checked').length == 0 && mode == 'light');
$('.programParams').toggleClass('hidden', $('[name^=sprints]:checked').length == 0);
$('.programForm').toggleClass('hidden', $('[name^=sprints]:checked').length != 0 && projectType == 'project' && mode == 'light');
@@ -407,6 +407,12 @@ window.initFormData = function()
$(".projectName .picker-field").zui('picker').render({disabled: false});
changeProjectType();
if(mode == 'light')
{
$('.programName').find('input[name=newProgram]').prop('checked', false);
changeNewProgram();
}
}
}
module/upgrade/ui/createprogram.html.php
+4 -4
View File
@@ -25,18 +25,18 @@ $createProgram = function($data)
div(setClass('createProjectTip text-gray ' . ($data->projectType == 'project' ? '' : 'hidden')), html($lang->upgrade->createProjectTip)),
div(setClass('createExecutionTip text-gray ' . ($data->projectType == 'execution' ? '' : 'hidden')), html($lang->upgrade->createExecutionTip))
),
formRowGroup(set::title($data->systemMode == 'light' ? $lang->upgrade->setProject : $lang->upgrade->setProgram), set::items(array())),
formRowGroup(set::class('formTitle'), set::title($data->systemMode == 'light' ? $lang->upgrade->setProject : $lang->upgrade->setProgram), set::items(array())),
div
(
setClass('programForm mt-4 form-horz'),
formGroup
(
setClass('programName my-2'),
setClass('programName my-2 ' . ($data->systemMode == 'light' ? 'hidden' : '')),
set::label($lang->upgrade->programName),
set::required(true),
inputGroup
(
picker(setID('programs'), set::name('programs'), set::items($data->programs), set::value($data->programID), setData(array('on' => 'change', 'call' => 'changePrograms')), setClass('hidden')),
picker(set::required(true), setID('programs'), set::name('programs'), set::items($data->programs), set::value($data->programID), setData(array('on' => 'change', 'call' => 'changePrograms')), setClass('hidden')),
input(set::name('programName')),
span
(
@@ -81,7 +81,7 @@ $createProgram = function($data)
),
formGroup
(
setClass('lineName my-2'),
setClass('lineName my-2 ' . ($data->systemMode == 'light' ? 'hidden' : '')),
set::label($lang->upgrade->line),
inputGroup
(
module/upgrade/ui/mergebysprint.html.php
+1 -1
View File
@@ -24,7 +24,7 @@ $getMergeData = function($data)
div
(
setClass('sprintItem px-4'),
checkbox(set::name("sprints[]"), set::text($sprint->name), set::value($sprint->id), set('data-on', 'change'), set('data-call', 'changeSprints'), set('data-params', 'event'))
checkbox(set::name("sprints[]"), set::text($sprint->name), set::value($sprint->id), set('data-on', 'change'), set('data-call', 'changeSprints'), set('data-params', 'event'), set('data-begin', $sprint->begin), set('data-end', $sprint->end), set('data-status', $sprint->status), set('data-pm', $sprint->PM))
)
);
}