Merge pull request #603 from errbit/remove_extra_apps_query

Remove extra queries on apps collection

app/controllers/apps_controller.rb

@@ -12,7 +12,7 @@ class AppsController < ApplicationController
   }
 
   expose(:apps) {
-    app_scope.all.sort
+    app_scope.all.sort.to_a
   }
 
   expose(:app, :ancestor => :app_scope)
@@ -143,4 +143,3 @@ def parse_notice_at_notices_or_set_default
       end
     end
 end
-

app/helpers/apps_helper.rb

@@ -12,27 +12,27 @@ def link_to_copy_attributes_from_other_app
   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 @@ def detect_any_apps_with_attributes
     end
   end
 end
-