From 24917a6ae32a4fa862f15b7d93b8ec222b1cd7ea Mon Sep 17 00:00:00 2001 From: Mariana Mendes Date: Fri, 13 Oct 2017 08:38:04 -0300 Subject: [PATCH] Troca os help_paths por help_topics e corrige a url do link de ajuda --- sapl/base/views.py | 4 ++-- sapl/comissoes/views.py | 2 +- sapl/crud/base.py | 18 +++++++++--------- sapl/crud/tests/stub_app/views.py | 4 ++-- sapl/materia/views.py | 24 ++++++++++++------------ sapl/norma/views.py | 4 ++-- sapl/parlamentares/views.py | 12 ++++++------ sapl/protocoloadm/views.py | 8 ++++---- sapl/sessao/views.py | 8 ++++---- sapl/templates/base.html | 8 ++++---- 10 files changed, 46 insertions(+), 46 deletions(-) diff --git a/sapl/base/views.py b/sapl/base/views.py index 47c3a5318..ebd22d626 100644 --- a/sapl/base/views.py +++ b/sapl/base/views.py @@ -54,7 +54,7 @@ class ConfirmarEmailView(TemplateView): class TipoAutorCrud(CrudAux): model = TipoAutor - help_path = 'tipo-autor' + help_topic = 'tipo-autor' class BaseMixin(CrudAux.BaseMixin): list_field_names = ['descricao', 'content_type'] @@ -63,7 +63,7 @@ class TipoAutorCrud(CrudAux): class AutorCrud(CrudAux): model = Autor - help_path = 'autor' + help_topic = 'autor' class BaseMixin(CrudAux.BaseMixin): list_field_names = ['tipo', 'nome', 'user'] diff --git a/sapl/comissoes/views.py b/sapl/comissoes/views.py index 713c8f03e..22147aae6 100644 --- a/sapl/comissoes/views.py +++ b/sapl/comissoes/views.py @@ -78,7 +78,7 @@ class ComposicaoCrud(MasterDetailCrud): class ComissaoCrud(Crud): model = Comissao - help_path = 'modulo_comissoes' + help_topic = 'modulo_comissoes' public = [RP_LIST, RP_DETAIL, ] class BaseMixin(Crud.BaseMixin): diff --git a/sapl/crud/base.py b/sapl/crud/base.py index 836af8925..d53125249 100644 --- a/sapl/crud/base.py +++ b/sapl/crud/base.py @@ -81,7 +81,7 @@ def make_pagination(index, num_pages): """ variáveis do crud: - help_path + help_topic container_field container_field_set is_m2m @@ -865,7 +865,7 @@ class Crud: DetailView = CrudDetailView UpdateView = CrudUpdateView DeleteView = CrudDeleteView - help_path = '' + help_topic = '' class PublicMixin: permission_required = [] @@ -877,7 +877,7 @@ class Crud: if view: class CrudViewWithBase(cls.BaseMixin, view): model = cls.model - help_path = cls.help_path + help_topic = cls.help_topic crud = cls CrudViewWithBase.__name__ = view.__name__ return CrudViewWithBase @@ -909,13 +909,13 @@ class Crud: for regex, view, suffix in cruds] @classonlymethod - def build(cls, _model, _help_path, _model_set=None, list_field_names=[]): + def build(cls, _model, _help_topic, _model_set=None, list_field_names=[]): def create_class(_list_field_names): class ModelCrud(cls): model = _model model_set = _model_set - help_path = _help_path + help_topic = _help_topic list_field_names = _list_field_names return ModelCrud @@ -950,10 +950,10 @@ class CrudAux(Crud): return context @classonlymethod - def build(cls, _model, _help_path, _model_set=None, list_field_names=[]): + def build(cls, _model, _help_topic, _model_set=None, list_field_names=[]): ModelCrud = Crud.build( - _model, _help_path, _model_set, list_field_names) + _model, _help_topic, _model_set, list_field_names) class ModelCrudAux(CrudAux, ModelCrud): pass @@ -1405,10 +1405,10 @@ class MasterDetailCrud(Crud): return '' @classonlymethod - def build(cls, model, parent_field, help_path, + def build(cls, model, parent_field, help_topic, _model_set=None, list_field_names=[]): crud = super(MasterDetailCrud, cls).build( - model, help_path, _model_set=_model_set, + model, help_topic, _model_set=_model_set, list_field_names=list_field_names) crud.parent_field = parent_field return crud diff --git a/sapl/crud/tests/stub_app/views.py b/sapl/crud/tests/stub_app/views.py index 81c6b834d..11d4e3d9f 100644 --- a/sapl/crud/tests/stub_app/views.py +++ b/sapl/crud/tests/stub_app/views.py @@ -6,7 +6,7 @@ from .models import City, Country class CountryCrud(Crud): model = Country - help_path = 'help_path', + help_topic = 'help_topic', class ListView(CrudListView): paginate_by = 10 @@ -14,4 +14,4 @@ class CountryCrud(Crud): class CityCrud(MasterDetailCrud): model = City - help_path = 'help_path', + help_topic = 'help_topic', diff --git a/sapl/materia/views.py b/sapl/materia/views.py index 1fa65bd85..69a4c3eab 100644 --- a/sapl/materia/views.py +++ b/sapl/materia/views.py @@ -525,7 +525,7 @@ class ConfirmarProposicao(PermissionRequiredForAppCrudMixin, UpdateView): class UnidadeTramitacaoCrud(CrudAux): model = UnidadeTramitacao - help_path = 'unidade_tramitacao' + help_topic = 'unidade_tramitacao' class BaseMixin(Crud.BaseMixin): list_field_names = ['comissao', 'orgao', 'parlamentar'] @@ -551,7 +551,7 @@ class UnidadeTramitacaoCrud(CrudAux): class ProposicaoCrud(Crud): model = Proposicao - help_path = '' + help_topic = '' container_field = 'autor__user' class BaseMixin(Crud.BaseMixin): @@ -838,7 +838,7 @@ class ReciboProposicaoView(TemplateView): class RelatoriaCrud(MasterDetailCrud): model = Relatoria parent_field = 'materia' - help_path = '' + help_topic = '' public = [RP_LIST, RP_DETAIL] class CreateView(MasterDetailCrud.CreateView): @@ -913,7 +913,7 @@ class RelatoriaCrud(MasterDetailCrud): class TramitacaoCrud(MasterDetailCrud): model = Tramitacao parent_field = 'materia' - help_path = '' + help_topic = '' public = [RP_LIST, RP_DETAIL] class BaseMixin(MasterDetailCrud.BaseMixin): @@ -1058,7 +1058,7 @@ def montar_helper_documento_acessorio(self): class DocumentoAcessorioCrud(MasterDetailCrud): model = DocumentoAcessorio parent_field = 'materia' - help_path = '' + help_topic = '' public = [RP_LIST, RP_DETAIL] class BaseMixin(MasterDetailCrud.BaseMixin): @@ -1094,7 +1094,7 @@ class DocumentoAcessorioCrud(MasterDetailCrud): class AutoriaCrud(MasterDetailCrud): model = Autoria parent_field = 'materia' - help_path = '' + help_topic = '' public = [RP_LIST, RP_DETAIL] list_field_names = ['autor', 'autor__tipo__descricao', 'primeiro_autor'] @@ -1169,7 +1169,7 @@ class AutoriaMultiCreateView(PermissionRequiredForAppCrudMixin, FormView): class DespachoInicialCrud(MasterDetailCrud): model = DespachoInicial parent_field = 'materia' - help_path = '' + help_topic = '' public = [RP_LIST, RP_DETAIL] class CreateView(MasterDetailCrud.CreateView): @@ -1182,7 +1182,7 @@ class DespachoInicialCrud(MasterDetailCrud): class LegislacaoCitadaCrud(MasterDetailCrud): model = LegislacaoCitada parent_field = 'materia' - help_path = '' + help_topic = '' public = [RP_LIST, RP_DETAIL] class BaseMixin(MasterDetailCrud.BaseMixin): @@ -1267,14 +1267,14 @@ class LegislacaoCitadaCrud(MasterDetailCrud): class NumeracaoCrud(MasterDetailCrud): model = Numeracao parent_field = 'materia' - help_path = '' + help_topic = '' public = [RP_LIST, RP_DETAIL] class AnexadaCrud(MasterDetailCrud): model = Anexada parent_field = 'materia_principal' - help_path = '' + help_topic = '' public = [RP_LIST, RP_DETAIL] class BaseMixin(MasterDetailCrud.BaseMixin): @@ -1302,7 +1302,7 @@ class AnexadaCrud(MasterDetailCrud): class MateriaAssuntoCrud(MasterDetailCrud): model = MateriaAssunto parent_field = 'materia' - help_path = '' + help_topic = '' public = [RP_LIST, RP_DETAIL] class BaseMixin(MasterDetailCrud.BaseMixin): @@ -1326,7 +1326,7 @@ class MateriaAssuntoCrud(MasterDetailCrud): class MateriaLegislativaCrud(Crud): model = MateriaLegislativa - help_path = 'materia_legislativa' + help_topic = 'materia_legislativa' public = [RP_LIST, RP_DETAIL] class BaseMixin(Crud.BaseMixin): diff --git a/sapl/norma/views.py b/sapl/norma/views.py index c374537ed..3bfb256f2 100644 --- a/sapl/norma/views.py +++ b/sapl/norma/views.py @@ -33,7 +33,7 @@ TipoVinculoNormaJuridicaCrud = CrudAux.build( class NormaRelacionadaCrud(MasterDetailCrud): model = NormaRelacionada parent_field = 'norma_principal' - help_path = '' + help_topic = '' public = [RP_LIST, RP_DETAIL] class BaseMixin(MasterDetailCrud.BaseMixin): @@ -123,7 +123,7 @@ class NormaTaView(IntegracaoTaView): class NormaCrud(Crud): model = NormaJuridica - help_path = 'norma_juridica' + help_topic = 'norma_juridica' public = [RP_LIST, RP_DETAIL] class BaseMixin(Crud.BaseMixin): diff --git a/sapl/parlamentares/views.py b/sapl/parlamentares/views.py index 02bbfae30..5432e70ef 100644 --- a/sapl/parlamentares/views.py +++ b/sapl/parlamentares/views.py @@ -89,7 +89,7 @@ class FrenteList(MasterDetailCrud): class RelatoriaParlamentarCrud(CrudBaseForListAndDetailExternalAppView): model = Relatoria parent_field = 'parlamentar' - help_path = 'relatoria_parlamentar' + help_topic = 'relatoria_parlamentar' namespace = AppConfig.name class BaseMixin(CrudBaseForListAndDetailExternalAppView.BaseMixin): @@ -181,7 +181,7 @@ class ParticipacaoParlamentarCrud(CrudBaseForListAndDetailExternalAppView): class ColigacaoCrud(CrudAux): model = Coligacao - help_path = 'tabelas_auxiliares#coligacao' + help_topic = 'tabelas_auxiliares#coligacao' class ListView(CrudAux.ListView): ordering = ('-numero_votos', 'nome') @@ -272,7 +272,7 @@ def parlamentares_frente_selected(request): class FrenteCrud(CrudAux): model = Frente - help_path = 'tabelas_auxiliares#tipo_situa_militar' + help_topic = 'tabelas_auxiliares#tipo_situa_militar' list_field_names = ['nome', 'data_criacao', 'parlamentares'] class CreateView(CrudAux.CreateView): @@ -337,7 +337,7 @@ class MandatoCrud(MasterDetailCrud): class ComposicaoColigacaoCrud(MasterDetailCrud): model = ComposicaoColigacao parent_field = 'coligacao' - help_path = '' + help_topic = '' class BaseMixin(MasterDetailCrud.BaseMixin): @@ -353,7 +353,7 @@ class ComposicaoColigacaoCrud(MasterDetailCrud): class LegislaturaCrud(CrudAux): model = Legislatura - help_path = 'tabelas_auxiliares#legislatura' + help_topic = 'tabelas_auxiliares#legislatura' class CreateView(CrudAux.CreateView): form_class = LegislaturaForm @@ -391,7 +391,7 @@ class LegislaturaCrud(CrudAux): class FiliacaoCrud(MasterDetailCrud): model = Filiacao parent_field = 'parlamentar' - help_path = '' + help_topic = '' public = [RP_LIST, RP_DETAIL] class BaseMixin(MasterDetailCrud.BaseMixin): diff --git a/sapl/protocoloadm/views.py b/sapl/protocoloadm/views.py index 3384e4934..bce99118d 100644 --- a/sapl/protocoloadm/views.py +++ b/sapl/protocoloadm/views.py @@ -84,7 +84,7 @@ class DocumentoAdministrativoMixin: class DocumentoAdministrativoCrud(Crud): model = DocumentoAdministrativo - help_path = '' + help_topic = '' class BaseMixin(Crud.BaseMixin): list_field_names = ['tipo', 'numero', 'ano', 'data', @@ -142,7 +142,7 @@ class DocumentoAdministrativoCrud(Crud): class StatusTramitacaoAdministrativoCrud(CrudAux): model = StatusTramitacaoAdministrativo - help_path = '' + help_topic = '' class BaseMixin(CrudAux.BaseMixin): list_field_names = ['sigla', 'indicador', 'descricao'] @@ -577,7 +577,7 @@ class PesquisarDocumentoAdministrativoView(DocumentoAdministrativoMixin, class TramitacaoAdmCrud(MasterDetailCrud): model = TramitacaoAdministrativo parent_field = 'documento' - help_path = '' + help_topic = '' class BaseMixin(MasterDetailCrud.BaseMixin): list_field_names = ['data_tramitacao', 'unidade_tramitacao_local', @@ -656,7 +656,7 @@ class TramitacaoAdmCrud(MasterDetailCrud): class DocumentoAcessorioAdministrativoCrud(MasterDetailCrud): model = DocumentoAcessorioAdministrativo parent_field = 'documento' - help_path = '' + help_topic = '' class BaseMixin(MasterDetailCrud.BaseMixin): list_field_names = ['nome', 'tipo', diff --git a/sapl/sessao/views.py b/sapl/sessao/views.py index 073030a70..df2e3e06a 100644 --- a/sapl/sessao/views.py +++ b/sapl/sessao/views.py @@ -203,7 +203,7 @@ def get_presencas_generic(model, sessao, legislatura): class MateriaOrdemDiaCrud(MasterDetailCrud): model = OrdemDia parent_field = 'sessao_plenaria' - help_path = '' + help_topic = '' public = [RP_LIST, RP_DETAIL] class BaseMixin(MasterDetailCrud.BaseMixin): @@ -358,7 +358,7 @@ def recuperar_materia(request): class ExpedienteMateriaCrud(MasterDetailCrud): model = ExpedienteMateria parent_field = 'sessao_plenaria' - help_path = '' + help_topic = '' public = [RP_LIST, RP_DETAIL] class BaseMixin(MasterDetailCrud.BaseMixin): @@ -504,7 +504,7 @@ class ExpedienteMateriaCrud(MasterDetailCrud): class OradorCrud(MasterDetailCrud): model = '' parent_field = 'sessao_plenaria' - help_path = '' + help_topic = '' public = [RP_LIST, RP_DETAIL] class ListView(MasterDetailCrud.ListView): @@ -571,7 +571,7 @@ def sessao_legislativa_legislatura_ajax(request): class SessaoCrud(Crud): model = SessaoPlenaria - help_path = 'sessao_plenaria' + help_topic = 'sessao_plenaria' public = [RP_DETAIL] class BaseMixin(Crud.BaseMixin): diff --git a/sapl/templates/base.html b/sapl/templates/base.html index dbecfbd32..98be3f87d 100644 --- a/sapl/templates/base.html +++ b/sapl/templates/base.html @@ -55,7 +55,7 @@ -{#
    • #} +
    • {% if not user.is_authenticated %}
    • {% else %} @@ -135,9 +135,9 @@
    {% block help %} -{# {% if view.help_path %}#} -{# {% trans 'Ajuda' %}#} -{# {% endif %}#} + {% if view.help_topic %} + {% trans 'Ajuda' %} + {% endif %} {% endblock %} {% block title %}