Add flag to initialize field default values

ManageIQ · Oct 4, 2018 · d4c8f5d · d4c8f5d
1 parent 4dbf6b0
commit d4c8f5d
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/app/controllers/api/mixins/service_templates.rb b/app/controllers/api/mixins/service_templates.rb
@@ -4,7 +4,8 @@ module ServiceTemplates
       def order_service_template(id, data, scheduled_time = nil)
         service_template = resource_search(id, :service_templates, ServiceTemplate)
         raise BadRequestError, "#{service_template_ident(service_template)} cannot be ordered" unless service_template.orderable?
-        request_result = service_template.order(User.current_user, (data || {}), {:submit_workflow => true}, scheduled_time)
+        init_defaults = !request_from_ui? && Settings.product.run_automate_methods_on_service_catalog_api_submit
+        request_result = service_template.order(User.current_user, (data || {}), {:submit_workflow => request_from_ui?, :init_defaults => init_defaults}, scheduled_time)
         errors = request_result[:errors]
         if errors.present?
           raise BadRequestError, "Failed to order #{service_template_ident(service_template)} - #{errors.join(", ")}"
@@ -14,6 +15,11 @@ def order_service_template(id, data, scheduled_time = nil)
 
       private
 
+      def request_from_ui?
+        return false if request.headers["x-auth-token"].blank?
+        !token_info.empty?
+      end
+
       def service_template_ident(st)
         "Service Template id:#{st.id} name:'#{st.name}'"
       end