diff options
| -rw-r--r-- | archaeological_operations/forms.py | 2 | ||||
| -rw-r--r-- | archaeological_operations/views.py | 17 |
2 files changed, 11 insertions, 8 deletions
diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py index b092e91f7..447e7c2b6 100644 --- a/archaeological_operations/forms.py +++ b/archaeological_operations/forms.py @@ -219,7 +219,7 @@ class ParcelFormSet(FormSet): def __init__(self, *args, **kwargs): if 'data' in kwargs and kwargs['data']: kwargs['data'] = self.rearrange_parcels(kwargs['data']) - super(FormSet, self).__init__(*args, **kwargs) + super(ParcelFormSet, self).__init__(*args, **kwargs) self.extra_form = None if self.forms[0].__class__.__name__ == 'ParcelForm': self.selection_form = ParcelSelectionForm() diff --git a/archaeological_operations/views.py b/archaeological_operations/views.py index f8976bd5d..f78431bc2 100644 --- a/archaeological_operations/views.py +++ b/archaeological_operations/views.py @@ -414,17 +414,18 @@ def operation_delete(request, pk): def operation_modify_parcels(request, pk): - formset = None + # TODO: add quick add form + formset_class = SelectedParcelGeneralFormSet operation = models.Operation.objects.get(pk=pk) parcels = models.Parcel.objects.filter(operation=pk).all() data = {} - if request.method == 'POST': #TODO - formset = SelectedParcelFormSet(request.POST, request.FILES) + if request.method == 'POST': #TODO + formset = formset_class(request.POST, request.FILES) if formset.is_valid(): pass else: - formset = SelectedParcelFormSet() + formset = formset_class() else: i = 0 towns_array = [] @@ -437,9 +438,11 @@ def operation_modify_parcels(request, pk): i += 1 data['TOWNS'] = towns_array # data['PARCELS'] = parcels_array - data['form-TOTAL_FORMS'] = '1' - data['form-INITIAL_FORMS'] = '0' - formset = SelectedParcelFormSet(intial=data) + data['form-TOTAL_FORMS'] = 3 + # TODO: feed initial with current parcels + initial = [] + data['form-INITIAL_FORMS'] = len(initial) + formset = formset_class(initial=initial, data=data) #formset = SelectedParcelGeneralFormSet() return render(request, 'ishtar/forms/operation_modify_parcels.html', { 'formset': formset, |