From 9b31fedd44239ad426fd4903fadbfee4b1298916 Mon Sep 17 00:00:00 2001
From: Monviech <79600909+Monviech@users.noreply.github.com>
Date: Tue, 15 Jul 2025 09:58:13 +0200
Subject: [PATCH] www/caddy: Remove obsolete model_relation_domain formatter
 (#4813)

* www/caddy: Remove obsolete model_relation_domain formatter

* www/caddy: Bump revision and changelog
---
 www/caddy/Makefile                                 |  2 +-
 www/caddy/pkg-descr                                |  1 +
 .../OPNsense/Caddy/forms/dialogHandle.xml          |  6 ------
 .../OPNsense/Caddy/forms/dialogSubdomain.xml       |  1 -
 .../app/views/OPNsense/Caddy/reverse_proxy.volt    | 14 --------------
 5 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/www/caddy/Makefile b/www/caddy/Makefile
index c2641be8c..ecbffe28a 100644
--- a/www/caddy/Makefile
+++ b/www/caddy/Makefile
@@ -1,6 +1,6 @@
 PLUGIN_NAME=		caddy
 PLUGIN_VERSION=		2.0.2
-PLUGIN_REVISION=	1
+PLUGIN_REVISION=	2
 PLUGIN_DEPENDS=		caddy-custom
 PLUGIN_COMMENT=		Modern Reverse Proxy with Automatic HTTPS, Dynamic DNS and Layer4 Routing
 PLUGIN_MAINTAINER=	cedrik@pischem.com
diff --git a/www/caddy/pkg-descr b/www/caddy/pkg-descr
index e75c90b9d..96041df58 100644
--- a/www/caddy/pkg-descr
+++ b/www/caddy/pkg-descr
@@ -12,6 +12,7 @@ Add: Global server timeout options (opnsense/plugins/pull/4778)
 Cleanup: Change all camelCase to snake_case in api notations (opnsense/plugins/pull/4767,4768,4776)
 Cleanup: Use SimpleActionButton in general.volt (opnsense/plugins/pull/4779)
 Cleanup: Change em into px, fix key/value display in formatter (opnsense/plugins/pull/4807)
+Cleanup: Remove obsolete model_relation_domain formatter (opnsense/plugins/pull/4813)
 
 2.0.1
 
diff --git a/www/caddy/src/opnsense/mvc/app/controllers/OPNsense/Caddy/forms/dialogHandle.xml b/www/caddy/src/opnsense/mvc/app/controllers/OPNsense/Caddy/forms/dialogHandle.xml
index 7371e8820..1869739bd 100644
--- a/www/caddy/src/opnsense/mvc/app/controllers/OPNsense/Caddy/forms/dialogHandle.xml
+++ b/www/caddy/src/opnsense/mvc/app/controllers/OPNsense/Caddy/forms/dialogHandle.xml
@@ -19,18 +19,12 @@
         <label>Domain</label>
         <type>dropdown</type>
         <help><![CDATA[Select a domain to handle.]]></help>
-        <grid_view>
-            <formatter>model_relation_domain</formatter>
-        </grid_view>
     </field>
     <field>
         <id>handle.subdomain</id>
         <label>Subdomain</label>
         <type>dropdown</type>
         <help><![CDATA[Select a subdomain to handle. Make sure to additionaly choose a wildcard domain as "Domain". Leave unset, if not using subdomains.]]></help>
-        <grid_view>
-            <formatter>model_relation_domain</formatter>
-        </grid_view>
     </field>
     <field>
         <type>header</type>
diff --git a/www/caddy/src/opnsense/mvc/app/controllers/OPNsense/Caddy/forms/dialogSubdomain.xml b/www/caddy/src/opnsense/mvc/app/controllers/OPNsense/Caddy/forms/dialogSubdomain.xml
index ee31bc02d..a70d8bcf9 100644
--- a/www/caddy/src/opnsense/mvc/app/controllers/OPNsense/Caddy/forms/dialogSubdomain.xml
+++ b/www/caddy/src/opnsense/mvc/app/controllers/OPNsense/Caddy/forms/dialogSubdomain.xml
@@ -21,7 +21,6 @@
         <help><![CDATA[Select a wildcard domain for this subdomain.]]></help>
         <grid_view>
             <visible>false</visible>
-            <formatter>model_relation_domain</formatter>
         </grid_view>
     </field>
     <field>
diff --git a/www/caddy/src/opnsense/mvc/app/views/OPNsense/Caddy/reverse_proxy.volt b/www/caddy/src/opnsense/mvc/app/views/OPNsense/Caddy/reverse_proxy.volt
index 336c9ec27..debf95f78 100644
--- a/www/caddy/src/opnsense/mvc/app/views/OPNsense/Caddy/reverse_proxy.volt
+++ b/www/caddy/src/opnsense/mvc/app/views/OPNsense/Caddy/reverse_proxy.volt
@@ -190,20 +190,6 @@
                                     },
                                 },
                                 formatters: {
-                                    model_relation_domain: function (column, row) {
-                                        let result = (row[column.id] || "").trim();
-                                        if (column.id === "reverse") {
-                                            result = result.replace(" ", ":");
-                                            if (!row["subdomain"] && row["HandlePath"]) {
-                                                result += row["HandlePath"];
-                                            }
-                                        } else if (column.id === "subdomain") {
-                                            if (row["subdomain"] && row["HandlePath"]) {
-                                                result += row["HandlePath"];
-                                            }
-                                        }
-                                        return result;
-                                    },
                                     from_domain: function (column, row) {
                                         return (
                                             (row["%DisableTls"] || "") +