X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=blobdiff_plain;f=portal%2Fviews.py;h=e554f1bdfc4484be246e70d673c165d3353c0bd5;hp=f72f6ce1833806a3cd4a3ded1581bdaab063d429;hb=2f0ca597d050216c92df1ba6bf472d2c937fe7ef;hpb=fd94e2aa074f084afdecf26f023c8e369fec6605

diff --git a/portal/views.py b/portal/views.py
index f72f6ce1..e554f1bd 100644
--- a/portal/views.py
+++ b/portal/views.py
@@ -49,82 +49,6 @@ from myslice.viewutils           import topmenu_items, the_user
 from django.http                 import HttpResponseRedirect, HttpResponse
 
 #class for my_account
-class AccountView(TemplateView):
-    template_name = "my_account.html"
-    
-    #This view requires login 
-    @method_decorator(login_required)
-    def dispatch(self, *args, **kwargs):
-        return super(AccountView, self).dispatch(*args, **kwargs)
-
-
-    def get_context_data(self, **kwargs):
-        #page = Page(self.request)
-
-        user_query  = Query().get('local:user').select('config','email')
-        user_details = execute_query(self.request, user_query)
-        
-        # not always found in user_details...
-        config={}
-        for user_detail in user_details:
-            #email = user_detail['email']
-            if user_detail['config']:
-                config = json.loads(user_detail['config'])
-
-        platform_query  = Query().get('local:platform').select('platform_id','platform')
-        account_query  = Query().get('local:account').select('user_id','platform_id','auth_type','config')
-        platform_details = execute_query(self.request, platform_query)
-        account_details = execute_query(self.request, account_query)
-       
-        # initial assignment needed for users having no account  
-        platform_name = ''
-        account_type = ''
-        account_usr_hrn = ''
-        account_pub_key = ''
-        platform_name_list = []
-        account_type_list = []
-        usr_hrn_list = []
-        pub_key_list = []          
-        for account_detail in account_details:
-            for platform_detail in platform_details:
-                if platform_detail['platform_id'] == account_detail['platform_id']:
-                    platform_name = platform_detail['platform']
-                    account_type = account_detail['auth_type']
-                    account_config = json.loads(account_detail['config'])
-                    # a bit more pythonic
-                    account_usr_hrn = account_config.get('user_hrn','N/A')
-                    account_pub_key = account_config.get('user_public_key','N/A')
-                    
-                    platform_name_list.append(platform_name)
-                    account_type_list.append(account_type)
-                    usr_hrn_list.append(account_usr_hrn)
-                    pub_key_list.append(account_pub_key)
-        
-        # combining 4 lists into 1 [to render in the template] 
-        lst = [{'platform_name': t[0], 'account_type': t[1], 'usr_hrn':t[2], 'usr_pubkey':t[3]} for t in zip(platform_name_list, account_type_list, usr_hrn_list, pub_key_list)]    
-        #print "test"
-        #print lst
-
-        context = super(AccountView, self).get_context_data(**kwargs)
-        context['data'] = lst
-        context['person']   = self.request.user
-        context ['firstname'] = config.get('firstname',"?")
-        context ['lastname'] = config.get('lastname',"?")
-        context ['fullname'] = context['firstname'] +' '+ context['lastname']
-        context ['authority'] = config.get('authority',"Unknown Authority")
-        #context['users'] = userlist.render(self.request)
-        
-        # XXX This is repeated in all pages
-        # more general variables expected in the template
-        context['title'] = 'Platforms connected to MySlice'
-        # the menu items on the top
-        context['topmenu_items'] = topmenu_items('My Account', self.request)
-        # so we can sho who is logged
-        context['username'] = the_user(self.request)
-#        context ['firstname'] = config['firstname']
-        #context.update(page.prelude_env())
-        return context
-
 @login_required
 #my_acc form value processing
 def account_process(request):