diff options
| author | Busfreak <martin@middeke.de> | 2015-12-15 12:00:47 +0100 |
|---|---|---|
| committer | Busfreak <martin@middeke.de> | 2015-12-15 12:00:47 +0100 |
| commit | 16e8241f0f29f0afb9c4ad4c6f68699d62d889ff (patch) | |
| tree | aa0f03c5c1d7897246e513e52c6a1f823709dd3d /app/Model/ProjectPermission.php | |
| parent | b834f5475c8eebb76548046558e7d1464cbd01d4 (diff) | |
| parent | 9e1f4fa6c7eae1b46cf5431ab085b82e970e2d57 (diff) | |
Merge remote-tracking branch 'refs/remotes/origin/master'
Diffstat (limited to 'app/Model/ProjectPermission.php')
| -rw-r--r-- | app/Model/ProjectPermission.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/Model/ProjectPermission.php b/app/Model/ProjectPermission.php index b311c10b..f74b8587 100644 --- a/app/Model/ProjectPermission.php +++ b/app/Model/ProjectPermission.php @@ -28,10 +28,10 @@ class ProjectPermission extends Base return $this ->db - ->table(self::TABLE) + ->table(ProjectUserRole::TABLE) ->join(User::TABLE, 'id', 'user_id') ->join(Project::TABLE, 'id', 'project_id') - ->eq(self::TABLE.'.role', $role) + ->eq(ProjectUserRole::TABLE.'.role', $role) ->eq(Project::TABLE.'.is_private', 0) ->in(Project::TABLE.'.id', $project_ids) ->columns( @@ -88,7 +88,7 @@ class ProjectPermission extends Base */ public function isMember($project_id, $user_id) { - return in_array($this->projectUserRole->getUSerRole($project_id, $user_id), array(Role::PROJECT_MEMBER, Role::PROJECT_MANAGER)); + return in_array($this->projectUserRole->getUserRole($project_id, $user_id), array(Role::PROJECT_MEMBER, Role::PROJECT_MANAGER)); } /** |