From 721790d5b5c0692330114fd24829f4e78abe8828 Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Tue, 3 May 2016 10:10:01 -0300 Subject: [PATCH] WIPFINAL2 --- .travis.yml | 2 ++ protocoloadm/views.py | 7 +++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7a8d95fbf..77b6e6b60 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,8 @@ install: - pip install -r requirements/dev-requirements.txt - pip install --upgrade setuptools +# Line 24 to 35 is a hack found in this link below +# It was used to fix an error in database building # https://dockyard.com/blog/ruby/2013/03/29/running-postgresql-9-2-on-travis-ci before_script: diff --git a/protocoloadm/views.py b/protocoloadm/views.py index 4aabbb9c9..851cf76f9 100644 --- a/protocoloadm/views.py +++ b/protocoloadm/views.py @@ -1,12 +1,10 @@ import json - -from braces.views import FormValidMessageMixin -from crud.base import Crud, make_pagination from datetime import date, datetime +from braces.views import FormValidMessageMixin from django.core.exceptions import ObjectDoesNotExist from django.core.urlresolvers import reverse -from django.db.models import Max, Q +from django.db.models import Q, Max from django.http import HttpResponse, HttpResponseRedirect from django.shortcuts import redirect from django.utils.translation import ugettext_lazy as _ @@ -14,6 +12,7 @@ from django.views.generic import CreateView, DetailView, FormView, ListView from django.views.generic.base import TemplateView from django_filters.views import FilterView +from crud.base import Crud, make_pagination from materia.models import Proposicao, TipoMateriaLegislativa from sapl.utils import create_barcode, get_client_ip