From d55a7a54febd2f1e821c890036b3403736fdc21d Mon Sep 17 00:00:00 2001 From: Victor Fabre Date: Wed, 10 Apr 2019 15:16:21 -0300 Subject: [PATCH 1/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 Date: Wed, 10 Apr 2019 15:19:09 -0300 Subject: [PATCH 2/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('---------------------------------------------------------------------') + From 661615116b514cc18d42be91761af81cb8e7f38b Mon Sep 17 00:00:00 2001 From: Victor Fabre Date: Wed, 10 Apr 2019 17:16:52 -0300 Subject: [PATCH 3/3] HOT-FIX: Fix #2717 --- sapl/rules/map_rules.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sapl/rules/map_rules.py b/sapl/rules/map_rules.py index d09e65961..d7f3e0b48 100644 --- a/sapl/rules/map_rules.py +++ b/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__),