Merge branch 'master' into ozfortress

ozfortress · Sep 12, 2020 · 2be9e3e · 2be9e3e
2 parents 2f77be3 + 85dc09f
commit 2be9e3e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/app/models/league/roster.rb b/app/models/league/roster.rb
@@ -46,8 +46,8 @@ class Roster < ApplicationRecord
       completed = League.statuses[:completed]
       includes(division: :league).where(leagues: { status: completed })
     }
-    scope :ordered, -> { order(placement: :asc) }
-    scope :seeded, -> { order(seeding: :asc) }
+    scope :ordered, -> { order(placement: :asc, id: :asc) }
+    scope :seeded, -> { order(seeding: :asc, id: :asc) }
 
     # rubocop:disable Rails/SkipsModelValidations
     after_create { League.increment_counter(:rosters_count, league.id) }

diff --git a/app/presenters/league/roster/transfer_presenter.rb b/app/presenters/league/roster/transfer_presenter.rb
@@ -28,7 +28,8 @@ def listing_with_implied_user
                 h 'Left '
               end
         out += roster.link
-        out + " in #{transfer.division.name} on #{transfer.created_at.strftime('%c')}"
+        out += " in #{transfer.division.name}" if roster.approved?
+        out + " on #{transfer.created_at.strftime('%c')}"
       end
     end
   end