Fixed assets load.
This commit is contained in:
parent
9af5867b6f
commit
21e6686b7e
2 changed files with 7 additions and 3 deletions
|
@ -26,7 +26,9 @@ class Index extends App.ControllerContent
|
|||
)
|
||||
|
||||
render: (data) ->
|
||||
App.Collection.load( type: 'User', data: data.users )
|
||||
|
||||
# load collections
|
||||
App.Event.trigger 'loadAssets', data.assets
|
||||
|
||||
# fill users
|
||||
for session in data.sessions
|
||||
|
|
|
@ -175,8 +175,10 @@ class SessionsController < ApplicationController
|
|||
end
|
||||
}
|
||||
render :json => {
|
||||
:sessions => sessions_clean,
|
||||
User.to_app_model => users,
|
||||
:sessions => sessions_clean,
|
||||
:assets => {
|
||||
User.to_app_model => users,
|
||||
},
|
||||
}
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in a new issue