espocrm-extensions/espocrm-base
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix install date format

Browse Source
This commit is contained in:
Yuri Kuznetsov
2022-04-19 13:35:16 +03:00
parent e2efb62a6a
commit e6f09ed32a
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install/core/Installer.php
+5 -2
View File
@@ -660,10 +660,13 @@ class Installer
$value = (int) $value;
case 'enum':
if (isset($paramDefs['options']) && array_key_exists($value, $paramDefs['options'])) {
if (
isset($paramDefs['options']) && array_key_exists($value, $paramDefs['options']) ||
!isset($paramDefs['options'])
) {
$normalizedParams[$name] = $value;
}
else if (array_key_exists('default', $paramDefs)) {
else if (isset($paramDefs['options']) && array_key_exists('default', $paramDefs)) {
$normalizedParams[$name] = $paramDefs['default'];
$GLOBALS['log']->warning(
install/core/tpl/step4.tpl
+6 -6
View File
@@ -10,11 +10,11 @@
</label>
<div class="field field-dateFormat">
<select name="dateFormat" class="form-control main-element">
{foreach from=$fields['dateFormat'].options item=lbl key=val}
{foreach from=$fields['dateFormat'].options item=val}
{if $val == $fields['dateFormat'].value}
<option selected="selected" value="{$val}">{$lbl}</option>
<option selected="selected" value="{$val}">{$val}</option>
{else}
<option value="{$val}">{$lbl}</option>
<option value="{$val}">{$val}</option>
{/if}
{/foreach}
</select>
@@ -27,11 +27,11 @@
</label>
<div class="field field-timeFormat">
<select name="timeFormat" class="form-control main-element">
{foreach from=$fields['timeFormat'].options item=lbl key=val}
{foreach from=$fields['timeFormat'].options item=val}
{if $val == $fields['timeFormat'].value}
<option selected="selected" value="{$val}">{$lbl}</option>
<option selected="selected" value="{$val}">{$val}</option>
{else}
<option value="{$val}">{$lbl}</option>
<option value="{$val}">{$val}</option>
{/if}
{/foreach}
</select>