Browse Source

Refatora Tramitacoes de Documentos Administrativos e faz alguns ajustes

pull/481/head
Eduardo Calil 10 years ago
parent
commit
0da3f4d371
  1. 3
      protocoloadm/views.py
  2. 1
      templates/protocoloadm/documentoadministrativo_detail.html
  3. 7
      templates/protocoloadm/proposicao_view.html.BACKUP.12159.html
  4. 0
      templates/protocoloadm/proposicao_view.html.BASE.12159.html
  5. 7
      templates/protocoloadm/proposicao_view.html.LOCAL.12159.html
  6. 0
      templates/protocoloadm/proposicao_view.html.REMOTE.12159.html

3
protocoloadm/views.py

@ -1,4 +1,6 @@
import json import json
import crud.base
from datetime import date, datetime from datetime import date, datetime
from braces.views import FormValidMessageMixin 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.views.generic.base import TemplateView
from django_filters.views import FilterView from django_filters.views import FilterView
import crud.base
from crud.base import Crud, make_pagination from crud.base import Crud, make_pagination
from crud.masterdetail import MasterDetailCrud from crud.masterdetail import MasterDetailCrud
from materia.models import Proposicao, TipoMateriaLegislativa from materia.models import Proposicao, TipoMateriaLegislativa

1
templates/protocoloadm/documentoadministrativo_detail.html

@ -1,6 +1,7 @@
{% extends "crud/detail.html" %} {% extends "crud/detail.html" %}
{% load i18n %} {% load i18n %}
{% block actions %} {% block actions %}
<h1><b>Protocolos</b></h1>
<div class="actions btn-group pull-right" role="group"> <div class="actions btn-group pull-right" role="group">
<a href="{% url 'protocoloadm:tramitacaoadministrativo_list' object.pk %}" class="btn btn-default">{% trans 'Tramitações' %}</a> <a href="{% url 'protocoloadm:tramitacaoadministrativo_list' object.pk %}" class="btn btn-default">{% trans 'Tramitações' %}</a>
<a href="{{ view.update_url }}" class="btn btn-default">{% trans 'Editar' %}</a> <a href="{{ view.update_url }}" class="btn btn-default">{% trans 'Editar' %}</a>

7
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 %}

0
templates/protocoloadm/proposicao_view.html.BASE.12159.html

7
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 %}

0
templates/protocoloadm/proposicao_view.html.REMOTE.12159.html

Loading…
Cancel
Save