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

Merge branch 'develop' into feature/ui2

Browse source
This commit is contained in:
Martin Edenhofer 2013-09-19 23:28:12 +02:00
parent 85e253b45d 81fc666cd2
commit 2215b2d553
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/assets/javascripts/app/controllers/navigation.js.coffee
View file

@ -298,11 +298,8 @@ class App.Navigation extends App.Controller
items = data.recent_viewed
# load user collection
App.Collection.load( type: 'User', data: data.users )
# load ticket collection
App.Collection.load( type: 'Ticket', data: data.tickets )
# load collections
App.Event.trigger 'loadAssets', data.assets
# remove old views
NavBarRight = @Config.get( 'NavBarRight' ) || {}