Merge 89c0afdbe4 into 4dc28a4a5b

sapl/api/views_materia.py

@@ -8,7 +8,7 @@ from drfautoapi.drfautoapi import ApiViewSetConstrutor, \
     customize, wrapper_queryset_response_for_drf_action
 from sapl.api.permissions import SaplModelPermissions
 from sapl.materia.models import TipoMateriaLegislativa, Tramitacao,\
-    MateriaLegislativa, Proposicao
+    MateriaLegislativa, Proposicao, DocumentoAcessorio
 
 
 ApiViewSetConstrutor.build_class(
@@ -111,6 +111,19 @@ class _MateriaLegislativaViewSet:
         return self.list(request, *args, **kwargs)
 
 
+
+@customize(DocumentoAcessorio)
+class _DocumentoAcessorioViewSet:
+
+    def get_queryset(self):
+        user = self.request.user
+        qs = super().get_queryset()
+
+        if user.is_anonymous or 'materia.change_documentoacessorio' not in user.get_all_permissions():
+            qs = qs.exclude(restrito=True)
+        return qs
+
+
 @customize(TipoMateriaLegislativa)
 class _TipoMateriaLegislativaViewSet:
 

sapl/api/views_protocoloadm.py

@@ -60,9 +60,12 @@ class _DocumentoAcessorioAdministrativoViewSet:
 
     def get_queryset(self):
         qs = super().get_queryset()
+        user = self.request.user
 
-        if self.request.user.is_anonymous:
+        if user.is_anonymous or 'protocoloadm.change_documentoacessorioadministrativo' not in user.get_all_permissions():
+#        if self.request.user.is_anonymous:
             qs = qs.exclude(documento__restrito=True)
+            qs = qs.exclude(restrito=True)
         return qs
 
 

sapl/materia/forms.py

@@ -330,11 +330,17 @@ class AcompanhamentoMateriaForm(GoogleRecapthaMixin, ModelForm):
 
 class DocumentoAcessorioForm(FileFieldCheckMixin, ModelForm):
     data = forms.DateField(required=True)
+    restrito = forms.ChoiceField(
+        label=_('Documento Restrito?'),
+        widget=forms.RadioSelect(),
+        choices=YES_NO_CHOICES,
+        initial=False)
 
     class Meta:
         model = DocumentoAcessorio
         fields = ['tipo', 'nome', 'data', 'autor',
-                  'ementa', 'indexacao', 'arquivo']
+                  'ementa', 'indexacao', 'arquivo',
+                  'restrito', 'justificativa_restricao']
 
     def clean(self):
         super(DocumentoAcessorioForm, self).clean()

sapl/materia/migrations/0082_auto_20220929_1450.py

@@ -0,0 +1,23 @@
+# Generated by Django 2.2.28 on 2022-09-29 17:50
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('materia', '0081_auto_20220321_0934'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='documentoacessorio',
+            name='justificativa_restricao',
+            field=models.TextField(blank=True, verbose_name='Justificativa de Restrição'),
+        ),
+        migrations.AddField(
+            model_name='documentoacessorio',
+            name='restrito',
+            field=models.BooleanField(blank=True, default=False, verbose_name='Restrito'),
+        ),
+    ]

sapl/materia/models.py

@@ -562,6 +562,11 @@ class DocumentoAcessorio(models.Model):
     proposicao = GenericRelation('Proposicao', related_query_name='proposicao')
     data_ultima_atualizacao = models.DateTimeField(
         blank=True, null=True, auto_now=True, verbose_name=_('Data'))
+    restrito = models.BooleanField(default=False,
+                                   verbose_name=_('Restrito'),
+                                   blank=True)
+    justificativa_restricao = models.TextField(
+        blank=True, verbose_name=_('Justificativa de Restrição'))
 
     class Meta:
         verbose_name = _('Documento Acessório')

sapl/materia/views.py

@@ -1595,6 +1595,46 @@ class DocumentoAcessorioCrud(MasterDetailCrud):
             context = super(UpdateView, self).get_context_data(**kwargs)
             return context
 
