diff --git a/materia/migrations/0031_merge.py b/materia/migrations/0031_merge.py index 4912ef045..9faf9d45a 100644 --- a/materia/migrations/0031_merge.py +++ b/materia/migrations/0031_merge.py @@ -8,8 +8,8 @@ from django.db import migrations class Migration(migrations.Migration): dependencies = [ - ('materia', '0030_auto_20160502_1630'), ('materia', '0030_auto_20160429_1349'), + ('materia', '0030_auto_20160502_1630'), ] operations = [ diff --git a/parlamentares/models.py b/parlamentares/models.py index 6bca49e95..2b59b254c 100644 --- a/parlamentares/models.py +++ b/parlamentares/models.py @@ -306,6 +306,7 @@ class Filiacao(models.Model): class Meta: verbose_name = _('Filiação') verbose_name_plural = _('Filiações') + ordering = ('parlamentar', '-data', '-data_desfiliacao') def __str__(self): return _('%(parlamentar)s - %(partido)s') % {