fnp
/
edumed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
disable form (cybernauts)
[edumed.git]
/
contact
/
views.py
diff --git
a/contact/views.py
b/contact/views.py
index
d18598c
..
4d5a40f
100644
(file)
--- a/
contact/views.py
+++ b/
contact/views.py
@@
-1,40
+1,61
@@
+# -*- coding: utf-8 -*-
+from urllib import unquote
+
from django.contrib.auth.decorators import permission_required
from django.contrib.auth.decorators import permission_required
-from django.http import Http404
, HttpResponse
+from django.http import Http404
from django.shortcuts import get_object_or_404, redirect, render
from django.shortcuts import get_object_or_404, redirect, render
-from django.utils.translation import ugettext_lazy as _
from fnpdjango.utils.views import serve_file
from .forms import contact_forms
from .models import Attachment
from fnpdjango.utils.views import serve_file
from .forms import contact_forms
from .models import Attachment
-def form(request, form_tag):
+def form(request, form_tag
, force_enabled=False
):
try:
form_class = contact_forms[form_tag]
except KeyError:
raise Http404
try:
form_class = contact_forms[form_tag]
except KeyError:
raise Http404
+ if (getattr(form_class, 'disabled', False) and
+ not (force_enabled and request.user.is_superuser)):
+ template = getattr(form_class, 'disabled_template', None)
+ if template:
+ return render(request, template)
+ raise Http404
if request.method == 'POST':
form = form_class(request.POST, request.FILES)
if request.method == 'POST':
form = form_class(request.POST, request.FILES)
- if form.is_valid():
- form.save(request)
+ formsets = []
+ valid = form.is_valid()
+ for formset in getattr(form, 'form_formsets', ()):
+ fset = formset(request.POST, request.FILES)
+ if not fset.is_valid():
+ valid = False
+ formsets.append(fset)
+ if valid:
+ form.save(request, formsets)
return redirect('contact_thanks', form_tag)
else:
form = form_class(initial=request.GET)
return redirect('contact_thanks', form_tag)
else:
form = form_class(initial=request.GET)
- return render(request,
- ['contact/%s/form.html' % form_tag, 'contact/form.html'],
- {'form': form}
- )
+ formsets = []
+ for formset in getattr(form, 'form_formsets', ()):
+ formsets.append(formset())
+ return render(
+ request, ['contact/%s/form.html' % form_tag, 'contact/form.html'],
+ {'form': form, 'formsets': formsets}
+ )
def thanks(request, form_tag):
def thanks(request, form_tag):
- if form_tag not in contact_forms:
+ try:
+ form_class = contact_forms[form_tag]
+ except KeyError:
raise Http404
raise Http404
- return render(
request,
- ['contact/%s/thanks.html' % form_tag, 'contact/thanks.html']
-
)
+ return render(
+ request, ['contact/%s/thanks.html' % form_tag, 'contact/thanks.html'],
+
{'base_template': getattr(form_class, 'base_template', None)}
)
@permission_required('contact.change_attachment')
def attachment(request, contact_id, tag):
attachment = get_object_or_404(Attachment, contact_id=contact_id, tag=tag)
@permission_required('contact.change_attachment')
def attachment(request, contact_id, tag):
attachment = get_object_or_404(Attachment, contact_id=contact_id, tag=tag)
- return serve_file(attachment.file.url)
+ attachment_url = unquote(attachment.file.url)
+ return serve_file(attachment_url)