+    class ListView(MasterDetailCrud.ListView):
+
+        def get_queryset(self):
+            qs = super(MasterDetailCrud.ListView, self).get_queryset()
+            kwargs = {self.crud.parent_field: self.kwargs['pk']}
+            exibir_restritos = 'materia.change_documentoacessorio' in self.request.user.get_all_permissions()
+            if 'o' in self.request.GET:
+                o = self.request.GET['o']
+                indice_field = abs(int(o)) - 1
+                if '-' in o:
+                    order_by = '-' + self.list_field_names[indice_field]
+                else:
+                    order_by = self.list_field_names[indice_field]
+                if exibir_restritos:
+                    return qs.filter(**kwargs).order_by(order_by, '-data', '-id')
+                else:
+                    return qs.filter(**kwargs).order_by('restrito', order_by, '-data', '-id')
+
+            if exibir_restritos:
+               return qs.filter(**kwargs).order_by('-data', '-id')
+            else:
+               return qs.filter(**kwargs).order_by('restrito', '-data', '-id')
+
+    class DetailView(MasterDetailCrud.DetailView):
+        layout_key = 'DocumentoAcessorioAdministrativo'
+        template_name = "materia/documentoacessorio_detail.html"
+
+        def get_context_data(self, **kwargs):
+            context = super().get_context_data(**kwargs)
+            context['AppConfig'] = sapl.base.models.AppConfig.objects.all().last()
+            context['user'] = self.request.user
+
+            doc = DocumentoAcessorio.objects.get(
+                pk=self.kwargs['pk']
+            )
+            context['object'] = doc
+            if doc.restrito and not 'materia.change_documentoacessorio' in self.request.user.get_all_permissions():
+                context['title'] = 'Documento Restrito'
+            return context
+
 
 class AutoriaCrud(MasterDetailCrud):
     model = Autoria
@@ -2893,13 +2933,15 @@ class TipoMateriaCrud(CrudAux):
             return fv
 
 
-def create_zip_docacessorios(materia):
+def create_zip_docacessorios(materia, excluir_restritos):
     """
         Creates in memory zip files
     """
     logger = logging.getLogger(__name__)
     docs = materia.documentoacessorio_set. \
         all().values_list('arquivo', flat=True)
+    if excluir_restritos:
+        docs = docs.filter(restrito=False)
     if not docs:
         return None, None
 
@@ -2929,10 +2971,14 @@ def create_zip_docacessorios(materia):
 def get_zip_docacessorios(request, pk):
     logger = logging.getLogger(__name__)
     username = 'Usuário anônimo' if request.user.is_anonymous else request.user.username
+    if request.user.is_anonymous or not 'protocoloadm.change_documentoacessorioadministrativo' in request.user.get_all_permissions():
+        excluir_restritos = True
+    else:
+        excluir_restritos = False
     materia = get_object_or_404(MateriaLegislativa, pk=pk)
     data = None
     try:
-        external_name, data = create_zip_docacessorios(materia)
+        external_name, data = create_zip_docacessorios(materia, excluir_restritos)
         logger.info(
             "user= {}. Gerou o zip compilado de documento acessorios".format(username))
     except FileNotFoundError:
@@ -2961,13 +3007,15 @@ def get_zip_docacessorios(request, pk):
     return response
 
 
-def create_pdf_docacessorios(materia):
+def create_pdf_docacessorios(materia,excluir_restritos):
     """
         Creates a unified in memory PDF file
     """
     logger = logging.getLogger(__name__)
     docs = materia.documentoacessorio_set. \
         all().values_list('arquivo', flat=True)
+    if excluir_restritos:
+        docs = docs.filter(restrito=False)
     if not docs:
         return None, None
 
@@ -3002,8 +3050,12 @@ def get_pdf_docacessorios(request, pk):
     materia = get_object_or_404(MateriaLegislativa, pk=pk)
     logger = logging.getLogger(__name__)
     username = 'Usuário anônimo' if request.user.is_anonymous else request.user.username
