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/SettingsController.php b/backend/controllers/settings/ListController.php similarity index 93% rename from backend/controllers/SettingsController.php rename to backend/controllers/settings/ListController.php index 25b7b2b..da83f0f 100644 --- a/backend/controllers/SettingsController.php +++ b/backend/controllers/settings/ListController.php @@ -4,7 +4,7 @@ * Date: 04.06.2018 */ -namespace backend\controllers; +namespace backend\controllers\settings; use backend\forms\SettingsSearch; @@ -18,7 +18,7 @@ use backend\components\ToggleAction; use Yii; use yii\web\NotFoundHttpException; -class SettingsController extends Controller +class ListController extends Controller { private $service; @@ -31,13 +31,13 @@ class SettingsController extends Controller { return [ 'verbs' => [ - 'class' => VerbFilter::className(), + 'class' => VerbFilter::class, 'actions' => [ 'delete' => ['POST'], ], ], 'access' => [ - 'class' => AccessControl::className(), + 'class' => AccessControl::class, 'rules' => [ [ 'actions' => ['create','view','index', 'update', 'delete', 'toggle'], @@ -57,7 +57,7 @@ class SettingsController extends Controller { return [ 'toggle' => [ - 'class' => ToggleAction::className(), + 'class' => ToggleAction::class, 'modelClass' => Settings::class, //'setFlash' => true, ] 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/list/_form.php similarity index 100% rename from backend/views/settings/_form.php rename to backend/views/settings/list/_form.php diff --git a/backend/views/settings/create.php b/backend/views/settings/list/create.php similarity index 100% rename from backend/views/settings/create.php rename to backend/views/settings/list/create.php diff --git a/backend/views/settings/index.php b/backend/views/settings/list/index.php similarity index 100% rename from backend/views/settings/index.php rename to backend/views/settings/list/index.php diff --git a/backend/views/settings/update.php b/backend/views/settings/list/update.php similarity index 100% rename from backend/views/settings/update.php rename to backend/views/settings/list/update.php diff --git a/backend/views/settings/view.php b/backend/views/settings/list/view.php similarity index 100% rename from backend/views/settings/view.php rename to backend/views/settings/list/view.php 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