refatora norma e compilação para sapl as sapn

sapl/base/templatetags/common_tags.py

@@ -51,6 +51,13 @@ def model_verbose_name_plural(class_name):
     model = get_class(class_name)
     return model._meta.verbose_name_plural
 
+@register.filter
+def meta_model_value(instance, attr):
+    try:
+        return getattr(instance._meta, attr)
+    except:
+        return ''
+
 
 @register.filter
 def split(value, arg):
@@ -324,12 +331,12 @@ def render_chunk_vendors(extension=None):
         return mark_safe('\n'.join(tags))
     except:
         return ''
-    
-   
+
+
 @register.filter(is_safe=True)
-@stringfilter 
+@stringfilter
 def dont_break_out(value):
     _safe = '<div class="dont-break-out">{}</div>'.format(value)
     _safe = mark_safe(_safe)
-    return _safe    
+    return _safe
 

sapl/norma/views.py

@@ -7,6 +7,7 @@ from django.core.exceptions import ObjectDoesNotExist
 from django.db.models import Q
 from django.http import HttpResponse, JsonResponse
 from django.http.response import HttpResponseRedirect
+from django.shortcuts import redirect
 from django.template import RequestContext, loader
 from django.urls import reverse
 from django.urls.base import reverse_lazy
@@ -35,8 +36,6 @@ from .models import (AnexoNormaJuridica, AssuntoNorma, NormaJuridica, NormaRelac
 
 
 # LegislacaoCitadaCrud = Crud.build(LegislacaoCitada, '')
-
-
 TipoNormaCrud = CrudAux.build(
     TipoNormaJuridica, 'tipo_norma_juridica',
     list_field_names=['sigla', 'descricao', 'equivalente_lexml'])
@@ -273,6 +272,11 @@ class NormaCrud(Crud):
                                                  norma_id=kwargs['pk'],
                                                  ano=timezone.now().year,
                                                  horario_acesso=timezone.now())
+
+            if not 'display' in request.GET and not request.user.has_perm('norma.change_normajuridica') and \
+                    self.get_object().texto_articulado.exists():
+                return redirect(reverse('sapl.norma:norma_ta',
+                                        kwargs={'pk': self.kwargs['pk']}))
             return super().get(request, *args, **kwargs)
 
     class DeleteView(Crud.DeleteView):

sapl/templates/base.html

@@ -66,7 +66,7 @@
                         </a>
                         <ul class="dropdown-menu">
                           <li class="dropdown-item"><a>{{user.username}}</a></li>
-                          {% if 'parlamentares.can_vote' in request.user.get_all_permissions %}
+                          {% if not sapl_as_sapn and 'parlamentares.can_vote' in request.user.get_all_permissions %}
                             <li class="dropdown-item"><a href="" onclick="window.open('{% url 'sapl.painel:voto_individual' %}','Voto Individual','width=1000, height=800, scrollbars=yes')";>
                               Votar Matéria
                             </a></li>

sapl/templates/compilacao/subnav.html

@@ -4,7 +4,9 @@
   <ul class="nav nav-tabs justify-content-end">
     {%if object %}
       <li class="nav-item">
-        {% if request.GET.back_type == 'history' and object.content_object %}
+        {% if object.content_object|meta_model_value:'model_name' == 'normajuridica' %}
+          <a class="nav-link" href="{% url object|urldetail_content_type:object.content_object object.content_object.pk %}?display" title="{% trans 'Dados Complementares '%}">{% trans 'Dados Complementares '%}</a>
+        {% elif request.GET.back_type == 'history' and object.content_object %}
           <a class="nav-link" href="javascript:window.history.back()" title="{% trans 'Voltar para '%}{{object}}">{% trans 'Voltar para '%}{{object}}</a>
         {% elif object.content_object%}
           <a class="nav-link" href="{% url object|urldetail_content_type:object.content_object object.content_object.pk %}" title="{% trans 'Voltar para '%}{{object}}">{% trans 'Voltar para '%}{{object}}</a>

sapl/templates/compilacao/text_list__embedded.html

@@ -6,6 +6,9 @@
   {% if object_list %}
       {% if 'print' not in request.GET %}
         <div class="actions btn-group" role="group">
