From: root Date: Mon, 14 Apr 2014 09:50:12 +0000 (+0200) Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab X-Git-Tag: myslice-1.1~136^2^2 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=7e3085c0c1769a4d26c7ffdd27d8f50f402fa598;hp=bf8ddd53efffa8c459343678686c0e7e4575a651;p=unfold.git Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab --- diff --git a/portal/actions.py b/portal/actions.py index c612b096..7cda3a97 100644 --- a/portal/actions.py +++ b/portal/actions.py @@ -279,7 +279,7 @@ def portal_validate_request(wsgi_request, request_ids): try: create_user(wsgi_request, request) request_status['SFA user'] = {'status': True } - + PendingUser.objects.get(id=request['id']).delete() except Exception, e: request_status['SFA user'] = {'status': False, 'description': str(e)} @@ -303,6 +303,7 @@ def portal_validate_request(wsgi_request, request_ids): try: create_slice(wsgi_request, request) request_status['SFA slice'] = {'status': True } + PendingSlice.objects.get(id=request['id']).delete() except Exception, e: request_status['SFA slice'] = {'status': False, 'description': str(e)} @@ -325,6 +326,7 @@ def portal_validate_request(wsgi_request, request_ids): print "ADD Authority" sfa_add_authority(wsgi_request, sfa_authority_params) request_status['SFA authority'] = {'status': True } + PendingAuthority.objects.get(id=request['id']).delete() except Exception, e: request_status['SFA authority'] = {'status': False, 'description': str(e)}