From aa5fbffce8febfb055947ed1e9d493d6eb2735f3 Mon Sep 17 00:00:00 2001 From: Martin Hradil Date: Thu, 28 Jan 2021 01:20:09 +0000 Subject: [PATCH 01/10] prov_wf: remove dead prov_host_dialog reference removed in #4169 (acb4316) --- app/views/miq_request/_prov_wf.html.haml | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/views/miq_request/_prov_wf.html.haml b/app/views/miq_request/_prov_wf.html.haml index 7f7686f9d0e..61f658a1cb9 100644 --- a/app/views/miq_request/_prov_wf.html.haml +++ b/app/views/miq_request/_prov_wf.html.haml @@ -24,8 +24,6 @@ = render :partial => "/shared/views/prov_dialog", :locals => partial_locals - elsif wf.kind_of?(VmMigrateWorkflow) = render :partial => "/miq_request/prov_vm_migrate_dialog", :locals => partial_locals - - else - = render :partial => "/miq_request/prov_host_dialog", :locals => partial_locals :javascript miq_tabs_init('#prov_tabs', '/miq_request/prov_field_changed', {edit_mode: 'true'}); From 9ca9010ab36bc5c017201202b3ee70660f6e66d5 Mon Sep 17 00:00:00 2001 From: Martin Hradil Date: Thu, 28 Jan 2021 01:21:46 +0000 Subject: [PATCH 02/10] alert_details: remove dead alert_assign reference I'm not seeing evidence the file ever existed --- app/views/miq_alert/_alert_details.html.haml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/views/miq_alert/_alert_details.html.haml b/app/views/miq_alert/_alert_details.html.haml index ef970e17a26..e2236add970 100644 --- a/app/views/miq_alert/_alert_details.html.haml +++ b/app/views/miq_alert/_alert_details.html.haml @@ -2,9 +2,7 @@ - url = url_for_only_path(:action => 'alert_field_changed', :id => (@alert.id || 'new')) - observe = {:url => url}.to_json #alert_details_div - - if @assign - = render :partial => 'alert_assign' - - elsif @alert + - if @alert #alert_info_div = render :partial => "layouts/flash_msg" %h3= _('Info') From eac147d24c880766992554aebf57bb1393f71da4 Mon Sep 17 00:00:00 2001 From: Martin Hradil Date: Thu, 28 Jan 2021 01:23:55 +0000 Subject: [PATCH 03/10] Remove dead app/views/dashboard/_dropdownbar.html.haml which itself referenced nonexistent dashboard/_widgets_menu removed in #5997 (59df33f) https://github.com/ManageIQ/manageiq-ui-classic/pull/5997/files#diff-11a60195925554b3a904f3fa652a3d9df5579ec522c0f177be4cba6693edae01L2 also being the last reference --- app/views/dashboard/_dropdownbar.html.haml | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 app/views/dashboard/_dropdownbar.html.haml diff --git a/app/views/dashboard/_dropdownbar.html.haml b/app/views/dashboard/_dropdownbar.html.haml deleted file mode 100644 index ed73507a8ec..00000000000 --- a/app/views/dashboard/_dropdownbar.html.haml +++ /dev/null @@ -1,3 +0,0 @@ -#dashboard_dropdown - #widget_select_div - = render :partial => 'dashboard/widgets_menu' From 324370c1e46c13e3943916196c53dc8dbf78755d Mon Sep 17 00:00:00 2001 From: Martin Hradil Date: Thu, 28 Jan 2021 01:27:33 +0000 Subject: [PATCH 04/10] rates_tabs: fix edit vs form partial reference there is no app/views/*/_edit.*, there is a charegeback_rate/edit template, which loads the form partial .. so fixing to reference form --- app/views/chargeback_rate/_rates_tabs.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/chargeback_rate/_rates_tabs.html.haml b/app/views/chargeback_rate/_rates_tabs.html.haml index 1f89a988cca..9739524d46c 100644 --- a/app/views/chargeback_rate/_rates_tabs.html.haml +++ b/app/views/chargeback_rate/_rates_tabs.html.haml @@ -2,7 +2,7 @@ - if x_node == "root" = render :partial => "rates_list" - elsif @edit && @edit[:new] && ((params[:pressed] && params[:pressed] != "chargeback_rates_delete") || params[:button] == "reset") - = render :partial => "edit" + = render :partial => "form" - elsif %w(Compute Storage).include?(x_node.split('-').last) = render :partial => 'layouts/x_gtl', :locals => {:action_url => "cb_rates_list"} - else From e8bb369ed0ad6e85cbeda05fef8dad380c9e7134 Mon Sep 17 00:00:00 2001 From: Martin Hradil Date: Thu, 28 Jan 2021 01:29:29 +0000 Subject: [PATCH 05/10] miq_template: remove dead layouts/drift reference removed in ManageIQ/manageiq#7321 (be99fb3b) --- app/views/miq_template/show.html.haml | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/views/miq_template/show.html.haml b/app/views/miq_template/show.html.haml index 556b9d1b6d5..2baa79154fa 100644 --- a/app/views/miq_template/show.html.haml +++ b/app/views/miq_template/show.html.haml @@ -17,8 +17,6 @@ = render :partial => "layouts/compare" - when "drift_history" = render :partial => "layouts/drift_history" - - when "drift" - = render :partial => "layouts/drift" - when "item" = render :partial => "layouts/item" - when "performance" From 3dd3484f24cf7950a247c8b91525bf97deeb10d7 Mon Sep 17 00:00:00 2001 From: Martin Hradil Date: Thu, 28 Jan 2021 01:31:45 +0000 Subject: [PATCH 06/10] policy explorer: remove dead _profile_list reference removed in #7348 (fe329b1f) --- app/views/miq_policy/explorer.html.haml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/app/views/miq_policy/explorer.html.haml b/app/views/miq_policy/explorer.html.haml index c03801b8450..7b77d837970 100644 --- a/app/views/miq_policy/explorer.html.haml +++ b/app/views/miq_policy/explorer.html.haml @@ -5,8 +5,6 @@ - case @nodetype - when "root" - case x_active_tree - - when :policy_profile_tree - = render :partial => "profile_list" - when :policy_tree = render :partial => "policy_folders" - when :event_tree @@ -22,9 +20,7 @@ - when "pp" = render :partial => "profile_details" - when "xx" - - if @profiles - = render :partial => "profile_list" - - elsif @policies || (@view && @sb[:tree_typ] == "policies") + - if @policies || (@view && @sb[:tree_typ] == "policies") = render :partial => "policy_list" - elsif @conditions = render :partial => "condition_list" From 7242fffd097c8ced1547483625d8aa675803401a Mon Sep 17 00:00:00 2001 From: Martin Hradil Date: Thu, 28 Jan 2021 01:37:05 +0000 Subject: [PATCH 07/10] Drop dead service/explorer.js partial references shared/explorer, removed in #1986 (f26af339) and not rendered by anything in service explorer, including the partials returned by set_right_cell_vars --- app/views/service/_explorer.js.haml | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 app/views/service/_explorer.js.haml diff --git a/app/views/service/_explorer.js.haml b/app/views/service/_explorer.js.haml deleted file mode 100644 index 1384e109b23..00000000000 --- a/app/views/service/_explorer.js.haml +++ /dev/null @@ -1,17 +0,0 @@ --# Renders JS to replace the contents of the miq_policy explorer view as directed by the controller - --# Pull options into local vars -- exp = options.delete(:exp) - -- if exp - -# See if any miq expression vars need to be set - - if exp[:val1_type] - ManageIQ.expEditor.first.type = '#{exp[:val1_type]}'; - - if exp[:val1_title] - ManageIQ.expEditor.first.title = '#{exp[:val1_title]}'; - - if exp[:val2_type] - ManageIQ.expEditor.second.type = '#{exp[:val2_type]}'; - - if exp[:val2_title] - ManageIQ.expEditor.second.title = '#{exp[:val2_title]}'; - -= render :partial => "shared/explorer", :locals => {:options => options} From 067663465cad501dcf7964eac32dcb8b85d6c330 Mon Sep 17 00:00:00 2001 From: Martin Hradil Date: Thu, 28 Jan 2021 01:39:43 +0000 Subject: [PATCH 08/10] configuration/show - drop dead ui_2 reference removed in #7189 (6601370) --- app/views/configuration/show.html.haml | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/views/configuration/show.html.haml b/app/views/configuration/show.html.haml index 323746fbfaa..206312e189b 100644 --- a/app/views/configuration/show.html.haml +++ b/app/views/configuration/show.html.haml @@ -2,8 +2,6 @@ - case @tabform - when 'ui_1' = render :partial => 'ui_1' - - when 'ui_2' - = render :partial => 'ui_2' - when 'ui_3' = render :partial => 'ui_3' - when 'ui_4' From 557b0fa8a29613542070fc1150a18ee754952115 Mon Sep 17 00:00:00 2001 From: Martin Hradil Date: Thu, 28 Jan 2021 01:55:07 +0000 Subject: [PATCH 09/10] miq_template/show: remove dead vm_common/provision reference I'm not seeing evidence of the file ever existing --- app/views/miq_template/show.html.haml | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/views/miq_template/show.html.haml b/app/views/miq_template/show.html.haml index 2baa79154fa..4ea8d7e25ff 100644 --- a/app/views/miq_template/show.html.haml +++ b/app/views/miq_template/show.html.haml @@ -5,8 +5,6 @@ = render :partial => "vm_common/right_size" - elsif @reconfigure = render :partial => "vm_common/reconfigure" - - elsif request.parameters[:action] == "provision" - = render :partial => "vm_common/provision" - else - case @showtype - when "details" From ab50019ad7de7ac8d4c517599dd10843c5f641e7 Mon Sep 17 00:00:00 2001 From: Martin Hradil Date: Thu, 28 Jan 2021 16:10:01 +0000 Subject: [PATCH 10/10] _rates_tabs - remove unused partial removed in #7039 (c083fc0) --- app/views/chargeback_rate/_rates_tabs.html.haml | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 app/views/chargeback_rate/_rates_tabs.html.haml diff --git a/app/views/chargeback_rate/_rates_tabs.html.haml b/app/views/chargeback_rate/_rates_tabs.html.haml deleted file mode 100644 index 9739524d46c..00000000000 --- a/app/views/chargeback_rate/_rates_tabs.html.haml +++ /dev/null @@ -1,9 +0,0 @@ -#rates_tabs_div - - if x_node == "root" - = render :partial => "rates_list" - - elsif @edit && @edit[:new] && ((params[:pressed] && params[:pressed] != "chargeback_rates_delete") || params[:button] == "reset") - = render :partial => "form" - - elsif %w(Compute Storage).include?(x_node.split('-').last) - = render :partial => 'layouts/x_gtl', :locals => {:action_url => "cb_rates_list"} - - else - = render :partial => "cb_rate_show"