Browse Source

Fix Chamado 493294 (osTicket) (#2345)

* Fix Chamado #493294

* Troca de .get por .filter

* Fix Chamado #493294

* Fix Chamado #493294
pull/2365/head
AndreSouto 6 years ago
committed by Edward
parent
commit
efa793ace3
  1. 23
      sapl/materia/models.py

23
sapl/materia/models.py

@ -2,7 +2,7 @@
from django.contrib.auth.models import Group from django.contrib.auth.models import Group
from django.contrib.contenttypes.fields import GenericRelation from django.contrib.contenttypes.fields import GenericRelation
from django.contrib.contenttypes.models import ContentType from django.contrib.contenttypes.models import ContentType
from django.core.exceptions import ObjectDoesNotExist from django.core.exceptions import ObjectDoesNotExist,MultipleObjectsReturned
from django.db import models from django.db import models
from django.db.models.functions import Concat from django.db.models.functions import Concat
from django.template import defaultfilters from django.template import defaultfilters
@ -261,18 +261,15 @@ class MateriaLegislativa(models.Model):
''' '''
from sapl.protocoloadm.models import Protocolo from sapl.protocoloadm.models import Protocolo
if self.ano and self.numero_protocolo: if self.ano and self.numero_protocolo:
try: protocolo = Protocolo.objects.filter(
protocolo = Protocolo.objects.get( ano=self.ano,
ano=self.ano, numero=self.numero_protocolo)
numero=self.numero_protocolo) if protocolo.first().timestamp:
if protocolo.timestamp: return protocolo.first().timestamp.date()
return protocolo.timestamp.date() else:
else: return protocolo.data
return protocolo.data else:
except ObjectDoesNotExist: return ''
pass
return ''
def delete(self, using=None, keep_parents=False): def delete(self, using=None, keep_parents=False):
if self.texto_original: if self.texto_original:

Loading…
Cancel
Save