SPDT
/
sapl
mirror of https://github.com/interlegis/sapl.git
5
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Resolve reverse accessor clashes disabling all 

Simply disabled all of them adding to the FKs:
related_name='+'

Should review this afterwards.
pull/6/head
Marcio Mazza 10 years ago
parent
0ee383fd7e
commit
91e3ddd58b
3 changed files with 19 additions and 15 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      materia/models.py
  2. 4
      norma/models.py
  3. 16
      pglegacy/models.py

14
materia/models.py
View File

@ -33,7 +33,7 @@ class MateriaLegislativa(models.Model):
tip_apresentacao = models.CharField(max_length=1, blank=True, null=True) tip_apresentacao = models.CharField(max_length=1, blank=True, null=True)
regime_tramitacao = models.ForeignKey(RegimeTramitacao) regime_tramitacao = models.ForeignKey(RegimeTramitacao)
dat_publicacao = models.DateField(blank=True, null=True) dat_publicacao = models.DateField(blank=True, null=True)
tip_origem_externa = models.ForeignKey(TipoMateriaLegislativa, blank=True, null=True) tip_origem_externa = models.ForeignKey(TipoMateriaLegislativa, blank=True, null=True, related_name='+')
num_origem_externa = models.CharField(max_length=5, blank=True, null=True) num_origem_externa = models.CharField(max_length=5, blank=True, null=True)
ano_origem_externa = models.SmallIntegerField(blank=True, null=True) ano_origem_externa = models.SmallIntegerField(blank=True, null=True)
dat_origem_externa = models.DateField(blank=True, null=True) dat_origem_externa = models.DateField(blank=True, null=True)
@ -49,6 +49,10 @@ class MateriaLegislativa(models.Model):
txt_indexacao = models.TextField(blank=True, null=True) txt_indexacao = models.TextField(blank=True, null=True)
txt_observacao = models.TextField(blank=True, null=True) txt_observacao = models.TextField(blank=True, null=True)
txt_resultado = models.TextField(blank=True, null=True) txt_resultado = models.TextField(blank=True, null=True)
# XXX novo
anexadas = models.ManyToManyField('self', through='Anexada',
symmetrical=False, related_name='anexo_de',
through_fields=('materia_principal', 'materia_anexada'))
class AcompMateria(models.Model): class AcompMateria(models.Model):
@ -59,8 +63,8 @@ class AcompMateria(models.Model):
class Anexada(models.Model): class Anexada(models.Model):
materia_principal = models.ForeignKey(MateriaLegislativa) materia_principal = models.ForeignKey(MateriaLegislativa, related_name='+')
materia_anexada = models.ForeignKey(MateriaLegislativa) materia_anexada = models.ForeignKey(MateriaLegislativa, related_name='+')
dat_anexacao = models.DateField() dat_anexacao = models.DateField()
dat_desanexacao = models.DateField(blank=True, null=True) dat_desanexacao = models.DateField(blank=True, null=True)
@ -203,9 +207,9 @@ class Tramitacao(models.Model):
status = models.ForeignKey(StatusTramitacao, blank=True, null=True) status = models.ForeignKey(StatusTramitacao, blank=True, null=True)
materia = models.ForeignKey(MateriaLegislativa) materia = models.ForeignKey(MateriaLegislativa)
dat_tramitacao = models.DateField(blank=True, null=True) dat_tramitacao = models.DateField(blank=True, null=True)
unid_tram_local = models.ForeignKey(UnidadeTramitacao, blank=True, null=True) unid_tram_local = models.ForeignKey(UnidadeTramitacao, blank=True, null=True, related_name='+')
dat_encaminha = models.DateField(blank=True, null=True) dat_encaminha = models.DateField(blank=True, null=True)
unid_tram_dest = models.ForeignKey(UnidadeTramitacao, blank=True, null=True) unid_tram_dest = models.ForeignKey(UnidadeTramitacao, blank=True, null=True, related_name='+')
ind_ult_tramitacao = models.IntegerField() ind_ult_tramitacao = models.IntegerField()
ind_urgencia = models.IntegerField() ind_urgencia = models.IntegerField()
sgl_turno = models.CharField(max_length=1, blank=True, null=True) sgl_turno = models.CharField(max_length=1, blank=True, null=True)

4
norma/models.py
View File

@ -57,7 +57,7 @@ class LegislacaoCitada(models.Model):
class VinculoNormaJuridica(models.Model): class VinculoNormaJuridica(models.Model):
cod_vinculo = models.AutoField(primary_key=True) cod_vinculo = models.AutoField(primary_key=True)
norma_referente = models.ForeignKey(NormaJuridica) norma_referente = models.ForeignKey(NormaJuridica, related_name='+')
norma_referida = models.ForeignKey(NormaJuridica) norma_referida = models.ForeignKey(NormaJuridica, related_name='+')
tip_vinculo = models.CharField(max_length=1, blank=True, null=True) tip_vinculo = models.CharField(max_length=1, blank=True, null=True)
ind_excluido = models.CharField(max_length=1) ind_excluido = models.CharField(max_length=1)

16
pglegacy/models.py
View File

