From e69c461a313ea315e86f04af337be263d36cd18c Mon Sep 17 00:00:00 2001 From: Edward Ribeiro Date: Wed, 4 May 2016 17:28:53 -0300 Subject: [PATCH 1/2] Fix #398 --- parlamentares/models.py | 1 + 1 file changed, 1 insertion(+) 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') % { From 13edd68d5da5a9e787758418e966046869a3f358 Mon Sep 17 00:00:00 2001 From: Edward Ribeiro Date: Wed, 4 May 2016 17:34:45 -0300 Subject: [PATCH 2/2] Faz o merge de migrations de materia --- materia/migrations/0031_merge.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 = [