diff --git a/classes/actions/ActionAdmin.class.php b/classes/actions/ActionAdmin.class.php index 2e12c74..4407508 100644 --- a/classes/actions/ActionAdmin.class.php +++ b/classes/actions/ActionAdmin.class.php @@ -459,13 +459,9 @@ protected function RegisterEvent() * */ /* - * Проверка и восстановление + * Оптимизации */ - $this->AddEventPreg('#^utils$#iu', '#^check_n_repair$#iu', 'Utils::EventCheckAndRepair'); - /* - * Сброс и очистка - */ - $this->AddEventPreg('#^utils$#iu', '#^reset_n_clear$#iu', 'Utils::EventResetAndClear'); + $this->AddEventPreg('#^utils$#iu', '#^optimization$#iu', 'Utils::EventOptimization'); /* * Планировщик cron */ @@ -545,8 +541,7 @@ private function InitMenu() ->AddSection( Engine::GetEntity('PluginAdmin_Ui_MenuSection')->SetCaption('Утилиты')->SetName('utils')->SetUrl('utils') ->AddItem(Engine::GetEntity('PluginAdmin_Ui_MenuItem')->SetCaption('Планировщик Cron')->SetUrl('cron')) - ->AddItem(Engine::GetEntity('PluginAdmin_Ui_MenuItem')->SetCaption('Проверка и восстановление')->SetUrl('check_n_repair')) - ->AddItem(Engine::GetEntity('PluginAdmin_Ui_MenuItem')->SetCaption('Сброс и очистка')->SetUrl('reset_n_clear')) + ->AddItem(Engine::GetEntity('PluginAdmin_Ui_MenuItem')->SetCaption('Оптимизация')->SetUrl('optimization')) ) // /AddSection ; } diff --git a/templates/skin/default/actions/ActionAdmin/property/types/type.checkbox.tpl b/templates/skin/default/actions/ActionAdmin/property/types/type.checkbox.tpl index e69de29..ee9b778 100644 --- a/templates/skin/default/actions/ActionAdmin/property/types/type.checkbox.tpl +++ b/templates/skin/default/actions/ActionAdmin/property/types/type.checkbox.tpl @@ -0,0 +1,12 @@ +

Дополнительные параметры

+ +{include file="{$aTemplatePathPlugin.admin}forms/fields/form.field.text.tpl" + sFieldName = 'param[default_value]' + sFieldClasses = 'width-150' + sFieldValue = $oPropertyParams.default_value + sFieldLabel = 'Значение атрибута value'} + +{include file="{$aTemplatePathPlugin.admin}forms/fields/form.field.checkbox.tpl" + sFieldName = 'param[default]' + bFieldChecked = $oPropertyParams.default + sFieldLabel = 'Дефолтное значение'} \ No newline at end of file diff --git a/templates/skin/default/actions/ActionAdmin/property/types/type.float.tpl b/templates/skin/default/actions/ActionAdmin/property/types/type.float.tpl index 5e6b944..e753c60 100644 --- a/templates/skin/default/actions/ActionAdmin/property/types/type.float.tpl +++ b/templates/skin/default/actions/ActionAdmin/property/types/type.float.tpl @@ -1,3 +1,12 @@ +

Дополнительные параметры

+ +{include file="{$aTemplatePathPlugin.admin}forms/fields/form.field.text.tpl" + sFieldName = 'param[default]' + sFieldClasses = 'width-150' + sFieldValue = $oPropertyParams.default + sFieldLabel = 'Дефолтное значение'} + +

Правила валидации

