IMPORTANT: myslice/manifold folder REMOVED due to conflicts with Manifold Server...

[myslice.git] / portal / joinview.py

diff --git a/portal/joinview.py b/portal/joinview.py
index 5c93d42..caea6d2 100644 (file)
--- a/portal/joinview.py
+++ b/portal/joinview.py
@@ -13,16 +13,18 @@ from unfold.page                import Page
 from unfold.loginrequired       import FreeAccessView
 from ui.topmenu                 import topmenu_items_live
 
-from manifold.manifoldapi       import execute_admin_query
+from manifoldapi.manifoldapi    import execute_admin_query
 from manifold.core.query        import Query
 
 from portal.models              import PendingUser,PendingAuthority
 from portal.actions             import authority_get_pi_emails, manifold_add_user,manifold_add_account
 
+from theme import ThemeView
+
 # since we inherit from FreeAccessView we cannot redefine 'dispatch'
 # so let's override 'get' and 'post' instead
 #
-class JoinView (FreeAccessView):
+class JoinView (FreeAccessView, ThemeView):
 
     def post (self, request):
         return self.get_or_post (request, 'POST')
@@ -132,6 +134,7 @@ class JoinView (FreeAccessView):
                     address_postalcode    = reg_address_postalcode,
                     address_state         = reg_address_state,
                     address_country       = reg_address_country,
+                    authority_hrn         = reg_root_authority_hrn,
                 )
                 a.save()
  
@@ -143,6 +146,7 @@ class JoinView (FreeAccessView):
                     email         = reg_email, 
                     password      = reg_password,
                     keypair       = account_config,
+                    pi            = reg_auth,
                 )
                 b.save()
 
@@ -199,8 +203,10 @@ class JoinView (FreeAccessView):
           'address_postalcode': request.POST.get('address_postalcode', ''),
           'address_state': request.POST.get('address_state', ''),
           'address_country': request.POST.get('address_country', ''),
+          'root_authority_hrn': request.POST.get('root_authority_hrn', '').lower(),
           'root_authorities': root_authorities,
           'authorities': authorities,
+          'theme': self.theme
           }
         template_env.update(page.prelude_env ())
         return render(request, 'join_view.html',template_env)