diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 39910f3..dcc9e5b 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -30,5 +30,5 @@ django-localflavor==4.0 django-tinymce==4.1.0 django-weasyprint==2.4.0 djangorestframework==3.16.0 -djbs-theme @ git+https://github.com/interlegis/djbs-theme.git +djbs-theme @ git+https://github.com/interlegis/djbs-theme.git@1.0.0 django-dashboard @ git+https://github.com/interlegis/django-dashboard.git diff --git a/sigi/apps/casas/admin.py b/sigi/apps/casas/admin.py index 8f7219f..578ee0c 100644 --- a/sigi/apps/casas/admin.py +++ b/sigi/apps/casas/admin.py @@ -215,20 +215,21 @@ class ConveniosInline(admin.TabularInline): ) ) + @mark_safe @admin.display(description=_("Status do convĂȘnio")) def status_convenio(self, obj): if obj.pk is None: - return "" + return None status = obj.get_status() if status in ["Vencido", "DesistĂȘncia", "Cancelado", "Extinto"]: - label = r"red lighten-3" + label = r"bg-danger" elif status == "Vigente": - label = r"green lighten-3" + label = r"bg-success" elif status == "Pendente": - label = r"deep-orange lighten-3" + label = r"bg-alert" else: label = r"" - return mark_safe(f'

{status}

') + return f'{status}' @admin.display(description=_("Ver no SIGAD")) def link_sigad(self, obj):