From 978063cf3ff3647ccfd41195f0a882862fdfbcad Mon Sep 17 00:00:00 2001
From: Edward <edwardoliveira@users.noreply.github.com>
Date: Fri, 22 Feb 2019 14:47:42 -0300
Subject: [PATCH] =?UTF-8?q?Verifica=C3=A7=C3=A3o=20em=20forms=20contendo?=
 =?UTF-8?q?=20arquivos=20(#2534)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* WIP

* WIP 2

* WIP 3

* Adiciona file check em Audiencia e Parlamentar e mostra todos os erros

* adicionado o file check em mais forms

* adiciona verificacao de arquivo em partido form
---
 sapl/base/forms.py | 26 +++++++++++++++++---------
 sapl/utils.py      |  3 +++
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/sapl/base/forms.py b/sapl/base/forms.py
index 0475fd474..18d67df64 100644
--- a/sapl/base/forms.py
+++ b/sapl/base/forms.py
@@ -1386,16 +1386,21 @@ class PartidoForm(FileFieldCheckMixin, ModelForm):
         model = Partido
         exclude = []
 
-    def __init__(self, pk=None, *args, **kwargs):
-        super().__init__(*args, **kwargs)
+    def __init__(self, *args, **kwargs):
 
-        row1 = to_row([
-            ('sigla', 2),
-            ('nome', 6),
-            ('data_criacao', 2),
-            ('data_extincao', 2)
-            ]
-        )
+        super(PartidoForm, self).__init__(*args, **kwargs)
+
+        # TODO Utilizar esses campos na issue #2161 de alteração de nomes de partidos
+        # if self.instance:
+        #     if self.instance.nome:
+        #         self.fields['nome'].widget.attrs['readonly'] = True
+        #         self.fields['sigla'].widget.attrs['readonly'] = True
+
+        row1 = to_row(
+            [('sigla', 2),
+             ('nome', 6),
+             ('data_criacao', 2),
+             ('data_extincao', 2),])
         row2 = to_row([('observacao', 12)])
         row3 = to_row([('logo_partido', 12)])
 
@@ -1469,6 +1474,9 @@ class PartidoUpdateForm(PartidoForm):
             row1, row2, row3, row4, to_row([(buttons, 12)]),
         )
 
+
+
+
     def clean(self):
         cleaned_data = super(PartidoUpdateForm,self).clean()
         
diff --git a/sapl/utils.py b/sapl/utils.py
index e6e2dabc3..f9f9a108f 100644
--- a/sapl/utils.py
+++ b/sapl/utils.py
@@ -600,7 +600,10 @@ class NormaPesquisaOrderingFilter(django_filters.OrderingFilter):
 
 
 class FileFieldCheckMixin(BaseForm):
+<<<<<<< HEAD
 
+=======
+>>>>>>> 708f5c76... Verificação em forms contendo arquivos (#2534)
     def _check(self):
         cleaned_data = super(FileFieldCheckMixin, self).clean()
         errors = []