Follow up 949a47a7be6cf10dc7fd38c3c5b06def6efad26d - Fixes #4040 - users customer name is displayed as id.
This commit is contained in:
parent
e50ba0aca5
commit
439b17800f
1 changed files with 3 additions and 7 deletions
|
@ -50,6 +50,9 @@ class User extends App.ControllerSubContent
|
||||||
@delay(@search, 220, 'search')
|
@delay(@search, 220, 'search')
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# App.User.subscribe will clear model data so we use controllerBind (#4040)
|
||||||
|
@controllerBind('User:create User:update User:touch User:destroy', => @delay(@search, 220, 'search'))
|
||||||
|
|
||||||
# show last 20 users
|
# show last 20 users
|
||||||
@search()
|
@search()
|
||||||
|
|
||||||
|
@ -182,9 +185,6 @@ class User extends App.ControllerSubContent
|
||||||
'click': edit
|
'click': edit
|
||||||
)
|
)
|
||||||
|
|
||||||
if !@subscribeId
|
|
||||||
@subscribeId = App.User.subscribe(=> @delay(@search, 220, 'search'))
|
|
||||||
|
|
||||||
search: =>
|
search: =>
|
||||||
role_ids = []
|
role_ids = []
|
||||||
@$('.tab.active').each( (i,d) ->
|
@$('.tab.active').each( (i,d) ->
|
||||||
|
@ -242,8 +242,4 @@ class User extends App.ControllerSubContent
|
||||||
container: @el.closest('.content')
|
container: @el.closest('.content')
|
||||||
)
|
)
|
||||||
|
|
||||||
release: =>
|
|
||||||
if @subscribeId
|
|
||||||
App.User.unsubscribe(@subscribeId)
|
|
||||||
|
|
||||||
App.Config.set( 'User', { prio: 1000, name: __('Users'), parent: '#manage', target: '#manage/users', controller: User, permission: ['admin.user'] }, 'NavBarAdmin' )
|
App.Config.set( 'User', { prio: 1000, name: __('Users'), parent: '#manage', target: '#manage/users', controller: User, permission: ['admin.user'] }, 'NavBarAdmin' )
|
||||||
|
|
Loading…
Reference in a new issue