From 5a064b0249922c4d82fb44ae9f3bcf230a3cbbd0 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Mon, 2 Jun 2014 21:25:01 +0300 Subject: [PATCH] Get group members only if group not nil Signed-off-by: Dmitriy Zaporozhets --- app/controllers/admin/projects_controller.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/controllers/admin/projects_controller.rb b/app/controllers/admin/projects_controller.rb index 097d208f313..8c1f45ac01c 100644 --- a/app/controllers/admin/projects_controller.rb +++ b/app/controllers/admin/projects_controller.rb @@ -17,7 +17,10 @@ class Admin::ProjectsController < Admin::ApplicationController end def show - @group_members = @group.members.order("group_access DESC").page(params[:group_members_page]).per(30) + if @group + @group_members = @group.members.order("group_access DESC").page(params[:group_members_page]).per(30) + end + @project_members = @project.users_projects.page(params[:project_members_page]).per(30) end -- GitLab