From 461ae3e52118e4592b225be44e8455fb3f8bd072 Mon Sep 17 00:00:00 2001 From: Zita Nemeckova Date: Tue, 24 Oct 2017 17:53:58 +0200 Subject: [PATCH] Remove remaining dialog_provision from show --- app/controllers/application_controller/dialog_runner.rb | 1 - app/controllers/infra_networking_controller.rb | 2 +- app/views/storage/show.html.haml | 4 +--- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/app/controllers/application_controller/dialog_runner.rb b/app/controllers/application_controller/dialog_runner.rb index 94254ac00b5..9e064c65be4 100644 --- a/app/controllers/application_controller/dialog_runner.rb +++ b/app/controllers/application_controller/dialog_runner.rb @@ -90,7 +90,6 @@ 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 :template => "shared/dialogs/dialog_provision" diff --git a/app/controllers/infra_networking_controller.rb b/app/controllers/infra_networking_controller.rb index a78aabc1cfc..b356c7c6a11 100644 --- a/app/controllers/infra_networking_controller.rb +++ b/app/controllers/infra_networking_controller.rb @@ -145,7 +145,7 @@ def tagging def button if params[:pressed] == "custom_button" custom_buttons - end + end end private diff --git a/app/views/storage/show.html.haml b/app/views/storage/show.html.haml index d63e1b7ab73..276b69c0499 100644 --- a/app/views/storage/show.html.haml +++ b/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