Merge pull request #1692 from ManageIQ/revert-1673-bugs/missing_ppcch…

…oices Revert "Fix missing constant in application_controller"
ManageIQ · Jul 14, 2017 · 25daac0 · 25daac0
2 parents 2811730 + d39c556
commit 25daac0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -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

diff --git a/app/controllers/miq_task_controller.rb b/app/controllers/miq_task_controller.rb
@@ -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
@@ -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