Fix merge conflict: MyAccount

[myslice.git] / portal / views.py

diff --git a/portal/views.py b/portal/views.py
index 05ca958..93ede27 100644 (file)
--- a/portal/views.py
+++ b/portal/views.py
@@ -42,7 +42,7 @@ from portal                      import signals
 from portal.forms                import SliceRequestForm, ContactForm
 from portal.util                 import RegistrationView, ActivationView
 from portal.models               import PendingUser, PendingSlice
-from portal.actions              import authority_get_pi_emails, get_request_by_authority
+from portal.actions              import authority_get_pi_emails, get_request_by_authority, manifold_add_user, manifold_update_user
 from manifold.core.query         import Query
 from manifold.manifoldapi        import execute_query
 from unfold.page                 import Page
@@ -612,6 +612,8 @@ class AccountView(TemplateView):
         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']:
@@ -637,17 +639,9 @@ class AccountView(TemplateView):
                     platform_name = platform_detail['platform']
                     account_type = account_detail['auth_type']
                     account_config = json.loads(account_detail['config'])
-                    
-                    if 'user_hrn' in account_config:
-                        account_usr_hrn = account_config['user_hrn']
-                    else:
-                        account_usr_hrn = 'N/A'
-                    if 'user_public_key' in account_config:
-                        account_pub_key = account_config['user_public_key']
-                    else:
-                        account_pub_key = 'N/A'            
-                        #print "THis is a test"
-                        #print account_pub_key
+                    # 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)
@@ -662,10 +656,10 @@ class AccountView(TemplateView):
         context = super(AccountView, self).get_context_data(**kwargs)
         context['data'] = lst
         context['person']   = self.request.user
-        context ['fullname'] = config['firstname'] +' '+ config['lastname']    
-        context ['firstname'] = config['firstname']
-        context ['lastname'] = config['lastname']
-        context ['affiliation'] = config['affiliation']
+        context ['firstname'] = config.get('firstname',"?")
+        context ['lastname'] = config.get('lastname',"?")
+        context ['fullname'] = context['firstname'] +' '+ context['lastname']
+        context ['affiliation'] = config.get('affiliation',"Unknown Affiliation")
         #context['users'] = userlist.render(self.request)
         
         # XXX This is repeated in all pages
@@ -675,7 +669,7 @@ class AccountView(TemplateView):
         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 ['firstname'] = config['firstname']
         #context.update(page.prelude_env())
         return context
 
@@ -719,9 +713,22 @@ def acc_process(request):
         # select the logged in user [for the moment hard coded]
         #get_user = PendingUser.objects.get(id='1') # here we will get the id/email from session e.g., person.email
         # update first and last name
-        get_user.first_name = edited_first_name
-        get_user.last_name = edited_last_name
-        get_user.save() 
+        #get_user.first_name = edited_first_name
+        #get_user.last_name = edited_last_name
+        #get_user.save()
+        #user_params = {'config':'hello'}
+        #query = Query.update('local:user').set(user_params).select('config')
+        #results = execute_query(request,query)
+        #if not results:
+        #    raise Exception, "Failed to update user: %s" % user_params['config']
+        #result, = results
+        #return result['config']
+        # create user is working fine :)
+        #user_params = ({'config':'"firstname":"HELLO"'},{'password':'hello'})
+        #user_params = { 'config':'{"firstname":"HEY"}'}
+        #user_params = {'email':'aa@aa.com','password':'demo'}
+        #manifold_add_user(request,user_params)        
+        #manifold_update_user(request,user_params)
 
         return HttpResponse('Sucess: First Name and Last Name Updated!')       
     elif 'submit_pass' in request.POST: