Skip to content

Commit

Permalink
removing code
Browse files Browse the repository at this point in the history
  • Loading branch information
europ committed Aug 9, 2017
1 parent 0f76b9f commit f6735a9
Showing 1 changed file with 0 additions and 23 deletions.
23 changes: 0 additions & 23 deletions app/controllers/dashboard_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,6 @@ class DashboardController < ApplicationController
include DashboardHelper
include StartUrl

# UI Themes
THEMES = [
[_("Red"), "red"],
[_("Orange"), "orange"],
[_("Yellow"), "yellow"],
[_("Green"), "green"],
[_("Blue"), "blue"],
[_("ManageIQ-Blue"), "manageiq-blue"],
[_("Black"), "black"]
].freeze

menu_section :vi

@@items_per_page = 8
Expand Down Expand Up @@ -382,9 +371,7 @@ def login
@user_name = params[:user_name]
@user_password = params[:user_password]
end
css = settings(:css) # Save prior CSS settings
@settings = copy_hash(DEFAULT_SETTINGS) # Need settings, else pages won't display
@settings[:css] = css if css # Restore CSS settings for other tabs previusly logged in
@more = params[:type] && params[:type] != "less"
flash[:notice] = _("Session was timed out due to inactivity. Please log in again.") if params[:timeout] == "true"
logon_details = MiqServer.my_server(true).logon_status_details
Expand Down Expand Up @@ -694,16 +681,6 @@ def session_init(db_user)
@settings[:default_search] = db_user.settings[:default_search] # Get the user's default search setting
end

# Copy ALL display settings into the :css hash so we can easily add new settings
@settings[:css] ||= {}
@settings[:css].merge!(@settings[:display])
@settings.store_path(:display, :theme, THEMES.first.last) unless THEMES.collect(&:last).include?(settings(:display, :theme))
@settings[:css].merge!(THEME_CSS_SETTINGS[settings(:display, :theme)])

@css ||= {}
@css.merge!(@settings[:display])
@css.merge!(THEME_CSS_SETTINGS[settings(:display, :theme)])

session[:user_TZO] = params[:user_TZO] ? params[:user_TZO].to_i : nil # Grab the timezone (future use)
session[:browser] ||= Hash.new("Unknown")
if params[:browser_name]
Expand Down

0 comments on commit f6735a9

Please sign in to comment.