Commit 72e9934271b5260392b6b90556ada2898c8ad470
1 parent
e9a445f5
Exists in
master
and in
2 other branches
fixed error in fields not showing in page
Showing
2 changed files
with
21 additions
and
3 deletions
Show diff stats
reports/templates/reports/_form.html
| ... | ... | @@ -16,6 +16,21 @@ |
| 16 | 16 | </div> |
| 17 | 17 | {% endif %} |
| 18 | 18 | |
| 19 | + {% for field in form %} | |
| 20 | + {% for error in field.errors %} | |
| 21 | + <div class="alert alert-danger alert-dismissible" role="alert"> | |
| 22 | + <button type="button" class="close" data-dismiss="alert" aria-label="Close"> | |
| 23 | + <span aria-hidden="true">×</span> | |
| 24 | + </button> | |
| 25 | + <ul> | |
| 26 | + | |
| 27 | + <li>{{error}}</li> | |
| 28 | + | |
| 29 | + </ul> | |
| 30 | + </div> | |
| 31 | + {% endfor %} | |
| 32 | + | |
| 33 | + {% endfor %} | |
| 19 | 34 | <h5 class="one"> <span>{% trans "General Parameters" %}</span></h5> |
| 20 | 35 | <div id="general-parameters-div"> |
| 21 | 36 | <div class="general-parameters-field"> | ... | ... |
reports/views.py
| ... | ... | @@ -3,7 +3,7 @@ from django.http import HttpResponse, JsonResponse |
| 3 | 3 | from django.utils.translation import ugettext_lazy as _ |
| 4 | 4 | |
| 5 | 5 | from django import forms |
| 6 | -from django.core.urlresolvers import reverse_lazy | |
| 6 | +from django.core.urlresolvers import reverse_lazy, reverse | |
| 7 | 7 | from amadeus import settings |
| 8 | 8 | from django.contrib import messages |
| 9 | 9 | from os.path import join |
| ... | ... | @@ -41,7 +41,7 @@ class ReportView(LoginRequiredMixin, generic.FormView): |
| 41 | 41 | subject = Subject.objects.get(id=params['subject_id']) |
| 42 | 42 | |
| 43 | 43 | if not has_subject_permissions(request.user, subject): |
| 44 | - return redirect(reverse_lazy('subjects:home')) | |
| 44 | + return redirect(reverse('subjects:home')) | |
| 45 | 45 | |
| 46 | 46 | |
| 47 | 47 | |
| ... | ... | @@ -91,7 +91,7 @@ class ReportView(LoginRequiredMixin, generic.FormView): |
| 91 | 91 | for key, value in self.request.GET.items(): |
| 92 | 92 | get_params += key + "=" + str(value) |
| 93 | 93 | |
| 94 | - return reverse_lazy('subjects:reports:view_report', kwargs={}) + get_params | |
| 94 | + return reverse('subjects:reports:view_report', kwargs={}) + get_params | |
| 95 | 95 | |
| 96 | 96 | def post(self, request, *args, **kwargs): |
| 97 | 97 | """ |
| ... | ... | @@ -129,6 +129,9 @@ class ReportView(LoginRequiredMixin, generic.FormView): |
| 129 | 129 | self.formset_data = resources_formset.cleaned_data |
| 130 | 130 | return self.form_valid(form) |
| 131 | 131 | else: |
| 132 | + for field in form: | |
| 133 | + for error in field.errors: | |
| 134 | + print(error) | |
| 132 | 135 | return self.form_invalid(form) |
| 133 | 136 | |
| 134 | 137 | ... | ... |