Browse Source

insere listagem de normas que possuem TAs não publicados

pull/3285/head
Leandro Roberto 5 years ago
parent
commit
5f637b73c8
  1. 25
      sapl/norma/views.py
  2. 9
      sapl/templates/norma/normajuridica_filter.html
  3. 9
      sapl/templates/norma/normajuridica_list.html

25
sapl/norma/views.py

@ -4,6 +4,7 @@ import re
from django.contrib.auth.mixins import PermissionRequiredMixin
from django.core.exceptions import ObjectDoesNotExist
from django.db.models import Q
from django.http import HttpResponse, JsonResponse
from django.template import RequestContext, loader
from django.urls import reverse
@ -242,14 +243,26 @@ class NormaCrud(Crud):
layout_key = 'NormaJuridicaCreate'
class ListView(Crud.ListView, RedirectView):
class ListView(Crud.ListView):
def get_redirect_url(self, *args, **kwargs):
namespace = self.model._meta.app_config.name
return reverse('%s:%s' % (namespace, 'norma_pesquisa'))
def get_queryset(self):
qs = Crud.ListView.get_queryset(self)
q = Q(
texto_articulado__privacidade=0
) | Q(
texto_articulado__isnull=True)
qs = qs.exclude(q)
return qs.order_by('-texto_articulado__privacidade', '-ano', '-numero')
def get(self, request, *args, **kwargs):
return RedirectView.get(self, request, *args, **kwargs)
def get_context_data(self, **kwargs):
context = Crud.ListView.get_context_data(self, **kwargs)
context['title'] = 'Normas Jurídicas com Textos Articulados não publicados'
return context
@classmethod
def get_url_regex(cls):
return r'^check_compilacao$'
class UpdateView(Crud.UpdateView):
form_class = NormaJuridicaForm

9
sapl/templates/norma/normajuridica_filter.html

@ -3,14 +3,19 @@
{% load crispy_forms_tags %}
{% block actions %}
<div class="actions btn-group float-left" role="group">
{% if perms.compilacao.lock_unlock_textoarticulado %}
<a href="{% url 'sapl.norma:normajuridica_list' %}" class="btn btn-sm btn-outline-primary">
{% blocktrans with verbose_name=view.verbose_name %}Pendências nos Textos Articulados{% endblocktrans %}
</a>
{% endif %}
</div>
<div class="actions btn-group float-right" role="group">
{% if USE_SOLR %}
<a href="{% url 'sapl.base:haystack_search' %}" class="btn btn-outline-primary">
Pesquisa Textual
</a>
{% endif %}
{% if perms.norma.add_normajuridica %}
<a href="{% url 'sapl.norma:normajuridica_create' %}" class="btn btn-outline-primary">
{% blocktrans with verbose_name=view.verbose_name %} Adicionar Norma Jurídica {% endblocktrans %}

9
sapl/templates/norma/normajuridica_list.html

@ -0,0 +1,9 @@
{% extends "crud/list.html" %}
{% load i18n %}
{% load crispy_forms_tags %}
{% block extra_actions %}
<div class="actions btn-group float-left" role="group">
<a href="{% url 'sapl.norma:norma_pesquisa' %}" class="btn btn-outline-primary">{% trans 'Voltar para pesquisa' %}</a>
</div>
{% endblock %}
Loading…
Cancel
Save