Merge pull request #165 from robotmay/rankings-improvement

Improvement for rankings and latest hotfixes
robotmay · Sep 13, 2013 · 771f3c7 · 771f3c7
2 parents e433846 + b4f99e5
commit 771f3c7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/app/models/collection_photograph.rb b/app/models/collection_photograph.rb
@@ -18,5 +18,5 @@ def set_last_photo_added_at
     end
   end
 
-  after_destroy { collection.touch }
+  after_destroy { collection.try(:touch) }
 end
diff --git a/app/models/photograph.rb b/app/models/photograph.rb
@@ -366,7 +366,8 @@ def recommended(opts = {})
       photo_ids = if opts[:n].present? && opts[:n] > 0
         all_photo_ids = Photograph.rankings.revrange(0,(opts[:n] - 1))
       else
-        all_photo_ids = Photograph.rankings.members.reverse
+        highest_score = Photograph.rankings.score(Photograph.rankings.last) || 1
+        all_photo_ids = Photograph.rankings.revrangebyscore(highest_score, 0.01)
         Kaminari.paginate_array(all_photo_ids).page(opts[:page]).per(Photograph.default_per_page)
       end