From: Yasin Date: Fri, 31 Jan 2014 10:07:23 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.onelab.eu/git/myslice X-Git-Tag: myslice-0.3-0~8^2~1 X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=9644d2a6bc4e9a32a0be1779180ce0830cbecf91;hp=048e585c9c2431b804a3bff921c17fc2d3b34e85 Merge branch 'master' of ssh://git.onelab.eu/git/myslice --- diff --git a/portal/actions.py b/portal/actions.py index 004ac686..629dd7c5 100644 --- a/portal/actions.py +++ b/portal/actions.py @@ -259,6 +259,9 @@ def portal_validate_request(wsgi_request, request_ids): except Exception, e: request_status['SFA user'] = {'status': False, 'description': str(e)} + + user_params = {'status':2} + manifold_update_user(request, request['email'],user_params) # MANIFOLD user should be added beforehand, during registration #try: diff --git a/portal/templates/account-view.html b/portal/templates/account-view.html index 3c3d5438..8f853e1b 100644 --- a/portal/templates/account-view.html +++ b/portal/templates/account-view.html @@ -156,6 +156,7 @@ Account Type Account Delegation User hrn + User Status {% for row in principal_acc %} @@ -164,6 +165,7 @@ {{ row.account_type }} {{ row.delegation_type }} {{ row.usr_hrn }} + {{ row.user_status }} {%endfor%}