From cc27e7a4f0c6133b132d41e14cd17e4e22465727 Mon Sep 17 00:00:00 2001 From: Ehco1996 Date: Sun, 25 Aug 2024 12:35:39 +0800 Subject: [PATCH] chore: fix admin issue --- apps/proxy/models.py | 3 --- templates/admin/includes/fieldset.html | 33 ++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 templates/admin/includes/fieldset.html diff --git a/apps/proxy/models.py b/apps/proxy/models.py index 0999a6403..c578f8b07 100644 --- a/apps/proxy/models.py +++ b/apps/proxy/models.py @@ -693,7 +693,6 @@ def get_config(self): for proxy_node in nodes: if not proxy_node.enable: continue - if not proxy_node.enable_ehco_tunnel: tcp_remote = f"{proxy_node.server}:{proxy_node.get_user_port()}" else: @@ -702,8 +701,6 @@ def get_config(self): tcp_remote = f"ws://{tcp_remote}" elif rule.transport_type == c.TRANSPORT_WSS: tcp_remote = f"wss://{tcp_remote}" - else: - raise Exception("not support transport type") tcp_remotes.append(tcp_remote) rule_cfg = { "label": rule.name, diff --git a/templates/admin/includes/fieldset.html b/templates/admin/includes/fieldset.html new file mode 100644 index 000000000..34b7fa7a8 --- /dev/null +++ b/templates/admin/includes/fieldset.html @@ -0,0 +1,33 @@ +{% comment %} https://github.com/newpanjing/simpleui/pull/506/files {% endcomment %} +{% load simpletags %} +
+ {% if fieldset.name %}

{{ fieldset.name }}

{% endif %} + {% if fieldset.description %}
{{ fieldset.description|safe }}
{% endif %} + {% for line in fieldset %} +
+ {% if line.fields|length == 1 %}{{ line.errors }}{% endif %} + {% for field in line %} +
+ {% if not line.fields|length == 1 and not field.is_readonly %}{{ field.errors }}{% endif %} + {% if field.is_checkbox %} + {{ field.field }}{{ field.label_tag }} + {% else %} + {{ field.label_tag }} + {% if field.is_readonly %} +
{{ field.contents }}
+ {% else %} + {{ field.field|get_value }} + {% endif %} + {% endif %} + {% if field.field.help_text %}
{{ field.field.help_text|safe }}
{% endif %} +
+ {% endfor %} +
+ {% endfor %} +