Merge pull request ManageIQ#13058 from jzigmund/storage_generic_session

StorageController is including GenericSessionMixin
kevensen · Dec 8, 2016 · 312ef27 · 312ef27
2 parents cfcd41e + bf3a1c4
commit 312ef27
Showing 1 changed file with 1 addition and 18 deletions.
diff --git a/app/controllers/storage_controller.rb b/app/controllers/storage_controller.rb
@@ -1,6 +1,7 @@
 class StorageController < ApplicationController
   include_concern 'StorageD'
   include_concern 'StoragePod'
+  include Mixins::GenericSessionMixin
 
   before_action :check_privileges
   before_action :get_session_data
@@ -638,23 +639,5 @@ def storage_scan
 
   private
 
-  def get_session_data
-    @title      = _("Storage")
-    @layout     = "storage"
-    @lastaction = session[:storage_lastaction]
-    @display    = session[:storage_display]
-    @filters    = session[:storage_filters]
-    @catinfo    = session[:storage_catinfo]
-    @showtype   = session[:storage_showtype]
-  end
-
-  def set_session_data
-    session[:storage_lastaction] = @lastaction
-    session[:storage_display]    = @display unless @display.nil?
-    session[:storage_filters]    = @filters
-    session[:storage_catinfo]    = @catinfo
-    session[:storage_showtype]   = @showtype
-  end
-
   menu_section :inf
 end