Eugeny Galkovskiy / kbenergy_new

Commit 43c0ab0989a103d64c52637a376d329bcb6da4c7

Authored by alex
1 parent ca9f09e2

Валидация формы

Showing 1 changed file with 18 additions and 8 deletions   Show diff stats
Inline Side-by-side
common/models/Feedback.php
  Show/Hide comments   View file @43c0ab0
@@ -118,7 +118,7 @@ class Feedback extends ArtboxFeedback @@ -118,7 +118,7 @@ class Feedback extends ArtboxFeedback
118 { 118 {
119 119
120 return array_merge( 120 return array_merge(
121 - parent::rules(), 121 + #parent::rules(),
122 [ 122 [
123 [ 123 [
124 [ 124 [
@@ -155,7 +155,7 @@ class Feedback extends ArtboxFeedback @@ -155,7 +155,7 @@ class Feedback extends ArtboxFeedback
155 ], 155 ],
156 'required', 156 'required',
157 'message'=>Yii::t('app','requiredField'), 157 'message'=>Yii::t('app','requiredField'),
158 - 'on' => parent::SCENARIO_DEFAULT, 158 + 'on' => self::SCENARIO_DEFAULT,
159 ], 159 ],
160 [ 160 [
161 [ 161 [
@@ -165,14 +165,14 @@ class Feedback extends ArtboxFeedback @@ -165,14 +165,14 @@ class Feedback extends ArtboxFeedback
165 ], 165 ],
166 'required', 166 'required',
167 'message'=>Yii::t('app','requiredField'), 167 'message'=>Yii::t('app','requiredField'),
168 - 'on' => parent::SCENARIO_FEEDBACK, 168 + 'on' => self::SCENARIO_FEEDBACK,
169 ], 169 ],
170 [ 170 [
171 ['phone'], 171 ['phone'],
172 'string', 172 'string',
173 'length'=>[10,17], 173 'length'=>[10,17],
174 'message'=>'Введите данные в форму согласно заданному шаблону: +38(132) 456 78 89', 174 'message'=>'Введите данные в форму согласно заданному шаблону: +38(132) 456 78 89',
175 - 'on'=>[parent::SCENARIO_FEEDBACK,parent::SCENARIO_DEFAULT] 175 + 'on'=>[self::SCENARIO_FEEDBACK,self::SCENARIO_DEFAULT]
176 ], 176 ],
177 //[['phone'],'match','pattern'=>'/\+3?8?\(?([\d]{3}([ .-]?))\)?([ .-]?)([\d]{3}([ .-]?))\2([\d]{2}([ .-]?))([\d]{2}([ .-]?))/','message'=>'некорректный ввод поля. Значение должно иметь вид: +38(123) 456 78 79'], 177 //[['phone'],'match','pattern'=>'/\+3?8?\(?([\d]{3}([ .-]?))\)?([ .-]?)([\d]{3}([ .-]?))\2([\d]{2}([ .-]?))([\d]{2}([ .-]?))/','message'=>'некорректный ввод поля. Значение должно иметь вид: +38(123) 456 78 79'],
178 [ 178 [
@@ -181,27 +181,37 @@ class Feedback extends ArtboxFeedback @@ -181,27 +181,37 @@ class Feedback extends ArtboxFeedback
181 'length'=>[2,25], 181 'length'=>[2,25],
182 'tooShort'=>Yii::t('app','lowName'), 182 'tooShort'=>Yii::t('app','lowName'),
183 'tooLong'=>Yii::t('app','upName'), 183 'tooLong'=>Yii::t('app','upName'),
184 - 'on'=>[parent::SCENARIO_FEEDBACK,parent::SCENARIO_DEFAULT] 184 + 'on'=>[self::SCENARIO_FEEDBACK,self::SCENARIO_DEFAULT]
185 ], 185 ],
186 [ 186 [
187 ['email'], 187 ['email'],
188 'string', 188 'string',
189 'max'=>25, 189 'max'=>25,
190 'tooLong'=>\Yii::t('app','upEmail'), 190 'tooLong'=>\Yii::t('app','upEmail'),
191 - 'on'=>[parent::SCENARIO_FEEDBACK,parent::SCENARIO_DEFAULT] 191 + 'on'=>[self::SCENARIO_FEEDBACK,self::SCENARIO_DEFAULT]
192 ], 192 ],
193 [ 193 [
194 ['name'], 194 ['name'],
195 'match', 195 'match',
196 'pattern' => '/^[а-яА-ЯёЁa-zA-Z\-\s]+$/', 196 'pattern' => '/^[а-яА-ЯёЁa-zA-Z\-\s]+$/',
197 'message'=> \Yii::t('app', 'wrongName'), 197 'message'=> \Yii::t('app', 'wrongName'),
198 - 'on'=>[parent::SCENARIO_FEEDBACK,parent::SCENARIO_DEFAULT] 198 + 'on'=>[self::SCENARIO_FEEDBACK,self::SCENARIO_DEFAULT]
199 ], 199 ],
200 [ 200 [
201 ['email'], 201 ['email'],
202 'email', 202 'email',
203 'message'=>\Yii::t('app','wrongEmail'), 203 'message'=>\Yii::t('app','wrongEmail'),
204 - 'on'=>[parent::SCENARIO_FEEDBACK,parent::SCENARIO_DEFAULT] 204 + 'on'=>[self::SCENARIO_FEEDBACK,self::SCENARIO_DEFAULT]
  205 + ],
  206 + [
  207 + [
  208 + 'status',
  209 + ],
  210 + 'boolean',
  211 + ],
  212 + [
  213 + 'returnUrl',
  214 + 'safe',
205 ], 215 ],
206 216
207 217