Browse Source

removed users not in group

tags/0.1.0
Robin Thoni 8 years ago
parent
commit
503fc1d4c4

+ 0
- 2
src/Auth/Business/LuticateBusiness.php View File

83
 
83
 
84
         $route->get("$prefix/groups/$group_id/users/", "${ns}LuticateGroupsController", "getUsers",
84
         $route->get("$prefix/groups/$group_id/users/", "${ns}LuticateGroupsController", "getUsers",
85
             LuticatePermissions::GROUP_GET);
85
             LuticatePermissions::GROUP_GET);
86
-        $route->get("$prefix/groups/$group_id/others/", "${ns}LuticateGroupsController", "getOtherUsers",
87
-            LuticatePermissions::GROUP_GET);
88
         $route->post("$prefix/groups/$group_id/users/$user_id/add", "${ns}LuticateGroupsController", "addUser",
86
         $route->post("$prefix/groups/$group_id/users/$user_id/add", "${ns}LuticateGroupsController", "addUser",
89
             array(LuticatePermissions::GROUP_USER_ADD, LuticatePermissions::GROUP_GET));
87
             array(LuticatePermissions::GROUP_USER_ADD, LuticatePermissions::GROUP_GET));
90
         $route->post("$prefix/groups/$group_id/users/$user_id/del", "${ns}LuticateGroupsController", "delUser",
88
         $route->post("$prefix/groups/$group_id/users/$user_id/del", "${ns}LuticateGroupsController", "delUser",

+ 0
- 5
src/Auth/Business/LuticateGroupsBusiness.php View File

30
         return LuticateGroupsDataAccess::getUsers($group_id, $page, $perPage, $query);
30
         return LuticateGroupsDataAccess::getUsers($group_id, $page, $perPage, $query);
31
     }
31
     }
32
 
32
 
33
-    public static function getOtherUsers($group_id, $page = 0, $perPage = PHP_INT_MAX, $query = "")
34
-    {
35
-        return LuticateGroupsDataAccess::getOtherUsers($group_id, $page, $perPage, $query);
36
-    }
37
-
38
     public static function getByName($group_name)
33
     public static function getByName($group_name)
39
     {
34
     {
40
         return LuticateGroupsDataAccess::getByName($group_name);
35
         return LuticateGroupsDataAccess::getByName($group_name);

+ 0
- 13
src/Auth/Controller/LuticateGroupsController.php View File

47
         return LuticateGroupsBusiness::getUsers($group_id, $page, $perPage, $query);
47
         return LuticateGroupsBusiness::getUsers($group_id, $page, $perPage, $query);
48
     }
48
     }
49
 
49
 
50
-    /**
51
-     * Get all users not in group
52
-     * @param $group_id int The group id
53
-     * @param int $page The page number, 0 based
54
-     * @param int $perPage The number of items per page
55
-     * @param string $query The filter query
56
-     * @return \Luticate\Utils\LuMultipleDbo
57
-     */
58
-    public function getOtherUsers($group_id, $page = 0, $perPage = PHP_INT_MAX, $query = "")
59
-    {
60
-        return LuticateGroupsBusiness::getOtherUsers($group_id, $page, $perPage, $query);
61
-    }
62
-
63
     /**
50
     /**
64
      * Add a new group
51
      * Add a new group
65
      * @param $group_name string The group name
52
      * @param $group_name string The group name

+ 0
- 22
src/Auth/DataAccess/LuticateGroupsDataAccess.php View File

59
         return new LuMultipleDbo($count, $usersLight);
59
         return new LuMultipleDbo($count, $usersLight);
60
     }
60
     }
61
 
61
 
62
-    public static function getOtherUsers($group_id, $page = 0, $perPage = PHP_INT_MAX, $query = "")
63
-    {
64
-        $model = LuticateUsers::where("luticate_users_groups.id", "IS", "NULL")
65
-            ->leftJoin("luticate_users_groups", function($join) use ($group_id)
66
-            {
67
-                $join->on("luticate_users.id", "=", "luticate_users_groups.user_id")
68
-                ->on("luticate_users_groups.group_id", "=", $group_id);
69
-            });
70
-
71
-        $count = $model->count();
72
-
73
-        $model = $model->orderBy("luticate_users.username", "ASC");
74
-        $data = $model->take($perPage)->offset($page * $perPage)->get();
75
-        $usersLight = [];
76
-        foreach ($data as $user) {
77
-            if (!is_null($user)) {
78
-                $usersLight[] = LuticateUsersLightDbo::fromUserDbo($user->toDbo());
79
-            }
80
-        }
81
-        return new LuMultipleDbo($count, $usersLight);
82
-    }
83
-
84
     public static function addUser($user_id, $group_id)
62
     public static function addUser($user_id, $group_id)
85
     {
63
     {
86
         LuticateGroups::find($group_id)->users()->attach($user_id);
64
         LuticateGroups::find($group_id)->users()->attach($user_id);

Loading…
Cancel
Save