@ -36,8 +36,8 @@ class AndamentoSessao(models.Model):
class Anexada(models.Model): class Anexada(models.Model):
cod_materia_principal = models.ForeignKey('MateriaLegislativa', db_column='cod_materia_principal') cod_materia_principal = models.ForeignKey('MateriaLegislativa', db_column='cod_materia_principal', related_name='+')
cod_materia_anexada = models.ForeignKey('MateriaLegislativa', db_column='cod_materia_anexada') cod_materia_anexada = models.ForeignKey('MateriaLegislativa', db_column='cod_materia_anexada', related_name='+')
dat_anexacao = models.DateField() dat_anexacao = models.DateField()
dat_desanexacao = models.DateField() dat_desanexacao = models.DateField()
ind_excluido = models.SmallIntegerField() ind_excluido = models.SmallIntegerField()
@ -341,14 +341,14 @@ class MateriaAssunto(models.Model):
class MateriaLegislativa(models.Model): class MateriaLegislativa(models.Model):
cod_materia = models.AutoField(primary_key=True) cod_materia = models.AutoField(primary_key=True)
tip_id_basica = models.ForeignKey('TipoMateriaLegislativa', db_column='tip_id_basica') tip_id_basica = models.ForeignKey('TipoMateriaLegislativa', db_column='tip_id_basica', related_name='+')
num_ident_basica = models.CharField(max_length=6) num_ident_basica = models.CharField(max_length=6)
ano_ident_basica = models.SmallIntegerField() ano_ident_basica = models.SmallIntegerField()
dat_apresentacao = models.DateField(blank=True, null=True) dat_apresentacao = models.DateField(blank=True, null=True)
tip_apresentacao = models.CharField(max_length=1, blank=True, null=True) tip_apresentacao = models.CharField(max_length=1, blank=True, null=True)
cod_regime_tramitacao = models.ForeignKey('RegimeTramitacao', db_column='cod_regime_tramitacao') cod_regime_tramitacao = models.ForeignKey('RegimeTramitacao', db_column='cod_regime_tramitacao')
dat_publicacao = models.DateField(blank=True, null=True) dat_publicacao = models.DateField(blank=True, null=True)
tip_origem_externa = models.ForeignKey('TipoMateriaLegislativa', db_column='tip_origem_externa', blank=True, null=True) tip_origem_externa = models.ForeignKey('TipoMateriaLegislativa', db_column='tip_origem_externa', blank=True, null=True, related_name='+')
num_origem_externa = models.CharField(max_length=9, blank=True, null=True) num_origem_externa = models.CharField(max_length=9, blank=True, null=True)
ano_origem_externa = models.SmallIntegerField(blank=True, null=True) ano_origem_externa = models.SmallIntegerField(blank=True, null=True)
dat_origem_externa = models.DateField(blank=True, null=True) dat_origem_externa = models.DateField(blank=True, null=True)
@ -845,9 +845,9 @@ class Tramitacao(models.Model):
cod_status = models.ForeignKey(StatusTramitacao, db_column='cod_status', blank=True, null=True) cod_status = models.ForeignKey(StatusTramitacao, db_column='cod_status', blank=True, null=True)
cod_materia = models.ForeignKey(MateriaLegislativa, db_column='cod_materia') cod_materia = models.ForeignKey(MateriaLegislativa, db_column='cod_materia')
dat_tramitacao = models.DateField(blank=True, null=True) dat_tramitacao = models.DateField(blank=True, null=True)
cod_unid_tram_local = models.ForeignKey('UnidadeTramitacao', db_column='cod_unid_tram_local', blank=True, null=True) cod_unid_tram_local = models.ForeignKey('UnidadeTramitacao', db_column='cod_unid_tram_local', blank=True, null=True, related_name='+')
dat_encaminha = models.DateField(blank=True, null=True) dat_encaminha = models.DateField(blank=True, null=True)
cod_unid_tram_dest = models.ForeignKey('UnidadeTramitacao', db_column='cod_unid_tram_dest', blank=True, null=True) cod_unid_tram_dest = models.ForeignKey('UnidadeTramitacao', db_column='cod_unid_tram_dest', blank=True, null=True, related_name='+')
ind_ult_tramitacao = models.SmallIntegerField() ind_ult_tramitacao = models.SmallIntegerField()
ind_urgencia = models.SmallIntegerField() ind_urgencia = models.SmallIntegerField()
sgl_turno = models.CharField(max_length=1, blank=True, null=True) sgl_turno = models.CharField(max_length=1, blank=True, null=True)
@ -874,8 +874,8 @@ class UnidadeTramitacao(models.Model):
class VinculoNormaJuridica(models.Model): class VinculoNormaJuridica(models.Model):
cod_vinculo = models.AutoField(primary_key=True) cod_vinculo = models.AutoField(primary_key=True)
cod_norma_referente = models.ForeignKey(NormaJuridica, db_column='cod_norma_referente') cod_norma_referente = models.ForeignKey(NormaJuridica, db_column='cod_norma_referente', related_name='+')
cod_norma_referida = models.ForeignKey(NormaJuridica, db_column='cod_norma_referida') cod_norma_referida = models.ForeignKey(NormaJuridica, db_column='cod_norma_referida', related_name='+')
tip_vinculo = models.CharField(max_length=1, blank=True, null=True) tip_vinculo = models.CharField(max_length=1, blank=True, null=True)
ind_excluido = models.CharField(max_length=1) ind_excluido = models.CharField(max_length=1)

Write Preview
Loading…
Cancel
Save