From 4bf19b3077e5cae5f9cef2393135f54ae6e11885 Mon Sep 17 00:00:00 2001 From: LeandroRoberto Date: Fri, 20 Nov 2015 18:29:59 -0200 Subject: [PATCH] fix qa_check and insert timestampdmixin --- base/migrations/0001_initial.py | 2 +- comissoes/migrations/0001_initial.py | 2 +- comissoes/migrations/0002_auto_20150729_1310.py | 2 +- compilacao/forms.py | 8 ++++++++ compilacao/migrations/0001_initial.py | 2 +- compilacao/migrations/0002_auto_20150907_2334.py | 2 +- compilacao/migrations/0003_auto_20150911_1735.py | 2 +- compilacao/migrations/0004_auto_20150914_0842.py | 2 +- compilacao/migrations/0005_auto_20150924_1012.py | 2 +- compilacao/migrations/0006_auto_20150924_1121.py | 2 +- compilacao/migrations/0007_auto_20150924_1131.py | 2 +- compilacao/migrations/0008_auto_20151005_1023.py | 2 +- compilacao/migrations/0009_auto_20151007_1635.py | 2 +- compilacao/migrations/0016_auto_20151119_0950.py | 3 ++- compilacao/models.py | 13 +++++-------- compilacao/views.py | 10 ++-------- lexml/migrations/0001_initial.py | 2 +- lexml/migrations/0002_auto_20150806_1614.py | 2 +- materia/migrations/0001_initial.py | 2 +- materia/migrations/0002_auto_20150729_1310.py | 2 +- materia/migrations/0003_auto_20150729_1717.py | 2 +- .../0004_materialegislativa_texto_original.py | 3 ++- materia/migrations/0005_auto_20150923_0941.py | 2 +- materia/migrations/0006_proposicao_status.py | 2 +- materia/migrations/0007_auto_20151021_1200.py | 2 +- materia/migrations/0008_auto_20151029_1416.py | 2 +- materia/migrations/0009_auto_20151029_1420.py | 2 +- materia/migrations/0010_auto_20151117_1551.py | 3 ++- norma/migrations/0001_initial.py | 2 +- norma/migrations/0002_auto_20150729_1717.py | 2 +- norma/migrations/0003_auto_20150906_0239.py | 2 +- norma/migrations/0004_auto_20150907_0004.py | 2 +- norma/migrations/0005_auto_20150915_1141.py | 2 +- norma/urls.py | 4 ++-- painel/migrations/0001_initial.py | 2 +- parlamentares/migrations/0001_initial.py | 2 +- parlamentares/migrations/0002_auto_20150729_1310.py | 2 +- parlamentares/migrations/0003_auto_20150729_1717.py | 2 +- parlamentares/migrations/0004_auto_20150929_1425.py | 2 +- .../migrations/0005_parlamentar_fotografia.py | 3 ++- parlamentares/migrations/0006_auto_20151119_1318.py | 2 +- protocoloadm/migrations/0001_initial.py | 2 +- protocoloadm/migrations/0002_auto_20150729_1717.py | 2 +- ...cumentoacessorioadministrativo_texto_integral.py | 3 ++- protocoloadm/migrations/0004_auto_20151007_1035.py | 3 ++- protocoloadm/migrations/0005_auto_20151008_0744.py | 3 ++- sapl/settings.py | 3 +-- sessao/migrations/0001_initial.py | 2 +- sessao/migrations/0002_auto_20150729_1450.py | 2 +- .../0003_remove_sessaoplenaria_tipo_expediente.py | 2 +- sessao/migrations/0004_auto_20150806_1614.py | 3 ++- .../0005_remove_presencaordemdia_data_ordem.py | 2 +- sessao/migrations/0006_auto_20150929_1425.py | 2 +- sessao/migrations/0007_auto_20150929_1426.py | 2 +- sessao/migrations/0008_auto_20151005_0814.py | 2 +- sessao/migrations/0009_auto_20151005_0934.py | 2 +- 56 files changed, 77 insertions(+), 71 deletions(-) diff --git a/base/migrations/0001_initial.py b/base/migrations/0001_initial.py index 9518c78f9..8b7f64d04 100644 --- a/base/migrations/0001_initial.py +++ b/base/migrations/0001_initial.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/comissoes/migrations/0001_initial.py b/comissoes/migrations/0001_initial.py index 5f87b599e..42cd116fa 100644 --- a/comissoes/migrations/0001_initial.py +++ b/comissoes/migrations/0001_initial.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/comissoes/migrations/0002_auto_20150729_1310.py b/comissoes/migrations/0002_auto_20150729_1310.py index 7f08b5fe3..eef2e558e 100644 --- a/comissoes/migrations/0002_auto_20150729_1310.py +++ b/comissoes/migrations/0002_auto_20150729_1310.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/compilacao/forms.py b/compilacao/forms.py index e69de29bb..6cfbbd873 100644 --- a/compilacao/forms.py +++ b/compilacao/forms.py @@ -0,0 +1,8 @@ +from django import forms +from django.utils.translation import ugettext_lazy as _ + + +class UpLoadImportFileForm(forms.Form): + import_file = forms.FileField( + required=True, + label=_('Arquivo formato ODF para Importanção')) diff --git a/compilacao/migrations/0001_initial.py b/compilacao/migrations/0001_initial.py index d8e06c220..fe763b7f0 100644 --- a/compilacao/migrations/0001_initial.py +++ b/compilacao/migrations/0001_initial.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations from django.conf import settings +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/compilacao/migrations/0002_auto_20150907_2334.py b/compilacao/migrations/0002_auto_20150907_2334.py index f92031d91..da10519c5 100644 --- a/compilacao/migrations/0002_auto_20150907_2334.py +++ b/compilacao/migrations/0002_auto_20150907_2334.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/compilacao/migrations/0003_auto_20150911_1735.py b/compilacao/migrations/0003_auto_20150911_1735.py index 36cfd09af..67ae645a6 100644 --- a/compilacao/migrations/0003_auto_20150911_1735.py +++ b/compilacao/migrations/0003_auto_20150911_1735.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/compilacao/migrations/0004_auto_20150914_0842.py b/compilacao/migrations/0004_auto_20150914_0842.py index 991257507..a871bcc07 100644 --- a/compilacao/migrations/0004_auto_20150914_0842.py +++ b/compilacao/migrations/0004_auto_20150914_0842.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/compilacao/migrations/0005_auto_20150924_1012.py b/compilacao/migrations/0005_auto_20150924_1012.py index bf712fe02..3e4dbe625 100644 --- a/compilacao/migrations/0005_auto_20150924_1012.py +++ b/compilacao/migrations/0005_auto_20150924_1012.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/compilacao/migrations/0006_auto_20150924_1121.py b/compilacao/migrations/0006_auto_20150924_1121.py index df4fe2fd4..a27cddf2b 100644 --- a/compilacao/migrations/0006_auto_20150924_1121.py +++ b/compilacao/migrations/0006_auto_20150924_1121.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/compilacao/migrations/0007_auto_20150924_1131.py b/compilacao/migrations/0007_auto_20150924_1131.py index 8866b0d92..56d0bcc25 100644 --- a/compilacao/migrations/0007_auto_20150924_1131.py +++ b/compilacao/migrations/0007_auto_20150924_1131.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/compilacao/migrations/0008_auto_20151005_1023.py b/compilacao/migrations/0008_auto_20151005_1023.py index a701292f2..995d4d9e1 100644 --- a/compilacao/migrations/0008_auto_20151005_1023.py +++ b/compilacao/migrations/0008_auto_20151005_1023.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/compilacao/migrations/0009_auto_20151007_1635.py b/compilacao/migrations/0009_auto_20151007_1635.py index 9a8618131..1fbc966c8 100644 --- a/compilacao/migrations/0009_auto_20151007_1635.py +++ b/compilacao/migrations/0009_auto_20151007_1635.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/compilacao/migrations/0016_auto_20151119_0950.py b/compilacao/migrations/0016_auto_20151119_0950.py index 3f417e105..807940b86 100644 --- a/compilacao/migrations/0016_auto_20151119_0950.py +++ b/compilacao/migrations/0016_auto_20151119_0950.py @@ -1,8 +1,9 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import migrations, models import datetime + +from django.db import migrations, models from django.utils.timezone import utc diff --git a/compilacao/models.py b/compilacao/models.py index b2d646eff..baaa77dd1 100644 --- a/compilacao/models.py +++ b/compilacao/models.py @@ -368,7 +368,7 @@ class VeiculoPublicacao(models.Model): return '%s: %s' % (self.sigla, self.nome) -class Publicacao(models.Model): +class Publicacao(TimestampedMixin): norma = models.ForeignKey( NormaJuridica, verbose_name=_('Norma Jurídica')) veiculo_publicacao = models.ForeignKey( @@ -380,7 +380,6 @@ class Publicacao(models.Model): blank=True, null=True, verbose_name=_('Pg. Início')) pagina_fim = models.PositiveIntegerField( blank=True, null=True, verbose_name=_('Pg. Fim')) - timestamp = models.DateTimeField() class Meta: verbose_name = _('Publicação') @@ -852,7 +851,7 @@ class Dispositivo(BaseModel, TimestampedMixin): tipo_dispositivo_id=self.tipo_dispositivo.pk)) else: # contagem continua restrita a articulacao - proxima_articulacao = self.get_proxima_articulacao() + proxima_articulacao = self.get_proximo_nivel_zero() if proxima_articulacao is None: irmaos = list(Dispositivo.objects.filter( @@ -940,7 +939,7 @@ class Dispositivo(BaseModel, TimestampedMixin): irmao.clean() irmao.save() - def get_proxima_articulacao(self): + def get_proximo_nivel_zero(self): proxima_articulacao = Dispositivo.objects.filter( ordem__gt=self.ordem, nivel=0, @@ -1025,8 +1024,7 @@ class Dispositivo(BaseModel, TimestampedMixin): dispositivo.set_numero_completo([1, 0, 0, 0, 0, 0, ]) -class Vide(models.Model): - data_criacao = models.DateTimeField(verbose_name=_('Data de Criação')) +class Vide(TimestampedMixin): texto = models.TextField(verbose_name=_('Texto do Vide')) tipo = models.ForeignKey(TipoVide, verbose_name=_('Tipo do Vide')) @@ -1048,7 +1046,7 @@ class Vide(models.Model): return _('Vide %s') % self.texto -class Nota(models.Model): +class Nota(TimestampedMixin): NPRIV = 1 NSTRL = 2 NINST = 3 @@ -1070,7 +1068,6 @@ class Nota(models.Model): blank=True, verbose_name=_('Url externa')) - data_criacao = models.DateTimeField(verbose_name=_('Data de Criação')) publicacao = models.DateTimeField(verbose_name=_('Data de Publicação')) efetifidade = models.DateTimeField(verbose_name=_('Data de Efeito')) diff --git a/compilacao/views.py b/compilacao/views.py index b5972d3e7..28000547a 100644 --- a/compilacao/views.py +++ b/compilacao/views.py @@ -2,7 +2,6 @@ from collections import OrderedDict from datetime import datetime, timedelta from os.path import sys -from django import forms from django.core.signing import Signer from django.db.models import Q from django.http.response import JsonResponse @@ -14,6 +13,7 @@ from django.views.generic.edit import FormMixin from django.views.generic.list import ListView from compilacao.file2dispositivo import Parser +from compilacao.forms import UpLoadImportFileForm from compilacao.models import (Dispositivo, PerfilEstruturalTextosNormativos, TipoDispositivo, TipoNota, TipoPublicacao, TipoVide, VeiculoPublicacao) @@ -253,12 +253,6 @@ class DispositivoView(CompilacaoView): return itens -class UpLoadImportFileForm(forms.Form): - import_file = forms.FileField( - required=True, - label=_('Arquivo formato ODF para Importanção')) - - def handle_uploaded_file(f, outfilepath): with open(outfilepath, 'wb+') as destination: for chunk in f.chunks(): @@ -1018,7 +1012,7 @@ class ActionsEditMixin(object): pkfilho = dispositivo.pk dispositivo = dispositivo.dispositivo_pai - proxima_articulacao = dispositivo.get_proxima_articulacao() + proxima_articulacao = dispositivo.get_proximo_nivel_zero() if proxima_articulacao is not None: parents = Dispositivo.objects.filter( diff --git a/lexml/migrations/0001_initial.py b/lexml/migrations/0001_initial.py index 39d4926f4..6a2e21391 100644 --- a/lexml/migrations/0001_initial.py +++ b/lexml/migrations/0001_initial.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/lexml/migrations/0002_auto_20150806_1614.py b/lexml/migrations/0002_auto_20150806_1614.py index c8629742f..b0ae800e0 100644 --- a/lexml/migrations/0002_auto_20150806_1614.py +++ b/lexml/migrations/0002_auto_20150806_1614.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/materia/migrations/0001_initial.py b/materia/migrations/0001_initial.py index 20976175c..0552b7edb 100644 --- a/materia/migrations/0001_initial.py +++ b/materia/migrations/0001_initial.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/materia/migrations/0002_auto_20150729_1310.py b/materia/migrations/0002_auto_20150729_1310.py index 613e5653f..a9e9b21c3 100644 --- a/materia/migrations/0002_auto_20150729_1310.py +++ b/materia/migrations/0002_auto_20150729_1310.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/materia/migrations/0003_auto_20150729_1717.py b/materia/migrations/0003_auto_20150729_1717.py index 49abc8853..6ffea56bd 100644 --- a/materia/migrations/0003_auto_20150729_1717.py +++ b/materia/migrations/0003_auto_20150729_1717.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/materia/migrations/0004_materialegislativa_texto_original.py b/materia/migrations/0004_materialegislativa_texto_original.py index 163ae0ff2..214864cf8 100644 --- a/materia/migrations/0004_materialegislativa_texto_original.py +++ b/materia/migrations/0004_materialegislativa_texto_original.py @@ -1,7 +1,8 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models + import materia.models diff --git a/materia/migrations/0005_auto_20150923_0941.py b/materia/migrations/0005_auto_20150923_0941.py index ae62096ef..24148ca2b 100644 --- a/materia/migrations/0005_auto_20150923_0941.py +++ b/materia/migrations/0005_auto_20150923_0941.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/materia/migrations/0006_proposicao_status.py b/materia/migrations/0006_proposicao_status.py index d6f84f45a..9e8678308 100644 --- a/materia/migrations/0006_proposicao_status.py +++ b/materia/migrations/0006_proposicao_status.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/materia/migrations/0007_auto_20151021_1200.py b/materia/migrations/0007_auto_20151021_1200.py index fb3563751..2cdad3b5c 100644 --- a/materia/migrations/0007_auto_20151021_1200.py +++ b/materia/migrations/0007_auto_20151021_1200.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/materia/migrations/0008_auto_20151029_1416.py b/materia/migrations/0008_auto_20151029_1416.py index 530e26990..4ee72acaf 100644 --- a/materia/migrations/0008_auto_20151029_1416.py +++ b/materia/migrations/0008_auto_20151029_1416.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/materia/migrations/0009_auto_20151029_1420.py b/materia/migrations/0009_auto_20151029_1420.py index 771b76392..b831a3885 100644 --- a/materia/migrations/0009_auto_20151029_1420.py +++ b/materia/migrations/0009_auto_20151029_1420.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/materia/migrations/0010_auto_20151117_1551.py b/materia/migrations/0010_auto_20151117_1551.py index 93f67f486..7d64b431d 100644 --- a/materia/migrations/0010_auto_20151117_1551.py +++ b/materia/migrations/0010_auto_20151117_1551.py @@ -1,7 +1,8 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models + import materia.models diff --git a/norma/migrations/0001_initial.py b/norma/migrations/0001_initial.py index 5ac87c706..1e3be4b19 100644 --- a/norma/migrations/0001_initial.py +++ b/norma/migrations/0001_initial.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/norma/migrations/0002_auto_20150729_1717.py b/norma/migrations/0002_auto_20150729_1717.py index 1695f9460..d2a9cba0f 100644 --- a/norma/migrations/0002_auto_20150729_1717.py +++ b/norma/migrations/0002_auto_20150729_1717.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/norma/migrations/0003_auto_20150906_0239.py b/norma/migrations/0003_auto_20150906_0239.py index 82dafbf88..dff90c71e 100644 --- a/norma/migrations/0003_auto_20150906_0239.py +++ b/norma/migrations/0003_auto_20150906_0239.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/norma/migrations/0004_auto_20150907_0004.py b/norma/migrations/0004_auto_20150907_0004.py index 961acc32c..9a716cabc 100644 --- a/norma/migrations/0004_auto_20150907_0004.py +++ b/norma/migrations/0004_auto_20150907_0004.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/norma/migrations/0005_auto_20150915_1141.py b/norma/migrations/0005_auto_20150915_1141.py index 67ed2e0a1..6d9798f23 100644 --- a/norma/migrations/0005_auto_20150915_1141.py +++ b/norma/migrations/0005_auto_20150915_1141.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/norma/urls.py b/norma/urls.py index a27a6b879..69199c2c3 100644 --- a/norma/urls.py +++ b/norma/urls.py @@ -1,6 +1,6 @@ -from django.conf.urls import url, include +from django.conf.urls import include, url -from norma.views import NormaIncluirView, tipo_norma_crud, assunto_norma_crud +from norma.views import NormaIncluirView, assunto_norma_crud, tipo_norma_crud urlpatterns = [ # url(r'^norma/', include(norma_url_patterns, diff --git a/painel/migrations/0001_initial.py b/painel/migrations/0001_initial.py index a19a4efeb..3b2dfa3c1 100644 --- a/painel/migrations/0001_initial.py +++ b/painel/migrations/0001_initial.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/parlamentares/migrations/0001_initial.py b/parlamentares/migrations/0001_initial.py index 4e176b045..152a92f82 100644 --- a/parlamentares/migrations/0001_initial.py +++ b/parlamentares/migrations/0001_initial.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/parlamentares/migrations/0002_auto_20150729_1310.py b/parlamentares/migrations/0002_auto_20150729_1310.py index 1cb4c1188..102db958e 100644 --- a/parlamentares/migrations/0002_auto_20150729_1310.py +++ b/parlamentares/migrations/0002_auto_20150729_1310.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/parlamentares/migrations/0003_auto_20150729_1717.py b/parlamentares/migrations/0003_auto_20150729_1717.py index 066201542..946e5bb4c 100644 --- a/parlamentares/migrations/0003_auto_20150729_1717.py +++ b/parlamentares/migrations/0003_auto_20150729_1717.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/parlamentares/migrations/0004_auto_20150929_1425.py b/parlamentares/migrations/0004_auto_20150929_1425.py index 7a19d3765..ffb8ca672 100644 --- a/parlamentares/migrations/0004_auto_20150929_1425.py +++ b/parlamentares/migrations/0004_auto_20150929_1425.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/parlamentares/migrations/0005_parlamentar_fotografia.py b/parlamentares/migrations/0005_parlamentar_fotografia.py index c81ab2ef2..db67012a2 100644 --- a/parlamentares/migrations/0005_parlamentar_fotografia.py +++ b/parlamentares/migrations/0005_parlamentar_fotografia.py @@ -1,7 +1,8 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models + import parlamentares.models diff --git a/parlamentares/migrations/0006_auto_20151119_1318.py b/parlamentares/migrations/0006_auto_20151119_1318.py index f220639a4..443dbcced 100644 --- a/parlamentares/migrations/0006_auto_20151119_1318.py +++ b/parlamentares/migrations/0006_auto_20151119_1318.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/protocoloadm/migrations/0001_initial.py b/protocoloadm/migrations/0001_initial.py index a4a71a154..a9f0277e4 100644 --- a/protocoloadm/migrations/0001_initial.py +++ b/protocoloadm/migrations/0001_initial.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/protocoloadm/migrations/0002_auto_20150729_1717.py b/protocoloadm/migrations/0002_auto_20150729_1717.py index 6e3073134..253bbb0eb 100644 --- a/protocoloadm/migrations/0002_auto_20150729_1717.py +++ b/protocoloadm/migrations/0002_auto_20150729_1717.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/protocoloadm/migrations/0003_documentoacessorioadministrativo_texto_integral.py b/protocoloadm/migrations/0003_documentoacessorioadministrativo_texto_integral.py index 0d80f3f8d..7d41c8776 100644 --- a/protocoloadm/migrations/0003_documentoacessorioadministrativo_texto_integral.py +++ b/protocoloadm/migrations/0003_documentoacessorioadministrativo_texto_integral.py @@ -1,7 +1,8 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models + import protocoloadm.models diff --git a/protocoloadm/migrations/0004_auto_20151007_1035.py b/protocoloadm/migrations/0004_auto_20151007_1035.py index 909f48138..5be623a0f 100644 --- a/protocoloadm/migrations/0004_auto_20151007_1035.py +++ b/protocoloadm/migrations/0004_auto_20151007_1035.py @@ -1,7 +1,8 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models + import protocoloadm.models diff --git a/protocoloadm/migrations/0005_auto_20151008_0744.py b/protocoloadm/migrations/0005_auto_20151008_0744.py index a7e93611a..799a501e6 100644 --- a/protocoloadm/migrations/0005_auto_20151008_0744.py +++ b/protocoloadm/migrations/0005_auto_20151008_0744.py @@ -1,7 +1,8 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models + import protocoloadm.models diff --git a/sapl/settings.py b/sapl/settings.py index 9f57f65d1..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/sessao/migrations/0001_initial.py b/sessao/migrations/0001_initial.py index 4151a7610..fe4d09a66 100644 --- a/sessao/migrations/0001_initial.py +++ b/sessao/migrations/0001_initial.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/sessao/migrations/0002_auto_20150729_1450.py b/sessao/migrations/0002_auto_20150729_1450.py index df29f69e5..6212c5f3f 100644 --- a/sessao/migrations/0002_auto_20150729_1450.py +++ b/sessao/migrations/0002_auto_20150729_1450.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/sessao/migrations/0003_remove_sessaoplenaria_tipo_expediente.py b/sessao/migrations/0003_remove_sessaoplenaria_tipo_expediente.py index 4dcc588c1..71e92b3d2 100644 --- a/sessao/migrations/0003_remove_sessaoplenaria_tipo_expediente.py +++ b/sessao/migrations/0003_remove_sessaoplenaria_tipo_expediente.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/sessao/migrations/0004_auto_20150806_1614.py b/sessao/migrations/0004_auto_20150806_1614.py index 03d6f8cbb..aaa5fe6c9 100644 --- a/sessao/migrations/0004_auto_20150806_1614.py +++ b/sessao/migrations/0004_auto_20150806_1614.py @@ -1,7 +1,8 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models + import sessao.models diff --git a/sessao/migrations/0005_remove_presencaordemdia_data_ordem.py b/sessao/migrations/0005_remove_presencaordemdia_data_ordem.py index 4064bdd68..8d73c542e 100644 --- a/sessao/migrations/0005_remove_presencaordemdia_data_ordem.py +++ b/sessao/migrations/0005_remove_presencaordemdia_data_ordem.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/sessao/migrations/0006_auto_20150929_1425.py b/sessao/migrations/0006_auto_20150929_1425.py index 429442f2b..4b438a29f 100644 --- a/sessao/migrations/0006_auto_20150929_1425.py +++ b/sessao/migrations/0006_auto_20150929_1425.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/sessao/migrations/0007_auto_20150929_1426.py b/sessao/migrations/0007_auto_20150929_1426.py index 6233ceb00..d97091ecb 100644 --- a/sessao/migrations/0007_auto_20150929_1426.py +++ b/sessao/migrations/0007_auto_20150929_1426.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/sessao/migrations/0008_auto_20151005_0814.py b/sessao/migrations/0008_auto_20151005_0814.py index d48449e4c..95cc5532a 100644 --- a/sessao/migrations/0008_auto_20151005_0814.py +++ b/sessao/migrations/0008_auto_20151005_0814.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/sessao/migrations/0009_auto_20151005_0934.py b/sessao/migrations/0009_auto_20151005_0934.py index dfb988970..b4d6819d6 100644 --- a/sessao/migrations/0009_auto_20151005_0934.py +++ b/sessao/migrations/0009_auto_20151005_0934.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration):