Merge pull request #584 from testmycode/optimizations-3232

Optimizations

Author: nygrenh

app/controllers/exercises_controller.rb

@@ -19,7 +19,6 @@ def show
 
             @submissions = @submissions.where(user_id: current_user.id) unless can? :teach, @course
             @submissions = @submissions.includes(:awarded_points).includes(:user).includes(:course)
-            @submission_count = @submissions.count
             @submissions = @submissions.limit(50) unless !!params[:view_all]
           else
             @submissions = nil

app/controllers/organizations_controller.rb

@@ -11,16 +11,18 @@ def index
     ordering = Arel.sql('hidden, LOWER(name)')
     @organizations = Organization
                      .accepted_organizations
+                     .with_attached_logo
                      .order(ordering)
                      .reject { |org| org.hidden? && !can?(:view_hidden_organizations, nil) || !org.visibility_allowed?(request, current_user) }
-    @my_organizations = Organization.taught_organizations(current_user).select { |org| org.visibility_allowed?(request, current_user) }
-    @my_organizations |= Organization.assisted_organizations(current_user).select { |org| org.visibility_allowed?(request, current_user) }
-    @my_organizations |= Organization.participated_organizations(current_user).select { |org| org.visibility_allowed?(request, current_user) }
+    @my_organizations = Organization.taught_organizations(current_user).with_attached_logo.select { |org| org.visibility_allowed?(request, current_user) }
+    @my_organizations |= Organization.assisted_organizations(current_user).with_attached_logo.select { |org| org.visibility_allowed?(request, current_user) }
+    @my_organizations |= Organization.participated_organizations(current_user).with_attached_logo.select { |org| org.visibility_allowed?(request, current_user) }
     @my_organizations.natsort_by!(&:name)
     @courses_under_initial_refresh = Course.where(initial_refresh_ready: false)
     @pinned_organizations = Organization
                             .accepted_organizations
                             .where(pinned: true)
+                            .with_attached_logo
                             .order(ordering)
                             .select { |org| org.visibility_allowed?(request, current_user) }
                             .reject { |org| org.hidden? && !can?(:view_hidden_organizations, nil) }

app/views/exercises/show.html.erb

@@ -180,8 +180,8 @@
   <div class="col-md-12">
   <h2>Submissions</h2>
     <% if !@submissions.empty? %>
-      <% if @submissions.size < @submission_count %>
-        <p>Showing <%= @submissions.size%> of <%= @submission_count %> submissions. <%= link_to "View all submissions", exercise_path(@exercise, view_all: 1) %></p>
+      <% if @submissions.size == 50 %>
+        <p>Showing only 50 submissions. <%= link_to "View all submissions", exercise_path(@exercise, view_all: 1) %></p>
       <% end %>
       <%= show_submission_list(@submissions, :show_exercise_column => false, :show_awarded_points => true) %>
     <% else %>