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

* [bug#63855,done,1h] fix bug.

Browse Source
This commit is contained in:
sunguangming
2025-07-15 09:30:25 +08:00
committed by wangyuting
parent 226603bbfc
commit 129449453d
4 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/control.php
+3 -1
View File
@@ -518,7 +518,7 @@ class project extends control
$extra = str_replace(array(',', ' '), array('&', ''), $extra);
parse_str($extra, $output);
$workflowGroup = !empty($output['workflowGroup']) ? (int)$output['workflowGroup'] : 0;
$workflowGroup = isset($output['workflowGroup']) ? (int)$output['workflowGroup'] : 0;
if($_POST)
{
@@ -548,6 +548,8 @@ class project extends control
}
if(!empty($output['workflowGroup'])) $project->workflowGroup = $workflowGroup;
if(!empty($output['model'])) $project->model = $output['model'];
$this->projectZen->buildEditForm($projectID, $project, $from, $programID);
}
module/project/js/edit.ui.js
+3 -9
View File
@@ -6,15 +6,9 @@ $(function()
/* 切换项目管理模型的逻辑. */
$(document).on('click', '.model-drop', function()
{
let text = $(this).find('.listitem').attr('data-value');
let model = $(this).find('.listitem').attr('data-key');
const btnClass = labelList[model];
$('#project-model .text').text(text);
$('#project-model').removeClass('secondary-outline special-outline warning-outline');
$('#project-model').addClass(btnClass);
$('[name=model]').val(model);
const currentModel = $(this).find('.listitem').attr('data-key');
const url = $.createLink('project', 'edit', "projectID=" + currentProject + "&from=" + from + "&programID=" + programID + "&extra=workflowGroup=,model=" + currentModel);
loadPage(url);
})
window.toggleStoryType = function(e)
module/project/ui/edit.html.php
+1 -1
View File
@@ -44,7 +44,7 @@ $modelMenuItems = array();
foreach($lang->project->modelList as $key => $text)
{
if(empty($key)) continue;
$modelMenuItems[] = array('text' => $text, 'value' => $key, 'data-key' => $key, 'data-value' => $text, 'class' => 'model-drop');
$modelMenuItems[] = array('text' => $text, 'value' => $key, 'data-key' => $key, 'data-value' => $text, 'class' => 'model-drop', 'active' => $key == $model);
}
formGridPanel
module/project/zen.php
+8
View File
@@ -459,6 +459,14 @@ class projectZen extends project
$programList = array($project->parent => $program->name);
}
$hasProduct = isset($project->hasProduct) ? $project->hasProduct : 1;
if($this->config->edition != 'open')
{
$workflowGroups = $this->loadModel('workflowgroup')->getPairs('project', $project->model, (int)$hasProduct, 'normal', '0');
$this->view->workflowGroupPairs = $workflowGroups;
$this->view->workflowGroups = $this->workflowgroup->appendBuildinLabel($workflowGroups);
}
$this->view->title = $this->lang->project->edit;
$this->view->PMUsers = $this->loadModel('user')->getPairs('noclosed|nodeleted|pmfirst', $project->PM);