Remove extra queries on apps collection

Using the scope on apps controller will yield lots of queries, so we need to call .to_a

Remove extra queries on apps collection
Using the scope on apps controller will yield lots of queries, so we need to call .to_a
Arthur Neves
1 parent 39c486a8
Showing 2 changed files with 6 additions and 8 deletions Show diff stats
app/controllers/apps_controller.rb
app/helpers/apps_helper.rb
@@ -12,7 +12,7 @@ class AppsController &lt; ApplicationController
   }
  
   expose(:apps) {
-    app_scope.all.sort
+    app_scope.all.sort.to_a
   }
  
   expose(:app, :ancestor => :app_scope)
@@ -143,4 +143,3 @@ class AppsController &lt; ApplicationController
       end
     end
 end
-
@@ -12,27 +12,27 @@ module AppsHelper
   end
  
   def any_github_repos?
-    detect_any_apps_with_attributes unless @any_github_repos
+    detect_any_apps_with_attributes if @any_github_repos.nil?
     @any_github_repos
   end
  
   def any_notification_services?
-    detect_any_apps_with_attributes unless @any_notification_services
+    detect_any_apps_with_attributes if @any_notification_services.present?
     @any_notification_services
   end
  
   def any_bitbucket_repos?
-    detect_any_apps_with_attributes unless @any_bitbucket_repos
+    detect_any_apps_with_attributes if @any_bitbucket_repos.nil?
     @any_bitbucket_repos
   end
  
   def any_issue_trackers?
-    detect_any_apps_with_attributes unless @any_issue_trackers
+    detect_any_apps_with_attributes if @any_issue_trackers.nil?
     @any_issue_trackers
   end
  
   def any_deploys?
-    detect_any_apps_with_attributes unless @any_deploys
+    detect_any_apps_with_attributes if @any_deploys.nil?
     @any_deploys
   end
  
@@ -50,4 +50,3 @@ module AppsHelper
     end
   end
 end
-
...	...	@@ -12,7 +12,7 @@ class AppsController < ApplicationController
12	12	}
13	13
14	14	expose(:apps) {
15		- app_scope.all.sort
	15	+ app_scope.all.sort.to_a
16	16	}
17	17
18	18	expose(:app, :ancestor => :app_scope)
...	...	@@ -143,4 +143,3 @@ class AppsController < ApplicationController
143	143	end
144	144	end
145	145	end
146		-
...	...
...	...	@@ -12,27 +12,27 @@ module AppsHelper
12	12	end
13	13
14	14	def any_github_repos?
15		- detect_any_apps_with_attributes unless @any_github_repos
	15	+ detect_any_apps_with_attributes if @any_github_repos.nil?
16	16	@any_github_repos
17	17	end
18	18
19	19	def any_notification_services?
20		- detect_any_apps_with_attributes unless @any_notification_services
	20	+ detect_any_apps_with_attributes if @any_notification_services.present?
21	21	@any_notification_services
22	22	end
23	23
24	24	def any_bitbucket_repos?
25		- detect_any_apps_with_attributes unless @any_bitbucket_repos
	25	+ detect_any_apps_with_attributes if @any_bitbucket_repos.nil?
26	26	@any_bitbucket_repos
27	27	end
28	28
29	29	def any_issue_trackers?
30		- detect_any_apps_with_attributes unless @any_issue_trackers
	30	+ detect_any_apps_with_attributes if @any_issue_trackers.nil?
31	31	@any_issue_trackers
32	32	end
33	33
34	34	def any_deploys?
35		- detect_any_apps_with_attributes unless @any_deploys
	35	+ detect_any_apps_with_attributes if @any_deploys.nil?
36	36	@any_deploys
37	37	end
38	38
...	...	@@ -50,4 +50,3 @@ module AppsHelper
50	50	end
51	51	end
52	52	end
53		-
...	...