Merge pull request #2439 from ZitaNemeckova/add_missing_load_dialog_r…

…outes

Fix custom button with dialog

app/controllers/application_controller/dialog_runner.rb

@@ -90,10 +90,9 @@ def dialog_field_changed
   def dialog_load
     @edit = session[:edit]
     @record = Dialog.find_by_id(@edit[:rec_id])
-    @dialog_prov = true
     @in_a_form = true
     @showtype = "dialog_provision"
-    render :action => "show"
+    render :template => "shared/dialogs/dialog_provision"
   end
 
   def dynamic_radio_button_refresh

app/controllers/cloud_subnet_controller.rb

@@ -28,9 +28,8 @@ def button
       delete_subnets
     when "cloud_subnet_edit"
       javascript_redirect :action => "edit", :id => checked_item_id
-    when params[:pressed] == "custom_button"
+    when "custom_button"
       custom_buttons
-      return
     else
       if params[:pressed] == "cloud_subnet_new"
         javascript_redirect :action => "new"

app/controllers/infra_networking_controller.rb

@@ -142,6 +142,12 @@ def tagging
     render_tagging_form
   end
 
+  def button
+    if params[:pressed] == "custom_button"
+      custom_buttons
+    end
+  end
+
   private
 
   def textual_group_list
@@ -568,7 +574,9 @@ def rebuild_toolbars(record_showing, presenter)
 
     h_tb = build_toolbar("x_history_tb") unless @in_a_form
 
-    presenter.reload_toolbars(:history => h_tb, :center => c_tb, :view => v_tb)
+    cb_tb = build_toolbar(Mixins::CustomButtons::Result.new(@nodetype == 'sw' ? :single : :list))
+
+    presenter.reload_toolbars(:history => h_tb, :center => c_tb, :view => v_tb, :custom => cb_tb)
 
     presenter.set_visibility(h_tb.present? || c_tb.present? || v_tb.present?, :toolbar)
 

app/controllers/network_router_controller.rb

@@ -27,6 +27,8 @@ def button
       javascript_redirect :action => "edit", :id => checked_item_id
     elsif params[:pressed] == "network_router_new"
       javascript_redirect :action => "new"
+    elsif params[:pressed] == "custom_button"
+      custom_buttons
     elsif params[:pressed] == "network_router_add_interface"
       javascript_redirect :action => "add_interface_select", :id => checked_item_id
     elsif params[:pressed] == "network_router_remove_interface"

app/controllers/security_group_controller.rb

@@ -29,9 +29,8 @@ def button
       delete_security_groups
     when "security_group_edit"
       javascript_redirect :action => "edit", :id => checked_item_id(params)
-    when params[:pressed] == "custom_button"
+    when "custom_button"
       custom_buttons
-      return
     else
       if params[:pressed] == "security_group_new"
         javascript_redirect :action => "new"

app/views/ems_cluster/show.html.haml

@@ -16,8 +16,6 @@
       = render :partial => "layouts/item"
     - when "timeline"
       = render(:partial => "layouts/tl_show_async")
-    - when "dialog_provision"
-      = render(:partial => "shared/dialogs/dialog_provision")
     - when "main"
       = render :partial => "layouts/textual_groups_generic"
     - when "config"

app/views/host/show.html.haml

@@ -15,8 +15,6 @@
       = render :partial => "layouts/performance_summary"
     - when "timeline"
       = render :partial => "layouts/tl_show_async"
-    - when "dialog_provision"
-      = render :partial => "shared/dialogs/dialog_provision"
     - when "compliance_history"
       = render :partial => "shared/views/compliance_history"
     - when "main"

app/views/shared/dialogs/dialog_provision.html.haml

@@ -0,0 +1,3 @@
+#main_div
+  = render :partial => "shared/dialogs/dialog_provision"
+

app/views/shared/views/ems_common/_show.html.haml

@@ -17,8 +17,6 @@
     = render :partial => "layouts/tl_show_async"
   - elsif @showtype == "performance"
     = render(:partial => "layouts/performance_async")
-  - elsif @showtype == "dialog_provision"
-    = render :partial => "shared/dialogs/dialog_provision"
   - elsif @showtype == "config"
     = render :partial => "shared/views/ems_common/config"
   - elsif @showtype == 'main'

app/views/storage/show.html.haml

@@ -1,7 +1,5 @@
 #main_div
-  - if @dialog_prov
-    = render :partial => "shared/dialogs/dialog_provision"
-  - elsif %w(all_vms hosts miq_proxies all_miq_templates storage_extents storage_systems).include?(@display) && @showtype != "compare"
+  - if %w(all_vms hosts miq_proxies all_miq_templates storage_extents storage_systems).include?(@display) && @showtype != "compare"
     = render :partial => "layouts/x_gtl", :locals => {:action_url => "show/#{@record.id}"}
   - else
     - case @showtype
