Revision 54ae949d snf-app/synnefo/helpdesk/helpdesk.py

b/snf-app/synnefo/helpdesk/helpdesk.py
34 34
from django.template.loader import render_to_string
35 35
from django.template.context import RequestContext
36 36
from django.http import HttpResponse, HttpResponseBadRequest
37
from synnefo.db.models import SynnefoUser, Invitations
37
from synnefo.db.models import SynnefoUser
38 38
from synnefo.api.common import method_not_allowed
39 39
from synnefo.logic import users
40 40

  
......
50 50
        method_not_allowed(request)
51 51

  
52 52
def get_users(request):
53
    #XXX: The following filter should change when the invitations app is removed
54
    invitations = Invitations.objects.filter(accepted = False)
55
    ids = map(lambda x: x.target.id, invitations)
56
    users = SynnefoUser.objects.exclude(id__in = ids)\
57
                               .exclude(type__exact = "HELPDESK")\
58
                               .order_by('realname')
53
    users = SynnefoUser.objects.exclude(type__exact='HELPDESK')
59 54
    result = []
60

  
61
    for user in users:
62
        resultentry = {}
63

  
64
        resultentry['id'] = user.id
65
        resultentry['name'] = user.realname
66

  
55
    for user in users.order_by('realname'):
56
        resultentry = dict(id=user.id, name=user.realname)
67 57
        result.append(resultentry)
68

  
69 58
    return result
70 59

  
71 60
def get_tmp_token(request):

Also available in: Unified diff