+    if request.user.is_anonymous or not 'protocoloadm.change_documentoacessorioadministrativo' in request.user.get_all_permissions():
+        excluir_restritos = True
+    else:
+        excluir_restritos = False
     try:
-        external_name, data = create_pdf_docacessorios(materia)
+        external_name, data = create_pdf_docacessorios(materia, excluir_restritos)
         logger.info(
             "user= {}. Gerou o pdf compilado de documento acessorios".format(username))
     except FileNotFoundError:

sapl/protocoloadm/forms.py

@@ -623,14 +623,22 @@ class ProtocoloMateriaForm(ModelForm):
 
 class DocumentoAcessorioAdministrativoForm(FileFieldCheckMixin, ModelForm):
 
+    restrito = forms.ChoiceField(
+        label=_('Documento Restrito?'),
+        widget=forms.RadioSelect(),
+        choices=YES_NO_CHOICES,
+        initial=False)
+
     class Meta:
         model = DocumentoAcessorioAdministrativo
         fields = ['tipo',
                   'nome',
+                  'restrito',
                   'data',
                   'autor',
                   'arquivo',
-                  'assunto']
+                  'assunto',
+                  'justificativa_restricao']
 
         widgets = {
             'data': forms.DateInput(format='%d/%m/%Y')

sapl/protocoloadm/migrations/0044_auto_20220923_0946.py

@@ -0,0 +1,23 @@
+# Generated by Django 2.2.28 on 2022-09-23 12:46
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('protocoloadm', '0043_auto_20220919_1705'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='documentoacessorioadministrativo',
+            name='justificativa_restricao',
+            field=models.TextField(blank=True, verbose_name='Justificativa de Restrição'),
+        ),
+        migrations.AddField(
+            model_name='documentoacessorioadministrativo',
+            name='restrito',
+            field=models.BooleanField(blank=True, default=False, verbose_name='Restrito'),
+        ),
+    ]

sapl/protocoloadm/models.py

@@ -362,6 +362,11 @@ class DocumentoAcessorioAdministrativo(models.Model):
     assunto = models.TextField(
         blank=True, verbose_name=_('Assunto'))
     indexacao = models.TextField(blank=True)
+    restrito = models.BooleanField(default=False,
+                                   verbose_name=_('Restrito'),
+                                   blank=True)
+    justificativa_restricao = models.TextField(
+        blank=True, verbose_name=_('Justificativa de Restrição'))
 
     class Meta:
         verbose_name = _('Documento Acessório')

sapl/protocoloadm/views.py

@@ -398,10 +398,15 @@ class AcompanhamentoDocumentoView(CreateView):
 class DocumentoAdministrativoMixin:
 
     def has_permission(self):
+
+        if self.model == DocumentoAcessorioAdministrativo and 'docadm/' + self.kwargs['pk'] in str(self.request):
+            doc_adm = DocumentoAdministrativo.objects.get(id=self.kwargs['pk'])
+            if doc_adm.restrito and not 'protocoloadm.change_documentoacessorioadministrativo' in self.request.user.get_all_permissions():
+                return False
+
         app_config = AppConfig.objects.last()
         if app_config and app_config.documentos_administrativos == 'O':
             return True
-
         return super().has_permission()
 
 
@@ -1459,15 +1464,51 @@ class DocumentoAcessorioAdministrativoCrud(MasterDetailCrud):
         form_class = DocumentoAcessorioAdministrativoForm
 
     class ListView(DocumentoAdministrativoMixin, MasterDetailCrud.ListView):
+        template_name = "protocoloadm/documentoacessorioadministrativo_list.html"
 
         def get_queryset(self):
             qs = super(MasterDetailCrud.ListView, self).get_queryset()
             kwargs = {self.crud.parent_field: self.kwargs['pk']}
