Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab

[unfold.git] / portal / manageuserview.py

diff --git a/portal/manageuserview.py b/portal/manageuserview.py
index 594c02a..52a69da 100644 (file)
--- a/portal/manageuserview.py
+++ b/portal/manageuserview.py
@@ -10,7 +10,7 @@ from ui.topmenu                         import topmenu_items_live, the_user
 from django.http                        import HttpResponse, HttpResponseRedirect
 from django.contrib                     import messages
 from django.contrib.auth.decorators     import login_required
-from theme import ThemeView
+from myslice.theme import ThemeView
 #
 import json, os, re, itertools
 
@@ -24,8 +24,8 @@ class UserView(LoginRequiredAutoLogoutView, ThemeView):
     def get_context_data(self, **kwargs):
 
         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" ] )
+        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","css/jquery-ui.css" ] )
 
         for key, value in kwargs.iteritems():
             #print "%s = %s" % (key, value)
@@ -281,16 +281,16 @@ def user_process(request, **kwargs):
                     if 'N/A' not in acc_auth_cred:
                         auth_list = []
                         auth_cred = [] 
-                    for key, value in acc_auth_cred.iteritems():
-                        auth_list.append(key)       
-                        auth_cred.append(value)
-                    # special case: download each slice credentials separately
-                    for i in range(0, len(auth_list)):
-                        if 'dl_'+auth_list[i] in request.POST:
-                            auth_detail = "Authority: " + auth_list[i] +"\nAuthority Credentials: \n"+ auth_cred[i]
-                            response = HttpResponse(auth_detail, content_type='text/plain')
-                            response['Content-Disposition'] = 'attachment; filename="auth_credential.txt"'
-                            return response
+                        for key, value in acc_auth_cred.iteritems():
+                            auth_list.append(key)       
+                            auth_cred.append(value)
+                        # special case: download each slice credentials separately
+                        for i in range(0, len(auth_list)):
+                            if 'dl_'+auth_list[i] in request.POST:
+                                auth_detail = "Authority: " + auth_list[i] +"\nAuthority Credentials: \n"+ auth_cred[i]
+                                response = HttpResponse(auth_detail, content_type='text/plain')
+                                response['Content-Disposition'] = 'attachment; filename="auth_credential.txt"'
+                                return response
 
     if 'submit_name' in request.POST:
         edited_first_name =  request.POST['fname']
@@ -399,7 +399,7 @@ def user_process(request, **kwargs):
                             return HttpResponseRedirect(redirect_url)
         else:
             messages.error(request, 'Account error: You need an account in myslice platform to perform this action')
-            return HttpResponseRedirect("/portal/account/")
+            return HttpResponseRedirect(redirect_url)
 
     elif 'dl_pubkey' in request.POST:
         for account_detail in account_details:
@@ -433,7 +433,7 @@ def user_process(request, **kwargs):
 
         else:
             messages.error(request, 'Account error: You need an account in myslice platform to perform this action')
-            return HttpResponseRedirect("/portal/account/")
+            return HttpResponseRedirect(redirect_url)
     
 #    elif 'delete' in request.POST:
 #        for account_detail in account_details:
@@ -476,7 +476,7 @@ def user_process(request, **kwargs):
                             user_params = { 'config': updated_config}
                             manifold_update_account(request, user_id,user_params)
                             messages.success(request, 'All Credentials cleared')
-                            return HttpResponseRedirect("/portal/account/")
+                            return HttpResponseRedirect(redirect_url)
                         else:
                             messages.error(request, 'Delete error: Credentials are not stored in the server')
                             return HttpResponseRedirect(redirect_url)