From 12aab8dd1a937177c72ddc7c6d81ef4664fbe10a Mon Sep 17 00:00:00 2001 From: Egorka Date: Wed, 22 Aug 2018 22:07:18 +0300 Subject: [PATCH] Backend language select in profile --- backend/controllers/SettingsController.php | 150 --------------------- backend/controllers/UserController.php | 5 +- backend/controllers/settings/ListController.php | 150 +++++++++++++++++++++ backend/messages/ru/main.php | 4 +- backend/messages/ru/user.php | 1 + backend/views/layouts/header.php | 17 +++ backend/views/layouts/left.php | 11 +- backend/views/settings/_form.php | 43 ------ backend/views/settings/create.php | 24 ---- backend/views/settings/index.php | 70 ---------- backend/views/settings/list/_form.php | 43 ++++++ backend/views/settings/list/create.php | 24 ++++ backend/views/settings/list/index.php | 70 ++++++++++ backend/views/settings/list/update.php | 29 ++++ backend/views/settings/list/view.php | 60 +++++++++ backend/views/settings/update.php | 29 ---- backend/views/settings/view.php | 60 --------- backend/views/user/profile.php | 4 + common/bootstrap/SetUp.php | 5 + .../m180822_182716_add_users_languages_fields.php | 27 ++++ core/entities/user/User.php | 5 +- core/forms/user/ProfileEditForm.php | 5 +- core/services/user/ProfileService.php | 2 +- 23 files changed, 450 insertions(+), 388 deletions(-) delete mode 100644 backend/controllers/SettingsController.php create mode 100644 backend/controllers/settings/ListController.php delete mode 100644 backend/views/settings/_form.php delete mode 100644 backend/views/settings/create.php delete mode 100644 backend/views/settings/index.php create mode 100644 backend/views/settings/list/_form.php create mode 100644 backend/views/settings/list/create.php create mode 100644 backend/views/settings/list/index.php create mode 100644 backend/views/settings/list/update.php create mode 100644 backend/views/settings/list/view.php delete mode 100644 backend/views/settings/update.php delete mode 100644 backend/views/settings/view.php create mode 100644 console/migrations/m180822_182716_add_users_languages_fields.php diff --git a/backend/controllers/SettingsController.php b/backend/controllers/SettingsController.php deleted file mode 100644 index 25b7b2b..0000000 --- a/backend/controllers/SettingsController.php +++ /dev/null @@ -1,150 +0,0 @@ -service = $service; - } - - public function behaviors() - { - return [ - 'verbs' => [ - 'class' => VerbFilter::className(), - 'actions' => [ - 'delete' => ['POST'], - ], - ], - 'access' => [ - 'class' => AccessControl::className(), - 'rules' => [ - [ - 'actions' => ['create','view','index', 'update', 'delete', 'toggle'], - 'allow' => true, - 'roles' => ['SettingsManagement'], - ], - [ // all the action are accessible to admin - 'allow' => true, - 'roles' => ['admin'], - ], - ], - ], - ]; - } - - public function actions() - { - return [ - 'toggle' => [ - 'class' => ToggleAction::className(), - 'modelClass' => Settings::class, - //'setFlash' => true, - ] - ]; - } - - public function actionIndex() - { - $searchModel = new SettingsSearch(); - $dataProvider = $searchModel->search(Yii::$app->request->queryParams); - return $this->render( - 'index', - [ - 'searchModel' => $searchModel, - 'dataProvider' => $dataProvider, - ] - ); - } - - public function actionView($id) - { - return $this->render( - 'view', - [ - 'model' => $this->findModel($id), - ] - ); - } - - public function actionCreate() - { - $form = new SettingsForm(); - if ($form->load(Yii::$app->request->post()) && $form->validate()) { - try { - $settings = $this->service->create($form); - return $this->redirect(['view', 'id' => $settings->id]); - } catch (\DomainException $e) { - Yii::$app->errorHandler->logException($e); - Yii::$app->session->setFlash('error', $e->getMessage()); - } - } - else { - $form->active = 1; - } - return $this->render( - 'create', - [ - 'model' => $form, - ] - ); - } - - public function actionUpdate($id) - { - $settings = $this->findModel($id); - - $form = new SettingsForm($settings); - if ($form->load(Yii::$app->request->post()) && $form->validate()) { - try { - $this->service->edit($settings->id, $form); - return $this->redirect(['view', 'id' => $settings->id]); - } catch (\DomainException $e) { - Yii::$app->errorHandler->logException($e); - Yii::$app->session->setFlash('error', $e->getMessage()); - } - } - return $this->render( - 'update', - [ - 'model' => $form, - 'settings' => $settings, - ] - ); - } - - public function actionDelete($id) - { - $this->service->remove($id); - return $this->redirect(['index']); - } - - protected function findModel($id) - { - if (($model = Settings::findOne($id)) !== null) { - return $model; - } else { - throw new NotFoundHttpException('The requested page does not exist.'); - } - } -} \ No newline at end of file diff --git a/backend/controllers/UserController.php b/backend/controllers/UserController.php index b47b564..cc4e60b 100644 --- a/backend/controllers/UserController.php +++ b/backend/controllers/UserController.php @@ -37,7 +37,7 @@ class UserController extends Controller { return [ 'access' => [ - 'class' => AccessControl::className(), + 'class' => AccessControl::class, 'rules' => [ [ 'actions' => ['create','view','index', 'update', 'delete'], @@ -56,7 +56,7 @@ class UserController extends Controller ], ], 'verbs' => [ - 'class' => VerbFilter::className(), + 'class' => VerbFilter::class, 'actions' => [ 'delete' => ['POST'], ], @@ -162,6 +162,7 @@ class UserController extends Controller $form->user_pic = UploadedFile::getInstance($form, 'user_pic'); $this->profile_service->edit(Yii::$app->user->id, $form); Yii::$app->session->setFlash('success', Yii::t('user', 'Profile is saved.')); + return $this->redirect(['/user/profile']); } catch (\DomainException $e) { Yii::$app->errorHandler->logException($e); Yii::$app->session->setFlash('error', $e->getMessage()); diff --git a/backend/controllers/settings/ListController.php b/backend/controllers/settings/ListController.php new file mode 100644 index 0000000..da83f0f --- /dev/null +++ b/backend/controllers/settings/ListController.php @@ -0,0 +1,150 @@ +service = $service; + } + + public function behaviors() + { + return [ + 'verbs' => [ + 'class' => VerbFilter::class, + 'actions' => [ + 'delete' => ['POST'], + ], + ], + 'access' => [ + 'class' => AccessControl::class, + 'rules' => [ + [ + 'actions' => ['create','view','index', 'update', 'delete', 'toggle'], + 'allow' => true, + 'roles' => ['SettingsManagement'], + ], + [ // all the action are accessible to admin + 'allow' => true, + 'roles' => ['admin'], + ], + ], + ], + ]; + } + + public function actions() + { + return [ + 'toggle' => [ + 'class' => ToggleAction::class, + 'modelClass' => Settings::class, + //'setFlash' => true, + ] + ]; + } + + public function actionIndex() + { + $searchModel = new SettingsSearch(); + $dataProvider = $searchModel->search(Yii::$app->request->queryParams); + return $this->render( + 'index', + [ + 'searchModel' => $searchModel, + 'dataProvider' => $dataProvider, + ] + ); + } + + public function actionView($id) + { + return $this->render( + 'view', + [ + 'model' => $this->findModel($id), + ] + ); + } + + public function actionCreate() + { + $form = new SettingsForm(); + if ($form->load(Yii::$app->request->post()) && $form->validate()) { + try { + $settings = $this->service->create($form); + return $this->redirect(['view', 'id' => $settings->id]); + } catch (\DomainException $e) { + Yii::$app->errorHandler->logException($e); + Yii::$app->session->setFlash('error', $e->getMessage()); + } + } + else { + $form->active = 1; + } + return $this->render( + 'create', + [ + 'model' => $form, + ] + ); + } + + public function actionUpdate($id) + { + $settings = $this->findModel($id); + + $form = new SettingsForm($settings); + if ($form->load(Yii::$app->request->post()) && $form->validate()) { + try { + $this->service->edit($settings->id, $form); + return $this->redirect(['view', 'id' => $settings->id]); + } catch (\DomainException $e) { + Yii::$app->errorHandler->logException($e); + Yii::$app->session->setFlash('error', $e->getMessage()); + } + } + return $this->render( + 'update', + [ + 'model' => $form, + 'settings' => $settings, + ] + ); + } + + public function actionDelete($id) + { + $this->service->remove($id); + return $this->redirect(['index']); + } + + protected function findModel($id) + { + if (($model = Settings::findOne($id)) !== null) { + return $model; + } else { + throw new NotFoundHttpException('The requested page does not exist.'); + } + } +} \ No newline at end of file diff --git a/backend/messages/ru/main.php b/backend/messages/ru/main.php index 70d7c09..d0ef37f 100644 --- a/backend/messages/ru/main.php +++ b/backend/messages/ru/main.php @@ -35,5 +35,7 @@ return [ 'Modules' => 'Модули', 'Find modules' => 'Поиск модулей', 'Enable' => 'Включить', - 'Disable' => 'Отключить' + 'Disable' => 'Отключить', + 'Settings List' => 'Все настройки', + 'Create Setting' => 'Новый параметр', ]; \ No newline at end of file diff --git a/backend/messages/ru/user.php b/backend/messages/ru/user.php index 7c9a5ed..6e19f35 100644 --- a/backend/messages/ru/user.php +++ b/backend/messages/ru/user.php @@ -38,4 +38,5 @@ return [ 'User Picture' => 'Аватар', 'Registered: {date}' => 'Дата регистрации: {date}', 'Remember Me' => 'Запомнить меня', + 'Dashboard Language' => 'Язык панели управления', ]; \ No newline at end of file diff --git a/backend/views/layouts/header.php b/backend/views/layouts/header.php index 58d56d7..10ab7af 100644 --- a/backend/views/layouts/header.php +++ b/backend/views/layouts/header.php @@ -193,6 +193,23 @@ use core\components\avatar_generator\AvatarGenerator; --> + +
  • + + + Русский + + +
    • +
  • <?= Yii::$app->user->identity->user->username ?> diff --git a/backend/views/layouts/left.php b/backend/views/layouts/left.php index c21b92f..0981cd5 100644 --- a/backend/views/layouts/left.php +++ b/backend/views/layouts/left.php @@ -114,12 +114,11 @@ $model = new SearchForm(); 'visible' => \Yii::$app->user->can('admin') || \Yii::$app->user->can('SliderManagement'), ], - [ - 'label' => Yii::t('main', 'Settings'), - 'icon' => 'cog', 'url' => ['/settings/index'], - 'active' => $this->context->id == 'settings', - 'visible' => \Yii::$app->user->can('admin') || \Yii::$app->user->can('SettingsManagement'), - ], + ['label' => Yii::t('main', 'Settings'), 'icon' => 'cog', 'items' => [ + ['label' => Yii::t('main', 'Settings List'), 'icon' => 'caret-right', 'url' => ['/settings/list/index'], 'active' => \Yii::$app->controller->getUniqueId() == 'settings/list'], + //['label' => Yii::t('main', 'Find modules'), 'icon' => 'caret-right', 'url' => ['/module/search'], 'active' => \Yii::$app->controller->action->getUniqueId() == 'module/search'], + ], 'visible' => \Yii::$app->user->can('admin') || \Yii::$app->user->can('SettingsManagement')], + ], Yii::$app->params['adminMenu']), ] ) ?> diff --git a/backend/views/settings/_form.php b/backend/views/settings/_form.php deleted file mode 100644 index 4c225a5..0000000 --- a/backend/views/settings/_form.php +++ /dev/null @@ -1,43 +0,0 @@ - - -
    - -
    -
    - - - - field($model, 'section')->textInput(['maxlength' => 255]) ?> - - field($model, 'key')->textInput(['maxlength' => 255]) ?> - - field($model, 'value')->textarea(['rows' => 6]) ?> - - field($model, 'active')->checkbox(['value' => 1]) ?> - - field($model, 'type')->dropDownList( - $model->getTypes() - )->hint(Yii::t('main', 'Change at your own risk')) ?> - -
    - 'btn btn-success']) ?> -
    - - - -
    -
    - -
    diff --git a/backend/views/settings/create.php b/backend/views/settings/create.php deleted file mode 100644 index c53fc7f..0000000 --- a/backend/views/settings/create.php +++ /dev/null @@ -1,24 +0,0 @@ -title = Yii::t('main','Create Setting'); -$this->params['breadcrumbs'][] = ['label' => Yii::t('main', 'Settings'), 'url' => ['index']]; -$this->params['breadcrumbs'][] = $this->title; -?> -
    - - render( - '_form', - [ - 'model' => $model, - ] - ) ?> - -
    \ No newline at end of file diff --git a/backend/views/settings/index.php b/backend/views/settings/index.php deleted file mode 100644 index a44f2f3..0000000 --- a/backend/views/settings/index.php +++ /dev/null @@ -1,70 +0,0 @@ -title = Yii::t('main', 'Settings'); -$this->params['breadcrumbs'][] = $this->title; -?> -
    - -

    - 'btn btn-success'] - ) ?> -

    - -
    -
    - - - $dataProvider, - 'filterModel' => $searchModel, - 'columns' => [ - //'id', - //'type', - [ - 'attribute' => 'section', - 'filter' => ArrayHelper::map( - Settings::find()->select('section')->distinct()->where(['<>', 'section', ''])->all(), - 'section', - 'section' - ), - ], - 'key', - 'value:ntext', - [ - 'class' => ToggleColumn::class, - 'attribute' => 'active', - 'filter' => [1 => Yii::t('yii', 'Yes'), 0 => Yii::t('yii', 'No')], - 'options' => ['style' => 'width: 100px;'], - 'contentOptions' => ['class' => 'text-center'], - ], - [ - 'class' => 'yii\grid\ActionColumn', - 'options' => ['style' => 'width: 100px;'], - 'contentOptions' => ['class' => 'text-center'], - ], - ], - ] - ); ?> - -
    -
    -
    \ No newline at end of file diff --git a/backend/views/settings/list/_form.php b/backend/views/settings/list/_form.php new file mode 100644 index 0000000..4c225a5 --- /dev/null +++ b/backend/views/settings/list/_form.php @@ -0,0 +1,43 @@ + + +
    + +
    +
    + + + + field($model, 'section')->textInput(['maxlength' => 255]) ?> + + field($model, 'key')->textInput(['maxlength' => 255]) ?> + + field($model, 'value')->textarea(['rows' => 6]) ?> + + field($model, 'active')->checkbox(['value' => 1]) ?> + + field($model, 'type')->dropDownList( + $model->getTypes() + )->hint(Yii::t('main', 'Change at your own risk')) ?> + +
    + 'btn btn-success']) ?> +
    + + + +
    +
    + +
    diff --git a/backend/views/settings/list/create.php b/backend/views/settings/list/create.php new file mode 100644 index 0000000..c53fc7f --- /dev/null +++ b/backend/views/settings/list/create.php @@ -0,0 +1,24 @@ +title = Yii::t('main','Create Setting'); +$this->params['breadcrumbs'][] = ['label' => Yii::t('main', 'Settings'), 'url' => ['index']]; +$this->params['breadcrumbs'][] = $this->title; +?> +
    + + render( + '_form', + [ + 'model' => $model, + ] + ) ?> + +
    \ No newline at end of file diff --git a/backend/views/settings/list/index.php b/backend/views/settings/list/index.php new file mode 100644 index 0000000..a44f2f3 --- /dev/null +++ b/backend/views/settings/list/index.php @@ -0,0 +1,70 @@ +title = Yii::t('main', 'Settings'); +$this->params['breadcrumbs'][] = $this->title; +?> +
    + +

    + 'btn btn-success'] + ) ?> +

    + +
    +
    + + + $dataProvider, + 'filterModel' => $searchModel, + 'columns' => [ + //'id', + //'type', + [ + 'attribute' => 'section', + 'filter' => ArrayHelper::map( + Settings::find()->select('section')->distinct()->where(['<>', 'section', ''])->all(), + 'section', + 'section' + ), + ], + 'key', + 'value:ntext', + [ + 'class' => ToggleColumn::class, + 'attribute' => 'active', + 'filter' => [1 => Yii::t('yii', 'Yes'), 0 => Yii::t('yii', 'No')], + 'options' => ['style' => 'width: 100px;'], + 'contentOptions' => ['class' => 'text-center'], + ], + [ + 'class' => 'yii\grid\ActionColumn', + 'options' => ['style' => 'width: 100px;'], + 'contentOptions' => ['class' => 'text-center'], + ], + ], + ] + ); ?> + +
    +
    +
    \ No newline at end of file diff --git a/backend/views/settings/list/update.php b/backend/views/settings/list/update.php new file mode 100644 index 0000000..dc6f003 --- /dev/null +++ b/backend/views/settings/list/update.php @@ -0,0 +1,29 @@ +title = Yii::t( + 'main', + 'Updating Setting') . ' ' . $model->section. '.' . $model->key; +$this->params['breadcrumbs'][] = ['label' => Yii::t('main', 'Settings'), 'url' => ['index']]; +$this->params['breadcrumbs'][] = ['label' => $model->section. '.' . $model->key, 'url' => ['view', 'id' => $settings->id]]; +$this->params['breadcrumbs'][] = Yii::t('main', 'Editing'); +?> +
    + + render( + '_form', + [ + 'model' => $model, + ] + ) ?> + +
    \ No newline at end of file diff --git a/backend/views/settings/list/view.php b/backend/views/settings/list/view.php new file mode 100644 index 0000000..a89a15f --- /dev/null +++ b/backend/views/settings/list/view.php @@ -0,0 +1,60 @@ +title = $model->section. '.' . $model->key; +$this->params['breadcrumbs'][] = ['label' => Yii::t('main', 'Settings'), 'url' => ['index']]; +$this->params['breadcrumbs'][] = $this->title; +?> +
    + +

    + 'btn btn-default']) ?> + $model->id], ['class' => 'btn btn-primary']) ?> + $model->id], + [ + 'class' => 'btn btn-danger', + 'data' => [ + 'confirm' => Yii::t('buttons', 'Are you sure you want to delete this item?'), + 'method' => 'post', + ], + ] + ) ?> +

    + +
    +
    + $model, + 'attributes' => [ + 'id', + 'type', + 'section', + 'active:boolean', + 'key', + 'value:ntext', + [ + 'attribute' => 'created_at', + 'format' => ['datetime', 'php:d.m.Y H:i'], + ], + [ + 'attribute' => 'updated_at', + 'format' => ['datetime', 'php:d.m.Y H:i'], + ], + ], + ] + ) ?> +
    +
    +
    \ No newline at end of file diff --git a/backend/views/settings/update.php b/backend/views/settings/update.php deleted file mode 100644 index dc6f003..0000000 --- a/backend/views/settings/update.php +++ /dev/null @@ -1,29 +0,0 @@ -title = Yii::t( - 'main', - 'Updating Setting') . ' ' . $model->section. '.' . $model->key; -$this->params['breadcrumbs'][] = ['label' => Yii::t('main', 'Settings'), 'url' => ['index']]; -$this->params['breadcrumbs'][] = ['label' => $model->section. '.' . $model->key, 'url' => ['view', 'id' => $settings->id]]; -$this->params['breadcrumbs'][] = Yii::t('main', 'Editing'); -?> -
    - - render( - '_form', - [ - 'model' => $model, - ] - ) ?> - -
    \ No newline at end of file diff --git a/backend/views/settings/view.php b/backend/views/settings/view.php deleted file mode 100644 index a89a15f..0000000 --- a/backend/views/settings/view.php +++ /dev/null @@ -1,60 +0,0 @@ -title = $model->section. '.' . $model->key; -$this->params['breadcrumbs'][] = ['label' => Yii::t('main', 'Settings'), 'url' => ['index']]; -$this->params['breadcrumbs'][] = $this->title; -?> -
    - -

    - 'btn btn-default']) ?> - $model->id], ['class' => 'btn btn-primary']) ?> - $model->id], - [ - 'class' => 'btn btn-danger', - 'data' => [ - 'confirm' => Yii::t('buttons', 'Are you sure you want to delete this item?'), - 'method' => 'post', - ], - ] - ) ?> -

    - -
    -
    - $model, - 'attributes' => [ - 'id', - 'type', - 'section', - 'active:boolean', - 'key', - 'value:ntext', - [ - 'attribute' => 'created_at', - 'format' => ['datetime', 'php:d.m.Y H:i'], - ], - [ - 'attribute' => 'updated_at', - 'format' => ['datetime', 'php:d.m.Y H:i'], - ], - ], - ] - ) ?> -
    -
    -
    \ No newline at end of file diff --git a/backend/views/user/profile.php b/backend/views/user/profile.php index e74deaf..6817a90 100644 --- a/backend/views/user/profile.php +++ b/backend/views/user/profile.php @@ -43,6 +43,10 @@ $this->params['breadcrumbs'][] = Yii::t('user', 'Profile'); field($model, 'username')->textInput(['maxLength' => true]) ?> field($model, 'email')->textInput(['maxLength' => true]) ?> field($model, 'password')->passwordInput(['maxLength' => true]) ?> + field($model, 'backend_language')->dropDownList([ + 'ru' => 'Русский', + 'en' => 'English', + ]) ?> diff --git a/common/bootstrap/SetUp.php b/common/bootstrap/SetUp.php index 532b76d..c6a2fb3 100644 --- a/common/bootstrap/SetUp.php +++ b/common/bootstrap/SetUp.php @@ -136,6 +136,11 @@ class SetUp implements BootstrapInterface $container->set(ImageUploadBehavior::class, FlySystemImageUploadBehavior::class); */ + // Set backend language + if (basename($app->getBasePath()) === 'backend') { + $app->language = ! $app->user->isGuest && $app->user->identity->user->backend_language ? $app->user->identity->user->backend_language : $app->language; + } + // Connect common modules if (Yii::$app->db->schema->getTableSchema('{{%modules}}') !== null) { $modules = ModuleRecord::find()->andWhere(['type' => 'common'])->andWhere(['active' => 1])->all(); diff --git a/console/migrations/m180822_182716_add_users_languages_fields.php b/console/migrations/m180822_182716_add_users_languages_fields.php new file mode 100644 index 0000000..61dd179 --- /dev/null +++ b/console/migrations/m180822_182716_add_users_languages_fields.php @@ -0,0 +1,27 @@ +addColumn('{{%users}}', 'backend_language', $this->string(10)); + $this->addColumn('{{%users}}', 'frontend_language', $this->string(10)); + } + + /** + * {@inheritdoc} + */ + public function safeDown() + { + $this->dropColumn('{{%users}}', 'backend_language'); + $this->dropColumn('{{%users}}', 'frontend_language'); + } +} diff --git a/core/entities/user/User.php b/core/entities/user/User.php index 90898e3..d8af0c4 100644 --- a/core/entities/user/User.php +++ b/core/entities/user/User.php @@ -27,6 +27,8 @@ use zertex\avatar_generator\AvatarGenerator; * @property integer $created_at * @property integer $updated_at * @property string $user_pic + * @property string $backend_language + * @property string $frontend_language * @property string $password write-only password * * @property Network[] $networks @@ -83,7 +85,7 @@ class User extends ActiveRecord implements AggregateRoot } } - public function editProfile(string $email, string $username, string $password = null, $user_pic = null): void + public function editProfile(string $email, string $username, string $password = null, $user_pic = null, $language): void { $this->email = $email; $this->username = $username; @@ -91,6 +93,7 @@ class User extends ActiveRecord implements AggregateRoot $this->setPassword( $password ); } $this->updated_at = time(); + $this->backend_language = $language; /* @var $user_pic \yii\web\UploadedFile */ if ($user_pic) diff --git a/core/forms/user/ProfileEditForm.php b/core/forms/user/ProfileEditForm.php index 2b1fb52..5b243a2 100644 --- a/core/forms/user/ProfileEditForm.php +++ b/core/forms/user/ProfileEditForm.php @@ -17,6 +17,7 @@ class ProfileEditForm extends Model public $username; public $password; public $user_pic; + public $backend_language; public $_user; @@ -26,6 +27,7 @@ class ProfileEditForm extends Model $this->username = $user->username; $this->_user = $user; $this->user_pic = $user->user_pic; + $this->backend_language = $user->backend_language ?: Yii::$app->language; parent::__construct($config); } @@ -35,7 +37,7 @@ class ProfileEditForm extends Model [['email', 'username'], 'required'], [['email', 'username'], 'trim'], ['email', 'email'], - [['email', 'password'], 'string', 'max' => 255], + [['email', 'password', 'backend_language'], 'string', 'max' => 255], [['username', 'email'], 'unique', 'targetClass' => User::class, 'filter' => ['<>', 'id', $this->_user->id]], ['username', 'string', 'min' => 2, 'max' => 255], ['user_pic', 'image', 'extensions' => 'png, jpg, jpeg, gif', @@ -53,6 +55,7 @@ class ProfileEditForm extends Model 'username' => Yii::t('user', 'Username'), 'password' => Yii::t('user', 'Password'), 'user_pic' => Yii::t('user', 'User Picture'), + 'backend_language' => Yii::t('user', 'Dashboard Language'), ]; } } \ No newline at end of file diff --git a/core/services/user/ProfileService.php b/core/services/user/ProfileService.php index 396a368..db6c194 100644 --- a/core/services/user/ProfileService.php +++ b/core/services/user/ProfileService.php @@ -21,7 +21,7 @@ class ProfileService public function edit($id, ProfileEditForm $form): void { $user = $this->users->get($id); - $user->editProfile($form->email, $form->username, $form->password, $form->user_pic); + $user->editProfile($form->email, $form->username, $form->password, $form->user_pic, $form->backend_language); $this->users->save($user); } } \ No newline at end of file