From 346d457e3133f59fe06b449052c7c81ea7b691e6 Mon Sep 17 00:00:00 2001
From: "piotr.atyjaszyk" <piotrmk1@gmail.com>
Date: Wed, 18 Jan 2017 15:57:52 +0100
Subject: [PATCH] Stashing itself!
---
smash/web/forms.py | 2 +-
smash/web/templates/subjects/add.html | 4 ----
smash/web/templates/subjects/edit.html | 2 --
smash/web/views.py | 17 ++++++++---------
4 files changed, 9 insertions(+), 16 deletions(-)
diff --git a/smash/web/forms.py b/smash/web/forms.py
index 145ea50f..91cc3c37 100644
--- a/smash/web/forms.py
+++ b/smash/web/forms.py
@@ -9,7 +9,7 @@ Redundancy? Maybe yes, but if need arises, contents of forms can be more easily
class SubjectAddForm(ModelForm):
class Meta:
model = Subject
- fields = '__all__'
+ exclude = ['title']
class SubjectDetailForm(ModelForm):
diff --git a/smash/web/templates/subjects/add.html b/smash/web/templates/subjects/add.html
index 4f8c93e9..6936737a 100644
--- a/smash/web/templates/subjects/add.html
+++ b/smash/web/templates/subjects/add.html
@@ -32,8 +32,6 @@
<form method="post" action="" class="form-horizontal">
{% csrf_token %}
- {% for form in formset %}
-
<div class="box-body">
{% for field in form %}
<div class="form-group">
@@ -54,8 +52,6 @@
{% endfor %}
</div><!-- /.box-body -->
- {% endfor %}
-
<div class="box-footer">
<div class="col-sm-6">
<button type="submit" class="btn btn-block btn-success">Add</button>
diff --git a/smash/web/templates/subjects/edit.html b/smash/web/templates/subjects/edit.html
index ec2b5730..13556f9f 100644
--- a/smash/web/templates/subjects/edit.html
+++ b/smash/web/templates/subjects/edit.html
@@ -66,8 +66,6 @@
{% endblock %}
-
-
{% endblock maincontent %}
{% block scripts %}
diff --git a/smash/web/views.py b/smash/web/views.py
index 45bc85d3..0ebc72c7 100644
--- a/smash/web/views.py
+++ b/smash/web/views.py
@@ -66,16 +66,15 @@ def subjects(request):
def subjectadd(request):
- subjectFormSet = modelformset_factory(Subject , fields='__all__')
- if request.method == 'POST':
- formset = subjectFormSet(request.POST, request.FILES)
- if formset.is_valid():
- formset.save()
+ if request.method == 'POST':
+ form = SubjectAddForm(request.POST, request.FILES)
+ if form.is_valid():
+ form.save()
return redirect(subjects)
- else:
- formset = subjectFormSet(queryset=Subject.objects.none())
-
- return wrap_response(request, 'subjects/add.html', {'formset': formset})
+ else:
+ form = SubjectAddForm()
+
+ return wrap_response(request, 'subjects/add.html', {'form': form})
def subjectdet(request, ids):
--
GitLab