updated addPermissions and fixed helper

kodeine · Mar 12, 2015 · e7cbd24 · e7cbd24
1 parent 8904127
commit e7cbd24
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/src/Kodeine/Acl/Helper/Helper.php b/src/Kodeine/Acl/Helper/Helper.php
@@ -39,11 +39,11 @@ protected function parseOperator($str)
     {
         // if its an array lets use
         // and operator by default
-        if (is_array($str)) {
+        if ( is_array($str) ) {
             $str = implode(',', $str);
         }
 
-        if (preg_match('/([,|])(?:\s+)?/', $str, $m)) {
+        if ( preg_match('/([,|])(?:\s+)?/', $str, $m) ) {
             return $m[1] == '|' ? 'or' : 'and';
         }
 
@@ -65,7 +65,8 @@ protected function hasDelimiterToArray($str)
         }
 
         return is_array($str) ?
-            array_filter($str, 'strtolower') : strtolower($str);
+            array_filter($str, 'strtolower') : is_object($str) ?
+                $str : strtolower($str);
     }
 
     /**
@@ -79,7 +80,7 @@ protected function mapArray($item, \Closure $closure)
 
         // multiple items
         if ( is_array($item) ) {
-            // is an array of One Role
+            // is an array of One Role/Permission
             // its an array containing id
             // we dont have to loop through
             if ( isset($item['id']) )

diff --git a/src/Kodeine/Acl/Models/Eloquent/Permission.php b/src/Kodeine/Acl/Models/Eloquent/Permission.php
@@ -59,6 +59,9 @@ public function setSlugAttribute($value)
         // if attribute is being updated.
         if ( isset($this->original['slug']) ) {
             $value = $value + json_decode($this->original['slug'], true);
+
+            // sort by key
+            ksort($value);
         }
 
         // remove null values.

diff --git a/src/Kodeine/Acl/Traits/HasUserPermission.php b/src/Kodeine/Acl/Traits/HasUserPermission.php
@@ -34,10 +34,13 @@ public function addPermission($name, $permission = true)
         ];
 
         if ( ! $slugs->has($alias) ) {
-            return $this->permissions()->create($array);
+            $new = $this->permissions()->create($array);
+            $this->permissions->push($new);
+            return $new;
         }
 
-        return $slugs[$alias]->update($array['slug']);
+        unset($array['name']);
+        return $slugs[$alias]->update($array);
     }
 
     public function removePermission($name)
@@ -91,10 +94,13 @@ protected function addPermissionCrud($name)
         ];
 
         if ( ! $slugs->has($alias) ) {
-            return $this->permissions()->create($array);
+            $new = $this->permissions()->create($array);
+            $this->permissions->push($new);
+            return $new;
         }
 
-        return $slugs[$alias]->update($array['slug']);
+        unset($array['name']);
+        return $slugs[$alias]->update($array);
     }
 
     protected function extractAlias($str)