Fix CS

jitamin · Dec 11, 2017 · 8566168 · 8566168
1 parent 689ae85
commit 8566168
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/app/Http/Controllers/Manage/ProjectPermissionController.php b/app/Http/Controllers/Manage/ProjectPermissionController.php
@@ -89,7 +89,9 @@ public function addUser()
     public function removeUser()
     {
         $project = $this->getProject();
-        $user = $this->projectUserRoleModel->getRemoveUser();
+        $values = $this->request->getValues();
+
+        $user = $this->projectUserRoleModel->getRemoveUser($values['project_id'], $values['user_id']);
 
         if ($this->request->isPost()) {
             $this->request->checkCSRFToken();

diff --git a/app/Models/ProjectUserRoleModel.php b/app/Models/ProjectUserRoleModel.php
@@ -228,15 +228,23 @@ public function addUser($project_id, $user_id, $role)
         ]);
     }
 
-    public function getRemoveUser()
+    /**
+     * Remove a user.
+     *
+     * @param int    $project_id
+     * @param int    $user_id
+     *
+     * @return array
+     */
+    public function getRemoveUser($project_id, $user_id)
     {
-        $user = $this->userModel->getById($this->request->getIntegerParam('user_id'));
+        $user = $this->userModel->getById($user_id);
 
         if (empty($user)) {
             throw new PageNotFoundException();
         }
 
-        $role = $this->getUserRole($this->request->getIntegerParam('project_id', 0), $this->userSession->getId());
+        $role = $this->getUserRole($project_id, $this->userSession->getId());
 
         if (!$this->userSession->isAdmin() && $role != Role::PROJECT_MANAGER) {
             throw new AccessForbiddenException();