From f41aced15fb032c3354a99210f1e669693828615 Mon Sep 17 00:00:00 2001 From: Jonathan Kolyer Date: Sun, 8 Nov 2015 22:44:15 +0000 Subject: [PATCH] VRFS-3681 reverted changes for develop branch merge --- ruby/lib/jam_ruby/models/jam_track.rb | 9 ++++----- web/app/controllers/api_auths_controller.rb | 7 ++++++- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ruby/lib/jam_ruby/models/jam_track.rb b/ruby/lib/jam_ruby/models/jam_track.rb index a44e1fe33..1697cda75 100644 --- a/ruby/lib/jam_ruby/models/jam_track.rb +++ b/ruby/lib/jam_ruby/models/jam_track.rb @@ -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 diff --git a/web/app/controllers/api_auths_controller.rb b/web/app/controllers/api_auths_controller.rb index b7868e7ce..a14ef0f93 100644 --- a/web/app/controllers/api_auths_controller.rb +++ b/web/app/controllers/api_auths_controller.rb @@ -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