Переделка привязки пользователей к сайтам + отключение списка сайтов

Author: skeeks-semenov

src/CmsManager.php

@@ -8,7 +8,6 @@
 
 namespace skeeks\cms\rbac;
 
-use skeeks\cms\models\CmsSite;
 use Yii;
 use yii\base\InvalidConfigException;
 use yii\caching\Cache;
@@ -24,8 +23,6 @@
 use yii\rbac\Rule;
 
 /**
- * @var CmsSite $cmsSite ;
- *
  * @author Semenov Alexander <semenov@skeeks.com>
  */
 class CmsManager extends \yii\rbac\DbManager
@@ -35,11 +32,6 @@ class CmsManager extends \yii\rbac\DbManager
      */
     public $config = [];
 
-    /**
-     * @var CmsSite
-     */
-    public $cmsSite = null;
-
     /**
      * @throws \yii\base\InvalidConfigException
      */
@@ -57,10 +49,6 @@ public function init()
         } else {
             $this->cache = null;
         }
-
-        if ($this->cmsSite === null) {
-            $this->cmsSite = \Yii::$app->skeeks->site;
-        }
     }
 
     /**
@@ -302,7 +290,6 @@ public function assign($role, $userId)
                 'cms_user_id' => $assignment->userId,
                 'item_name'   => $assignment->roleName,
                 'created_at'  => $assignment->createdAt,
-                'cms_site_id' => $this->cmsSite->id,
             ])->execute();
 
         unset($this->checkAccessAssignments[(string)$userId]);
@@ -327,7 +314,8 @@ protected function _parentRevoke($role, $userId)
 
         unset($this->checkAccessAssignments[(string)$userId]);
         return $this->db->createCommand()
-                ->delete($this->assignmentTable, ['cms_user_id' => (string)$userId, 'cms_site_id' => $this->cmsSite->id, 'item_name' => $role->name])
+                ->delete($this->assignmentTable, ['cms_user_id' => (string)$userId,
+                                                  'item_name' => $role->name])
                 ->execute() > 0;
     }
     /**
@@ -783,7 +771,7 @@ private function _loadAssignments($userId)
                 ->select('item_name')
                 ->from($this->assignmentTable)
                 ->where(['cms_user_id' => $userId])
-                ->andWhere(['cms_site_id' => $this->cmsSite->id]);
+            ;
 
             $this->_assignments[$userId] = $query->column($this->db);
         }

src/migrations/m220126_011000__alter_table__auth_assignment.php

@@ -0,0 +1,50 @@
+<?php
+/**
+ * @author Semenov Alexander <semenov@skeeks.com>
+ * @link http://skeeks.com/
+ * @copyright 2010 SkeekS (СкикС)
+ * @date 28.08.2015
+ */
+
+use yii\db\Migration;
+
+class m220126_011000__alter_table__auth_assignment extends Migration
+{
+    public function safeUp()
+    {
+        $tableName = "auth_assignment";
+
+        $this->dropForeignKey("auth_assignment__cms_site_id", $tableName);
+
+        $this->dropForeignKey(
+            "{$tableName}__cms_user_id", $tableName
+        );
+
+        $this->dropForeignKey(
+            "{$tableName}__item_name", $tableName
+        );
+
+        $this->dropIndex("uniq", $tableName);
+        $this->dropIndex("auth_assignment__cms_site_id", $tableName);
+
+        $this->dropColumn($tableName, 'cms_site_id');
+
+        $this->createIndex("uniq", $tableName, ['item_name', 'cms_user_id'], true);
+
+        $this->addForeignKey(
+            "{$tableName}__cms_user_id", $tableName,
+            'cms_user_id', '{{%cms_user}}', 'id', 'CASCADE', 'CASCADE'
+        );
+
+        $this->addForeignKey(
+            "{$tableName}__item_name", $tableName,
+            'item_name', '{{%auth_item}}', 'name', 'CASCADE', 'CASCADE'
+        );
+    }
+
+    public function safeDown()
+    {
+        echo "m200410_121000__alter_table__cms_tree cannot be reverted.\n";
+        return false;
+    }
+}

src/models/CmsAuthAssignment.php

@@ -26,7 +26,6 @@
  *
  * @property CmsAuthItem $authItem
  * @property CmsUser $user
- * @property CmsSite $cmsSite
  */
 class CmsAuthAssignment extends ActiveRecord
 {
@@ -77,15 +76,5 @@ public function getUser()
     {
         return $this->hasOne(CmsUser::className(), ['id' => 'cms_user_id']);
     }
-    
-    /**
-     * Gets query for [[CmsSite]].
-     *
-     * @return \yii\db\ActiveQuery
-     */
-    public function getCmsSite()
-    {
-        return $this->hasOne(CmsSite::className(), ['id' => 'cms_site_id']);
-    }
 
 }