Browse Source

Atualiza tema e corrige bug de filtro

master 4.0.23
Sesóstris Vieira 1 week ago
parent
commit
530c62c82d
  1. 2
      requirements/requirements.txt
  2. 12
      sigi/apps/servicos/admin.py

2
requirements/requirements.txt

@ -33,6 +33,6 @@ tzdata==2026.1
uritemplate==4.2.0 uritemplate==4.2.0
weasyprint==68.1 weasyprint==68.1
xlsxwriter==3.2.9 xlsxwriter==3.2.9
djbs-theme @ git+https://github.com/interlegis/djbs-theme.git@v1.0.7 djbs-theme @ git+https://github.com/interlegis/djbs-theme.git@v1.0.8
django-dashboard @ git+https://github.com/interlegis/django-dashboard.git django-dashboard @ git+https://github.com/interlegis/django-dashboard.git
dx-job-controller @ git+https://github.com/interlegis/dx-job-controller.git@v1.0.0 dx-job-controller @ git+https://github.com/interlegis/dx-job-controller.git@v1.0.0

12
sigi/apps/servicos/admin.py

@ -1,6 +1,7 @@
from django.contrib import admin from django.contrib import admin
from django.urls import reverse from django.urls import reverse
from django.utils.encoding import force_str from django.utils.encoding import force_str
from django.utils.html import escape
from django.utils.safestring import mark_safe from django.utils.safestring import mark_safe
from django.http import Http404, HttpResponseRedirect from django.http import Http404, HttpResponseRedirect
from django.utils.translation import gettext as _ from django.utils.translation import gettext as _
@ -137,6 +138,8 @@ class ServicoAdmin(ReturnMixin, ExportActionMixin, admin.ModelAdmin):
def getUrl(self, obj): def getUrl(self, obj):
url = obj.url url = obj.url
if url == "":
return ""
if "//" not in url: if "//" not in url:
url = "//" + url url = "//" + url
return mark_safe(f'<a href="{url}" target="_blank">{obj.url}</a>') return mark_safe(f'<a href="{url}" target="_blank">{obj.url}</a>')
@ -144,11 +147,12 @@ class ServicoAdmin(ReturnMixin, ExportActionMixin, admin.ModelAdmin):
getUrl.short_description = _("Url") getUrl.short_description = _("Url")
def get_link_erro(self, obj): def get_link_erro(self, obj):
if not obj.erro_atualizacao: erro = escape(obj.erro_atualizacao)
if not erro:
return "" return ""
url = obj.url url = obj.url
if not url: if not url:
return obj.erro_atualizacao return erro
if url[-1] != "/": if url[-1] != "/":
url += "/" url += "/"
if obj.tipo_servico.string_pesquisa: if obj.tipo_servico.string_pesquisa:
@ -157,9 +161,7 @@ class ServicoAdmin(ReturnMixin, ExportActionMixin, admin.ModelAdmin):
] ]
elif obj.tipo_servico.modo == "R": elif obj.tipo_servico.modo == "R":
url = f"https://toolbox.googleapps.com/apps/dig/#SOA/{obj.url}" url = f"https://toolbox.googleapps.com/apps/dig/#SOA/{obj.url}"
return mark_safe( return mark_safe(f'<a href="{url}" target="_blank">{erro}</a>')
f'<a href="{url}" target="_blank">{obj.erro_atualizacao}</a>'
)
get_link_erro.short_description = _("Erro na atualização") get_link_erro.short_description = _("Erro na atualização")
get_link_erro.admin_order_field = "erro_atualizacao" get_link_erro.admin_order_field = "erro_atualizacao"

Loading…
Cancel
Save