---
src/app/controllers/application_controller.rb | 3 ++-
src/app/controllers/permissions_controller.rb | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/app/controllers/application_controller.rb
b/src/app/controllers/application_controller.rb
index fda6a06..7e9d85e 100644
--- a/src/app/controllers/application_controller.rb
+++ b/src/app/controllers/application_controller.rb
@@ -285,7 +285,8 @@ class ApplicationController < ActionController::Base
def sort_column(model, default = nil)
return params[:order_field] if model.column_names.include?(params[:order_field])
- return default || "#{model.quoted_table_name}.name"
+ return default unless default.nil? || !model.column_names.include?(default)
+ return "#{model.quoted_table_name}.name"
end
def sort_direction
diff --git a/src/app/controllers/permissions_controller.rb
b/src/app/controllers/permissions_controller.rb
index 9f984fa..9e8ba51 100644
--- a/src/app/controllers/permissions_controller.rb
+++ b/src/app/controllers/permissions_controller.rb
@@ -169,7 +169,8 @@ class PermissionsController < ApplicationController
def load_users
sort_order = params[:sort_by].nil? ? "login" : params[:sort_by]
- @users = paginate_collection(User.all(:order => sort_order), params[:page])
+ @users = paginate_collection(User.all(:order => sort_column(User, sort_order)),
+ params[:page])
end
def load_headers
--
1.7.6.5