dev

CHANGELOG.md

@@ -1,6 +1,10 @@
 CHANGELOG
 ==============
 
+5.2.1.1.pre
+----------------
+ * Update
+
 5.2.1
 ----------------
  * Fixed admin cms content elements

src/controllers/AuthController.php

@@ -255,16 +255,30 @@ public function actionRegisterByEmail()
         }
         //Запрос ajax post
         if ($rr->isRequestAjaxPost()) {
-            if ($model->load(\Yii::$app->request->post()) && $registeredUser = $model->signup()) {
-                $rr->success = true;
-                $rr->message = 'Для дальнейших действий, проверьте вашу почту.';
 
-                return $rr;
+            $t = \Yii::$app->db->beginTransaction();
 
-            } else {
-                $rr->message = 'Не удалось зарегистрироваться';
+            try {
+
+                if ($model->load(\Yii::$app->request->post()) && $registeredUser = $model->signup()) {
+
+                    $t->commit();
+
+                    $rr->success = true;
+                    $rr->message = 'Для дальнейших действий, проверьте вашу почту.';
+
+                    return $rr;
+
+                } else {
+                    $rr->message = 'Не удалось зарегистрироваться';
+                }
+
+            } catch (\Exception $e) {
+                $t->rollBack();
+                throw $e;
             }
 
+
             return (array)$rr;
 
         }

src/controllers/UpaPersonalController.php

@@ -50,6 +50,7 @@ public function actions()
     {
         return ArrayHelper::merge(parent::actions(), [
                 "update" => [
+                    'buttons' => ['save'],
                     'class' => BackendModelUpdateAction::class,
                     'name' => ['skeeks/cms', 'Personal data'],
                     'fields' => [
@@ -62,8 +63,8 @@ public function actions()
                             ]
                         ],
                         'username',
-                        'first_name',
                         'last_name',
+                        'first_name',
                         'patronymic',
                         'email',
                         'phone' => [
@@ -86,6 +87,7 @@ public function actions()
                     ]
                 ],
                 "change-password" => [
+                    'buttons' => ['save'],
                     'class' => BackendModelUpdateAction::class,
                     'name' => ['skeeks/cms', 'Change password'],
                     'icon' => 'fa fa-key',

src/mail-templates/register-by-email.php

@@ -22,9 +22,9 @@
     <b>Email: </b><?= $user->email; ?><br>
     <b>Пароль: </b><?= $password; ?><br>
 <?= Html::a("Ссылка на авторизацию", \skeeks\cms\helpers\UrlHelper::construct('cms/auth/login')
-    ->setRef(
+    /*->setRef(
         \skeeks\cms\helpers\UrlHelper::construct('/cms/profile')->enableAbsolute()->toString()
-    )
+    )*/
     ->enableAbsolute()
     ->toString()
 ) ?>

src/models/User.php

@@ -19,6 +19,7 @@
 use skeeks\cms\models\behaviors\HasSubscribes;
 use skeeks\cms\models\behaviors\traits\HasRelatedPropertiesTrait;
 use skeeks\cms\models\user\UserEmail;
+use skeeks\cms\rbac\models\CmsAuthAssignment;
 use skeeks\cms\validators\PhoneValidator;
 use Yii;
 use yii\base\Exception;
@@ -72,10 +73,10 @@
  * @property []   $roleNames
  *
  * @property string $displayName
- * @property string $profileUrl
  *
  * @property CmsContentElement2cmsUser[] $cmsContentElement2cmsUsers
  * @property CmsContentElement[] $favoriteCmsContentElements
+ * @property CmsAuthAssignment[] $cmsAuthAssignments
  *
  */
 class User
@@ -158,19 +159,19 @@ public function behaviors()
     {
         return array_merge(parent::behaviors(), [
 
-            TimestampBehavior::className(),
+            TimestampBehavior::class,
 
-            HasStorageFile::className() =>
+            HasStorageFile::class =>
                 [
-                    'class' => HasStorageFile::className(),
+                    'class' => HasStorageFile::class,
                     'fields' => ['image_id']
                 ],
 
-            HasRelatedProperties::className() =>
+            HasRelatedProperties::class =>
                 [
-                    'class' => HasRelatedProperties::className(),
-                    'relatedElementPropertyClassName' => CmsUserProperty::className(),
-                    'relatedPropertyClassName' => CmsUserUniversalProperty::className(),
+                    'class' => HasRelatedProperties::class,
+                    'relatedElementPropertyClassName' => CmsUserProperty::class,
+                    'relatedPropertyClassName' => CmsUserUniversalProperty::class,
                 ],
 
         ]);
@@ -208,7 +209,7 @@ public function rules()
             [['auth_key'], 'string', 'max' => 32],
 
             [['phone'], 'string', 'max' => 64],
-            [['phone'], PhoneValidator::className()],
+            [['phone'], PhoneValidator::class],
             [['phone'], 'unique'],
             [['phone', 'email'], 'default', 'value' => null],
 
@@ -219,7 +220,7 @@ public function rules()
             //[['username'], 'required'],
             ['username', 'string', 'min' => 3, 'max' => 25],
             [['username'], 'unique'],
-            [['username'], \skeeks\cms\validators\LoginValidator::className()],
+            [['username'], \skeeks\cms\validators\LoginValidator::class],
 
             [['logged_at'], 'integer'],
             [['last_activity_at'], 'integer'],
@@ -373,7 +374,7 @@ public function updateLastActivity()
      */
     public function getImage()
     {
-        return $this->hasOne(StorageFile::className(), ['id' => 'image_id']);
+        return $this->hasOne(StorageFile::class, ['id' => 'image_id']);
     }
 
 
@@ -382,7 +383,7 @@ public function getImage()
      */
     public function getStorageFiles()
     {
-        return $this->hasMany(StorageFile::className(), ['created_by' => 'id']);
+        return $this->hasMany(StorageFile::class, ['created_by' => 'id']);
     }
 
 
@@ -391,7 +392,7 @@ public function getStorageFiles()
      */
     public function getUserAuthClients()
     {
-        return $this->hasMany(UserAuthClient::className(), ['user_id' => 'id']);
+        return $this->hasMany(UserAuthClient::class, ['user_id' => 'id']);
     }
 
     /**
@@ -440,12 +441,14 @@ public function getName()
     {
         $data = [];
 
-        if ($this->first_name) {
-            $data[] = $this->first_name;
-        }
         if ($this->last_name) {
             $data[] = $this->last_name;
         }
+
+        if ($this->first_name) {
+            $data[] = $this->first_name;
+        }
+
         if ($this->patronymic) {
             $data[] = $this->patronymic;
         }
@@ -687,23 +690,30 @@ public function getAvatarSrc($width = 50, $height = 50, $mode = ManipulatorInter
      */
     public function getCmsUserAuthClients()
     {
-        return $this->hasMany(UserAuthClient::className(), ['user_id' => 'id']);
+        return $this->hasMany(UserAuthClient::class, ['user_id' => 'id']);
     }
 
     /**
      * @return \yii\db\ActiveQuery
      */
     public function getCmsUserEmails()
     {
-        return $this->hasMany(CmsUserEmail::className(), ['user_id' => 'id']);
+        return $this->hasMany(CmsUserEmail::class, ['user_id' => 'id']);
     }
 
     /**
      * @return \yii\db\ActiveQuery
      */
     public function getCmsUserPhones()
     {
-        return $this->hasMany(CmsUserPhone::className(), ['user_id' => 'id']);
+        return $this->hasMany(CmsUserPhone::class, ['user_id' => 'id']);
+    }
+    /**
+     * @return \yii\db\ActiveQuery
+     */
+    public function getCmsAuthAssignments()
+    {
+        return $this->hasMany(CmsAuthAssignment::class, ['user_id' => 'id']);
     }
 
     /**
@@ -747,15 +757,15 @@ public function setRoleNames($roleNames = [])
      */
     public function getCmsContentElement2cmsUsers()
     {
-        return $this->hasMany(CmsContentElement2cmsUser::className(), ['cms_user_id' => 'id']);
+        return $this->hasMany(CmsContentElement2cmsUser::class, ['cms_user_id' => 'id']);
     }
 
     /**
      * @return \yii\db\ActiveQuery
      */
     public function getFavoriteCmsContentElements()
     {
-        return $this->hasMany(CmsContentElement::className(), ['id' => 'cms_content_element_id'])
+        return $this->hasMany(CmsContentElement::class, ['id' => 'cms_content_element_id'])
             ->via('cmsContentElement2cmsUsers');
     }