diff options
| author | Phil Hughes <me@iamphill.com> | 2016-09-02 09:25:53 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-09-13 08:44:59 +0100 |
| commit | e477ad44565dbe69e3f0200f4f4f7bebbd48cb15 (patch) | |
| tree | 9300603b45ad3168be44abf045f59a1ac1fbfd29 /app/controllers/projects/project_members_controller.rb | |
| parent | 15a3111a6663894d952103e7395f2f56408f88ce (diff) | |
| download | gitlab-ce-e477ad44565dbe69e3f0200f4f4f7bebbd48cb15.tar.gz | |
Removes row from dom when deleting
Fixed spacing with buttons
Disables group form when user doesnt have correct permissions
Diffstat (limited to 'app/controllers/projects/project_members_controller.rb')
| -rw-r--r-- | app/controllers/projects/project_members_controller.rb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/app/controllers/projects/project_members_controller.rb b/app/controllers/projects/project_members_controller.rb index abb92938211..cd31653698c 100644 --- a/app/controllers/projects/project_members_controller.rb +++ b/app/controllers/projects/project_members_controller.rb @@ -5,11 +5,9 @@ class Projects::ProjectMembersController < Projects::ApplicationController before_action :authorize_admin_project_member!, except: [:index, :leave, :request_access] def index - @groups = @project.project_group_links.all - @project_members = @project.team.members.all + @groups = @project.project_group_links + @project_members = @project.team.members(can?(current_user, :admin_project, @project)) @project_members_size = @project_members.size - @group_members = @project.group.group_members - @project_members = @project_members.non_invite unless can?(current_user, :admin_project, @project) if params[:search].present? @project_members = @project_members.search(params[:search]) @@ -20,7 +18,6 @@ class Projects::ProjectMembersController < Projects::ApplicationController @requesters = @project.requesters if can?(current_user, :admin_project, @project) @project_member = @project.project_members.new - @project_group_links = @project.project_group_links end def create |