Merge branch '3.1.x' into add-regime-tramitacao-obr

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,

sapl/rules/map_rules.py

@@ -118,6 +118,8 @@ rules_group_materia = {
         (materia.Autoria, __base__, __perms_publicas__),
         (materia.DespachoInicial, __base__, __perms_publicas__),
         (materia.DocumentoAcessorio, __base__, __perms_publicas__),
+        (materia.MateriaAssunto, __base__, __perms_publicas__),
+        (materia.AssuntoMateria, __base__, __perms_publicas__),
 
         (materia.MateriaLegislativa, __base__ +
          ['can_access_impressos'], __perms_publicas__),

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('---------------------------------------------------------------------')
+