Admin view renamed to Users view

diff --git a/portal/manageuserview.py b/portal/manageuserview.py
index 391e72c..11166bb 100644 (file)
--- a/portal/manageuserview.py
+++ b/portal/manageuserview.py
@@ -221,8 +221,8 @@ def user_process(request, **kwargs):
     for key, value in kwargs.iteritems():
         if key == "email":
             selected_email=value
     for key, value in kwargs.iteritems():
         if key == "email":
             selected_email=value

-    print "yasin"
-    print selected_email
+
+    redirect_url = "/portal/user/"+selected_email

     
     user_query  = Query().get('local:user').filter_by('email', '==', selected_email).select('user_id','email','password','config')
     user_details = execute_admin_query(request, user_query)
     
     user_query  = Query().get('local:user').filter_by('email', '==', selected_email).select('user_id','email','password','config')
     user_details = execute_admin_query(request, user_query)


@@ -230,6 +230,7 @@ def user_process(request, **kwargs):
     # getting the user_id from the session
     for user_detail in user_details:
         user_id = user_detail['user_id']
     # getting the user_id from the session
     for user_detail in user_details:
         user_id = user_detail['user_id']

+        user_email = user_detail['email']

     
     account_query  = Query().get('local:account').filter_by('user_id', '==', user_id).select('user_id','platform_id','auth_type','config')
     account_details = execute_admin_query(request, account_query)
     
     account_query  = Query().get('local:account').filter_by('user_id', '==', user_id).select('user_id','platform_id','auth_type','config')
     account_details = execute_admin_query(request, account_query)


@@ -237,12 +238,6 @@ def user_process(request, **kwargs):
     platform_query  = Query().get('local:platform').select('platform_id','platform')
     platform_details = execute_admin_query(request, platform_query)
     
     platform_query  = Query().get('local:platform').select('platform_id','platform')
     platform_details = execute_admin_query(request, platform_query)
     

-    # getting the user_id from the session
-    for user_detail in user_details:
-            user_id = user_detail['user_id']
-            user_email = user_detail['email']
-    
-    redirect_url = "/portal/user/"+selected_email

 
     for account_detail in account_details:
         for platform_detail in platform_details:
 
     for account_detail in account_details:
         for platform_detail in platform_details:

diff --git a/portal/templates/adminview.html b/portal/templates/usersview.html
similarity index 100%
rename from portal/templates/adminview.html
rename to portal/templates/usersview.html

diff --git a/portal/adminview.py b/portal/usersview.py
similarity index 93%
rename from portal/adminview.py
rename to portal/usersview.py
index 8a51da9..8dfd915 100644 (file)
--- a/portal/adminview.py
+++ b/portal/usersview.py
@@ -10,8 +10,8 @@ from unfold.loginrequired       import LoginRequiredAutoLogoutView
 import json
 
 # View for platforms
 import json
 
 # View for platforms

-class AdminView(LoginRequiredAutoLogoutView):
-    template_name = "adminview.html"
+class UsersView(LoginRequiredAutoLogoutView):
+    template_name = "usersview.html"

 
     def get_context_data(self, **kwargs):
         page = Page(self.request)
 
     def get_context_data(self, **kwargs):
         page = Page(self.request)


@@ -69,7 +69,7 @@ class AdminView(LoginRequiredAutoLogoutView):
         #        },
         #)
 
         #        },
         #)
 

-        context = super(AdminView, self).get_context_data(**kwargs)
+        context = super(UsersView, self).get_context_data(**kwargs)

         context['person']   = self.request.user
         context['user_list'] = user_list
 
         context['person']   = self.request.user
         context['user_list'] = user_list
 


@@ -77,7 +77,7 @@ class AdminView(LoginRequiredAutoLogoutView):
         # more general variables expected in the template
         context['title'] = 'Users in MySlice'
         # the menu items on the top
         # more general variables expected in the template
         context['title'] = 'Users in MySlice'
         # the menu items on the top

-        context['topmenu_items'] = topmenu_items_live('Admin', page)
+        context['topmenu_items'] = topmenu_items_live('Users', page)

         # so we can sho who is logged
         context['username'] = the_user(self.request)
 
         # so we can sho who is logged
         context['username'] = the_user(self.request)