Reverte reversion (#3605)

* Reverte reversion * Remove arquivos legacy.yaml
interlegis · Sep 14, 2022 · b7bdbb1 · b7bdbb1
1 parent a972310
commit b7bdbb1
Show file tree

Hide file tree

Showing 61 changed files with 16 additions and 5,341 deletions.
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
@@ -9,8 +9,6 @@ django-contrib-postgres==0.0.1
 django-floppyforms==1.8.0
 django-extra-views==0.12.0
 django-model-utils==3.1.2
-django-reversion==3.0.2
-django-reversion-compare==0.8.6
 django-speedinfo==1.4.0
 django-extensions==2.1.4
 django-image-cropping==1.2

diff --git a/sapl/audiencia/models.py b/sapl/audiencia/models.py
@@ -1,4 +1,3 @@
-import reversion
 from django.db import models
 from django.utils import timezone
 from django.utils.translation import ugettext_lazy as _
@@ -29,7 +28,6 @@ def anexo_upload_path(instance, filename):
  instance, filename, subpath='anexo', pk_first=True)
 
 
-@reversion.register()
 class TipoAudienciaPublica(models.Model):
  TIPO_AUDIENCIA_CHOICES = Choices(('A', 'audiencia', _('Audiência Pública')),
  ('P', 'plebiscito', _('Plebiscito')),
@@ -51,7 +49,6 @@ def __str__(self):
  return self.nome
 
 
-@reversion.register()
 class AudienciaPublica(models.Model):
  materia = models.ForeignKey(
  MateriaLegislativa,
@@ -175,7 +172,6 @@ def save(self, force_insert=False, force_update=False, using=None,
  update_fields=update_fields)
 
 
-@reversion.register()
 class AnexoAudienciaPublica(models.Model):
  audiencia = models.ForeignKey(AudienciaPublica,
  on_delete=models.PROTECT)

diff --git a/sapl/base/admin.py b/sapl/base/admin.py
@@ -1,7 +1,6 @@
 from django.contrib import admin
 from django.shortcuts import redirect
 from django.utils.translation import ugettext_lazy as _
-from reversion.models import Revision
 
 from sapl.base.models import AuditLog
 from sapl.utils import register_all_models_in_admin
@@ -12,18 +11,6 @@
 admin.site.site_header = 'Administração - SAPL'
 
 
-class RevisionAdmin(admin.ModelAdmin):
- list_display = ('user', 'comment', 'date_created')
- search_fields = ('=user__username', '=user__email')
- date_hierarchy = ('date_created')
-
- def change_view(self, request, obj=None):
- self.message_user(request, _('You cannot change history.'))
- return redirect('admin:reversion_revision_changelist')
-
-admin.site.register(Revision, RevisionAdmin)
-
-
 class AuditLogAdmin(admin.ModelAdmin):
  pass
 

diff --git a/sapl/base/legacy.yaml b/sapl/base/legacy.yaml
diff --git a/sapl/base/migrations/0052_auto_20220914_1125.py b/sapl/base/migrations/0052_auto_20220914_1125.py
@@ -0,0 +1,15 @@
+# Generated by Django 2.2.28 on 2022-09-14 14:25
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('base', '0051_auto_20220814_2138'),
+ ]
+
+ operations = [
+ migrations.RunSQL("DROP TABLE IF EXISTS reversion_version"),
+ migrations.RunSQL("DROP TABLE IF EXISTS reversion_revision"),
+ ]
diff --git a/sapl/base/models.py b/sapl/base/models.py
@@ -8,7 +8,6 @@
 from django.db.models.signals import post_migrate
 from django.db.utils import DEFAULT_DB_ALIAS
 from django.utils.translation import ugettext_lazy as _
-import reversion
 
 from sapl.utils import (LISTA_DE_UFS, YES_NO_CHOICES,
  get_settings_auth_user_model, models_with_gr_for_model)
@@ -42,7 +41,6 @@
 )
 
 
-@reversion.register()
 class CasaLegislativa(models.Model):
  # TODO ajustar todos os max_length !!!!
  # cod_casa => id (pk)
@@ -85,7 +83,6 @@ def __str__(self):
  'municipio': self.municipio}
 
 
-@reversion.register()
 class AppConfig(models.Model):
 
  POLITICA_PROTOCOLO_CHOICES = (
@@ -298,7 +295,6 @@ def __str__(self):
  'id': self.id}
 
 
