VRFS-3681 reverted changes for develop branch merge

This commit is contained in:
Jonathan Kolyer 2015-11-08 22:44:15 +00:00
parent 0f4fb0816e
commit f41aced15f
2 changed files with 10 additions and 6 deletions

View File

@ -351,15 +351,14 @@ module JamRuby
{ genres_jam_tracks: :genre },
:jam_track_tap_ins])
objs = query.all
count = query.total_entries
if count == 0
[objs, nil, count]
elsif objs.length < limit
[objs, nil, count]
[query, nil, count]
elseif query.length < limit
[query, nil, count]
else
[objs, start + limit, count]
[query, start + limit, count]
end
end

View File

@ -16,7 +16,12 @@ class ApiAuthsController < ApiController
complete_sign_in(user, redirect=false)
render :json => {}, :status => :ok
render :json => {
first_name: user.first_name,
last_name: user.last_name,
photo_url: user.photo_url,
email: user.email
}, :status => :ok
end
end
end