diff --git a/smash/web/forms.py b/smash/web/forms.py index 145ea50ffef7337fffd5fcf67f59d143803bae32..91cc3c37b33c0adc146fe850983bd3899df6282c 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 4f8c93e9702d47de2de272162e6c8ae9357e20a4..6936737aaa048f50b2cb4f6ec6f0f6c88e885e34 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 ec2b573060da1b80f32191393a450e48967df776..13556f9f13c2971daf158fc2f634b4c462bf0c06 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 45bc85d3c07d409b55394b4001448617ffa788ed..0ebc72c729156efafbc8f0c111ce4b7d2820ef8e 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):