Browse Source

WIP 3

pull/2534/head
Edward Ribeiro 7 years ago
parent
commit
db71a858de
  1. 4
      sapl/base/forms.py
  2. 6
      sapl/utils.py

4
sapl/base/forms.py

@ -1139,7 +1139,9 @@ class CasaLegislativaForm(FileFieldCheckMixin, ModelForm):
} }
def clean_logotipo(self): def clean_logotipo(self):
super(CasaLegislativaForm, self).clean() # chama __clean de FileFieldCheckMixin
# por estar em clean de campo
super(CasaLegislativaForm, self)._check()
logotipo = self.cleaned_data.get('logotipo') logotipo = self.cleaned_data.get('logotipo')
if logotipo: if logotipo:

6
sapl/utils.py

@ -578,7 +578,7 @@ class NormaPesquisaOrderingFilter(django_filters.OrderingFilter):
class FileFieldCheckMixin(BaseForm): class FileFieldCheckMixin(BaseForm):
def clean(self): def _check(self):
cleaned_data = super(FileFieldCheckMixin, self).clean() cleaned_data = super(FileFieldCheckMixin, self).clean()
for name, campo in self.fields.items(): for name, campo in self.fields.items():
if isinstance(campo, forms.fields.FileField): if isinstance(campo, forms.fields.FileField):
@ -599,6 +599,10 @@ class FileFieldCheckMixin(BaseForm):
"opção Limpar e Salve." % campo.label) "opção Limpar e Salve." % campo.label)
return cleaned_data return cleaned_data
def clean(self):
""" Alias for _check() """
return self._check()
class AnoNumeroOrderingFilter(django_filters.OrderingFilter): class AnoNumeroOrderingFilter(django_filters.OrderingFilter):

Loading…
Cancel
Save