+            {% if sapl_as_sapn %}
+              <a href="{% url 'sapl.norma:norma_pesquisa' %}" class="btn btn-outline-primary" >{% trans 'Fazer nova pesquisa' %}</a>
+            {% endif %}
             <a href="{% if 'compilacao' not in request.resolver_match.namespace %}{% url 'sapl.compilacao:ta_text' object_list.0.ta_id %}{% else %}{{request.path}}{% endif %}?print" class="btn btn-outline-primary" id="btn_impressao">{% trans 'Preparar para impressão' %}</a>
         </div>
       {% endif %}

sapl/templates/compilacao/textoarticulado_detail.html

@@ -8,10 +8,10 @@
 {% endblock %}
 
 {% block base_content %}
-  
+
   {% block actions %}
     <div class="context-actions d-flex justify-content-between mb-4">
-      <div class="actions btn-group" role="group">        
+      <div class="actions btn-group" role="group">
         {% if not object.editing_locked %}
           <a class="btn btn-success" href="{% url 'sapl.compilacao:ta_text' object.pk %}">PreView</a>
         {% endif %}
@@ -19,7 +19,7 @@
           <a href="{% url 'sapl.compilacao:ta_text_edit' object.pk %}?{% if object.editing_locked %}unlock{%else%}lock{% endif %}" class="btn {% if object.editing_locked %}btn-danger{%else%}btn-outline-primary{% endif %}">{% if object.editing_locked %}{% trans 'Desbloquear Edição' %}{%else%}{% trans 'Publicar Texto' %}{% endif %}</a>
         {% endif %}
       </div>
-      <div class="actions btn-group" role="group">        
+      <div class="actions btn-group" role="group">
         {% if perms.compilacao.change_textoarticulado and object|can_use_dynamic_editing:user %}
           <a href="{% url 'sapl.compilacao:ta_edit' object.pk %}" class="btn btn-outline-primary">{% trans 'Editar Metadados do Texto Articulado' %}</a>
         {% endif %}

sapl/templates/norma/normajuridica_detail.html

@@ -132,7 +132,7 @@
       {% endif %}
     </div>
   {% endif %}
-  {% if object.texto_articulado.exists and object.texto_articulado.first.has_view_permission %}
+  {% if not sapl_as_sapn and object.texto_articulado.exists and object.texto_articulado.first.has_view_permission %}
     <hr />
     <div class="row">
       <div class="col-sm-12">
@@ -146,13 +146,13 @@
 
 {% block webpack_loader_js %}
     {{ block.super }}
-    {% if object.texto_articulado.exists and object.texto_articulado.first.has_view_permission  %}
+    {% if not sapl_as_sapn and object.texto_articulado.exists and object.texto_articulado.first.has_view_permission  %}
       {% render_bundle 'compilacao' 'js' %}
     {% endif %}
 {% endblock %}
 
 {% block extra_js %}
-{% if object.texto_articulado.exists and object.texto_articulado.first.has_view_permission  %}
+{% if not sapl_as_sapn and object.texto_articulado.exists and object.texto_articulado.first.has_view_permission  %}
   <script language="Javascript">
     window.onload = function () {
       $.get("{% url 'sapl.compilacao:ta_text' object.texto_articulado.first.id %}?embedded",

sapl/urls.py

@@ -38,12 +38,6 @@ import sapl.sessao.urls
 
 urlpatterns = []
 
-if not settings.SAPL_AS_SAPN:
-    urlpatterns = [
-        url(r'^$', TemplateView.as_view(template_name='index.html'),
-            name='sapl_index'),
-    ]
-
 urlpatterns += [
     url(r'^message$', TemplateView.as_view(template_name='base.html')),
     url(r'^admin/', admin.site.urls),
@@ -60,6 +54,8 @@ urlpatterns += [
     url(r'', include(sapl.relatorios.urls)),
     url(r'', include(sapl.audiencia.urls)),
 
+    url(r'^$', TemplateView.as_view(template_name='index.html'),
+        name='sapl_index'),
     # must come at the end
     #   so that base /sistema/ url doesn't capture its children
     url(r'', include(sapl.base.urls)),