Skip to content

Commit

Permalink
Revert "Fix missing constant in application_controller"
Browse files Browse the repository at this point in the history
  • Loading branch information
martinpovolny committed Jul 14, 2017
1 parent 1528241 commit d39c556
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion app/controllers/application_controller.rb
Expand Up @@ -1879,7 +1879,7 @@ def get_global_session_data
handle_remember_tab

# Get all of the global variables used by most of the controllers
@pp_choices = UiConstants::PPCHOICES
@pp_choices = PPCHOICES
@panels = session[:panels].nil? ? {} : session[:panels]
@breadcrumbs = session[:breadcrumbs].nil? ? [] : session[:breadcrumbs]
@panels["icon"] = true if @panels["icon"].nil? # Default icon panels to be open
Expand Down
4 changes: 2 additions & 2 deletions app/controllers/miq_task_controller.rb
Expand Up @@ -34,7 +34,7 @@ def change_tab
end

def build_jobs_tab
@pp_choices = UiConstants::PPCHOICES2 # Get special pp choices for jobs/tasks lists
@pp_choices = PPCHOICES2 # Get special pp choices for jobs/tasks lists
@settings[:perpage][:job_task] ||= 50 # Default to 50 per page until changed
@tasks_options = HashWithIndifferentAccess.new if @tasks_options.blank?
@tasks_options[:zones] = Zone.all.collect { |z| z.name unless z.miq_servers.blank? }.compact
Expand Down Expand Up @@ -188,7 +188,7 @@ def tasks_button
end

list_jobs # Get the jobs based on the latest options
@pp_choices = UiConstants::PPCHOICES2 # Get special pp choices for jobs/tasks lists
@pp_choices = PPCHOICES2 # Get special pp choices for jobs/tasks lists

render :update do |page|
page << javascript_prologue
Expand Down

0 comments on commit d39c556

Please sign in to comment.