@@ -11,7 +9,5 @@
       = render :partial => "layouts/item"
     - when "performance"
       = render :partial => "layouts/performance_async"
-    - when "dialog_provision"
-      = render :partial => "shared/dialogs/dialog_provision"
     - when "main"
       = render :partial => "layouts/textual_groups_generic"

config/routes.rb

@@ -228,7 +228,7 @@
         tag_edit_form_field_changed
         tl_chooser
         wait_for_task
-      ) + adv_search_post + compare_post + exp_post + perf_post + save_post
+      ) + adv_search_post + compare_post + exp_post + perf_post + save_post + dialog_runner_post
     },
 
     :host_aggregate           => {
@@ -425,12 +425,13 @@
         tag_edit_form_field_changed
         create
         wait_for_task
-      ) + compare_post + adv_search_post + exp_post + save_post
+      ) + compare_post + adv_search_post + exp_post + save_post + dialog_runner_post
     },
 
     :cloud_tenant             => {
       :get => %w(
         cloud_tenant_form_fields
+        dialog_load
         download_data
         download_summary_pdf
         edit
@@ -456,7 +457,7 @@
         update
         wait_for_task
       ) +
-               compare_post + adv_search_post + exp_post + save_post
+               compare_post + adv_search_post + exp_post + save_post + dialog_runner_post
     },
 
     :cloud_object_store_object => {
@@ -483,7 +484,7 @@
         tagging_edit
         tag_edit_form_field_changed
         update
-      ) + compare_post + adv_search_post + exp_post + save_post
+      ) + compare_post + adv_search_post + exp_post
     },
 
     :cloud_volume             => {
@@ -524,7 +525,7 @@
         tag_edit_form_field_changed
         update
         wait_for_task
-      ) + compare_post + adv_search_post + exp_post + save_post
+      ) + compare_post + adv_search_post + exp_post + save_post + dialog_runner_post
     },
 
     :cloud_volume_snapshot    => {
@@ -678,7 +679,8 @@
                adv_search_post +
                exp_post +
                perf_post +
-               save_post
+               save_post +
+               dialog_runner_post
     },
 
     :container_node           => {
@@ -793,7 +795,7 @@
         openscap_rule_results
         protect
         squash_toggle
-      ) + adv_search_post + exp_post + save_post
+      ) + adv_search_post + exp_post + save_post + dialog_runner_post
     },
 
     :container_image_registry => {
@@ -891,7 +893,8 @@
                adv_search_post +
                exp_post +
                perf_post +
-               save_post
+               save_post +
+               dialog_runner_post
     },
 
     :container_route          => {
@@ -948,7 +951,7 @@
         update
         tagging_edit
         tag_edit_form_field_changed
-      ) + adv_search_post + exp_post + save_post
+      ) + adv_search_post + exp_post + save_post + dialog_runner_post
     },
 
     :container_build          => {
@@ -1004,7 +1007,7 @@
         show_list
         tagging_edit
         tag_edit_form_field_changed
-      ) + adv_search_post + exp_post + save_post
+      ) + adv_search_post + exp_post + save_post + dialog_runner_post
     },
 
     :container_topology       => {
@@ -1732,7 +1735,8 @@
         adv_search_post +
         compare_post +
         save_post +
-        exp_post
+        exp_post +
+        dialog_runner_post
     },
 
     :floating_ip              => {
@@ -1801,7 +1805,8 @@
         adv_search_post +
         compare_post +
         save_post +
-        exp_post
+        exp_post +
+        dialog_runner_post
     },
 
     :cloud_network             => {
@@ -1834,7 +1839,8 @@
         adv_search_post +
         compare_post +
         save_post +
-        exp_post
+        exp_post +
+        dialog_runner_post
     },
 
     :network_port             => {
@@ -1906,7 +1912,8 @@
         adv_search_post +
         compare_post +
         save_post +
-        exp_post
+        exp_post +
+        dialog_runner_post
     },
 
     :load_balancer             => {
@@ -1932,7 +1939,8 @@
         adv_search_post +
         compare_post +
         save_post +
-        exp_post
+        exp_post +
+        dialog_runner_post
     },
 
     :flavor                   => {
@@ -2075,7 +2083,8 @@
         adv_search_post +
         exp_post +
         save_post +
-        x_post
+        x_post +
+        dialog_runner_post
     },
 
     :generic_object => {
@@ -2761,7 +2770,8 @@
       ) +
                adv_search_post +
                exp_post +
-               save_post
+               save_post +
+               dialog_runner_post
     },
 
     :provider_foreman         => {