From d17c2fea287d1d11ef7b02fd7c7c84d6e4037e3c Mon Sep 17 00:00:00 2001 From: Marcio Mazza Date: Mon, 29 Jun 2015 11:32:16 -0300 Subject: [PATCH] Fix verbose names for NormaJuridica --- .../scripts/original_forms/NormaJuridica.html | 2 +- norma/models.py | 34 +++++++++---------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/legacy/scripts/original_forms/NormaJuridica.html b/legacy/scripts/original_forms/NormaJuridica.html index b4c11ecb4..4c1a1f4ab 100644 --- a/legacy/scripts/original_forms/NormaJuridica.html +++ b/legacy/scripts/original_forms/NormaJuridica.html @@ -510,7 +510,7 @@ $(function() { -  
+  
 
diff --git a/norma/models.py b/norma/models.py index 61cd306bc..544fd40f7 100644 --- a/norma/models.py +++ b/norma/models.py @@ -25,23 +25,23 @@ class TipoNormaJuridica(models.Model): class NormaJuridica(models.Model): - tipo = models.ForeignKey(TipoNormaJuridica, verbose_name=_(u'Tipo')) # tip_norma - materia = models.ForeignKey(MateriaLegislativa, blank=True, null=True) # cod_materia - numero_norma = models.IntegerField(verbose_name=_(u'Número')) # num_norma - ano_norma = models.SmallIntegerField(verbose_name=_(u'Ano')) # ano_norma - tipo_esfera_federacao = models.CharField(max_length=1) # tip_esfera_federacao - data_norma = models.DateField(blank=True, null=True) # dat_norma - data_publicacao = models.DateField(blank=True, null=True) # dat_publicacao - descricao_veiculo_publicacao = models.CharField(max_length=30, blank=True, null=True) # des_veiculo_publicacao - numero_pag_inicio_publ = models.IntegerField(blank=True, null=True) # num_pag_inicio_publ - numero_pag_fim_publ = models.IntegerField(blank=True, null=True) # num_pag_fim_publ - txt_ementa = models.TextField() # txt_ementa - txt_indexacao = models.TextField(blank=True, null=True) # txt_indexacao - txt_observacao = models.TextField(blank=True, null=True) # txt_observacao - complemento = models.NullBooleanField(blank=True) # ind_complemento - assunto = models.ForeignKey(AssuntoNorma) # XXX was a CharField (attention on migrate) # cod_assunto - data_vigencia = models.DateField(blank=True, null=True) # dat_vigencia - timestamp = models.DateTimeField() # timestamp + tipo = models.ForeignKey(TipoNormaJuridica, verbose_name=_(u'Tipo')) # tip_norma + materia = models.ForeignKey(MateriaLegislativa, blank=True, null=True) # cod_materia + numero_norma = models.IntegerField(verbose_name=_(u'Número')) # num_norma + ano_norma = models.SmallIntegerField(verbose_name=_(u'Ano')) # ano_norma + tipo_esfera_federacao = models.CharField(max_length=1, verbose_name=_(u'Esfera Federação')) # tip_esfera_federacao + data_norma = models.DateField(blank=True, null=True, verbose_name=_(u'Data')) # dat_norma + data_publicacao = models.DateField(blank=True, null=True, verbose_name=_(u'Data Publicação')) # dat_publicacao + descricao_veiculo_publicacao = models.CharField(max_length=30, blank=True, null=True, verbose_name=_(u'Veículo Publicação')) # des_veiculo_publicacao + numero_pag_inicio_publ = models.IntegerField(blank=True, null=True, verbose_name=_(u'Pg. Início')) # num_pag_inicio_publ + numero_pag_fim_publ = models.IntegerField(blank=True, null=True, verbose_name=_(u'Pg. Fim')) # num_pag_fim_publ + txt_ementa = models.TextField(verbose_name=_(u'Ementa')) # txt_ementa + txt_indexacao = models.TextField(blank=True, null=True, verbose_name=_(u'Indexação')) # txt_indexacao + txt_observacao = models.TextField(blank=True, null=True, verbose_name=_(u'Observação')) # txt_observacao + complemento = models.NullBooleanField(blank=True, verbose_name=_(u'Complementar ?')) # ind_complemento + assunto = models.ForeignKey(AssuntoNorma) # XXX was a CharField (attention on migrate) # cod_assunto + data_vigencia = models.DateField(blank=True, null=True) # dat_vigencia + timestamp = models.DateTimeField() # timestamp class Meta: verbose_name = _(u'Norma Jurídica')