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
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
[unfold.git]
/
portal
/
contactview.py
diff --git
a/portal/contactview.py
b/portal/contactview.py
index
caee44a
..
63b4bb0
100644
(file)
--- a/
portal/contactview.py
+++ b/
portal/contactview.py
@@
-8,10
+8,12
@@
from ui.topmenu import topmenu_items, the_user
from portal.forms import ContactForm
from portal.forms import ContactForm
+from theme import ThemeView
+
# splitting the 2 functions done here
# GET is for displaying the empty form
# POST is to process it once filled - or show the form again if anything is missing
# splitting the 2 functions done here
# GET is for displaying the empty form
# POST is to process it once filled - or show the form again if anything is missing
-class ContactView (FreeAccessView):
+class ContactView (FreeAccessView
, ThemeView
):
def post (self, request):
form = ContactForm(request.POST) # A form bound to the POST data
if form.is_valid(): # All validation rules pass
def post (self, request):
form = ContactForm(request.POST) # A form bound to the POST data
if form.is_valid(): # All validation rules pass
@@
-31,7
+33,11
@@
class ContactView (FreeAccessView):
msg = render_to_string('contact-support-email.txt', form.cleaned_data)
send_mail("Onelab user %s submitted a query "%email, msg, email, recipients)
msg = render_to_string('contact-support-email.txt', form.cleaned_data)
send_mail("Onelab user %s submitted a query "%email, msg, email, recipients)
- return render(request,'contact_sent.html') # Redirect after POST
+ if request.user.is_authenticated() :
+ username = request.user.email
+ else :
+ username = None
+ return render(request,'contact_sent.html', { 'theme' : self.theme, 'username': username}) # Redirect after POST
else:
return self._display (request, form)
else:
return self._display (request, form)
@@
-39,8
+45,13
@@
class ContactView (FreeAccessView):
return self._display (request, ContactForm()) # A fresh unbound form
def _display (self, request, form):
return self._display (request, ContactForm()) # A fresh unbound form
def _display (self, request, form):
+ if request.user.is_authenticated() :
+ username = request.user.email
+ else :
+ username = None
return render(request, 'contact.html', {
'form': form,
'topmenu_items': topmenu_items('Contact', request),
return render(request, 'contact.html', {
'form': form,
'topmenu_items': topmenu_items('Contact', request),
- 'username': the_user (request)
+ 'theme' : self.theme,
+ 'username': username,
})
})