From 302cfa73ab233271cf1dbb5c5805b7219f9a4cc9 Mon Sep 17 00:00:00 2001
From: Alexandre Arias <apa13@inf.ufpr.br>
Date: Tue, 10 Nov 2015 09:49:51 -0200
Subject: [PATCH] fix query bug
Signed-off-by: Alexandre Arias <apa13@inf.ufpr.br>
---
app/controllers/management/users_controller.rb | 2 +-
app/repositories/orient_db/user_repository.rb | 5 -----
app/repositories/user_repository_proxy.rb | 4 ++++
app/views/management/users/admins.html.erb | 2 +-
app/views/management/users/curators.html.erb | 2 +-
5 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/app/controllers/management/users_controller.rb b/app/controllers/management/users_controller.rb
index 6522fd5a..93172970 100644
--- a/app/controllers/management/users_controller.rb
+++ b/app/controllers/management/users_controller.rb
@@ -75,7 +75,7 @@ class Management::UsersController < ManagementController
# Use callbacks to share common setup or constraints between actions.
def set_user
- @user = user_repository.find params[:id]
+ @user = user_repository.find(params[:id])
end
# Never trust parameters from the scary internet, only allow the white list through.
diff --git a/app/repositories/orient_db/user_repository.rb b/app/repositories/orient_db/user_repository.rb
index 6fa51a2e..7a904ba1 100644
--- a/app/repositories/orient_db/user_repository.rb
+++ b/app/repositories/orient_db/user_repository.rb
@@ -31,11 +31,6 @@ module OrientDb
(result.count > 0)
end
- def all
- result = connection.query sprintf("SELECT FROM USER")
-
- end
-
private
def odb_class
diff --git a/app/repositories/user_repository_proxy.rb b/app/repositories/user_repository_proxy.rb
index 3c43aae3..28ce0f85 100644
--- a/app/repositories/user_repository_proxy.rb
+++ b/app/repositories/user_repository_proxy.rb
@@ -32,6 +32,10 @@ class UserRepositoryProxy
user.save!
end
+ def all
+ User.includes(:roles).all
+ end
+
def method_missing(method_name, *arguments, &block)
User.send(method_name, *arguments, &block)
end
diff --git a/app/views/management/users/admins.html.erb b/app/views/management/users/admins.html.erb
index 91a70e6a..6c3ae270 100644
--- a/app/views/management/users/admins.html.erb
+++ b/app/views/management/users/admins.html.erb
@@ -5,7 +5,7 @@
<% admins = Array.new %>
-<% @users = User.all%>
+<% @users = User.includes(:roles).all%>
<% @users.all.each do |user|%>
<% admins << user if user.roles[0].name == "admin" %>
<% end %>
diff --git a/app/views/management/users/curators.html.erb b/app/views/management/users/curators.html.erb
index 4d3e9561..b5924c8a 100644
--- a/app/views/management/users/curators.html.erb
+++ b/app/views/management/users/curators.html.erb
@@ -5,7 +5,7 @@
<% curators = Array.new %>
-<% @users = User.all%>
+<% @users = User.includes(:roles).all%>
<% @users.all.each do |user|%>
<% curators << user if user.roles[0].name == "curator" %>
<% end %>
--
GitLab