* VRFS-2973 - fix pagination in jam trackdialog

This commit is contained in:
Seth Call 2015-03-20 21:27:11 -05:00
parent 36b4179492
commit b137d7586f
4 changed files with 27 additions and 8 deletions

View File

@ -59,15 +59,27 @@ module JamRuby
class << self
def index(options, user)
limit = options[:limit]
limit ||= 20
limit = limit.to_i
if options[:page]
page = options[:page].to_i
per_page = options[:per_page].to_i
start = (page -1 )* per_page
limit = per_page
else
limit = options[:limit]
limit ||= 20
limit = limit.to_i
start = options[:start].presence
start = start.to_i || 0
page = 1 + start/limit
per_page = limit
end
start = options[:start].presence
start = start.to_i || 0
query = JamTrack.joins(:jam_track_tracks)
.paginate(page: 1 + start/limit, per_page: limit)
.paginate(page: page, per_page: per_page)
if options[:show_purchased_only]
query = query.joins(:jam_track_rights)

View File

@ -58,7 +58,8 @@
options.jamTrackId = jamTrack.id;
options.name = jamTrack.name;
options.artist = jamTrack.original_artist;
options.downloaded = 'Yes'
var detail = context.jamClient.JamTrackGetTrackDetail(jamTrack.id) || {}
options.downloaded = detail.key_state == 'ready' ? 'Yes' : 'No'
var $tr = $(context._.template($templateOpenJamTrackRow.html(), options, { variable: 'data' }));
$tr.data('server-model', jamTrack);

View File

@ -72,7 +72,6 @@
function isMetronomeOpen() {
var metronomeOpen = false;
context._.each(participants(), function(participant) {
console.log("paritiparc.", participant.metronome_open)
if(participant.metronome_open) {
metronomeOpen = true;
return false;

View File

@ -31,6 +31,7 @@
left: 15%;
font-size: 12px;
padding-top:5px;
z-index:-1;
a {
margin:0 10px;
@ -40,5 +41,11 @@
.paginator-holder {
padding-top:3px;
}
.recording-wrapper {
height:290px;
overflow:auto;
}
}