diff --git a/compilacao/templatetags/compilacao_filters.py b/compilacao/templatetags/compilacao_filters.py index ed28d24dc..d1c1f75da 100644 --- a/compilacao/templatetags/compilacao_filters.py +++ b/compilacao/templatetags/compilacao_filters.py @@ -91,6 +91,7 @@ def render_actions_head(view, d_atual): return False + @register.filter def short_string(str, length): if len(str) > length: @@ -98,6 +99,7 @@ def short_string(str, length): else: return str + @register.filter def nomenclatura(d): result = '' @@ -112,6 +114,7 @@ def nomenclatura(d): d.rotulo_padrao() + ')' return result + @register.simple_tag def nomenclatura_heranca(d): result = '' diff --git a/compilacao/urls.py b/compilacao/urls.py index a60a623be..39b7db482 100644 --- a/compilacao/urls.py +++ b/compilacao/urls.py @@ -1,10 +1,9 @@ -from django.conf.urls import url, include +from django.conf.urls import include, url from compilacao import views -from compilacao.views import (tipo_nota_crud, tipo_vide_crud, - tipo_publicacao_crud, veiculo_publicacao_crud, - tipo_dispositivo_crud) - +from compilacao.views import (tipo_dispositivo_crud, tipo_nota_crud, + tipo_publicacao_crud, tipo_vide_crud, + veiculo_publicacao_crud) urlpatterns_compilacao = [ url(r'^(?P[0-9]+)/compilacao/$', diff --git a/compilacao/views.py b/compilacao/views.py index edc393ab0..ab6bbc201 100644 --- a/compilacao/views.py +++ b/compilacao/views.py @@ -1,7 +1,5 @@ - - from collections import OrderedDict -from datetime import timedelta, datetime +from datetime import datetime, timedelta from os.path import sys from django import forms @@ -15,12 +13,11 @@ from django.views.generic.base import TemplateView from django.views.generic.edit import FormMixin from django.views.generic.list import ListView -from compilacao.models import (Dispositivo, TipoNota, TipoVide, TipoPublicacao, - VeiculoPublicacao, TipoDispositivo) +from compilacao.models import (Dispositivo, TipoDispositivo, TipoNota, + TipoPublicacao, TipoVide, VeiculoPublicacao) from norma.models import NormaJuridica from sapl.crud import build_crud - DISPOSITIVO_SELECT_RELATED = ( 'tipo_dispositivo', 'norma_publicada', diff --git a/norma/migrations/0006_auto_20151025_1427.py b/norma/migrations/0006_auto_20151025_1427.py new file mode 100644 index 000000000..1a5f7c607 --- /dev/null +++ b/norma/migrations/0006_auto_20151025_1427.py @@ -0,0 +1,18 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('norma', '0005_auto_20150915_1141'), + ] + + operations = [ + migrations.AlterModelOptions( + name='normajuridica', + options={'ordering': ['-data', '-numero'], 'verbose_name_plural': 'Normas Jurídicas', 'verbose_name': 'Norma Jurídica'}, + ), + ] diff --git a/sapl/settings.py b/sapl/settings.py index 0ebf07620..52d0b2b53 100644 --- a/sapl/settings.py +++ b/sapl/settings.py @@ -60,8 +60,7 @@ INSTALLED_APPS = ( 'sass_processor', ) if DEBUG: - #INSTALLED_APPS += ('debug_toolbar',) - pass + INSTALLED_APPS += ('debug_toolbar',) MIDDLEWARE_CLASSES = ( 'django.contrib.sessions.middleware.SessionMiddleware', diff --git a/static/img/icon_delete_white.png b/static/img/icon_delete_white.png new file mode 100644 index 000000000..f06892bff Binary files /dev/null and b/static/img/icon_delete_white.png differ diff --git a/static/img/icon_save_white.png b/static/img/icon_save_white.png new file mode 100644 index 000000000..8f9ccbbf1 Binary files /dev/null and b/static/img/icon_save_white.png differ