From 08e15ba2dd734d4f8049587f38b0250d192c4173 Mon Sep 17 00:00:00 2001
From: Guilherme Gondim <guilhermegondim>
Date: Mon, 23 Jun 2008 22:31:36 +0000
Subject: [PATCH] =?UTF-8?q?Adequado=20configura=C3=A7=C3=B5es=20do=20admin?=
 =?UTF-8?q?=20de=20alguns=20models.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sigi/apps/contatos/models.py      | 2 +-
 sigi/apps/inventario/models.py    | 6 +++---
 sigi/apps/parlamentares/models.py | 7 +++----
 sigi/settings.py                  | 3 ++-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/sigi/apps/contatos/models.py b/sigi/apps/contatos/models.py
index f5e6859..0378ea3 100644
--- a/sigi/apps/contatos/models.py
+++ b/sigi/apps/contatos/models.py
@@ -147,7 +147,7 @@ class Contato(models.Model):
         verbose_name_plural = 'contatos Interlegis'
 
     class Admin:
-        list_display = ('nome', 'nota', 'casa_legislativa')
+        list_display = ('nome', 'nota')
         list_display_links = ('nome',)
 
     def __unicode__(self):
diff --git a/sigi/apps/inventario/models.py b/sigi/apps/inventario/models.py
index 8ad1322..b415688 100644
--- a/sigi/apps/inventario/models.py
+++ b/sigi/apps/inventario/models.py
@@ -71,9 +71,9 @@ class Equipamento(models.Model):
         unique_together = (('fabricante', 'modelo'),)
 
     class Admin:
-        ordering = ('fabricante', 'tipo', 'modelo')
-        list_display = ('id', 'tipo', 'modelo', 'fabricante')
-        list_filter  = ('tipo', 'fabricante')
+        ordering = ('fabricante', 'modelo')
+        list_display = ('id', 'modelo', 'fabricante')
+        list_filter  = ('fabricante',)
 
     def __unicode__(self):
         return self.id
diff --git a/sigi/apps/parlamentares/models.py b/sigi/apps/parlamentares/models.py
index 3b60592..999a024 100644
--- a/sigi/apps/parlamentares/models.py
+++ b/sigi/apps/parlamentares/models.py
@@ -58,10 +58,9 @@ class Parlamentar(models.Model):
         verbose_name_plural = 'parlamentares'
 
     class Admin:
-        list_display = ('nome_completo', 'nome_parlamentar', 'sexo', 'partido',
-                        'suplencia')
+        list_display = ('nome_completo', 'nome_parlamentar', 'sexo')
         list_display_links = ('nome_completo', 'nome_parlamentar')
-        list_filter = ('sexo', 'suplencia', 'partido')
+        list_filter = ('sexo',)
 
     def __unicode__(self):
         if self.nome_parlamentar:
@@ -93,4 +92,4 @@ class Mandato(models.Model):
     class Admin:
         list_display = ('parlamentar', 'legislatura', 'partido',
                         'inicio_mandato', 'fim_mandato', 'is_afastado')
-        list_filter = ('is_afastado', 'partido')
+        list_filter = ('is_afastado', 'partido', 'suplencia')
diff --git a/sigi/settings.py b/sigi/settings.py
index 74d990f..5ac5c1a 100644
--- a/sigi/settings.py
+++ b/sigi/settings.py
@@ -78,11 +78,12 @@ INSTALLED_APPS = (
     'django.contrib.sessions',
     'django.contrib.sites',
     'django.contrib.admin',
-    'extensions',               # http://django-command-extensions.googlecode.com/
+    'extensions',   # http://django-command-extensions.googlecode.com/
     'sigi.apps.casas',
     'sigi.apps.contatos',
     'sigi.apps.convenios',
     'sigi.apps.inventario',
     'sigi.apps.mesas',
     'sigi.apps.parlamentares',
+    'sigi.apps.servicos',
 )