From e77d34c2c6f2bd6c1a9a636e134bdaf8c3c06c9b Mon Sep 17 00:00:00 2001 From: LeandroRoberto Date: Sun, 25 Oct 2015 22:25:16 -0200 Subject: [PATCH] fix qa check --- compilacao/templatetags/compilacao_filters.py | 3 +++ compilacao/urls.py | 9 ++++----- compilacao/views.py | 9 +++------ norma/migrations/0006_auto_20151025_1427.py | 18 ++++++++++++++++++ sapl/settings.py | 3 +-- static/img/icon_delete_white.png | Bin 0 -> 2866 bytes static/img/icon_save_white.png | Bin 0 -> 2921 bytes 7 files changed, 29 insertions(+), 13 deletions(-) create mode 100644 norma/migrations/0006_auto_20151025_1427.py create mode 100644 static/img/icon_delete_white.png create mode 100644 static/img/icon_save_white.png 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 0000000000000000000000000000000000000000..f06892bffd3a1121220a65970e24365fd97002bb GIT binary patch literal 2866 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 TJ`*L800000NkvXXu0mjfKu>MT literal 0 HcmV?d00001