-            return qs.filter(**kwargs).order_by('-data', '-id')
+            exibir_restritos = 'protocoloadm.change_documentoacessorioadministrativo' in self.request.user.get_all_permissions()
+            if 'o' in self.request.GET:
+                o = self.request.GET['o']
+                indice_field = abs(int(o)) - 1
+                if '-' in o:
+                    order_by = '-' + self.list_field_names[indice_field]
+                else:
+                    order_by = self.list_field_names[indice_field]
+                if exibir_restritos:
+                    return qs.filter(**kwargs).order_by(order_by, '-data', '-id')
+                else:
+                    return qs.filter(**kwargs).order_by('restrito', order_by, '-data', '-id')
+
+            if exibir_restritos:
+               return qs.filter(**kwargs).order_by('-data', '-id')
+            else:
+               return qs.filter(**kwargs).order_by('restrito', '-data', '-id')
+
 
     class DetailView(DocumentoAdministrativoMixin,
                      MasterDetailCrud.DetailView):
-        pass
+        layout_key = 'DocumentoAcessorioAdministrativo'
+        template_name = "protocoloadm/documentoacessorioadministrativo_detail.html"
+
+        def get_context_data(self, **kwargs):
+            context = super().get_context_data(**kwargs)
+            context['AppConfig'] = sapl.base.models.AppConfig.objects.all().last()
+            context['user'] = self.request.user
+            doc_acessorio = DocumentoAcessorioAdministrativo.objects.get(
+                pk=self.kwargs['pk'])
+            doc_adm = DocumentoAdministrativo.objects.get(
+                id=doc_acessorio.documento_id)
+            if not doc_adm.restrito:
+                context['doc_adm_restrito'] = False
+                context['object'] = doc_acessorio
+            else:
+                context['doc_adm_restrito'] = True
+            if (doc_adm.restrito or doc_acessorio.restrito) and not 'protocoloadm.change_documentoacessorioadministrativo' in self.request.user.get_all_permissions():
+                context['title'] = 'Documento Restrito'
+            return context
 
 
 def atualizar_numero_documento(request):

sapl/templates/materia/documentoacessorio_detail.html

@@ -0,0 +1,84 @@
+{% extends "crud/detail_detail.html" %}
+{% load i18n common_tags %}
+{% load tz %}
+
+{% block detail_content %}
+
+  {% if not object.restrito or 'materia.change_documentoacessorio' in user.get_all_permissions %}
+     <div class="row">
+      <div class="col-sm-6">
+        <div id="div_id_tipo" class="form-group">
+          <p class="control-label">{%field_verbose_name object 'tipo'%}</p>
+          <div class="controls">
+            <div class="form-control-static">{{object.tipo}}</div>
+          </div>
+        </div>
+      </div>
+      <div class="col-sm-6">
+        <div id="div_id_autor" class="form-group">
+          <p class="control-label">{%field_verbose_name object 'autor'%}</p>
+          <div class="controls">
+            <div class="form-control-static">{{object.autor}}</div>
+          </div>
+        </div>
+      </div>
+     </div>
+     <div class="row">
+      <div class="col-sm-6">
+        <div id="div_id_nome" class="form-group">
+          <p class="control-label">{%field_verbose_name object 'nome'%}</p>
+          <div class="controls">
+            <div class="form-control-static">{{object.nome}}</div>
+          </div>
+        </div>
+      </div>
+      <div class="col-sm-6">
+        <div id="div_id_data" class="form-group">
+          <p class="control-label">{%field_verbose_name object 'data'%}</p>
+          <div class="controls">
+            <div class="form-control-static">{{object.data}}</div>
+          </div>
+        </div>
+      </div>
+     </div>
+     <div class="row">
+      <div class="col-sm-12">
+        <div id="div_id_arquivo" class="form-group">
+          <p class="control-label">{%field_verbose_name object 'arquivo'%}</p>
+          <div class="controls">
+            <div class="form-control-static">
+              {% if object.arquivo %}
+                <a href="{{object.arquivo.url}}">{{object.arquivo.name}}</a>
+              {% endif %}
+            </div>
+          </div>
+        </div>
+      </div>
+     </div>
+     <div class="row">
+      <div class="col-sm-2">
+        <div id="div_id_restrito" class="form-group">
+          <p class="control-label">{%field_verbose_name object 'restrito'%}</p>
+          <div class="controls">
+            <div class="form-control-static">{% if object.restrito %}Sim{% else %}Não{% endif %}</div>
+          </div>
+        </div>
+      </div>
+      <div class="col-sm-10">
+        <div id="div_id_justificativa_restricao" class="form-group">
+          <p class="control-label">{%field_verbose_name object 'justificativa_restricao'%}</p>
+          <div class="controls">
+            <div class="form-control-static">{{object.justificativa_restricao}}</div>
+          </div>
+        </div>
+      </div>
+     </div>
+  {% else %}
+     <br><br>
+      <div class="alert alert-danger alert-dismissible" role="alert">
+        <h3>Documento restrito</h3>
+        {{ object.justificativa_restricao }}
+      </div>
+  {% endif %}
+{% endblock detail_content %}
+

