Huge replace of old users_project and users_group references

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

2 files changed, 4 insertions, 4 deletions

diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb
index 0388997ec69..e6d0c9323c1 100644
--- a/app/controllers/admin/groups_controller.rb
+++ b/app/controllers/admin/groups_controller.rb
@@ -8,7 +8,7 @@ class Admin::GroupsController < Admin::ApplicationController
   end
 
   def show
-    @members = @group.members.order("group_access DESC").page(params[:members_page]).per(30)
+    @members = @group.members.order("access_level DESC").page(params[:members_page]).per(30)
     @projects = @group.projects.page(params[:projects_page]).per(30)
   end
 
@@ -40,7 +40,7 @@ class Admin::GroupsController < Admin::ApplicationController
   end
 
   def project_teams_update
-    @group.add_users(params[:user_ids].split(','), params[:group_access])
+    @group.add_users(params[:user_ids].split(','), params[:access_level])
 
     redirect_to [:admin, @group], notice: 'Users were successfully added.'
   end
diff --git a/app/controllers/admin/projects_controller.rb b/app/controllers/admin/projects_controller.rb
index 1c7c09d0cd4..2f0d344802f 100644
--- a/app/controllers/admin/projects_controller.rb
+++ b/app/controllers/admin/projects_controller.rb
@@ -16,10 +16,10 @@ class Admin::ProjectsController < Admin::ApplicationController
 
   def show
     if @group
-      @group_members = @group.members.order("group_access DESC").page(params[:group_members_page]).per(30)
+      @group_members = @group.members.order("access_level DESC").page(params[:group_members_page]).per(30)
     end
 
-    @project_members = @project.users_projects.page(params[:project_members_page]).per(30)
+    @project_members = @project.project_members.page(params[:project_members_page]).per(30)
   end
 
   def transfer