Commit cbbc84017fb7e0c01dcf0eca40dd6dc1a919de73

Authored by Alexey Boroda
2 parents b32c8ed8 f0b73ab3

Merge remote-tracking branch 'origin/master'

common/models/speaker/Speaker.php
@@ -85,7 +85,7 @@ @@ -85,7 +85,7 @@
85 */ 85 */
86 public function getLanguage() 86 public function getLanguage()
87 { 87 {
88 - return $this->hasMany(SpeakerLang::className(), [ 'speaker_id' => 'id' ]) 88 + return $this->hasOne(SpeakerLang::className(), [ 'speaker_id' => 'id' ])
89 ->where( 89 ->where(
90 [ 90 [
91 'language_id' => Language::getCurrent()->id, 91 'language_id' => Language::getCurrent()->id,
frontend/views/site/signup.php
@@ -3,8 +3,9 @@ @@ -3,8 +3,9 @@
3 /* @var $this yii\web\View */ 3 /* @var $this yii\web\View */
4 /* @var $form yii\bootstrap\ActiveForm */ 4 /* @var $form yii\bootstrap\ActiveForm */
5 /* @var $model \common\models\Customer */ 5 /* @var $model \common\models\Customer */
6 -  
7 -use yii\helpers\Html; 6 +
  7 + use artbox\core\models\Language;
  8 + use yii\helpers\Html;
8 use yii\web\View; 9 use yii\web\View;
9 use yii\widgets\ActiveForm; 10 use yii\widgets\ActiveForm;
10 use common\models\Customer; 11 use common\models\Customer;
@@ -133,6 +134,11 @@ JS; @@ -133,6 +134,11 @@ JS;
133 <button type="submit">РЕЄСТРАЦІЯ</button> 134 <button type="submit">РЕЄСТРАЦІЯ</button>
134 </div> 135 </div>
135 </div> 136 </div>
  137 + <?php
  138 + echo $form->field($model, 'language_id') ->hiddenInput(['value' => Language::getCurrent()->id])->label(false);
  139 + echo $form->field($model, 'status') ->hiddenInput(['value' => Customer::STATUS_NEW])->label(false);
  140 +
  141 + ?>
136 <?php ActiveForm::end(); ?> 142 <?php ActiveForm::end(); ?>
137 </div> 143 </div>
138 </div> 144 </div>