From 7784675d758dc9aafcfd508eecf16e77a05bcf7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Rodrigues?= Date: Wed, 27 Nov 2019 16:26:24 -0300 Subject: [PATCH] =?UTF-8?q?Corrige=20ordena=C3=A7=C3=A3o=20models=20bancad?= =?UTF-8?q?a=20e=20parlamentarbancada?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migrations/0043_auto_20191127_1419.py | 23 +++++++++++++++++++ sapl/parlamentares/models.py | 4 ++-- 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 sapl/parlamentares/migrations/0043_auto_20191127_1419.py diff --git a/sapl/parlamentares/migrations/0043_auto_20191127_1419.py b/sapl/parlamentares/migrations/0043_auto_20191127_1419.py new file mode 100644 index 000000000..dfb0f29ea --- /dev/null +++ b/sapl/parlamentares/migrations/0043_auto_20191127_1419.py @@ -0,0 +1,23 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.20 on 2019-11-27 17:19 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('parlamentares', '0042_auto_20191126_1635'), + ] + + operations = [ + migrations.AlterModelOptions( + name='bancada', + options={'ordering': ('-legislatura__numero', 'nome'), 'verbose_name': 'Bancada Parlamentar', 'verbose_name_plural': 'Bancadas Parlamentares'}, + ), + migrations.AlterModelOptions( + name='parlamentarbancada', + options={'ordering': ('cargo', 'parlamentar__nome_parlamentar'), 'verbose_name': 'Parlamentar', 'verbose_name_plural': 'Parlamentares'}, + ), + ] diff --git a/sapl/parlamentares/models.py b/sapl/parlamentares/models.py index 9b87bfab0..3b1607e22 100644 --- a/sapl/parlamentares/models.py +++ b/sapl/parlamentares/models.py @@ -741,7 +741,7 @@ class Bancada(models.Model): db_table = 'parlamentares_bancada' verbose_name = _('Bancada Parlamentar') verbose_name_plural = _('Bancadas Parlamentares') - ordering = ('-legislatura__numero', ) + ordering = ('-legislatura__numero', 'nome') def __str__(self): return self.nome @@ -787,7 +787,7 @@ class ParlamentarBancada(models.Model): class Meta: verbose_name = _('Parlamentar') verbose_name_plural = _('Parlamentares') - ordering=('cargo',) + ordering=('cargo', 'parlamentar__nome_parlamentar') def __str__(self): return "%s - %s" % (self.bancada, self.parlamentar)