Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#1038 項目設定画面において「必須」などをクイック変更した場合にデフォルト値が消える問題などの対応 #1039

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

#1038 項目設定画面において「必須」などをクイック変更した場合にデフォルト値が消える問題などの対応 #1039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions layouts/v7/modules/Settings/LayoutEditor/resources/LayoutEditor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -952,10 +952,6 @@ Vtiger.Class('Settings_LayoutEditor_Js', {

data.name = nameAttr;
data.value = defaultValueUi.val();
//チェックボックス項目から、または選択肢(複数)からの変更の場合、デフォルト値に何も表示されないようにする
if(nameAttr == 'fieldDefaultValue' && (typeBeforeChange == 'Boolean' || typeBeforeChange == 'Multipicklist')){
data.value = "";
}
if (currentTarget.val() == "MultiSelectCombo") {
if (data.value != null && data.value.length > 0) {
data.value = data.value.join('|##|');
Expand Down
15 changes: 10 additions & 5 deletions modules/Settings/LayoutEditor/actions/Field.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ public function save(Vtiger_Request $request) {
$summaryField = $request->get('summaryfield',null);
$massEditable = $request->get('masseditable',null);
$headerField = $request->get('headerfield',null);
$fieldDefaultValue = $request->get('fieldDefaultValue', null);

if (!$fieldLabel) {
$fieldInstance->set('label', $fieldLabel);
Expand Down Expand Up @@ -108,12 +109,15 @@ public function save(Vtiger_Request $request) {
$fieldInstance->set('masseditable', $massEditable);
}

if($uitype == 33){
$defaultValue = decode_html(implode(' |##| ', $request->get('fieldDefaultValue')));
}else{
$defaultValue = decode_html($request->get('fieldDefaultValue'));
if(isset($fieldDefaultValue) && $fieldDefaultValue !== null) {
$fieldDataType = $fieldInstance->getFieldDataType();
if($fieldDataType == 'multipicklist'){
$defaultValue = decode_html(implode(' |##| ', $request->get('fieldDefaultValue')));
}else{
$defaultValue = decode_html($request->get('fieldDefaultValue'));
}
$fieldInstance->set('defaultvalue', $defaultValue);
}
$fieldInstance->set('defaultvalue', $defaultValue);
$response = new Vtiger_Response();
try{
$fieldInstance->save();
Expand All @@ -122,6 +126,7 @@ public function save(Vtiger_Request $request) {
$fieldInfo = $fieldInstance->getFieldInfo();
$fieldInfo['id'] = $fieldInstance->getId();

$defaultValue = $fieldInstance->getDefaultFieldValue();
$fieldInfo['fieldDefaultValueRaw'] = $defaultValue;
if (isset($defaultValue)) {
if ($defaultValue && $fieldInfo['type'] == 'date') {
Expand Down