From: Yasin <mohammed-yasin.rahman@lip6.fr>
Date: Mon, 2 Sep 2013 15:54:30 +0000 (+0200)
Subject: FIX: conflict in My Account view. Thanks to thierry for making the  code more efficient
X-Git-Tag: myslice-0.2-1~31^2
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=814c26b7693c50f9bb2a4e52e3000d9b8cc2ab80;hp=4d631eaaa0936add1c71b7e9ac2601c8533556fd

FIX: conflict in My Account view. Thanks to thierry for making the  code more efficient
---

diff --git a/.gitignore b/.gitignore
index 8e936432..a7f44c4f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,16 @@
+# any local dbfile
+*.sqlite3
+# here is a mode to 'record' the backend answers and replay them offline
+offline-*
+# the usual useless crap
 TAGS
 *.pyc
-*.sqlite3
 *~
+# these essentially are copies/links from other places
 all-static/
 all-templates/
-offline-*
+django-static/
+# various working files
 play/
 *.leftovers
+entrypoints.ongoing/
diff --git a/plugins/updater/WARNING b/plugins/updater/WARNING
new file mode 100644
index 00000000..9e0494cc
--- /dev/null
+++ b/plugins/updater/WARNING
@@ -0,0 +1,4 @@
+This plugin was an early attempt at implementing the widget that would
+. actually gather pending changes
+. and have an 'Update' button so as to post them
+However this work has been put on hold and is currently not used in real apps.
diff --git a/portal/views.py b/portal/views.py
index 05ca9589..f2d4aed2 100644
--- a/portal/views.py
+++ b/portal/views.py
@@ -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