Merge pull request #17206 from d-m-u/ordering_models_in_miq_request_m…

…ore_rightly Cleanup order of model request types
ManageIQ · Mar 27, 2018 · f0ad654 · f0ad654
2 parents 9d70fbc + 3bd892d
commit f0ad654
Showing 1 changed file with 29 additions and 29 deletions.
diff --git a/app/models/miq_request.rb b/app/models/miq_request.rb
@@ -59,52 +59,52 @@ class MiqRequest < ApplicationRecord
   scope :with_requester,      ->(id)         { where(:requester_id => User.with_same_userid(id).collect(&:id)) }
 
   MODEL_REQUEST_TYPES = {
+    :Automate       => {
+      :AutomationRequest => {
+        :automation => N_("Automation")
+      }
+    },
+    :Infrastructure => {
+      :MiqHostProvisionRequest => {
+        :host_pxe_install => N_("Host Provision")
+      },
+    },
     :Service        => {
+      :MiqProvisionConfiguredSystemRequest => {
+        :provision_via_foreman => N_("%{config_mgr_type} Provision") % {:config_mgr_type => ui_lookup(:ui_title => 'foreman')}
+      },
       :MiqProvisionRequest                 => {
         :template          => N_("VM Provision"),
         :clone_to_vm       => N_("VM Clone"),
         :clone_to_template => N_("VM Publish"),
       },
-      :MiqProvisionConfiguredSystemRequest => {
-        :provision_via_foreman => N_("%{config_mgr_type} Provision") % {:config_mgr_type => ui_lookup(:ui_title => 'foreman')}
-      },
-      :VmReconfigureRequest                => {
-        :vm_reconfigure => N_("VM Reconfigure")
-      },
-      :VmCloudReconfigureRequest           => {
-        :vm_cloud_reconfigure => N_("VM Cloud Reconfigure")
-      },
-      :VmMigrateRequest                    => {
-        :vm_migrate => N_("VM Migrate")
+      :OrchestrationStackRetireRequest     => {
+        :orchestration_stack_retire => N_("Orchestration Stack Retire")
       },
-      :VmRetireRequest                     => {
-        :vm_retire => N_("VM Retire")
+      :PhysicalServerProvisionRequest      => {
+        :provision_physical_server => N_("Physical Server Provision")
       },
       :ServiceRetireRequest                => {
         :service_retire => N_("Service Retire")
       },
-      :OrchestrationStackRetireRequest     => {
-        :orchestration_stack_retire => N_("Orchestration Stack Retire")
+      :ServiceReconfigureRequest           => {
+        :service_reconfigure => N_("Service Reconfigure")
       },
       :ServiceTemplateProvisionRequest     => {
         :clone_to_service => N_("Service Provision")
       },
-      :ServiceReconfigureRequest           => {
-        :service_reconfigure => N_("Service Reconfigure")
+      :VmCloudReconfigureRequest           => {
+        :vm_cloud_reconfigure => N_("VM Cloud Reconfigure")
       },
-      :PhysicalServerProvisionRequest      => {
-        :provision_physical_server => N_("Physical Server Provision")
-      }
-    },
-    :Infrastructure => {
-      :MiqHostProvisionRequest => {
-        :host_pxe_install => N_("Host Provision")
+      :VmMigrateRequest                    => {
+        :vm_migrate => N_("VM Migrate")
+      },
+      :VmReconfigureRequest                => {
+        :vm_reconfigure => N_("VM Reconfigure")
+      },
+      :VmRetireRequest                     => {
+        :vm_retire => N_("VM Retire")
       },
-    },
-    :Automate       => {
-      :AutomationRequest => {
-        :automation => N_("Automation")
-      }
     },
   }.freeze