sapl/templates/materia/documentoacessorio_list.html

@@ -1,5 +1,68 @@
 {% extends "crud/list.html" %}
-{% load i18n %}
+{% load i18n common_tags %}
+
+{% block container_table_list %}
+  {% if not rows %}
+    <p>{{ NO_ENTRIES_MSG }}</p>
+  {% else %}
+    <div class="container-table">
+      <div class="result-count">{% blocktrans with verbose_name_plural=view.verbose_name_plural %}Total de {{ verbose_name_plural }}: <strong>{{count}}</strong>{% endblocktrans %}</div>
+      <table class="table table-striped table-hover table-link-ordering">
+        <thead>
+          <tr>
+            {% for name in headers %}
+              <th>
+                {% if view.ordered_list %}
+                  <a title="{% trans 'Clique para alterar a ordem a listagem'%}" href="?o={% if 'o' not in request.GET and forloop.counter == 1 or 'o' in request.GET and forloop.counter|safe == request.GET.o %}-{%endif%}{{forloop.counter}}{{ordering_url}}">
+                    {{ name }}
+                    {% if 'o' in request.GET or not view.ordering %}
+                      {% if 'o' not in request.GET and forloop.counter == 1 or 'o' in request.GET and forloop.counter|safe == request.GET.o %}
+                        <span class="caret top" title="{% trans 'Listado na Ordem Ascendente'%}"></span>
+                      {% elif 'o' in request.GET and forloop.counter == request.GET.o|str2intabs %}
+                        <span class="caret" title="{% trans 'Listado na Ordem Descendente'%}"></span>
+                      {% endif %}
+                    {% endif %}
+                  </a>
+                {% else %}
+                    {{ name }}
+                {% endif %}
+              </th>
+            {% endfor %}
+          </tr>
+        </thead>
+        <tbody>
+        {% for doc in object_list %}
+         <tr>
+          {% if not doc.restrito or 'materia.change_documentoacessorio' in request.user.get_all_permissions %}
+            <td>
+              <a href="{% url 'sapl.materia:documentoacessorio_detail' doc.id %}">{{ doc.nome }}</a>
+            </td>
+            <td>
+              {{ doc.tipo }}
+            </td>
+            <td>
+              {% if doc.data %}{{ doc.data }}{% endif %}
+            </td>
+            <td>
+              {% if doc.autor %}{{ doc.autor }}{% endif %}
+            </td>
+            <td>
+              {% if doc.arquivo %}<a href="{{ doc.arquivo.url }}">Ver arquivo{% endif %}
+            </td>
+          {% else %}
+            <td colspan=5>
+              <strong style="color: red">Documento Restrito</strong></br>{{ doc.justificativa_restricao|safe }}
+            </td>
+          {% endif %}
+         </tr>
+        {% endfor %}
+      </tbody>
+      </table>
+    </div>
+  {% endif %}
+{% endblock container_table_list %}
+
+
 {% block base_content %}
   {{ block.super }}
   <div style="display:flex;padding-left: 600px;padding-top: 10px;">
