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

Only show active macros, groups and users.

Browse source
This commit is contained in:
Martin Edenhofer 2017-02-08 01:53:38 +01:00
parent b1c6768114
commit e5ba41892a
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/assets/javascripts/app/controllers/ticket_overview.coffee
View file

@ -470,8 +470,8 @@ class App.TicketOverview extends App.Controller
@delay(update, 2800, 'overview:fetch') @delay(update, 2800, 'overview:fetch')
renderOptions: => renderOptions: =>
macros = App.Macro.all() macros = App.Macro.findAllByAttribute('active', true)
groups = App.Group.all() groups = App.Group.findAllByAttribute('active', true)
users = [] users = []
items = @el.find('[name="bulk"]:checked') items = @el.find('[name="bulk"]:checked')
@ -495,8 +495,10 @@ class App.TicketOverview extends App.Controller
delete possibleUsers[user_id.toString()] delete possibleUsers[user_id.toString()]
possibleUserGroups[ticket.group_id.toString()] = true possibleUserGroups[ticket.group_id.toString()] = true
for user_id, _exists of possibleUsers for user_id, _exists of possibleUsers
user = App.User.find(user_id) if App.User.exists(user_id)
users.push user user = App.User.find(user_id)
if user.active is true
users.push user
### ###
users = [ users = [
App.User.find(2), App.User.find(2),