Browse Source

fix qa check

pull/10/head
LeandroRoberto 9 years ago
parent
commit
e77d34c2c6
  1. 3
      compilacao/templatetags/compilacao_filters.py
  2. 9
      compilacao/urls.py
  3. 9
      compilacao/views.py
  4. 18
      norma/migrations/0006_auto_20151025_1427.py
  5. 3
      sapl/settings.py
  6. BIN
      static/img/icon_delete_white.png
  7. BIN
      static/img/icon_save_white.png

3
compilacao/templatetags/compilacao_filters.py

@ -91,6 +91,7 @@ def render_actions_head(view, d_atual):
return False return False
@register.filter @register.filter
def short_string(str, length): def short_string(str, length):
if len(str) > length: if len(str) > length:
@ -98,6 +99,7 @@ def short_string(str, length):
else: else:
return str return str
@register.filter @register.filter
def nomenclatura(d): def nomenclatura(d):
result = '' result = ''
@ -112,6 +114,7 @@ def nomenclatura(d):
d.rotulo_padrao() + ')' d.rotulo_padrao() + ')'
return result return result
@register.simple_tag @register.simple_tag
def nomenclatura_heranca(d): def nomenclatura_heranca(d):
result = '' result = ''

9
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 import views
from compilacao.views import (tipo_nota_crud, tipo_vide_crud, from compilacao.views import (tipo_dispositivo_crud, tipo_nota_crud,
tipo_publicacao_crud, veiculo_publicacao_crud, tipo_publicacao_crud, tipo_vide_crud,
tipo_dispositivo_crud) veiculo_publicacao_crud)
urlpatterns_compilacao = [ urlpatterns_compilacao = [
url(r'^(?P<norma_id>[0-9]+)/compilacao/$', url(r'^(?P<norma_id>[0-9]+)/compilacao/$',

9
compilacao/views.py

@ -1,7 +1,5 @@
from collections import OrderedDict from collections import OrderedDict
from datetime import timedelta, datetime from datetime import datetime, timedelta
from os.path import sys from os.path import sys
from django import forms 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.edit import FormMixin
from django.views.generic.list import ListView from django.views.generic.list import ListView
from compilacao.models import (Dispositivo, TipoNota, TipoVide, TipoPublicacao, from compilacao.models import (Dispositivo, TipoDispositivo, TipoNota,
VeiculoPublicacao, TipoDispositivo) TipoPublicacao, TipoVide, VeiculoPublicacao)
from norma.models import NormaJuridica from norma.models import NormaJuridica
from sapl.crud import build_crud from sapl.crud import build_crud
DISPOSITIVO_SELECT_RELATED = ( DISPOSITIVO_SELECT_RELATED = (
'tipo_dispositivo', 'tipo_dispositivo',
'norma_publicada', 'norma_publicada',

18
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'},
),
]

3
sapl/settings.py

@ -60,8 +60,7 @@ INSTALLED_APPS = (
'sass_processor', 'sass_processor',
) )
if DEBUG: if DEBUG:
#INSTALLED_APPS += ('debug_toolbar',) INSTALLED_APPS += ('debug_toolbar',)
pass
MIDDLEWARE_CLASSES = ( MIDDLEWARE_CLASSES = (
'django.contrib.sessions.middleware.SessionMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware',

BIN
static/img/icon_delete_white.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
static/img/icon_save_white.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Loading…
Cancel
Save