diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/Controller/Group.php | 2 | ||||
| -rw-r--r-- | app/Model/ProjectPermission.php | 6 | ||||
| -rw-r--r-- | app/ServiceProvider/RouteProvider.php | 7 |
3 files changed, 11 insertions, 4 deletions
diff --git a/app/Controller/Group.php b/app/Controller/Group.php index 395a954d..3e6505e9 100644 --- a/app/Controller/Group.php +++ b/app/Controller/Group.php @@ -42,7 +42,7 @@ class Group extends Base $group = $this->group->getById($group_id); $paginator = $this->paginator - ->setUrl('group', 'users') + ->setUrl('group', 'users', array('group_id' => $group_id)) ->setMax(30) ->setOrder('username') ->setQuery($this->groupMember->getQuery($group_id)) 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)); } /** diff --git a/app/ServiceProvider/RouteProvider.php b/app/ServiceProvider/RouteProvider.php index 6b1d0d88..26ab488a 100644 --- a/app/ServiceProvider/RouteProvider.php +++ b/app/ServiceProvider/RouteProvider.php @@ -57,6 +57,13 @@ class RouteProvider implements ServiceProviderInterface $container['router']->addRoute('project/:project_id/permissions', 'ProjectPermission', 'index', array('project_id')); $container['router']->addRoute('project/:project_id/import', 'taskImport', 'step1', array('project_id')); + // ProjectUser routes + $container['router']->addRoute('projects/managers/:user_id', 'projectuser', 'managers', array('user_id')); + $container['router']->addRoute('projects/members/:user_id', 'projectuser', 'members', array('user_id')); + $container['router']->addRoute('projects/tasks/:user_id/opens', 'projectuser', 'opens', array('user_id')); + $container['router']->addRoute('projects/tasks/:user_id/closed', 'projectuser', 'closed', array('user_id')); + $container['router']->addRoute('projects/managers', 'projectuser', 'managers'); + // Action routes $container['router']->addRoute('project/:project_id/actions', 'action', 'index', array('project_id')); $container['router']->addRoute('project/:project_id/action/:action_id/confirm', 'action', 'confirm', array('project_id', 'action_id')); |