Optimize view exercise page

testmycode · Mar 28, 2024 · deb0140 · deb0140
1 parent 8d4e216
commit deb0140
Show file tree

Hide file tree

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

diff --git a/app/views/exercises/show.html.erb b/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 %>