diff --git a/protocoloadm/views.py b/protocoloadm/views.py index 1c08edf26..18bb6c1fa 100644 --- a/protocoloadm/views.py +++ b/protocoloadm/views.py @@ -1,4 +1,6 @@ import json +import crud.base + from datetime import date, datetime from braces.views import FormValidMessageMixin @@ -12,7 +14,6 @@ from django.views.generic import CreateView, DetailView, FormView, ListView from django.views.generic.base import TemplateView from django_filters.views import FilterView -import crud.base from crud.base import Crud, make_pagination from crud.masterdetail import MasterDetailCrud from materia.models import Proposicao, TipoMateriaLegislativa diff --git a/templates/protocoloadm/documentoadministrativo_detail.html b/templates/protocoloadm/documentoadministrativo_detail.html index f443579c0..a56d176f3 100644 --- a/templates/protocoloadm/documentoadministrativo_detail.html +++ b/templates/protocoloadm/documentoadministrativo_detail.html @@ -1,6 +1,7 @@ {% extends "crud/detail.html" %} {% load i18n %} {% block actions %} +

Protocolos

{% trans 'Tramitações' %} {% trans 'Editar' %} diff --git a/templates/protocoloadm/proposicao_view.html.BACKUP.12159.html b/templates/protocoloadm/proposicao_view.html.BACKUP.12159.html new file mode 100644 index 000000000..ffccb66a4 --- /dev/null +++ b/templates/protocoloadm/proposicao_view.html.BACKUP.12159.html @@ -0,0 +1,7 @@ +{% extends "protocoloadm/protocoloadm_detail.html" %} +{% load i18n %} +{% load crispy_forms_tags %} + +{% block detail_content %} + {{ form.as_p }} +{% endblock detail_content %} \ No newline at end of file diff --git a/templates/protocoloadm/proposicao_view.html.BASE.12159.html b/templates/protocoloadm/proposicao_view.html.BASE.12159.html new file mode 100644 index 000000000..e69de29bb diff --git a/templates/protocoloadm/proposicao_view.html.LOCAL.12159.html b/templates/protocoloadm/proposicao_view.html.LOCAL.12159.html new file mode 100644 index 000000000..ffccb66a4 --- /dev/null +++ b/templates/protocoloadm/proposicao_view.html.LOCAL.12159.html @@ -0,0 +1,7 @@ +{% extends "protocoloadm/protocoloadm_detail.html" %} +{% load i18n %} +{% load crispy_forms_tags %} + +{% block detail_content %} + {{ form.as_p }} +{% endblock detail_content %} \ No newline at end of file diff --git a/templates/protocoloadm/proposicao_view.html.REMOTE.12159.html b/templates/protocoloadm/proposicao_view.html.REMOTE.12159.html new file mode 100644 index 000000000..e69de29bb