Browse Source

adicionado o file check em mais forms

pull/2534/head
Cesar Carvalho 7 years ago
parent
commit
094054c57b
  1. 2
      sapl/base/forms.py
  2. 5
      sapl/base/views.py
  3. 5
      sapl/comissoes/forms.py
  4. 4
      sapl/materia/forms.py
  5. 2
      sapl/norma/forms.py
  6. 7
      sapl/protocoloadm/forms.py
  7. 5
      sapl/sessao/forms.py

2
sapl/base/forms.py

@ -199,7 +199,7 @@ class UsuarioEditForm(ModelForm):
return data
class SessaoLegislativaForm(ModelForm):
class SessaoLegislativaForm(FileFieldCheckMixin, ModelForm):
logger = logging.getLogger(__name__)
class Meta:

5
sapl/base/views.py

@ -9,7 +9,7 @@ from django.contrib.auth import get_user_model
from django.contrib.auth.mixins import PermissionRequiredMixin
from django.contrib.auth.models import Group, User
from django.contrib.auth.tokens import default_token_generator
from django.core.exceptions import ObjectDoesNotExist, PermissionDenied
from django.core.exceptions import ObjectDoesNotExist, PermissionDenied, ValidationError
from django.core.mail import send_mail
from django.core.urlresolvers import reverse, reverse_lazy
from django.db import connection
@ -1499,8 +1499,11 @@ class AppConfigCrud(CrudAux):
def gerar_hash(self, inst):
inst.save()
if inst.texto_original:
try:
inst.hash_code = gerar_hash_arquivo(
inst.texto_original.path, str(inst.pk))
except IOError:
raise ValidationError("Existem proposicoes com arquivos inexistentes.")
elif inst.texto_articulado.exists():
ta = inst.texto_articulado.first()
inst.hash_code = 'P' + ta.hash() + SEPARADOR_HASH_PROPOSICAO + str(inst.pk)

5
sapl/comissoes/forms.py

@ -12,6 +12,7 @@ from sapl.base.models import Autor, TipoAutor
from sapl.comissoes.models import (Comissao, Composicao, DocumentoAcessorio,
Participacao, Reuniao, Periodo)
from sapl.parlamentares.models import Legislatura, Mandato, Parlamentar
from sapl.utils import FileFieldCheckMixin
class ComposicaoForm(forms.ModelForm):
@ -382,7 +383,7 @@ class ReuniaoForm(ModelForm):
return self.cleaned_data
class DocumentoAcessorioCreateForm(forms.ModelForm):
class DocumentoAcessorioCreateForm(FileFieldCheckMixin, forms.ModelForm):
parent_pk = forms.CharField(required=False) # widget=forms.HiddenInput())
@ -404,7 +405,7 @@ class DocumentoAcessorioCreateForm(forms.ModelForm):
reuniao = Reuniao.objects.get(id=self.initial['parent_pk'])
class DocumentoAcessorioEditForm(forms.ModelForm):
class DocumentoAcessorioEditForm(FileFieldCheckMixin, forms.ModelForm):
parent_pk = forms.CharField(required=False) # widget=forms.HiddenInput())

4
sapl/materia/forms.py

@ -355,7 +355,7 @@ class AcompanhamentoMateriaForm(ModelForm):
super(AcompanhamentoMateriaForm, self).__init__(*args, **kwargs)
class DocumentoAcessorioForm(ModelForm):
class DocumentoAcessorioForm(FileFieldCheckMixin, ModelForm):
data = forms.DateField(required=True)
class Meta:
@ -1345,7 +1345,7 @@ class TipoProposicaoSelect(Select):
return option
class ProposicaoForm(forms.ModelForm):
class ProposicaoForm(FileFieldCheckMixin, forms.ModelForm):
logger = logging.getLogger(__name__)

2
sapl/norma/forms.py

@ -271,7 +271,7 @@ class AutoriaNormaForm(ModelForm):
return cd
class AnexoNormaJuridicaForm(ModelForm):
class AnexoNormaJuridicaForm(FileFieldCheckMixin, ModelForm):
class Meta:
model = AnexoNormaJuridica
fields = ['norma', 'anexo_arquivo', 'assunto_anexo']

7
sapl/protocoloadm/forms.py

@ -23,7 +23,8 @@ from sapl.utils import (RANGE_ANOS, YES_NO_CHOICES, AnoNumeroOrderingFilter,
RangeWidgetOverride, autor_label, autor_modal,
choice_anos_com_protocolo, choice_force_optional,
choice_anos_com_documentoadministrativo,
FilterOverridesMetaMixin, choice_anos_com_materias)
FilterOverridesMetaMixin, choice_anos_com_materias,
FileFieldCheckMixin)
from .models import (AcompanhamentoDocumento, DocumentoAcessorioAdministrativo,
DocumentoAdministrativo,
@ -626,7 +627,7 @@ class ProtocoloMateriaForm(ModelForm):
self.fields['data_hora_manual'].widget = forms.HiddenInput()
class DocumentoAcessorioAdministrativoForm(ModelForm):
class DocumentoAcessorioAdministrativoForm(FileFieldCheckMixin, ModelForm):
class Meta:
model = DocumentoAcessorioAdministrativo
@ -782,7 +783,7 @@ class TramitacaoAdmEditForm(TramitacaoAdmForm):
return self.cleaned_data
class DocumentoAdministrativoForm(ModelForm):
class DocumentoAdministrativoForm(FileFieldCheckMixin, ModelForm):
logger = logging.getLogger(__name__)

5
sapl/sessao/forms.py

@ -20,7 +20,8 @@ from sapl.materia.models import (MateriaLegislativa, StatusTramitacao,
from sapl.parlamentares.models import Parlamentar, Mandato
from sapl.utils import (RANGE_DIAS_MES, RANGE_MESES,
MateriaPesquisaOrderingFilter, autor_label,
autor_modal, timezone, choice_anos_com_sessaoplenaria)
autor_modal, timezone, choice_anos_com_sessaoplenaria,
FileFieldCheckMixin)
from .models import (Bancada, Bloco, ExpedienteMateria, JustificativaAusencia,
Orador, OradorExpediente, OrdemDia, PresencaOrdemDia, SessaoPlenaria,
@ -45,7 +46,7 @@ ORDENACAO_RESUMO = [('cont_mult', 'Conteúdo Multimídia'),
('ocorr_sessao', 'Ocorrências da Sessão')]
class SessaoPlenariaForm(ModelForm):
class SessaoPlenariaForm(FileFieldCheckMixin, ModelForm):
class Meta:
model = SessaoPlenaria

Loading…
Cancel
Save