Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed assets load.

Browse source
This commit is contained in:
Martin Edenhofer 2013-10-01 18:58:21 +02:00
parent 9af5867b6f
commit 21e6686b7e
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/app/controllers/session.js.coffee
View file

@ -26,7 +26,9 @@ class Index extends App.ControllerContent
) )
render: (data) -> render: (data) ->
App.Collection.load( type: 'User', data: data.users )
# load collections
App.Event.trigger 'loadAssets', data.assets
# fill users # fill users
for session in data.sessions for session in data.sessions

6
app/controllers/sessions_controller.rb
View file

@ -175,8 +175,10 @@ class SessionsController < ApplicationController
end end
} }
render :json => { render :json => {
:sessions => sessions_clean, :sessions => sessions_clean,
User.to_app_model => users, :assets => {
User.to_app_model => users,
},
} }
end end