|
@ -1,6 +1,5 @@ |
|
|
import logging |
|
|
import logging |
|
|
|
|
|
|
|
|
import django_filters |
|
|
|
|
|
from crispy_forms.layout import (Button, Fieldset, HTML, Layout) |
|
|
from crispy_forms.layout import (Button, Fieldset, HTML, Layout) |
|
|
from django import forms |
|
|
from django import forms |
|
|
from django.contrib.postgres.search import SearchVector |
|
|
from django.contrib.postgres.search import SearchVector |
|
@ -9,6 +8,7 @@ from django.db.models import Q |
|
|
from django.forms import ModelChoiceField, ModelForm, widgets |
|
|
from django.forms import ModelChoiceField, ModelForm, widgets |
|
|
from django.utils import timezone |
|
|
from django.utils import timezone |
|
|
from django.utils.translation import ugettext_lazy as _ |
|
|
from django.utils.translation import ugettext_lazy as _ |
|
|
|
|
|
import django_filters |
|
|
|
|
|
|
|
|
from sapl.base.models import TipoAutor |
|
|
from sapl.base.models import TipoAutor |
|
|
from sapl.crispy_layout_mixin import form_actions, SaplFormHelper, to_row |
|
|
from sapl.crispy_layout_mixin import form_actions, SaplFormHelper, to_row |
|
@ -18,6 +18,7 @@ from sapl.parlamentares.models import Partido |
|
|
from sapl.utils import (autor_label, autor_modal, ANO_CHOICES, choice_anos_com_normas, |
|
|
from sapl.utils import (autor_label, autor_modal, ANO_CHOICES, choice_anos_com_normas, |
|
|
FileFieldCheckMixin, FilterOverridesMetaMixin, |
|
|
FileFieldCheckMixin, FilterOverridesMetaMixin, |
|
|
NormaPesquisaOrderingFilter, validar_arquivo) |
|
|
NormaPesquisaOrderingFilter, validar_arquivo) |
|
|
|
|
|
|
|
|
from .models import (AnexoNormaJuridica, AssuntoNorma, AutoriaNorma, |
|
|
from .models import (AnexoNormaJuridica, AssuntoNorma, AutoriaNorma, |
|
|
NormaJuridica, NormaRelacionada, TipoNormaJuridica) |
|
|
NormaJuridica, NormaRelacionada, TipoNormaJuridica) |
|
|
|
|
|
|
|
@ -308,7 +309,6 @@ class AutoriaNormaForm(ModelForm): |
|
|
if not self.instance: |
|
|
if not self.instance: |
|
|
self.fields['autor'].choices = [] |
|
|
self.fields['autor'].choices = [] |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class Meta: |
|
|
class Meta: |
|
|
model = AutoriaNorma |
|
|
model = AutoriaNorma |
|
|
fields = ['tipo_autor', 'autor', |
|
|
fields = ['tipo_autor', 'autor', |
|
@ -397,7 +397,12 @@ class NormaRelacionadaForm(ModelForm): |
|
|
|
|
|
|
|
|
class Meta: |
|
|
class Meta: |
|
|
model = NormaRelacionada |
|
|
model = NormaRelacionada |
|
|
fields = ['orgao', 'tipo', 'numero', 'ano', 'ementa', 'tipo_vinculo'] |
|
|
fields = ['orgao', 'tipo', 'numero', 'ano', |
|
|
|
|
|
'resumo', 'ementa', 'tipo_vinculo'] |
|
|
|
|
|
|
|
|
|
|
|
widgets = { |
|
|
|
|
|
'resumo': forms.Textarea( |
|
|
|
|
|
attrs={'id': 'texto-rico'})} |
|
|
|
|
|
|
|
|
def __init__(self, *args, **kwargs): |
|
|
def __init__(self, *args, **kwargs): |
|
|
super(NormaRelacionadaForm, self).__init__(*args, **kwargs) |
|
|
super(NormaRelacionadaForm, self).__init__(*args, **kwargs) |
|
|