diff --git a/backend/controllers/SettingsController.php b/backend/controllers/SettingsController.php index 5b6ec03..630ddde 100755 --- a/backend/controllers/SettingsController.php +++ b/backend/controllers/SettingsController.php @@ -53,7 +53,7 @@ $mail = Mail::findOne(1); if ($model->load(Yii::$app->request->post()) && Model::loadMultiple($model->getVariationModels(), \Yii::$app->request->post())) { foreach ($model->getVariationModels() as $index => $lang){ - $lang->id = $index+1; + $lang->id = $lang->language_id; } if ($model->save()){ if (!empty($_FILES['logo']['tmp_name'])){ @@ -69,7 +69,6 @@ $mail->save(); return $this->goHome(); } - return $this->render( 'settings', [ diff --git a/backend/views/settings/_main_tab.php b/backend/views/settings/_main_tab.php index dad4f8c..37636d1 100755 --- a/backend/views/settings/_main_tab.php +++ b/backend/views/settings/_main_tab.php @@ -11,6 +11,14 @@ * @var ActiveForm $form * @var string $logo */ + if (!empty($model->logo)) { + $logo[] = ''; + $config = ["url" => "delete-image", "key" => 0, 'extra' => ['image' => $model->logo]]; + + } else { + $logo = []; + $config = []; + } echo '
'; echo $form->field($model, 'name') ->textInput(); @@ -48,7 +56,7 @@ echo $form->field($variationModel, '[' . $index . ']' . 'id') - ->hiddenInput(['value' => $index])->label(false); + ->hiddenInput(['value' => $variationModel->language_id])->label(false); echo '
'; echo '
0 ? 'style="display:none"' : '').'>'; echo $form->field($variationModel, '[' . $index . ']' . 'about') diff --git a/backend/views/settings/settings.php b/backend/views/settings/settings.php index da07fd8..880a558 100755 --- a/backend/views/settings/settings.php +++ b/backend/views/settings/settings.php @@ -19,7 +19,7 @@ $languages = \artbox\core\models\Language::getActive(); ['enctype' => 'multipart/form-data']]); ?>
diff --git a/common/models/Settings.php b/common/models/Settings.php index 09ef7d4..9fee890 100755 --- a/common/models/Settings.php +++ b/common/models/Settings.php @@ -122,15 +122,7 @@ [ 'logo', ], - 'integer', - ], - [ - [ - 'logo', - ], - 'exist', - 'targetClass' => ImageManager::className(), - 'targetAttribute' => 'id', + 'string', ], [ [ -- libgit2 0.21.4