Compare commits

..

No commits in common. "b2f29a36516285b943bfc112da0bfc5a31464f32" and "b5333baa868eba37e962a8dfe63f7fa26dfde1ab" have entirely different histories.

View File

@ -15,7 +15,6 @@ from django.contrib import messages
from django.contrib.gis import gdal from django.contrib.gis import gdal
from django.db.models.fields.files import FieldFile from django.db.models.fields.files import FieldFile
from compensation.models import EcoAccount
from konova.sub_settings.lanis_settings import DEFAULT_SRID_RLP from konova.sub_settings.lanis_settings import DEFAULT_SRID_RLP
from user.models import User from user.models import User
from django.contrib.gis.forms import MultiPolygonField from django.contrib.gis.forms import MultiPolygonField
@ -157,16 +156,16 @@ class BaseForm(forms.Form):
RemoveEcoAccountDeductionModalForm RemoveEcoAccountDeductionModalForm
is_none = self.instance is None is_none = self.instance is None
is_other_data_type = not isinstance(self.instance, BaseObject) is_other_data_type = not isinstance(self.instance, BaseObject)
is_deduction_form_from_account = isinstance( is_deduction_form = isinstance(
self, self,
( (
NewDeductionModalForm, NewDeductionModalForm,
EditEcoAccountDeductionModalForm, EditEcoAccountDeductionModalForm,
RemoveEcoAccountDeductionModalForm, RemoveEcoAccountDeductionModalForm,
) )
) and isinstance(self.instance, EcoAccount) )
if is_none or is_other_data_type or is_deduction_form_from_account: if is_none or is_other_data_type or is_deduction_form:
# Do nothing # Do nothing
return return