From da9013045c8df1326b64303832e78ede601053ee Mon Sep 17 00:00:00 2001 From: wangyidong Date: Mon, 14 Apr 2025 15:25:26 +0800 Subject: [PATCH] * [refac bug #61481] Init disabled for attribute field. --- module/programplan/js/create.ui.js | 1 + module/programplan/ui/create.html.php | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/module/programplan/js/create.ui.js b/module/programplan/js/create.ui.js index d2934c648c..5b58e7aae0 100644 --- a/module/programplan/js/create.ui.js +++ b/module/programplan/js/create.ui.js @@ -288,6 +288,7 @@ window.handleRenderRow = function($row, index, data) let disabled = false; if(preAttribute && preAttribute != 'mix') disabled = true; if(data && data.attribute != 'mix') disabled = true; + if($attributePicker.options.defaultValue == "mix") disabled = false; if(disabled) $attributePicker.render({disabled: disabled}); if(preAttribute) $attributePicker.$.setValue(preAttribute); diff --git a/module/programplan/ui/create.html.php b/module/programplan/ui/create.html.php index eb55f0345f..fde97ddea2 100644 --- a/module/programplan/ui/create.html.php +++ b/module/programplan/ui/create.html.php @@ -87,7 +87,7 @@ $fnGenerateSubPlanManageFields = function() use ($lang, $planID, $project, $exec }; /* Generate form fields. */ -$fnGenerateFields = function() use ($config, $lang, $requiredFields, $showFields, $fields, $PMUsers, $enableOptionalAttr, $programPlan, $planID, $executionType, $project, $syncData) +$fnGenerateFields = function() use ($lang, $requiredFields, $showFields, $fields, $PMUsers, $enableOptionalAttr, $programPlan, $planID, $executionType, $project, $syncData) { $items = array(); @@ -119,10 +119,10 @@ $fnGenerateFields = function() use ($config, $lang, $requiredFields, $showFields if(!str_contains($renderFields, ",$name,")) $field['hidden'] = true; /* Sub-stage. */ - if($name == 'attribute' && !$enableOptionalAttr) + if($name == 'attribute') { - $field['disabled'] = true; - $field['value'] = $programPlan->attribute; + if(!$enableOptionalAttr) $field['disabled'] = true; + if($programPlan) $field['value'] = $programPlan->attribute; } if($name == 'acl' && $planID)