Administrator / realy_old_artbox

Commit 73c98b9a326bcdc70d713aabf39b202e624d16e1

Authored by Yarik
1 parent 0829b346

Устранены баги, поменял базу на PostgreSQL

Showing 3 changed files with 19 additions and 12 deletions   Show diff stats
Inline Side-by-side
common/config/main-local.php
  Show/Hide comments   View file @73c98b9
... ... @@ -3,10 +3,15 @@ return [
3 3 'components' => [
4 4 'db' => [
5 5 'class' => 'yii\db\Connection',
6   - 'dsn' => 'mysql:host=localhost;dbname=artbox_db',
7   - 'username' => 'root',
  6 + 'dsn' => 'pgsql:host=localhost;port=5432;dbname=artbox_pg',
  7 + 'username' => 'postgres',
8 8 'password' => '',
9   - 'charset' => 'utf8',
  9 + 'schemaMap' => [
  10 + 'pgsql'=> [
  11 + 'class'=>'yii\db\pgsql\Schema',
  12 + 'defaultSchema' => 'public'
  13 + ]
  14 + ],
10 15 ],
11 16 'mailer' => [
12 17 'class' => 'yii\swiftmailer\Mailer',
... ...
common/models/User.php
  Show/Hide comments   View file @73c98b9
... ... @@ -64,14 +64,20 @@ class User extends ActiveRecord implements IdentityInterface, UserRbacInterface
64 64 /**
65 65 * @inheritdoc
66 66 */
67   - public static function findIdentity($id) {
68   - if (Yii::$app->getSession()->has('user-'.$id)) {
  67 + public static function findIdentity($id) {
  68 + if(Yii::$app->getSession()->has('user-'.$id)) {
  69 + if (Yii::$app->getSession()->has('user-'.$id)) {
69 70 return new self(Yii::$app->getSession()->get('user-'.$id));
70   - }
  71 + }
  72 + else {
  73 + return isset(self::$users[$id]) ? new self(self::$users[$id]) : null;
  74 + }
  75 + }
71 76 else {
72   - return isset(self::$users[$id]) ? new self(self::$users[$id]) : null;
  77 + return static::findOne(['id' => $id, 'status' => self::STATUS_ACTIVE]);
73 78 }
74   - }
  79 +
  80 + }
75 81 /**
76 82 * @param \nodge\eauth\ServiceBase $service
77 83 * @return User
... ...
common/translation/ru/app.php
  Show/Hide comments   View file @73c98b9
... ... @@ -11,9 +11,6 @@ return [
11 11 'Make default' => 'Установить по умолчанию',
12 12 'Language Name' => 'Название языка',
13 13 'Lang Code' => 'Код языка',
14   -<<<<<<< 1fd2bdb43fc5cfdcf100cac8b72e67fd81e7f0fa
15   - 'Is Default' => 'По умолчанию'
16   -=======
17 14 'Is Default' => 'По умолчанию',
18 15 'adress' => 'Адрес',
19 16 'adress_name' => 'Адрес',
... ... @@ -26,5 +23,4 @@ return [
26 23 'one_name' => 'Имя',
27 24 'message' => 'Сообщение',
28 25 'Feedback' => 'Обратная связь'
29   ->>>>>>> 0e0edb85a79343e4d020ff05378179e2323b21bd
30 26 ];
31 27 \ No newline at end of file
... ...