ifhub/ifhub.club
1
0
Fork 0
mirror of https://github.com/Oreolek/ifhub.club.git synced 2024-06-16 23:00:51 +03:00
Code Issues Releases Wiki Activity

fix полей

Browse source
This commit is contained in:
Mzhelskiy Maxim 2014-01-13 13:50:04 +07:00
parent 32d3f990be
commit a3465ce63a
19 changed files with 47 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
application/classes/modules/property/entity/Property.entity.class.php
View file

@ -25,10 +25,12 @@ class ModuleProperty_EntityProperty extends EntityORM {
array('type','check_type','on'=>array('create')),
array('code','regexp','allowEmpty'=>false,'pattern'=>'#^[a-z0-9\_]+$#i','on'=>array('create','update')),
array('title','string','allowEmpty'=>false,'min'=>1,'max'=>250,'on'=>array('create','update')),
array('description','string','allowEmpty'=>true,'max'=>500,'on'=>array('update')),
array('sort','number','allowEmpty'=>false,'integerOnly'=>true,'min'=>0,'on'=>array('update')),
array('validate_rules_raw','check_validate_rules_raw','on'=>array('create','update')),
array('params_raw','check_params_raw','on'=>array('update')),
array('title','check_title','on'=>array('create','update')),
array('description','check_description','on'=>array('update')),
);
protected $aRelations=array(
@ -47,6 +49,11 @@ class ModuleProperty_EntityProperty extends EntityORM {
return true;
}
public function ValidateCheckDescription() {
$this->setDescription(htmlspecialchars($this->getDescription()));
return true;
}
public function ValidateCheckValidateRulesRaw() {
$aRulesRaw=$this->getValidateRulesRaw();
/**

2
application/frontend/skin/developer/forms/fields/form.field.base.tpl
View file

@ -23,7 +23,7 @@
<div class="form-field {if $bFieldInline}form-field-inline{/if} {block name='field_classes'}{/block} {if $bFieldNoMargin}m-0{/if}">
{if $sFieldLabel && ! $bFieldNoLabel}
<label for="{$sFieldName}" class="form-field-label">{$sFieldLabel}:</label>
<label for="{if $sFieldId}{$sFieldId}{else}{$sFieldName}{/if}" class="form-field-label">{$sFieldLabel}:</label>
{/if}
<div class="form-field-holder">

14
application/frontend/skin/developer/forms/fields/form.field.button.tpl
View file

@ -2,12 +2,12 @@
* Кнопка
*}
<button type="{if $sFieldType}{$sFieldType}{else}submit{/if}"
id="{if $sFieldId}{$sFieldId}{else}{$sFieldName}{/if}"
name="{$sFieldName}"
value="{if isset($sFieldValue)}{$sFieldValue}{elseif isset($_aRequest[$sFieldName])}{$_aRequest[$sFieldName]}{/if}"
class="button {if $sFieldStyle}button-{$sFieldStyle}{/if} {$sFieldClasses}"
{if $bFieldIsDisabled}disabled{/if}>
{if $sFieldIcon}<i class="{$sFieldIcon}"></i>{/if}
<button type="{if $sFieldType}{$sFieldType}{else}submit{/if}"
id="{if $sFieldId}{$sFieldId}{else}{$sFieldName}{/if}"
name="{$sFieldName}"
value="{if isset($sFieldValue)}{$sFieldValue}{elseif isset($_aRequest[$sFieldName])}{$_aRequest[$sFieldName]}{/if}"
class="button {if $sFieldStyle}button-{$sFieldStyle}{/if} {$sFieldClasses}"
{if $bFieldIsDisabled}disabled{/if}>
{if $sFieldIcon}<i class="{$sFieldIcon}"></i>{/if}
{$sFieldText}
</button>

4
application/frontend/skin/developer/forms/fields/form.field.captcha.tpl
View file

@ -14,9 +14,9 @@
<span style="background-image: url({cfg name='path.framework.libs_vendor.web'}/kcaptcha/index.php?{$_sPhpSessionName}={$_sPhpSessionId}&n={rand()});" class="form-auth-captcha js-form-auth-captcha"></span>
{/if}
<input type="text"
id="{$sFieldName}"
id="{if $sFieldId}{$sFieldId}{else}{$sFieldName}{/if}"
name="{$sFieldName}"
value="{if $sFieldValue}{$sFieldValue}{else}{if $_aRequest[$sFieldName]}{$_aRequest[$sFieldName]}{/if}{/if}"
value="{if $sFieldValue}{$sFieldValue}{elseif $_aRequest[$sFieldName]}{$_aRequest[$sFieldName]}{/if}"
class="{if $sFieldClasses}{$sFieldClasses}{else}width-150{/if} js-input-{$sFieldName}"
data-length="3"
data-required="true"

2
application/frontend/skin/developer/forms/fields/form.field.checkbox.tpl
View file

@ -11,7 +11,7 @@
{block name='field_holder' prepend}
{if $sFieldLabel}<label>{/if}
<input type="checkbox"
id="{$sFieldName}"
id="{if $sFieldId}{$sFieldId}{else}{$sFieldName}{/if}"
name="{$sFieldName}"
value="{if $sFieldValue}{$sFieldValue}{else}1{/if}"
{if $bFieldChecked}checked{else}{if $_aRequest[$sFieldName] == 1}checked{/if}{/if} />

2
application/frontend/skin/developer/forms/fields/form.field.file.image.tpl
View file

@ -22,7 +22,7 @@
</span>
{/strip}
<input type="file" name="{$sFieldName}" id="{$sFieldName}" class="js-ajax-image-upload-file">
<input type="file" name="{$sFieldName}" id="{if $sFieldId}{$sFieldId}{else}{$sFieldName}{/if}" class="js-ajax-image-upload-file">
</label>
<a href="#" class="js-ajax-image-upload-remove link-dotted" {if ! $bFieldIsImage}style="display: none;"{/if}>

2
application/frontend/skin/developer/forms/fields/form.field.file.tpl
View file

@ -6,7 +6,7 @@
{block name='field_holder' prepend}
<input type="file"
id="{$sFieldName}"
id="{if $sFieldId}{$sFieldId}{else}{$sFieldName}{/if}"
name="{$sFieldName}"
class="{if $sFieldClasses}{$sFieldClasses}{/if}"
{if $bFieldIsDisabled}disabled{/if} />

4
application/frontend/skin/developer/forms/fields/form.field.hidden.tpl
View file

@ -3,6 +3,6 @@
*}
<input type="hidden"
id="{$sFieldName}"
id="{if $sFieldId}{$sFieldId}{else}{$sFieldName}{/if}"
name="{$sFieldName}"
value="{if $sFieldValue}{$sFieldValue|escape:'html'}{else}{if $_aRequest[$sFieldName]}{$_aRequest[$sFieldName]}{/if}{/if}" />
value="{if $sFieldValue}{$sFieldValue}{elseif $_aRequest[$sFieldName]}{$_aRequest[$sFieldName]}{/if}" />

2
application/frontend/skin/developer/forms/fields/form.field.select.tpl
View file

@ -5,7 +5,7 @@
{extends file='forms/fields/form.field.base.tpl'}
{block name='field_holder' prepend}
<select id="{$sFieldName}" name="{$sFieldName}" class="{if $sFieldClasses}{$sFieldClasses}{else}width-full{/if}" {if $bFieldIsDisabled}disabled{/if}>
<select id="{if $sFieldId}{$sFieldId}{else}{$sFieldName}{/if}" name="{$sFieldName}" class="{if $sFieldClasses}{$sFieldClasses}{else}width-full{/if}" {if $bFieldIsDisabled}disabled{/if}>
{foreach $aFieldItems as $aItem}
<option value="{$aItem.value}" {if $aItem.value == $sFieldSelectedValue}selected{/if}>{$aItem.text}</option>
{/foreach}

4
application/frontend/skin/developer/forms/fields/form.field.text.tpl
View file

@ -6,9 +6,9 @@
{block name='field_holder' prepend}
<input type="{if $sFieldType}{$sFieldType}{else}text{/if}"
id="{$sFieldName}"
id="{if $sFieldId}{$sFieldId}{else}{$sFieldName}{/if}"
name="{$sFieldName}"
value="{if isset($sFieldValue)}{$sFieldValue|escape:'html'}{else}{if isset($_aRequest[$sFieldName])}{$_aRequest[$sFieldName]}{/if}{/if}"
value="{if isset($sFieldValue)}{$sFieldValue}{elseif isset($_aRequest[$sFieldName])}{$_aRequest[$sFieldName]}{/if}"
class="{if $sFieldClasses}{$sFieldClasses}{else}width-full{/if} js-input-{$sFieldName}"
{if $sFieldPlaceholder}placeholder="{$sFieldPlaceholder}"{/if}
{foreach $aFieldRules as $sRule}data-{$sRule} {/foreach}

18
application/frontend/skin/developer/forms/fields/form.field.textarea.tpl
View file

@ -1,11 +1,15 @@
{extends file='forms/fields/form.field.base.tpl'}
{block name='field_holder' prepend}
<textarea id="{$sFieldName}"
name="{$sFieldName}"
class="{if $sFieldClasses}{$sFieldClasses}{else}width-full{/if}"
rows="{$iFieldRows}"
{if $sFieldPlaceholder}placeholder="{$sFieldPlaceholder}"{/if}
{if $bFieldIsDisabled}disabled{/if}
{foreach $aFieldRules as $sRule}data-{$sRule} {/foreach}>{if $sFieldValue}{$sFieldValue|escape:'html'}{else}{if $_aRequest[$sFieldName]}{$_aRequest[$sFieldName]}{/if}{/if}</textarea>
{strip}
<textarea id="{if $sFieldId}{$sFieldId}{else}{$sFieldName}{/if}"
name="{$sFieldName}"
class="{if $sFieldClasses}{$sFieldClasses}{else}width-full{/if}"
rows="{$iFieldRows}"
{if $sFieldPlaceholder}placeholder="{$sFieldPlaceholder}"{/if}
{if $bFieldIsDisabled}disabled{/if}
{foreach $aFieldRules as $sRule}data-{$sRule} {/foreach}>
{if $sFieldValue}{$sFieldValue}{else}{if $_aRequest[$sFieldName]}{$_aRequest[$sFieldName]}{/if}{/if}
</textarea>
{/strip}
{/block}

1
application/frontend/skin/developer/forms/property/form.field.checkbox.tpl
View file

@ -3,4 +3,5 @@
{include file="forms/fields/form.field.checkbox.tpl"
sFieldName = "property[{$oProperty->getId()}]"
bFieldChecked = $oValue->getValueInt()
sFieldNote = $oProperty->getDescription()
sFieldLabel = $oProperty->getTitle()}

1
application/frontend/skin/developer/forms/property/form.field.float.tpl
View file

@ -4,4 +4,5 @@
sFieldName = "property[{$oProperty->getId()}]"
sFieldValue = $oValue->getValueFloat()
sFieldClasses = 'width-150'
sFieldNote = $oProperty->getDescription()
sFieldLabel = $oProperty->getTitle()}

1
application/frontend/skin/developer/forms/property/form.field.int.tpl
View file

@ -4,4 +4,5 @@
sFieldName = "property[{$oProperty->getId()}]"
sFieldValue = $oValue->getValueInt()
sFieldClasses = 'width-150'
sFieldNote = $oProperty->getDescription()
sFieldLabel = $oProperty->getTitle()}

1
application/frontend/skin/developer/forms/property/form.field.tags.tpl
View file

@ -4,6 +4,7 @@
sFieldName = "property[{$oProperty->getId()}]"
sFieldValue = $oValue->getValueVarchar()
sFieldId = "property-value-tags-{$oProperty->getId()}"
sFieldNote = $oProperty->getDescription()
sFieldLabel = $oProperty->getTitle()}
<script>

1
application/frontend/skin/developer/forms/property/form.field.text.tpl
View file

@ -4,4 +4,5 @@
sFieldName = "property[{$oProperty->getId()}]"
sFieldValue = $oValue->getValueForForm()
iFieldRows = 10
sFieldNote = $oProperty->getDescription()
sFieldLabel = $oProperty->getTitle()}

1
application/frontend/skin/developer/forms/property/form.field.varchar.tpl
View file

@ -3,4 +3,5 @@
{include file="forms/fields/form.field.text.tpl"
sFieldName = "property[{$oProperty->getId()}]"
sFieldValue = $oValue->getValueVarchar()
sFieldNote = $oProperty->getDescription()
sFieldLabel = $oProperty->getTitle()}

1
application/frontend/skin/developer/forms/property/form.field.video_link.tpl
View file

@ -4,6 +4,7 @@
sFieldName = "property[{$oProperty->getId()}]"
sFieldValue = $oValue->getValueVarchar()
sFieldClasses = 'width-300'
sFieldNote = $oProperty->getDescription()
sFieldLabel = $oProperty->getTitle()}
{include file="modals/modal.property_type_video.tpl" oValue=$oValue}

5
install/patch.sql
View file

@ -221,4 +221,7 @@ INSERT INTO `prefix_topic_type` (`id`, `name`, `name_many`, `code`, `allow_remov
-- 12.01.2014
ALTER TABLE `prefix_topic_type` ADD `sort` INT NOT NULL DEFAULT '0' AFTER `state` ,
ADD INDEX ( `sort` ) ;
ADD INDEX ( `sort` ) ;
-- 12.01.2014
ALTER TABLE `prefix_property` ADD `description` VARCHAR( 500 ) NOT NULL AFTER `title` ;