X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fmanagementtababout.py;h=899fbfdf676117939d24bafb75391ca5fcc1ee64;hb=fef70ee832b2575ae8db826ce6ae62c0e02a04e6;hp=8a5f97a8262f984e74d6bd34a78f763f51fde948;hpb=af5885eb6b24505d4979de9d580a1e13e297bde8;p=unfold.git diff --git a/portal/managementtababout.py b/portal/managementtababout.py index 8a5f97a8..899fbfdf 100644 --- a/portal/managementtababout.py +++ b/portal/managementtababout.py @@ -16,10 +16,15 @@ from myslice.configengine import ConfigEngine from myslice.theme import ThemeView import json +import activity + class ManagementAboutView (FreeAccessView, ThemeView): template_name = 'management-tab-about.html' def get (self, request): + + activity.userLogin(request) + if request.user.is_authenticated(): user_query = Query().get('user').select('user_hrn','parent_authority').filter_by('user_hrn','==','$user_hrn') user_details = execute_query(self.request, user_query) @@ -34,17 +39,16 @@ class ManagementAboutView (FreeAccessView, ThemeView): 'postcode').filter_by('authority_hrn','==',user_authority) authority_details = execute_query(self.request, authority_query) - authority_contacts = {} - authority_contacts['scientific'] = [ x.strip()[1:-1] for x in authority_details[0]['scientific'][1:-1].split(',') ] - authority_contacts['technical'] = [ x.strip()[1:-1] for x in authority_details[0]['tech'][1:-1].split(',') ] - - authority_contacts['legal'] = [ x.strip().replace('"','') for x in authority_details[0]['legal'][1:-1].split(',') ] - print authority_contacts['legal'] - + if authority_details : + authority_contacts = {} + authority_contacts['scientific'] = [ x.strip()[1:-1] for x in authority_details[0]['scientific'][1:-1].split(',') ] + authority_contacts['technical'] = [ x.strip()[1:-1] for x in authority_details[0]['tech'][1:-1].split(',') ] - print "#######",authority_contacts - print "$$$$$$$",user_local_details - print "@@@@@@@",authority_details + authority_contacts['legal'] = [ x.strip().replace('"','') for x in authority_details[0]['legal'][1:-1].split(',') ] + authority = authority_details[0] + else : + authority_contacts = None + authority = None - return render_to_response(self.template, { 'theme' : self.theme, 'authority' : authority_details[0], 'authority_contacts' : authority_contacts }, context_instance=RequestContext(request)) + return render_to_response(self.template, { 'theme' : self.theme, 'authority' : authority, 'authority_contacts' : authority_contacts }, context_instance=RequestContext(request))