Bläddra i källkod

fixed users permissions

tags/0.1.0
Robin Thoni 8 år sedan
förälder
incheckning
4362ec98a3

+ 2
- 6
src/Auth/Business/LuticatePermissionsUsersBusiness.php Visa fil

@@ -62,11 +62,7 @@ class LuticatePermissionsUsersBusiness extends LuBusiness {
62 62
 
63 63
     public static function edit($user_id, $permission_name, $permission_value)
64 64
     {
65
-        $perm = self::checkPermissionUserName($user_id, $permission_name);
66
-        if (is_null($perm)) {
67
-            self::badInput("Permission not found");
68
-        }
69
-        LuticatePermissionsUsersDataAccess::edit($user_id, $permission_name, $permission_value);
70
-        return true;
65
+        self::del($user_id, $permission_name);
66
+        return self::add($user_id, $permission_name, $permission_value);
71 67
     }
72 68
 }

+ 0
- 13
src/Auth/DataAccess/LuticatePermissionsGroupsDataAccess.php Visa fil

@@ -35,18 +35,5 @@ class LuticatePermissionsGroupsDataAccess extends LuDataAccess {
35 35
     public static function delete($group_id, $permission_name)
36 36
     {
37 37
         LuticateGroups::find($group_id)->permissions()->detach($permission_name);
38
-        /*$perm = self::getModelByName($group_id, $permission_name);
39
-        if (is_null($perm))
40
-            return;
41
-        $perm->delete();*/
42
-    }
43
-
44
-    public static function edit($group_id, $permission_name, $permission_value)
45
-    {
46
-        /*$perm = self::getModelByName($group_id, $permission_name);
47
-        if (is_null($perm))
48
-            return;
49
-        $perm->value = $permission_value;
50
-        $perm->save();*/
51 38
     }
52 39
 }

+ 7
- 18
src/Auth/DataAccess/LuticatePermissionsUsersDataAccess.php Visa fil

@@ -2,6 +2,7 @@
2 2
 
3 3
 namespace Luticate\Auth\DataAccess;
4 4
 
5
+use Luticate\Auth\DataAccess\Models\LuticateUsers;
5 6
 use Luticate\Utils\LuDataAccess;
6 7
 use Luticate\Auth\DataAccess\Models\LuticatePermissionsUsers;
7 8
 use Luticate\Auth\DBO\LuticatePermissionsUsersDbo;
@@ -17,6 +18,11 @@ class LuticatePermissionsUsersDataAccess extends LuDataAccess {
17 18
         return LuticatePermissionsUsers::where("name", "=", $permission_name)->where("user_id", "=", $user_id)->first();
18 19
     }
19 20
 
21
+    public static function getAllByUser($user_id, $page = 0, $perPage = PHP_INT_MAX)
22
+    {
23
+        return self::getMultiple(array(array('user_id', '=', $user_id)), array(array("name", "ASC")), $page, $perPage);
24
+    }
25
+
20 26
     public static function getByName($user_id, $permission_name)
21 27
     {
22 28
         $perm = self::getModelByName($user_id, $permission_name);
@@ -26,25 +32,8 @@ class LuticatePermissionsUsersDataAccess extends LuDataAccess {
26 32
         return $perm->toDbo();
27 33
     }
28 34
 
29
-    public static function getAllByUser($user_id, $page = 0, $perPage = PHP_INT_MAX)
30
-    {
31
-        return self::getMultiple(array(array('user_id', '=', $user_id)), array(array("name", "ASC")), $page, $perPage);
32
-    }
33
-
34 35
     public static function delete($user_id, $permission_name)
35 36
     {
36
-        $perm = self::getModelByName($user_id, $permission_name);
37
-        if (is_null($perm))
38
-            return;
39
-        $perm->delete();
40
-    }
41
-
42
-    public static function edit($user_id, $permission_name, $permission_value)
43
-    {
44
-        $perm = self::getModelByName($user_id, $permission_name);
45
-        if (is_null($perm))
46
-            return;
47
-        $perm->value = $permission_value;
48
-        $perm->save();
37
+        LuticateUsers::find($user_id)->permissions()->detach($permission_name);
49 38
     }
50 39
 }

+ 1
- 0
src/Auth/DataAccess/Models/LuticatePermissionsUsers.php Visa fil

@@ -6,4 +6,5 @@ use Luticate\Auth\DBO\LuticatePermissionsUsersDbo;
6 6
 
7 7
 class LuticatePermissionsUsers extends LuticatePermissionsUsersModel
8 8
 {
9
+    protected $primaryKey = "name";
9 10
 }

+ 4
- 0
src/Auth/DataAccess/Models/LuticateUsers.php Visa fil

@@ -6,4 +6,8 @@ use Luticate\Auth\DBO\LuticateUsersDbo;
6 6
 
7 7
 class LuticateUsers extends LuticateUsersModel
8 8
 {
9
+    public function permissions()
10
+    {
11
+        return $this->belongsToMany('Luticate\Auth\DataAccess\Models\LuticatePermissions', "luticate_permissions_users", "user_id", "name");
12
+    }
9 13
 }

Laddar…
Avbryt
Spara