{include file="{$aTemplatePathPlugin.admin}forms/fields/form.field.checkbox.tpl" diff --git a/templates/skin/default/actions/ActionAdmin/property/types/type.int.tpl b/templates/skin/default/actions/ActionAdmin/property/types/type.int.tpl index 5ffafc0..c5f63b3 100644 --- a/templates/skin/default/actions/ActionAdmin/property/types/type.int.tpl +++ b/templates/skin/default/actions/ActionAdmin/property/types/type.int.tpl @@ -1,3 +1,12 @@ +

Дополнительные параметры

+ +{include file="{$aTemplatePathPlugin.admin}forms/fields/form.field.text.tpl" + sFieldName = 'param[default]' + sFieldClasses = 'width-150' + sFieldValue = $oPropertyParams.default + sFieldLabel = 'Дефолтное значение'} + +

Правила валидации

{include file="{$aTemplatePathPlugin.admin}forms/fields/form.field.checkbox.tpl" diff --git a/templates/skin/default/actions/ActionAdmin/property/types/type.varchar.tpl b/templates/skin/default/actions/ActionAdmin/property/types/type.varchar.tpl index 5e6b944..2352b53 100644 --- a/templates/skin/default/actions/ActionAdmin/property/types/type.varchar.tpl +++ b/templates/skin/default/actions/ActionAdmin/property/types/type.varchar.tpl @@ -1,3 +1,11 @@ +

Дополнительные параметры

+ +{include file="{$aTemplatePathPlugin.admin}forms/fields/form.field.text.tpl" + sFieldName = 'param[default]' + sFieldClasses = 'width-150' + sFieldValue = $oPropertyParams.default + sFieldLabel = 'Дефолтное значение'} +

Правила валидации

{include file="{$aTemplatePathPlugin.admin}forms/fields/form.field.checkbox.tpl" diff --git a/templates/skin/default/property/form.field.checkbox.tpl b/templates/skin/default/property/form.field.checkbox.tpl index e46f6f1..3a56342 100644 --- a/templates/skin/default/property/form.field.checkbox.tpl +++ b/templates/skin/default/property/form.field.checkbox.tpl @@ -2,6 +2,7 @@ {include file="{$aTemplatePathPlugin.admin}forms/fields/form.field.checkbox.tpl" sFieldName = "property[{$oProperty->getId()}]" - bFieldChecked = $oValue->getValueInt() + sFieldValue = $oProperty->getParam('default_value') + bFieldChecked = $oValue->getValueForForm() sFieldNote = $oProperty->getDescription() sFieldLabel = $oProperty->getTitle()} \ No newline at end of file diff --git a/templates/skin/default/property/form.field.float.tpl b/templates/skin/default/property/form.field.float.tpl index b208068..f5ea07e 100644 --- a/templates/skin/default/property/form.field.float.tpl +++ b/templates/skin/default/property/form.field.float.tpl @@ -2,7 +2,7 @@ {include file="{$aTemplatePathPlugin.admin}forms/fields/form.field.text.tpl" sFieldName = "property[{$oProperty->getId()}]" - sFieldValue = $oValue->getValueFloat() + sFieldValue = $oValue->getValueForForm() sFieldClasses = 'width-150' sFieldNote = $oProperty->getDescription() sFieldLabel = $oProperty->getTitle()} \ No newline at end of file diff --git a/templates/skin/default/property/form.field.int.tpl b/templates/skin/default/property/form.field.int.tpl index 13ef5b5..f5ea07e 100644 --- a/templates/skin/default/property/form.field.int.tpl +++ b/templates/skin/default/property/form.field.int.tpl @@ -2,7 +2,7 @@ {include file="{$aTemplatePathPlugin.admin}forms/fields/form.field.text.tpl" sFieldName = "property[{$oProperty->getId()}]" - sFieldValue = $oValue->getValueInt() + sFieldValue = $oValue->getValueForForm() sFieldClasses = 'width-150' sFieldNote = $oProperty->getDescription() sFieldLabel = $oProperty->getTitle()} \ No newline at end of file diff --git a/templates/skin/default/property/form.field.varchar.tpl b/templates/skin/default/property/form.field.varchar.tpl index 7d5a3c2..3aba9fe 100644 --- a/templates/skin/default/property/form.field.varchar.tpl +++ b/templates/skin/default/property/form.field.varchar.tpl @@ -2,6 +2,6 @@ {include file="{$aTemplatePathPlugin.admin}forms/fields/form.field.text.tpl" sFieldName = "property[{$oProperty->getId()}]" - sFieldValue = $oValue->getValueVarchar() + sFieldValue = $oValue->getValueForForm() sFieldNote = $oProperty->getDescription() sFieldLabel = $oProperty->getTitle()} \ No newline at end of file