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 @@ dropdown - - model_relation_domain - handle.subdomain dropdown - - model_relation_domain - header 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 @@ false - model_relation_domain 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"] || "") +