Browse Source

Fix #3339 (#3341)

Co-authored-by: eribeiro <edwardr@senado.leg.br>
pull/3345/head
Edward 4 years ago
committed by GitHub
parent
commit
8b0c2a185f
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 17
      sapl/comissoes/migrations/0027_auto_20210209_1047.py
  2. 2
      sapl/comissoes/models.py
  3. 17
      sapl/materia/migrations/0077_auto_20210209_1047.py
  4. 2
      sapl/materia/models.py
  5. 17
      sapl/protocoloadm/migrations/0037_auto_20210209_1047.py
  6. 2
      sapl/protocoloadm/models.py

17
sapl/comissoes/migrations/0027_auto_20210209_1047.py

@ -0,0 +1,17 @@
# Generated by Django 2.2.13 on 2021-02-09 13:47
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('comissoes', '0026_auto_20201009_0950'),
]
operations = [
migrations.AlterModelOptions(
name='documentoacessorio',
options={'ordering': ('data', 'id'), 'verbose_name': 'Documento Acessório', 'verbose_name_plural': 'Documentos Acessórios'},
),
]

2
sapl/comissoes/models.py

@ -345,7 +345,7 @@ class DocumentoAcessorio(models.Model):
class Meta: class Meta:
verbose_name = _('Documento Acessório') verbose_name = _('Documento Acessório')
verbose_name_plural = _('Documentos Acessórios') verbose_name_plural = _('Documentos Acessórios')
ordering = ('data', '-data_ultima_atualizacao') ordering = ('data', 'id')
def __str__(self): def __str__(self):
return _('%(nome)s por %(autor)s') % { return _('%(nome)s por %(autor)s') % {

17
sapl/materia/migrations/0077_auto_20210209_1047.py

@ -0,0 +1,17 @@
# Generated by Django 2.2.13 on 2021-02-09 13:47
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('materia', '0076_auto_20210107_1408'),
]
operations = [
migrations.AlterModelOptions(
name='documentoacessorio',
options={'ordering': ('data', 'id'), 'verbose_name': 'Documento Acessório', 'verbose_name_plural': 'Documentos Acessórios'},
),
]

2
sapl/materia/models.py

@ -568,7 +568,7 @@ class DocumentoAcessorio(models.Model):
class Meta: class Meta:
verbose_name = _('Documento Acessório') verbose_name = _('Documento Acessório')
verbose_name_plural = _('Documentos Acessórios') verbose_name_plural = _('Documentos Acessórios')
ordering = ('data', '-data_ultima_atualizacao') ordering = ('data', 'id')
def __str__(self): def __str__(self):
return _('%(tipo)s - %(nome)s de %(data)s por %(autor)s') % { return _('%(tipo)s - %(nome)s de %(data)s por %(autor)s') % {

17
sapl/protocoloadm/migrations/0037_auto_20210209_1047.py

@ -0,0 +1,17 @@
# Generated by Django 2.2.13 on 2021-02-09 13:47
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('protocoloadm', '0036_auto_20210107_1408'),
]
operations = [
migrations.AlterModelOptions(
name='documentoacessorioadministrativo',
options={'ordering': ('data', 'id'), 'verbose_name': 'Documento Acessório', 'verbose_name_plural': 'Documentos Acessórios'},
),
]

2
sapl/protocoloadm/models.py

@ -287,7 +287,7 @@ class DocumentoAcessorioAdministrativo(models.Model):
class Meta: class Meta:
verbose_name = _('Documento Acessório') verbose_name = _('Documento Acessório')
verbose_name_plural = _('Documentos Acessórios') verbose_name_plural = _('Documentos Acessórios')
ordering = ('id',) ordering = ('data', 'id')
def __str__(self): def __str__(self):
return self.nome return self.nome

Loading…
Cancel
Save