From 8e761bfd3b4e0e4de5848e97b3f250499c4af2d0 Mon Sep 17 00:00:00 2001 From: Lude Ribeiro Date: Thu, 19 Aug 2021 10:37:40 -0300 Subject: [PATCH] finalizando o tkt #77 --- .../migrations/0010_auto_20210819_0833.py | 20 +++++++++++++++++++ sigi/apps/ocorrencias/admin.py | 14 ++++++------- 2 files changed, 27 insertions(+), 7 deletions(-) create mode 100644 sigi/apps/convenios/migrations/0010_auto_20210819_0833.py diff --git a/sigi/apps/convenios/migrations/0010_auto_20210819_0833.py b/sigi/apps/convenios/migrations/0010_auto_20210819_0833.py new file mode 100644 index 0000000..e1827de --- /dev/null +++ b/sigi/apps/convenios/migrations/0010_auto_20210819_0833.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('convenios', '0009_auto_20210611_0946'), + ] + + operations = [ + migrations.AlterField( + model_name='convenio', + name='data_retorno_assinatura', + field=models.DateField(help_text='Conv\xeanio firmado.', null=True, verbose_name='data in\xedcio vig\xeancia', blank=True), + preserve_default=True, + ), + ] diff --git a/sigi/apps/ocorrencias/admin.py b/sigi/apps/ocorrencias/admin.py index 2c55cc9..4f873b87 100644 --- a/sigi/apps/ocorrencias/admin.py +++ b/sigi/apps/ocorrencias/admin.py @@ -85,13 +85,13 @@ class OcorrenciaAdmin(BaseModelAdmin): def get_changelist(self, request, **kwargs): return OcorrenciaChangeList - def get_readonly_fields(self, request, obj=None): - fields = list(self.readonly_fields) - if obj is not None: - fields.extend(['casa_legislativa', 'categoria', 'tipo_contato', 'assunto', 'status', 'descricao', ]) - if obj.status in [Ocorrencia.STATUS_RESOLVIDO, Ocorrencia.STATUS_FECHADO, Ocorrencia.STATUS_DUPLICADO]: # Fechados - fields.append('prioridade') - return fields + # def get_readonly_fields(self, request, obj=None): + # fields = list(self.readonly_fields) + # if obj is not None: + # fields.extend(['casa_legislativa', 'categoria', 'tipo_contato', 'assunto', 'status', 'descricao', ]) + # if obj.status in [Ocorrencia.STATUS_RESOLVIDO, Ocorrencia.STATUS_FECHADO, Ocorrencia.STATUS_DUPLICADO]: # Fechados + # fields.append('prioridade') + # return fields def get_fieldsets(self, request, obj=None): if obj is None: