updated migrations and getPermissions()

kodeine · Mar 17, 2015 · 4f6ffd4 · 4f6ffd4 · Mythos · Mar 19, 2015
1 parent 0860431
commit 4f6ffd4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/Kodeine/Acl/Traits/HasPermission.php b/src/Kodeine/Acl/Traits/HasPermission.php
@@ -34,11 +34,11 @@ public function permissions()
     public function getPermissions()
     {
         // user permissions overridden from role.
-        $permissions = $this->getPermissionsInherited();
+        $permissions = $this->permissions->lists('slug', 'name');
 
         // permissions based on role.
         foreach ($this->roles as $role) {
-            $permissions = $permissions + $role->getPermissions();
+            $permissions = array_replace_recursive($role->getPermissions(), $permissions);
         }
 
         return $permissions;

diff --git a/src/Kodeine/Acl/Traits/HasPermissionInheritance.php b/src/Kodeine/Acl/Traits/HasPermissionInheritance.php
@@ -18,7 +18,7 @@ public function getPermissionsInherited()
         $inherits = $this->permissions->lists('inherit_id', 'name');
 
         foreach ($inherits as $name => $inherit_id) {
-            if ( ! $inherit_id ) continue;
+            if ( is_null($inherit_id) ) continue;
 
             // get inherit row from cache else query it.
             $inherit = $this->getCacheInherit($inherit_id);

diff --git a/src/migrations/2015_02_07_172649_create_permissions_table.php b/src/migrations/2015_02_07_172649_create_permissions_table.php
@@ -15,12 +15,12 @@ public function up()
     {
         Schema::create('permissions', function (Blueprint $table) {
             $table->increments('id');
-            $table->integer('inherit_id')->unsigned()->index();
+            $table->integer('inherit_id')->unsigned()->nullable()->index();
+            $table->foreign('inherit_id')->references('id')->on('permissions');
             $table->string('name')->index();
             $table->string('slug')->index();
             $table->text('description')->nullable();
             $table->timestamps();
-            $table->foreign('inherit_id')->references('id')->on('permissions');
         });
     }