From 5adcf9c4843d0af108f6245b56fcec9c2dca78bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vin=C3=ADcius=20Cantu=C3=A1ria?= <cantuariavc@gmail.com>
Date: Wed, 10 Apr 2019 14:20:04 -0300
Subject: [PATCH 1/3] HOT-FIX: Corrige contagem de autores duplicados

---
 sapl/base/views.py                          | 7 ++-----
 sapl/templates/base/autores_duplicados.html | 8 +++-----
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/sapl/base/views.py b/sapl/base/views.py
index 2312ab721..3226b4926 100644
--- a/sapl/base/views.py
+++ b/sapl/base/views.py
@@ -1081,9 +1081,7 @@ class ListarBancadaComissaoAutorExternoView(PermissionRequiredMixin, ListView):
 
 
 def autores_duplicados():
-    return [autor.values() for autor in Autor.objects.values(
-        'nome', 'tipo__descricao').order_by(
-            "nome").annotate(count=Count('nome')).filter(count__gt=1)]
+    return [autor for autor in Autor.objects.values('nome').annotate(count=Count('nome')).filter(count__gt=1)]
 
 
 class ListarAutoresDuplicadosView(PermissionRequiredMixin, ListView):
@@ -1097,8 +1095,7 @@ class ListarAutoresDuplicadosView(PermissionRequiredMixin, ListView):
         return autores_duplicados()
 
     def get_context_data(self, **kwargs):
-        context = super(
-            ListarAutoresDuplicadosView, self).get_context_data(**kwargs)
+        context = super().get_context_data(**kwargs)
         paginator = context['paginator']
         page_obj = context['page_obj']
         context['page_range'] = make_pagination(
diff --git a/sapl/templates/base/autores_duplicados.html b/sapl/templates/base/autores_duplicados.html
index a7861aecd..361ff7add 100644
--- a/sapl/templates/base/autores_duplicados.html
+++ b/sapl/templates/base/autores_duplicados.html
@@ -11,16 +11,14 @@
                 <thead>
                   <tr>
                     <th>Autor</th>
-                    <th>Tipo de Autor</th>
                     <th>Quantidade</th>
                   </tr>
                 </thead>
                 <tbody>
-                  {% for autor, tipo, quantidade in autores_duplicados %}
+                  {% for autor in autores_duplicados %}
                     <tr>
-                        <td>{{ autor }}</td>
-                        <td>{{ tipo }}</td>
-                        <td>{{ quantidade }}</td>
+                        <td>{{ autor.nome }}</td>
+                        <td>{{ autor.count }}</td>
                      </tr>
                   {% endfor %}
                 </tbody>

From d55a7a54febd2f1e821c890036b3403736fdc21d Mon Sep 17 00:00:00 2001
From: Victor Fabre <victorfabre@me.com>
Date: Wed, 10 Apr 2019 15:16:21 -0300
Subject: [PATCH 2/3] HOT-FIX: limita caracteres capa processo

---
 sapl/protocoloadm/views.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sapl/protocoloadm/views.py b/sapl/protocoloadm/views.py
index bb5d12ed1..c400cf9a2 100755
--- a/sapl/protocoloadm/views.py
+++ b/sapl/protocoloadm/views.py
@@ -1232,8 +1232,8 @@ class FichaSelecionaAdmView(PermissionRequiredMixin, FormView):
             self.messages.add_message(self.request, messages.INFO, mensagem)
 
             return self.render_to_response(context)
-        if len(documento.assunto) > 301:
-            documento.assunto = documento.assunto[0:300] + '[...]'
+        if len(documento.assunto) > 201:
+            documento.assunto = documento.assunto[0:200] + '[...]'
         context['documento'] = documento
 
         return gerar_pdf_impressos(self.request, context,

From 33e7db1a42ee599474fe73e5f751a4b31b70a1dd Mon Sep 17 00:00:00 2001
From: Cesar Carvalho <cesaraugc@gmail.com>
Date: Wed, 10 Apr 2019 15:19:09 -0300
Subject: [PATCH 3/3] Adiciona script de checar os commits entre 3.1.x e master

---
 scripts/check_commits.py | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 scripts/check_commits.py

diff --git a/scripts/check_commits.py b/scripts/check_commits.py
new file mode 100644
index 000000000..f34c6f0c6
--- /dev/null
+++ b/scripts/check_commits.py
@@ -0,0 +1,27 @@
+import requests
+
+branch_master = requests.get('https://api.github.com/repos/interlegis/sapl/commits?per_page=100&sha=master')
+branch_master = branch_master.json()
+
+commits_master = [e['commit']['message'] for e in branch_master]
+
+branch_3_1_x = requests.get('https://api.github.com/repos/interlegis/sapl/commits?per_page=70&sha=3.1.x')
+branch_3_1_x = branch_3_1_x.json()
+
+commits_3_1_x = [(e['commit']['message'], {'sha':e['sha'], 'data':e['commit']['author']['date']}) for e in branch_3_1_x]
+
+print("\nCommits que estão em 3.1.x, mas não em master:\n")
+
+# retira os \r para evitar bugs
+commits_master = [commit.replace('\r', '') for commit in commits_master]
+
+for c, s in commits_3_1_x:
+    # retira os \r para evitar bugs
+    c = c.replace('\r', '')
+    if c not in commits_master:
+        print('---------------------------------------------------------------------')
+        print('Data: ' + s['data'][:10])
+        print(s['sha'][:7] + '-> ' + c)
+
+print('---------------------------------------------------------------------')
+