From dd7bb94c053a37f2adbe3c725adf9ceed72ad6cd Mon Sep 17 00:00:00 2001 From: Martin Hradil Date: Mon, 13 Mar 2017 14:59:47 +0000 Subject: [PATCH] Remove dead @base from controllers only ever saved to session and restored from there --- app/controllers/host_controller.rb | 2 -- app/controllers/miq_template_controller.rb | 2 -- app/controllers/mixins/vm_show_mixin.rb | 2 -- app/controllers/vm_controller.rb | 2 -- 4 files changed, 8 deletions(-) diff --git a/app/controllers/host_controller.rb b/app/controllers/host_controller.rb index 647e9694711..214ff7cc5ba 100644 --- a/app/controllers/host_controller.rb +++ b/app/controllers/host_controller.rb @@ -653,7 +653,6 @@ def get_session_data @display = session[:host_display] @filters = session[:host_filters] @catinfo = session[:host_catinfo] - @base = session[:vm_compare_base] end def set_session_data @@ -663,7 +662,6 @@ def set_session_data session[:host_catinfo] = @catinfo session[:miq_compressed] = @compressed unless @compressed.nil? session[:miq_exists_mode] = @exists_mode unless @exists_mode.nil? - session[:vm_compare_base] = @base end menu_section :inf diff --git a/app/controllers/miq_template_controller.rb b/app/controllers/miq_template_controller.rb index d2984183548..a5b9163267f 100644 --- a/app/controllers/miq_template_controller.rb +++ b/app/controllers/miq_template_controller.rb @@ -21,7 +21,6 @@ def get_session_data @layout = session[:miq_template_type] ? session[:miq_template_type] : "miq_template" @lastaction = session[:miq_template_lastaction] @showtype = session[:miq_template_showtype] - @base = session[:miq_template_compare_base] @filters = session[:miq_template_filters] @catinfo = session[:miq_template_catinfo] @cats = session[:miq_template_cats] @@ -35,7 +34,6 @@ def set_session_data session[:miq_template_showtype] = @showtype session[:miq_compressed] = @compressed unless @compressed.nil? session[:miq_exists_mode] = @exists_mode unless @exists_mode.nil? - session[:miq_template_compare_base] = @base session[:miq_template_filters] = @filters session[:miq_template_catinfo] = @catinfo session[:miq_template_cats] = @cats diff --git a/app/controllers/mixins/vm_show_mixin.rb b/app/controllers/mixins/vm_show_mixin.rb index 2b36f594943..5a92fd4936c 100644 --- a/app/controllers/mixins/vm_show_mixin.rb +++ b/app/controllers/mixins/vm_show_mixin.rb @@ -135,7 +135,6 @@ def get_session_data @layout = controller_name @lastaction = session[:vm_lastaction] @showtype = session[:vm_showtype] - @base = session[:vm_compare_base] @filters = get_filters @catinfo = session[:vm_catinfo] @cats = session[:vm_cats] @@ -149,7 +148,6 @@ def set_session_data session[:vm_showtype] = @showtype session[:miq_compressed] = @compressed unless @compressed.nil? session[:miq_exists_mode] = @exists_mode unless @exists_mode.nil? - session[:vm_compare_base] = @base session[:vm_filters] = @filters session[:vm_catinfo] = @catinfo session[:vm_cats] = @cats diff --git a/app/controllers/vm_controller.rb b/app/controllers/vm_controller.rb index 78f5a94b220..37d21dd7ce4 100644 --- a/app/controllers/vm_controller.rb +++ b/app/controllers/vm_controller.rb @@ -24,7 +24,6 @@ def get_session_data @layout = "vm" @lastaction = session[:vm_lastaction] @showtype = session[:vm_showtype] - @base = session[:vm_compare_base] @filters = session[:vm_filters] @catinfo = session[:vm_catinfo] @cats = session[:vm_cats] @@ -38,7 +37,6 @@ def set_session_data session[:vm_showtype] = @showtype session[:miq_compressed] = @compressed unless @compressed.nil? session[:miq_exists_mode] = @exists_mode unless @exists_mode.nil? - session[:vm_compare_base] = @base session[:vm_filters] = @filters session[:vm_catinfo] = @catinfo session[:vm_cats] = @cats