Browse Source

Remove botão Salvar e adicionar outro da tela de Casas para evitar confusões. Gertiq #219927

dependabot/pip/requirements/pillow-11.3.0 4.0.3
Sesóstris Vieira 3 months ago
parent
commit
2c24621f18
  1. 2
      requirements/requirements.txt
  2. 22
      sigi/apps/casas/admin.py

2
requirements/requirements.txt

@ -30,5 +30,5 @@ django-localflavor==4.0
django-tinymce==4.1.0 django-tinymce==4.1.0
django-weasyprint==2.4.0 django-weasyprint==2.4.0
djangorestframework==3.16.0 djangorestframework==3.16.0
djbs-theme @ git+https://github.com/interlegis/djbs-theme.git@1.0.1 djbs-theme @ git+https://github.com/interlegis/djbs-theme.git@1.0.2
django-dashboard @ git+https://github.com/interlegis/django-dashboard.git django-dashboard @ git+https://github.com/interlegis/django-dashboard.git

22
sigi/apps/casas/admin.py

@ -191,6 +191,9 @@ class ListaFuncionarioInline(admin.TabularInline):
qs = super().get_queryset(request) qs = super().get_queryset(request)
return qs.exclude(desativado=True) return qs.exclude(desativado=True)
def has_change_permission(self, request, obj):
return False
@admin.display(description=_("setor")) @admin.display(description=_("setor"))
def get_setor(self, func): def get_setor(self, func):
if func.setor == "contato_interlegis": if func.setor == "contato_interlegis":
@ -469,8 +472,9 @@ class OrgaoAdmin(AsciifyQParameter, ExportActionMixin, admin.ModelAdmin):
"bairro", "bairro",
"logradouro", "logradouro",
"cep", "cep",
"municipio__nome", "municipio__search_text",
"municipio__uf__nome", "municipio__uf__search_text",
"municipio__uf__sigla",
"municipio__codigo_ibge", "municipio__codigo_ibge",
"pagina_web", "pagina_web",
"observacoes", "observacoes",
@ -491,6 +495,15 @@ class OrgaoAdmin(AsciifyQParameter, ExportActionMixin, admin.ModelAdmin):
queryset = super().get_queryset(request) queryset = super().get_queryset(request)
return queryset.prefetch_related("gerentes_interlegis", "convenio_set") return queryset.prefetch_related("gerentes_interlegis", "convenio_set")
def changeform_view(
self, request, object_id, form_url, extra_context=None
):
extra_context = extra_context or {}
extra_context["show_save_and_add_another"] = False
return super().changeform_view(
request, object_id, form_url, extra_context
)
def save_related(self, request, form, formsets, change): def save_related(self, request, form, formsets, change):
ocorrencia_formset = next( ocorrencia_formset = next(
filter(lambda f: f.model == Ocorrencia, formsets), None filter(lambda f: f.model == Ocorrencia, formsets), None
@ -501,13 +514,14 @@ class OrgaoAdmin(AsciifyQParameter, ExportActionMixin, admin.ModelAdmin):
except Servidor.DoesNotExist: except Servidor.DoesNotExist:
servidor = None servidor = None
if servidor is not None: if servidor is not None:
ocorrencia_formset.save(commit=False) instances = ocorrencia_formset.save(commit=False)
for obj in ocorrencia_formset.new_objects: for obj in instances:
if ( if (
not hasattr(obj, "servidor_registro") not hasattr(obj, "servidor_registro")
or obj.servidor_registro is None or obj.servidor_registro is None
): ):
obj.servidor_registro = servidor obj.servidor_registro = servidor
obj.save()
return super().save_related(request, form, formsets, change) return super().save_related(request, form, formsets, change)
@admin.display( @admin.display(

Loading…
Cancel
Save