X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Faccountview.py;h=fb9f6427693bed647b0973e98c83278f336eaa37;hb=7e8b243ba01f6ee786c44cf71a01963f936f67ea;hp=15c3799c9b55da9d142cff24cb2a6fbef5d9ee60;hpb=5ff398d7f973cb4c813dfa3b1c57378315310787;p=unfold.git diff --git a/portal/accountview.py b/portal/accountview.py index 15c3799c..fb9f6427 100644 --- a/portal/accountview.py +++ b/portal/accountview.py @@ -31,9 +31,11 @@ class AccountView(LoginRequiredAutoLogoutView, ThemeView): def get_context_data(self, **kwargs): self.template_name = self.template page = Page(self.request) - page.add_js_files ( [ "js/jquery.validate.js", "js/my_account.register.js", "js/my_account.edit_profile.js" ] ) - page.add_css_files ( [ "css/onelab.css", "css/account_view.css","css/plugin.css" ] ) + metadata = page.get_metadata() + page.expose_js_metadata() + page.add_js_files ( [ "js/jquery.validate.js", "js/my_account.register.js", "js/my_account.edit_profile.js","js/jquery-ui.js" ] ) + page.add_css_files ( [ "css/onelab.css", "css/account_view.css","css/plugin.css" ] ) user_query = Query().get('local:user').select('config','email','status') user_details = execute_query(self.request, user_query) @@ -199,7 +201,7 @@ class AccountView(LoginRequiredAutoLogoutView, ThemeView): if 'myslice' in platform_detail['platform']: acc_auth_cred = account_config.get('delegated_authority_credentials','N/A') # assigning values - if acc_auth_cred == {}: + if acc_auth_cred == {} or acc_auth_cred == 'N/A': pi = "is_not_pi" else: pi = "is_pi" @@ -346,6 +348,8 @@ def account_process(request): return HttpResponseRedirect("/portal/account/") # XXX TODO: Factorize with portal/registrationview.py +# XXX TODO: Factorize with portal/registrationview.py +# XXX TODO: Factorize with portal/joinview.py elif 'generate' in request.POST: for account_detail in account_details: