librewolf
/
bunkerized-nginx
mirror of https://github.com/bunkerity/bunkerized-nginx
4
0
Fork 1
Code Issues Projects Releases Wiki Activity

Small tweaks and handle services variables better

This commit is contained in:
Théophile Diot 2022-12-12 14:52:16 +01:00
parent 98bda4d1e6
commit b1ca472537
No known key found for this signature in database
GPG Key ID: E752C80DB72BB014
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/ui/main.py
View File

@ -422,15 +422,20 @@ def services():
flash("Missing OLD_SERVER_NAME parameter.", "error")
return redirect(url_for("loading", next=url_for("services")))
if "SERVER_NAME" not in variables:
variables["SERVER_NAME"] = variables["OLD_SERVER_NAME"]
if request.form["operation"] in ("new", "edit"):
del variables["operation"]
if request.form["operation"] == "edit":
del variables["OLD_SERVER_NAME"]
del variables["OLD_SERVER_NAME"]
# Edit check fields and remove already existing ones
config = app.config["CONFIG"].get_config()
for variable in deepcopy(variables):
if variables.endswith("_SCHEMA"):
del variables[variable]
continue
if variables[variable] == "on":
variables[variable] = "yes"
elif variables[variable] == "off":

6
src/ui/src/Config.py
View File

@ -249,7 +249,7 @@ class Config:
if k in self.__plugins_settings:
if _global ^ (self.__plugins_settings[k]["context"] == "global"):
error = 1
flash(f"Variable {k} is not valid.")
flash(f"Variable {k} is not valid.", "error")
continue
setting = k
@ -260,7 +260,7 @@ class Config:
or "multiple" not in self.__plugins_settings[setting]
):
error = 1
flash(f"Variable {k} is not valid.")
flash(f"Variable {k} is not valid.", "error")
continue
if not (
@ -270,7 +270,7 @@ class Config:
if not check:
error = 1
flash(f"Variable {k} is not valid.")
flash(f"Variable {k} is not valid.", "error")
continue
return error