@@ -10,4 +73,4 @@
         <a href="{% url 'sapl.materia:compress_docacessorios' root_pk %}" class="btn btn-outline-primary">{% trans 'Baixar documentos compactados' %}</a>
     </div>
   </div>
-{% endblock %}
+{% endblock %}

sapl/templates/materia/layouts.yaml

@@ -75,6 +75,8 @@ DocumentoAcessorio:
   - ementa
   - indexacao
   - arquivo
+  - restrito
+  - justificativa_restricao
 
 Numeracao:
   {% trans 'Numeração' %}:
@@ -172,4 +174,4 @@ ConfigEtiquetaMateriaLegislativa:
   {% trans 'Configurações de Etiqueta' %}:
   - largura
   - altura
-  - mostrar_em_arquivo
+  - mostrar_em_arquivo

sapl/templates/protocoloadm/documentoacessorioadministrativo_detail.html

@@ -0,0 +1,95 @@
+{% extends "crud/detail_detail.html" %}
+{% load i18n common_tags %}
+{% load tz %}
+
+{% block detail_content %}
+
+  {% if not object.restrito and not doc_adm_restrito or 'protocoloadm.change_documentoacessorioadministrativo' in user.get_all_permissions %}
+     <div class="row">
+      <div class="col-sm-6">
+        <div id="div_id_tipo" class="form-group">
+          <p class="control-label">{%field_verbose_name object 'tipo'%}</p>
+          <div class="controls">
+            <div class="form-control-static">{{object.tipo}} </div>
+          </div>
+        </div>
+      </div>
+      <div class="col-sm-6">
+        <div id="div_id_autor" class="form-group">
+          <p class="control-label">{%field_verbose_name object 'autor'%}</p>
+          <div class="controls">
+            <div class="form-control-static">{{object.autor}}</div>
+          </div>
+        </div>
+      </div>
+     </div>
+     <div class="row">
+      <div class="col-sm-6">
+        <div id="div_id_nome" class="form-group">
+          <p class="control-label">{%field_verbose_name object 'nome'%}</p>
+          <div class="controls">
+            <div class="form-control-static">{{object.nome}}</div>
+          </div>
+        </div>
+      </div>
+      <div class="col-sm-6">
+        <div id="div_id_data" class="form-group">
+          <p class="control-label">{%field_verbose_name object 'data'%}</p>
+          <div class="controls">
+            <div class="form-control-static">{{object.data}}</div>
+          </div>
+        </div>
+      </div>
+     </div>
+     <div class="row">
+      <div class="col-sm-12">
+        <div id="div_id_arquivo" class="form-group">
+          <p class="control-label">{%field_verbose_name object 'arquivo'%}</p>
+          <div class="controls">
+            <div class="form-control-static">
+              {% if object.arquivo %}
+                <a href="{{object.arquivo.url}}">{{object.arquivo.name}}</a>
+              {% endif %}
+            </div>
+          </div>
+        </div>
+      </div>
+     </div>
+     <div class="row">
+      <div class="col-sm-12">
+        <div id="div_id_assunto" class="form-group">
+          <p class="control-label">{%field_verbose_name object 'assunto'%}</p>
+          <div class="controls">
+            <div class="form-control-static">{{object.assunto}}</div>
+          </div>
+        </div>
+      </div>
+     </div>
+     <div class="row">
+      <div class="col-sm-2">
+        <div id="div_id_restrito" class="form-group">
+          <p class="control-label">{%field_verbose_name object 'restrito'%}</p>
+          <div class="controls">
+            <div class="form-control-static">{% if object.restrito %}Sim{% else %}Não{% endif %}</div>
+          </div>
+        </div>
+      </div>
+      <div class="col-sm-10">
+        <div id="div_id_justificativa_restricao" class="form-group">
+          <p class="control-label">{%field_verbose_name object 'justificativa_restricao'%}</p>
+          <div class="controls">
+            <div class="form-control-static">{{object.justificativa_restricao}}</div>
+          </div>
+        </div>
+      </div>
+     </div>
+  {% else %}
+     <br><br>
+      <div class="alert alert-danger alert-dismissible" role="alert">
+        <h3>Documento restrito</h3>
+        {% if object.restrito %}
+          {{ object.justificativa_restricao }}
+        {% endif %}
+      </div>
+  {% endif %}
+{% endblock detail_content %}