-@reversion.register()
 class TipoAutor(models.Model):
  descricao = models.CharField(
  max_length=50,
@@ -323,7 +319,6 @@ def __str__(self):
  return self.descricao
 
 
-@reversion.register()
 class Autor(models.Model):
  operadores = models.ManyToManyField(
  get_settings_auth_user_model(),

diff --git a/sapl/comissoes/legacy.yaml b/sapl/comissoes/legacy.yaml
diff --git a/sapl/comissoes/models.py b/sapl/comissoes/models.py
@@ -1,4 +1,3 @@
-import reversion
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 from model_utils import Choices
@@ -10,7 +9,6 @@
  OverwriteStorage)
 
 
-@reversion.register()
 class TipoComissao(models.Model):
  NATUREZA_CHOICES = Choices(('T', 'temporaria', _('Temporária')),
  ('P', 'permanente', _('Permanente')))
@@ -32,7 +30,6 @@ def __str__(self):
  return self.nome
 
 
-@reversion.register()
 class Comissao(models.Model):
  tipo = models.ForeignKey(TipoComissao,
  on_delete=models.PROTECT,
@@ -99,7 +96,6 @@ def __str__(self):
  return self.sigla + ' - ' + self.nome
 
 
-@reversion.register()
 class Periodo(models.Model): # PeriodoCompComissao
  data_inicio = models.DateField(verbose_name=_('Data Início'))
  data_fim = models.DateField(
@@ -120,7 +116,6 @@ def __str__(self):
  return '-'
 
 
-@reversion.register()
 class CargoComissao(models.Model):
  id_ordenacao = models.PositiveIntegerField(
  blank=True, null=True, verbose_name=_('Posição na Ordenação'),
@@ -139,7 +134,6 @@ def __str__(self):
  return self.nome
 
 
-@reversion.register()
 class Composicao(models.Model): # IGNORE
  comissao = models.ForeignKey(Comissao,
  on_delete=models.CASCADE,
@@ -157,7 +151,6 @@ def __str__(self):
  return '%s: %s' % (self.comissao.sigla, self.periodo)
 
 
-@reversion.register()
 class Participacao(models.Model): # ComposicaoComissao
  composicao = models.ForeignKey(Composicao,
  related_name='participacao_set',
@@ -314,7 +307,6 @@ def save(self, force_insert=False, force_update=False, using=None,
  update_fields=update_fields)
 
 
-@reversion.register()
 class DocumentoAcessorio(models.Model):
  reuniao = models.ForeignKey(Reuniao,
  related_name='documentoacessorio_set',

diff --git a/sapl/compilacao/models.py b/sapl/compilacao/models.py
@@ -12,15 +12,13 @@
 from django.utils.encoding import force_text
 from django.utils.translation import ugettext_lazy as _
 from image_cropping.fields import ImageCropField, ImageRatioField
-import reversion
 
 from sapl.compilacao.utils import (get_integrations_view_names, int_to_letter,
  int_to_roman)
 from sapl.utils import YES_NO_CHOICES, get_settings_auth_user_model,\
  texto_upload_path, restringe_tipos_de_arquivo_img
 
 
-@reversion.register()
 class TimestampedMixin(models.Model):
  created = models.DateTimeField(
  verbose_name=_('created'),
@@ -32,7 +30,6 @@ class Meta:
  abstract = True
 
 
-@reversion.register()
 class BaseModel(models.Model):
 
  class Meta:
@@ -87,7 +84,6 @@ def save(self, force_insert=False, force_update=False, using=None,
  update_fields=update_fields)
 
 
-@reversion.register()
 class PerfilEstruturalTextoArticulado(BaseModel):
  sigla = models.CharField(
  max_length=10, unique=True, verbose_name=_('Sigla'))
@@ -121,7 +117,6 @@ def parents(self):
  return parents
 
 
-@reversion.register()
 class TipoTextoArticulado(models.Model):
  sigla = models.CharField(max_length=3, verbose_name=_('Sigla'))
  descricao = models.CharField(max_length=50, verbose_name=_('Descrição'))
@@ -190,7 +185,6 @@ def __str__(self):
 )
 
 
-@reversion.register()
 class TextoArticulado(TimestampedMixin):
  data = models.DateField(
  blank=True,
@@ -564,7 +558,6 @@ def update(dpk):
  update(dpk)
 
 
-@reversion.register()
 class TipoNota(models.Model):
  sigla = models.CharField(
  max_length=10, unique=True, verbose_name=_('Sigla'))
@@ -581,7 +574,6 @@ def __str__(self):
  return '%s: %s' % (self.sigla, self.nome)
 
 
-@reversion.register()
 class TipoVide(models.Model):
  sigla = models.CharField(
  max_length=10, unique=True, verbose_name=_('Sigla'))
@@ -596,7 +588,6 @@ def __str__(self):
  return '%s: %s' % (self.sigla, self.nome)
 
 
-@reversion.register()
 class TipoDispositivo(BaseModel):
  """
  - no attributo rotulo_prefixo_texto, caso haja um ';' (ponto e vírgula), e
@@ -806,7 +797,6 @@ def permitido_variacao(self, base, perfil_pk=None):
  return False
 
 
-@reversion.register()
 class TipoDispositivoRelationship(BaseModel):
  pai = models.ForeignKey(
  TipoDispositivo,
@@ -855,7 +845,6 @@ def __str__(self):
  self.filho_permitido.nome if self.filho_permitido else '')
 
 
-@reversion.register()
 class TipoPublicacao(models.Model):
  sigla = models.CharField(
  max_length=10, unique=True, verbose_name=_('Sigla'))
@@ -870,7 +859,6 @@ def __str__(self):
  return self.nome
 
 
-@reversion.register()
 class VeiculoPublicacao(models.Model):
  sigla = models.CharField(
  max_length=10, unique=True, verbose_name=_('Sigla'))
@@ -885,7 +873,6 @@ def __str__(self):
  return '%s: %s' % (self.sigla, self.nome)
 
 
-@reversion.register()
 class Publicacao(TimestampedMixin):
  ta = models.ForeignKey(
  TextoArticulado,
@@ -965,7 +952,6 @@ def imagem_upload_path(instance, filename):
  return texto_upload_path(instance, filename, subpath='')
 
 
-@reversion.register()
 class Dispositivo(BaseModel, TimestampedMixin):
  TEXTO_PADRAO_DISPOSITIVO_REVOGADO = force_text(_('(Revogado)'))
  INTERVALO_ORDEM = 1000
@@ -1907,7 +1893,6 @@ def ordenar_bloco_alteracao(self):
  ordem_bloco_atualizador=count)
 
 
-@reversion.register()
 class Vide(TimestampedMixin):
  texto = models.TextField(verbose_name=_('Texto do Vide'))
 
@@ -1954,7 +1939,6 @@ def __str__(self):
 )
 
 
-@reversion.register()
 class Nota(TimestampedMixin):
 
  NPRIV = 1