Skip to content
Snippets Groups Projects
Commit 5eaf479c authored by Phil Hughes's avatar Phil Hughes
Browse files

Fixed issue with groups not displaying

parent db56ac65
No related branches found
No related tags found
No related merge requests found
Loading
@@ -16,20 +16,6 @@ class Projects::ProjectMembersController < Projects::ApplicationController
Loading
@@ -16,20 +16,6 @@ class Projects::ProjectMembersController < Projects::ApplicationController
   
@project_members = @project_members.order('access_level DESC') @project_members = @project_members.order('access_level DESC')
   
@group = @project.group
if @group
@group_members = @group.group_members
@group_members = @group_members.non_invite unless can?(current_user, :admin_group, @group)
if params[:search].present?
users = @group.users.search(params[:search]).to_a
@group_members = @group_members.where(user_id: users)
end
@group_members = @group_members.order('access_level DESC')
end
@requesters = @project.requesters if can?(current_user, :admin_project, @project) @requesters = @project.requesters if can?(current_user, :admin_project, @project)
   
@project_member = @project.project_members.new @project_member = @project.project_members.new
Loading
Loading
Loading
@@ -21,9 +21,7 @@
Loading
@@ -21,9 +21,7 @@
.form-group .form-group
= search_field_tag :search, params[:search], { placeholder: 'Find existing members by name', class: 'form-control', spellcheck: false } = search_field_tag :search, params[:search], { placeholder: 'Find existing members by name', class: 'form-control', spellcheck: false }
= icon("search") = icon("search")
- if @grups - if @groups.size > 0
= render 'groups', groups: @groups = render 'groups', groups: @groups
= render 'team', members: @project_members
   
- if @group = render 'team', members: @project_members
= render "group_members", members: @group_members
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment