HOT-FIX: Refactorings

sapl/materia/forms.py

@@ -1295,12 +1295,11 @@ class ProposicaoForm(forms.ModelForm):
 
     def clean_texto_original(self):
         texto_original = self.cleaned_data.get('texto_original', False)
-        if texto_original:
+        if texto_original and texto_original.size > MAX_DOC_UPLOAD_SIZE:
-            if texto_original.size > MAX_DOC_UPLOAD_SIZE:
+            max_size = str(MAX_DOC_UPLOAD_SIZE / (1024 * 1024))
-                max_size = str(MAX_DOC_UPLOAD_SIZE / (1024 * 1024))
+            raise ValidationError(
-                raise ValidationError(
                     "Arquivo muito grande. ( > {0}MB )".format(max_size))
-            return texto_original
+        return texto_original
 
     def gerar_hash(self, inst, receber_recibo):
 

sapl/norma/forms.py

@@ -164,11 +164,10 @@ class NormaJuridicaForm(ModelForm):
 
     def clean_texto_integral(self):
         texto_integral = self.cleaned_data.get('texto_integral', False)
-        if texto_integral:
+        if texto_integral and texto_integral.size > MAX_DOC_UPLOAD_SIZE:
-            if texto_integral.size > MAX_DOC_UPLOAD_SIZE:
+            max_size = str(MAX_DOC_UPLOAD_SIZE / (1024 * 1024))
-                max_size = str(MAX_DOC_UPLOAD_SIZE / (1024 * 1024))
+            raise ValidationError(
-                raise ValidationError(
+                  "Arquivo muito grande. ( > {0}MB )".format(max_size))
-                    "Arquivo muito grande. ( > {0}MB )".format(max_size))
         return texto_integral
 
     def save(self, commit=False):

sapl/norma/views.py

@@ -110,15 +110,16 @@ class AnexoNormaJuridicaCrud(MasterDetailCrud):
     class CreateView(MasterDetailCrud.CreateView):
         form_class = AnexoNormaJuridicaForm
         layout_key = 'AnexoNormaJuridica'
+
         def get_initial(self):
-            norma_id = str(self.request).split("/")[-3]
+            initial = super(MasterDetailCrud.CreateView, self).get_initial()
-            self.initial = super(MasterDetailCrud.CreateView, self).get_initial()
+            initial['norma'] = NormaJuridica.objects.get(id=self.kwargs['pk'])
-            self.initial['norma'] = NormaJuridica.objects.get(id=norma_id)
+            return initial
-            return self.initial
 
     class UpdateView(MasterDetailCrud.UpdateView):
         form_class = AnexoNormaJuridicaForm
         layout_key = 'AnexoNormaJuridica'
+
         def get_initial(self):
             initial = super(UpdateView, self).get_initial()
             initial['norma'] = self.object.norma