From: Loic Baron Date: Fri, 17 Jan 2014 15:11:44 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.onelab.eu/git/myslice X-Git-Tag: myslice-0.3-0~30 X-Git-Url: http://git.onelab.eu/?p=unfold.git;a=commitdiff_plain;h=1afacfe6585d82ff1f6b8d5c37b00ff977f11d36;hp=31cc945eda5880557485ca4c78f2c23ad991faf4 Merge branch 'master' of ssh://git.onelab.eu/git/myslice --- diff --git a/portal/contactview.py b/portal/contactview.py index 796c8b04..caee44a4 100644 --- a/portal/contactview.py +++ b/portal/contactview.py @@ -18,18 +18,18 @@ class ContactView (FreeAccessView): # Process the data in form.cleaned_data first_name = form.cleaned_data['first_name'] last_name = form.cleaned_data['last_name'] - affiliation = form.cleaned_data['affiliation'] + authority = form.cleaned_data['authority'] subject = form.cleaned_data['subject'] - message = form.cleaned_data['message'] + description = form.cleaned_data['description'] email = form.cleaned_data['email'] # email of the sender cc_myself = form.cleaned_data['cc_myself'] #recipients = authority_get_pi_emails(authority_hrn) - recipients = ['yasin.upmc@gmail.com', 'thierry.parmentelat@inria.fr', ] + recipients = ['support@myslice.info' ] if cc_myself: recipients.append(email) - msg = render_to_string('slice-request-email.txt', form.cleaned_data) + 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 else: diff --git a/portal/forms.py b/portal/forms.py index df5c1a67..fc8d8c3f 100644 --- a/portal/forms.py +++ b/portal/forms.py @@ -56,10 +56,10 @@ from django.template import loader class ContactForm(forms.Form): first_name = forms.CharField(widget=forms.TextInput(attrs={'class':'form-control'})) last_name = forms.CharField(widget=forms.TextInput(attrs={'class':'form-control'})) - affiliation = forms.CharField(widget=forms.TextInput(attrs={'class':'form-control'})) + authority = forms.CharField(widget=forms.TextInput(attrs={'class':'form-control'})) email = forms.EmailField(widget=forms.TextInput(attrs={'class':'form-control'})) subject = forms.CharField(max_length=100,widget=forms.TextInput(attrs={'class':'form-control'})) - message = forms.CharField(widget=forms.Textarea(attrs={'class':'form-control'})) + description = forms.CharField(widget=forms.Textarea(attrs={'class':'form-control'})) cc_myself = forms.BooleanField(required=False,widget=forms.CheckboxInput(attrs={'class':'form-control'})) class PassResetForm(forms.Form): diff --git a/portal/registrationview.py b/portal/registrationview.py index 9cc0cc3e..e068aecf 100644 --- a/portal/registrationview.py +++ b/portal/registrationview.py @@ -46,7 +46,8 @@ class RegistrationView (FreeAccessView): print "FIREXP ENABLED" authorities = execute_admin_query(request, authorities_query) - authorities = sorted(authorities) + if authorities is not None: + authorities = sorted(authorities) # xxx tocheck - if authorities is empty, it's no use anyway # (users won't be able to validate the form anyway) diff --git a/portal/slicerequestview.py b/portal/slicerequestview.py index ee947386..5b496079 100644 --- a/portal/slicerequestview.py +++ b/portal/slicerequestview.py @@ -30,7 +30,8 @@ class SliceRequestView (LoginRequiredAutoLogoutView): # Using cache manifold-tables to get the list of authorities faster authorities_query = Query.get('authority').select('name', 'authority_hrn') authorities = execute_admin_query(request, authorities_query) - authorities = sorted(authorities) + if authorities is not None: + authorities = sorted(authorities) user_query = Query().get('local:user').select('email') user_email = execute_query(self.request, user_query) diff --git a/portal/templates/contact-support-email.txt b/portal/templates/contact-support-email.txt new file mode 100644 index 00000000..9eb576d6 --- /dev/null +++ b/portal/templates/contact-support-email.txt @@ -0,0 +1,12 @@ +User details: + +First name : {{first_name}} +Last name : {{last_name}} +email : {{email}} +Authority : {{authority}} + +Query Details: + +Subject : {{subject}} +Description : {{description}} + diff --git a/portal/templates/contact.html b/portal/templates/contact.html index ab00b157..12f76c33 100644 --- a/portal/templates/contact.html +++ b/portal/templates/contact.html @@ -9,8 +9,8 @@

Onelab Support

-

If you have already registered, then please send an e-mail - or visit us

+

If you have any diffculties using the portal, please contact us by filling this form below.

+

You can also e-mail us directly or consult to our documentation