vm_controller and genericSessionMixin update

app/controllers/mixins/generic_session_mixin.rb

@@ -4,24 +4,34 @@ module GenericSessionMixin
     private
 
     def get_session_data
-      prefix      = self.class.session_key_prefix
-      @title      = respond_to?(:title) ? title : ui_lookup(:tables => self.class.table_name)
-      @layout     = prefix
-      @table_name = request.parameters[:controller]
-      @lastaction = session["#{prefix}_lastaction".to_sym]
-      @display    = session["#{prefix}_display".to_sym]
-      @filters    = session["#{prefix}_filters".to_sym]
-      @catinfo    = session["#{prefix}_catinfo".to_sym]
-      @showtype   = session["#{prefix}_showtype".to_sym]
+      prefix          = self.class.session_key_prefix
+      @title          = respond_to?(:title) ? title : ui_lookup(:tables => self.class.table_name)
+      @layout         = prefix
+      @table_name     = request.parameters[:controller]
+      @lastaction     = session["#{prefix}_lastaction".to_sym]
+      @display        = session["#{prefix}_display".to_sym]
+      @filters        = session["#{prefix}_filters".to_sym]
+      @catinfo        = session["#{prefix}_catinfo".to_sym]
+      @cats           = session["#{prefix}_cats".to_sym]
+      @showtype       = session["#{prefix}_showtype".to_sym]
+      @base           = session["#{prefix}_compare_base".to_sym]
+      @polArr         = session[:polArr] || ""           # current tags in effect
+      @policy_options = session[:policy_options] || ""
     end
 
     def set_session_data
       prefix = self.class.session_key_prefix
-      session["#{prefix}_lastaction".to_sym] = @lastaction
-      session["#{prefix}_display".to_sym]    = @display unless @display.nil?
-      session["#{prefix}_filters".to_sym]    = @filters
-      session["#{prefix}_catinfo".to_sym]    = @catinfo
-      session["#{prefix}_showtype".to_sym]   = @showtype
+      session["#{prefix}_lastaction".to_sym]      = @lastaction
+      session["#{prefix}_display".to_sym]         = @display unless @display.nil?
+      session["#{prefix}_compare_base".to_sym]    = @base
+      session["#{prefix}_filters".to_sym]         = @filters
+      session["#{prefix}_catinfo".to_sym]         = @catinfo
+      session["#{prefix}_cats".to_sym]            = @cats
+      session["#{prefix}_showtype".to_sym]        = @showtype
+      session[:miq_compressed]                    = @compressed unless @compressed.nil?
+      session[:miq_exists_mode]                   = @exists_mode unless @exists_mode.nil?
+      session[:polArr]                            = @polArr unless @polArr.nil?
+      session[:policy_options]                    = @policy_options unless @policy_options.nil?
     end
   end
 end

app/controllers/vm_controller.rb

@@ -6,6 +6,8 @@ class VmController < ApplicationController
   include VmCommon # common methods for vm controllers
   include VmRemote # methods for VM remote access
 
+  include Mixins::GenericSessionMixin
+
   def index
     session[:vm_type] = nil             # Reset VM type if coming in from All tab
     redirect_to :action => 'show_list'
@@ -17,33 +19,7 @@ def show_list
     process_show_list(options)
   end
 
-  private ####
-
-  def get_session_data
-    @title          = _("Virtual Machines")
-    @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]
-    @display        = session[:vm_display]
-    @polArr         = session[:polArr] || ""           # current tags in effect
-    @policy_options = session[:policy_options] || ""
-  end
-
-  def set_session_data
-    session[:vm_lastaction]   = @lastaction
-    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
-    session[:vm_display]      = @display unless @display.nil?
-    session[:polArr]          = @polArr unless @polArr.nil?
-    session[:policy_options]  = @policy_options unless @policy_options.nil?
+  def title
+    _("Virtual Machines")
   end
 end