sapl/templates/protocoloadm/documentoacessorioadministrativo_list.html

@@ -1,6 +1,66 @@
 {% extends "crud/list.html" %}
-{% load i18n %}
-{% load common_tags %}
+{% load i18n common_tags crispy_forms_tags%}
+
+{% block container_table_list %}
+  {% if not rows %}
+    <p>{{ NO_ENTRIES_MSG }}</p>
+  {% else %}
+    <div class="container-table">
+      <div class="result-count">{% blocktrans with verbose_name_plural=view.verbose_name_plural %}Total de {{ verbose_name_plural }}: <strong>{{count}}</strong>{% endblocktrans %}</div>
+      <table class="table table-striped table-hover table-link-ordering">
+        <thead>
+          <tr>
+            {% for name in headers %}
+              <th>
+                {% if view.ordered_list %}
+                  <a title="{% trans 'Clique para alterar a ordem a listagem'%}" href="?o={% if 'o' not in request.GET and forloop.counter == 1 or 'o' in request.GET and forloop.counter|safe == request.GET.o %}-{%endif%}{{forloop.counter}}{{ordering_url}}">
+                    {{ name }}
+                    {% if 'o' in request.GET or not view.ordering %}
+                      {% if 'o' not in request.GET and forloop.counter == 1 or 'o' in request.GET and forloop.counter|safe == request.GET.o %}
+                        <span class="caret top" title="{% trans 'Listado na Ordem Ascendente'%}"></span>
+                      {% elif 'o' in request.GET and forloop.counter == request.GET.o|str2intabs %}
+                        <span class="caret" title="{% trans 'Listado na Ordem Descendente'%}"></span>
+                      {% endif %}
+                    {% endif %}
+                  </a>
+                {% else %}
+                    {{ name }}
+                {% endif %}
+              </th>
+            {% endfor %}
+          </tr>
+        </thead>
+        <tbody>
+        {% for doc in object_list %}
+         <tr>
+          {% if not doc.restrito or 'protocoloadm.change_documentoacessorioadministrativo' in request.user.get_all_permissions %}
+            <td>
+              <a href="{% url 'sapl.protocoloadm:documentoacessorioadministrativo_detail' doc.id %}">{{ doc.nome }}</a>
+            </td>
+            <td>
+              {{ doc.tipo }}
+            </td>
+            <td>
+              {% if doc.data %}{{ doc.data }}{% endif %}
+            </td>
+            <td>
+              {% if doc.autor %}{{ doc.autor }}{% endif %}
+            </td>
+            <td>
+              {% if doc.assunto %}{{ doc.assunto }}{% endif %}
+            </td>
+          {% else %}
+            <td colspan=5>
+              <strong style="color: red">Documento Restrito</strong></br>{{ doc.justificativa_restricao|safe }}
+            </td>
+          {% endif %}
+         </tr>
+        {% endfor %}
+     </tbody>
+      </table>
+    </div>
+  {% endif %}
+{% endblock container_table_list %}
 
 {% block base_content %}
   {{ block.super }}
@@ -9,4 +69,4 @@
         <a href="{% url 'sapl.protocoloadm:merge_docacessorios' root_pk %}" class="btn btn-outline-primary">{% trans 'Baixar documentos como PDF único' %}</a>
     </div>
   </div>
-{% endblock base_content%}
+{% endblock base_content%}

sapl/templates/protocoloadm/layouts.yaml

@@ -24,6 +24,8 @@ DocumentoAcessorioAdministrativo:
   - nome  data
   - arquivo
   - assunto
+  - restrito
+  - justificativa_restricao
 
 StatusTramitacaoAdministrativo:
   {% trans 'Status Tramitação Administrativo' %}: