Merge pull request #1 from newsdev/feature/user-name-sort

user names now sorted by full_name
newsdev · Apr 26, 2017 · d703924 · d703924
2 parents aee1c81 + e29baa8
commit d703924
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
@@ -34,13 +34,13 @@ def show
   # GET /pages/new
   def new
     @page = Page.new
-    @users = User.all
+    @users = User.all.sort_by { |obj| (obj.display_name.nil? ? 0 : obj.display_name.downcase) }
     @slack_integrations = SlackIntegration.all
   end
 
   # GET /pages/1/edit
   def edit
-    @users = User.all
+    @users = User.all.sort_by { |obj| (obj.display_name.nil? ? 0 : obj.display_name.downcase) }
     @slack_integrations = SlackIntegration.all
   end