Merge PR #160 into 16.0

Signed-off-by simahawk
2023-06-21 05:49:56 +00:00 · 2023-06-21 05:49:56 +00:00 · 6d6fbcb31a
parent a652e1690e 778029822a
commit 6d6fbcb31a
1 changed files with 1 additions and 1 deletions
--- a/server_environment/models/server_env_mixin.py
+++ b/server_environment/models/server_env_mixin.py
@ -401,7 +401,7 @@ class ServerEnvMixin(models.AbstractModel):
            base_field_cls = base_field.__class__
            field_args = base_field.args.copy() if base_field.args else {}
            field_args.pop("_sequence", None)
-            fieldlabel = "{} {}".format(field_args.get("string", ""), "Env Default")
+            fieldlabel = "{} {}".format(base_field.string or "", "Env Default")
            field_args.update(
                {
                    "sparse": "server_env_defaults",