git://git.onelab.eu
/
unfold.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Manageuser: tabbed view
[unfold.git]
/
portal
/
registrationview.py
diff --git
a/portal/registrationview.py
b/portal/registrationview.py
index
fed383f
..
7c2ab03
100644
(file)
--- a/
portal/registrationview.py
+++ b/
portal/registrationview.py
@@
-13,17
+13,20
@@
from unfold.page import Page
from unfold.loginrequired import FreeAccessView
from ui.topmenu import topmenu_items_live
from unfold.loginrequired import FreeAccessView
from ui.topmenu import topmenu_items_live
-from manifold
.manifoldapi
import execute_admin_query
+from manifold
api.manifoldapi
import execute_admin_query
from manifold.core.query import Query
from portal.models import PendingUser
from portal.actions import authority_get_pi_emails, manifold_add_user,manifold_add_account
from manifold.core.query import Query
from portal.models import PendingUser
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
#
# since we inherit from FreeAccessView we cannot redefine 'dispatch'
# so let's override 'get' and 'post' instead
#
-class RegistrationView (FreeAccessView):
-
+class RegistrationView (FreeAccessView, ThemeView):
+ template_name = 'registration_view.html'
+
def post (self, request):
return self.get_or_post (request, 'POST')
def post (self, request):
return self.get_or_post (request, 'POST')
@@
-149,6
+152,7
@@
class RegistrationView (FreeAccessView):
email = reg_email,
password = request.POST['password'],
keypair = account_config,
email = reg_email,
password = request.POST['password'],
keypair = account_config,
+ pi = '',
)
b.save()
# saves the user to django auth_user table [needed for password reset]
)
b.save()
# saves the user to django auth_user table [needed for password reset]
@@
-171,16
+175,14
@@
class RegistrationView (FreeAccessView):
'user_hrn' : user_hrn,
'public_key' : public_key,
}
'user_hrn' : user_hrn,
'public_key' : public_key,
}
+
recipients = authority_get_pi_emails(request,reg_auth)
recipients = authority_get_pi_emails(request,reg_auth)
- # We don't need to send this email to user.
- # it's for the PI only
- #if ctx['cc_myself']:
- # recipients.append(ctx['email'])
msg = render_to_string('user_request_email.txt', ctx)
send_mail("Onelab New User request for %s submitted"%reg_email, msg, 'support@myslice.info', recipients)
msg = render_to_string('user_request_email.txt', ctx)
send_mail("Onelab New User request for %s submitted"%reg_email, msg, 'support@myslice.info', recipients)
- return render(request, 'user_register_complete.html')
+ self.template_name = 'user_register_complete.html'
+ return render(request, self.template, {'theme': self.theme})
template_env = {
'topmenu_items': topmenu_items_live('Register', page),
template_env = {
'topmenu_items': topmenu_items_live('Register', page),
@@
-192,6
+194,7
@@
class RegistrationView (FreeAccessView):
'email': request.POST.get('email', ''),
'password': request.POST.get('password', ''),
'authorities': authorities,
'email': request.POST.get('email', ''),
'password': request.POST.get('password', ''),
'authorities': authorities,
+ 'theme': self.theme
}
template_env.update(page.prelude_env ())
}
template_env.update(page.prelude_env ())
- return render(request,
'registration_view.html'
,template_env)
+ return render(request,
self.template
,template_env)