Merge cherry pick

2015-03-20 21:27:11 -05:00 · 2015-03-20 21:27:11 -05:00 · ef78471b59
parent 5f953d1b19
commit ef78471b59
1 changed files with 1 additions and 8 deletions
--- a/ruby/lib/jam_ruby/models/jam_track.rb
+++ b/ruby/lib/jam_ruby/models/jam_track.rb
@ -81,16 +81,9 @@ module JamRuby
          page = options[:page].to_i
          per_page = options[:per_page].to_i

-          if per_page == 0
-            # try and see if limit was specified
-            limit = options[:limit]
-            limit ||= 20
-            limit = limit.to_i
-          else
-            limit = per_page
-          end

          start = (page -1 )* per_page
+          limit = per_page
        else
          limit = options[:limit]
          limit ||= 20