From: Kurund Jalmi Date: Fri, 3 Nov 2023 18:05:59 +0000 (+0000) Subject: admin defaults fixes X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=e49aa9b625cfec28c55e197f6c9bb25572e2d90f;p=civicrm-core.git admin defaults fixes --- diff --git a/ext/afform/admin/ang/afGuiEditor/elements/afGuiField.component.js b/ext/afform/admin/ang/afGuiEditor/elements/afGuiField.component.js index 512f7e48ac..e5ca829c24 100644 --- a/ext/afform/admin/ang/afGuiEditor/elements/afGuiField.component.js +++ b/ext/afform/admin/ang/afGuiEditor/elements/afGuiField.component.js @@ -54,8 +54,12 @@ } setDateOptions(); - if (ctrl.getDefn().input_type == 'Date' && !getSet('default_date_type')) { - ctrl.defaultDateType = getSet('default_date_type', 'fixed'); + if (ctrl.getDefn().input_type == 'Date') { + if (!getSet('default_date_type')) { + ctrl.defaultDateType = getSet('default_date_type', 'fixed'); + } else { + ctrl.defaultDateType = getSet("default_date_type"); + } } };