Merge pull request #2565 from yrudman/sort-reports-alphabetically

Sort reports alphabetically
ManageIQ · Oct 31, 2017 · e41ecad · e41ecad
2 parents 60269d4 + 8c2cb8b
commit e41ecad
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -1046,6 +1046,7 @@ def get_reports_menu(group = current_group, tree_type = "reports", mode = "menu"
           end
         else
           if @temp_title1 != title[1]
+            reports.sort!
             reports = []
             @temp_title1 = title[1]
           end

diff --git a/app/presenters/tree_builder_report_reports.rb b/app/presenters/tree_builder_report_reports.rb
@@ -51,7 +51,7 @@ def x_get_tree_custom_kids(object, count_only, _options)
     node_id = nodes.last.to_i
 
     child_names = @rpt_menu[parent_id][1][node_id][1]
-    count_only ? child_names.size : MiqReport.where(:name => child_names)
+    count_only ? child_names.size : MiqReport.where(:name => child_names).order(:name)
   end
 
   def folder_hash(id, text, blue)