Revision d60db93b flowspec/views.py

b/flowspec/views.py
63 63
@never_cache
64 64
def group_routes(request):
65 65
    group_routes = []
66
    peer = request.user.get_profile().peer
66
    try:
67
        peer = request.user.get_profile().peer
68
    except UserProfile.DoesNotExist:
69
        error = "User <strong>%s</strong> does not belong to any peer or organization. It is not possible to create new firewall rules.<br>Please contact Helpdesk to resolve this issue" % request.user.username
70
        return render_to_response('error.html', {'error': error})
67 71
    if peer:
68 72
       peer_members = UserProfile.objects.filter(peer=peer)
69 73
       users = [prof.user for prof in peer_members]
70 74
       group_routes = Route.objects.filter(applier__in=users)
71
    return render_to_response('user_routes.html', {'routes': group_routes},
75
       return render_to_response('user_routes.html', {'routes': group_routes},
72 76
                              context_instance=RequestContext(request))
73 77

  
74 78

  
......
207 211
@never_cache
208 212
def user_profile(request):
209 213
    user = request.user
210
    peer = request.user.get_profile().peer
211
    
214
    try:
215
        peer = request.user.get_profile().peer
216
    except UserProfile.DoesNotExist:
217
        error = "User <strong>%s</strong> does not belong to any peer or organization. It is not possible to create new firewall rules.<br>Please contact Helpdesk to resolve this issue" % user.username
218
        return render_to_response('error.html', {'error': error})
212 219
    return render_to_response('profile.html', {'user': user, 'peer':peer},
213 220
                                  context_instance=RequestContext(request))
214 221

  
......
250 257
                                  context_instance=RequestContext(request))
251 258
        try:
252 259
            user = User.objects.get(username__exact=username)
260
            user.email = mail
261
            user.first_name = firstname
262
            user.last_name = lastname
263
            user.save()
253 264
            user_exists = True
254 265
        except:
255 266
            user_exists = False
256
        user = authenticate(username=username, firstname=firstname, lastname=lastname, mail=mail)
267
        user = authenticate(username=username, firstname=firstname, lastname=lastname, mail=mail, authsource='shibboleth')
257 268
        if user is not None:
258 269
            try:
259 270
                peer = Peer.objects.get(domain_name=organization)

Also available in: Unified diff