X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fmanageuserview.py;h=47e69742c9d76df4b2d9a7af79d91881d10f9bf9;hb=ea32c70056c271c76cbd96cc1442a4ab8faf5108;hp=8192033ec5e780b49b6a480501f8acc8bd0ce4db;hpb=62341f0480bfc606fa0cf34059820fb7f20f6ecd;p=unfold.git diff --git a/portal/manageuserview.py b/portal/manageuserview.py index 8192033e..47e69742 100644 --- a/portal/manageuserview.py +++ b/portal/manageuserview.py @@ -1,19 +1,24 @@ +import os +import re +import itertools +import json + from unfold.loginrequired import LoginRequiredAutoLogoutView -# + from manifold.core.query import Query from manifoldapi.manifoldapi import execute_query, execute_admin_query from portal.actions import manifold_update_user, manifold_update_account, manifold_add_account, manifold_delete_account -from portal.actions import sfa_update_user, authority_get_pis, authority_add_pis, authority_remove_pis, clear_user_creds -# +from portal.actions import ( + sfa_update_user, authority_get_pis, authority_add_pis, + authority_remove_pis,authority_check_pis ,clear_user_creds ) + from unfold.page import Page from ui.topmenu import topmenu_items_live, the_user -# + from django.http import HttpResponse, HttpResponseRedirect from django.contrib import messages from django.contrib.auth.decorators import login_required from myslice.theme import ThemeView -# -import json, os, re, itertools # requires login class UserView(LoginRequiredAutoLogoutView, ThemeView): @@ -29,7 +34,6 @@ class UserView(LoginRequiredAutoLogoutView, ThemeView): page.add_css_files ( [ "css/onelab.css", "css/account_view.css","css/plugin.css","css/jquery-ui.css" ] ) for key, value in kwargs.iteritems(): - #print "%s = %s" % (key, value) if key == "email": selected_email=value @@ -191,12 +195,7 @@ class UserView(LoginRequiredAutoLogoutView, ThemeView): for t in itertools.izip_longest(total_platform_list)] ## check pi or no - pi_status = False - pis = authority_get_pis (self.request, authority_hrn) - for pi in pis: - pi_list = pi['pi_users'] - if account_usr_hrn_myslice in pi_list: - pi_status = True + pi_status = authority_check_pis(self.request, user_email) context = super(UserView, self).get_context_data(**kwargs) context['principal_acc'] = principal_acc_list