diff --git a/src/admin/projects.py b/src/admin/projects.py
index 30989e6..c10f3c4 100644
--- a/src/admin/projects.py
+++ b/src/admin/projects.py
@@ -8,7 +8,6 @@ from src.admin.shared import (
format_currency,
format_placeholder,
format_strong,
- format_strong_with_subtext,
)
from src.models.projects import Milestone, Project, Task
diff --git a/src/admin/services.py b/src/admin/services.py
index 87c04e9..e5a43b2 100644
--- a/src/admin/services.py
+++ b/src/admin/services.py
@@ -6,6 +6,7 @@ from src.admin.shared import (
admin_site,
format_badge,
format_boolean_icon,
+ format_colored_text_with_subtext,
format_currency,
format_link,
format_placeholder,
@@ -132,12 +133,7 @@ class ServiceAdmin(admin.ModelAdmin):
color = "#28a745"
label = f"In {delta}d"
- return format_html(
- "{}
{}",
- color,
- label,
- obj.expiry_date,
- )
+ return format_colored_text_with_subtext(color, label, obj.expiry_date)
expiry_display.short_description = "Expiry"
diff --git a/src/admin/shared.py b/src/admin/shared.py
index ac69b24..b42f073 100644
--- a/src/admin/shared.py
+++ b/src/admin/shared.py
@@ -1,5 +1,7 @@
from django.utils.html import format_html
-from src.admin.base import * #noqa: F401
+
+from src.admin.base import admin_site # noqa: F401
+
def format_strong(text):
return format_html("{}", text)
@@ -52,4 +54,13 @@ def format_link(url, label=None):
format_html("{}", url, label or url)
if url
else format_placeholder()
- )
\ No newline at end of file
+ )
+
+
+def format_colored_text_with_subtext(color, label, subtext):
+ return format_html(
+ "{}
{}",
+ color,
+ label,
+ subtext,
+ )
diff --git a/src/migrations/0001_initial.py b/src/migrations/0001_initial.py
index 0ce8683..22b2fb1 100644
--- a/src/migrations/0001_initial.py
+++ b/src/migrations/0001_initial.py
@@ -6,7 +6,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
initial = True
dependencies = []
diff --git a/src/migrations/0002_alter_client_phone.py b/src/migrations/0002_alter_client_phone.py
index b6e151e..5740785 100644
--- a/src/migrations/0002_alter_client_phone.py
+++ b/src/migrations/0002_alter_client_phone.py
@@ -5,7 +5,6 @@ from django.db import migrations
class Migration(migrations.Migration):
-
dependencies = [
("src", "0001_initial"),
]