diff --git a/modules/Vtiger/helpers/Util.php b/modules/Vtiger/helpers/Util.php index bda04b35c004b2248d21758fd945123d3aa39e43..ff7856806f9f04a57fd0d54545b3518c95301a07 100644 --- a/modules/Vtiger/helpers/Util.php +++ b/modules/Vtiger/helpers/Util.php @@ -1158,12 +1158,20 @@ class Vtiger_Util_Helper { } break; case 'picklist' : $pickListDetails = $fieldModel->getPicklistValues(); + if($defaultValue){ + $value = $defaultValue; + break; + } foreach ($pickListDetails as $key => $value) { $value = $key; break; } break; case 'multipicklist': $pickListDetails = $fieldModel->getPicklistValues(); + if($defaultValue){ + $value = $defaultValue; + break; + } foreach ($pickListDetails as $key => $value) { $value = $key; break; diff --git a/pkg/vtiger/modules/CustomerPortal/layouts/v7/modules/Settings/CustomerPortal/resources/CustomerPortal.js b/pkg/vtiger/modules/CustomerPortal/layouts/v7/modules/Settings/CustomerPortal/resources/CustomerPortal.js index 03edba10312b3ba7c5d02c121e3e954cbb244bd8..8364d7471535c77eacbab9109b22bc15d57d3620 100644 --- a/pkg/vtiger/modules/CustomerPortal/layouts/v7/modules/Settings/CustomerPortal/resources/CustomerPortal.js +++ b/pkg/vtiger/modules/CustomerPortal/layouts/v7/modules/Settings/CustomerPortal/resources/CustomerPortal.js @@ -141,6 +141,7 @@ Vtiger.Class('Settings_Customer_Portal_Js', {}, { }); var fieldInfo = jQuery('input[name="selectedFields_'+moduleName+'"]').val(); + //Removed mandatory fields checkingRinde if (fieldInfo != 'null') { selectedFields[moduleName] = fieldInfo; }