From e0c51536c33ff751121af0a87337d4b3d794df2b Mon Sep 17 00:00:00 2001 From: Edward Ribeiro Date: Wed, 10 Jul 2019 12:55:40 -0300 Subject: [PATCH] Fixes #615960 (OSTicket) --- sapl/base/tests/test_view_base.py | 26 ------------------- .../migrations/0022_auto_20190710_1254.py | 19 ++++++++++++++ sapl/protocoloadm/models.py | 1 + 3 files changed, 20 insertions(+), 26 deletions(-) create mode 100644 sapl/protocoloadm/migrations/0022_auto_20190710_1254.py diff --git a/sapl/base/tests/test_view_base.py b/sapl/base/tests/test_view_base.py index 6655317b3..c73536ddb 100644 --- a/sapl/base/tests/test_view_base.py +++ b/sapl/base/tests/test_view_base.py @@ -24,32 +24,6 @@ from sapl.base.views import (protocolos_duplicados, protocolos_com_materias, bancada_comissao_autor_externo, anexados_ciclicos) -@pytest.mark.django_db(transaction=False) -def test_lista_protocolos_duplicados(): - mommy.make( - Protocolo, - numero=15, - ano=2031 - ) - mommy.make( - Protocolo, - numero=15, - ano=2031 - ) - mommy.make( - Protocolo, - numero=33, - ano=2033 - ) - - lista_protocolos_duplicados = protocolos_duplicados() - - assert len(lista_protocolos_duplicados) == 1 - assert lista_protocolos_duplicados[0][1] == 2 - assert lista_protocolos_duplicados[0][0].numero == 15 - assert lista_protocolos_duplicados[0][0].ano == 2031 - - @pytest.mark.django_db(transaction=False) def test_lista_protocolos_com_materias(): mommy.make( diff --git a/sapl/protocoloadm/migrations/0022_auto_20190710_1254.py b/sapl/protocoloadm/migrations/0022_auto_20190710_1254.py new file mode 100644 index 000000000..cc9e3ad3d --- /dev/null +++ b/sapl/protocoloadm/migrations/0022_auto_20190710_1254.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.20 on 2019-07-10 15:54 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('protocoloadm', '0021_merge_20190429_1531'), + ] + + operations = [ + migrations.AlterUniqueTogether( + name='protocolo', + unique_together=set([('numero', 'ano')]), + ), + ] diff --git a/sapl/protocoloadm/models.py b/sapl/protocoloadm/models.py index e8413f068..1a5318fcb 100644 --- a/sapl/protocoloadm/models.py +++ b/sapl/protocoloadm/models.py @@ -119,6 +119,7 @@ class Protocolo(models.Model): permissions = ( ('action_anular_protocolo', _('Permissão para Anular Protocolo')), ) + unique_together = ('numero', 'ano',) def __str__(self): return _('%(numero)s/%(ano)s') % {