From d25cfef61809f1891cac5705d13822ade6cb85b2 Mon Sep 17 00:00:00 2001
From: Aidaho <aidaho@roxy-wi.org>
Date: Wed, 17 May 2023 21:45:18 +0300
Subject: [PATCH] v6.3.12.0

Changelog: https://roxy-wi.org/changelog#6_3_12
---
 app/create_db.py                   | 2 +-
 app/modules/provisioning/do.py     | 1 -
 app/modules/provisioning/server.py | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/create_db.py b/app/create_db.py
index 2574e2d3..ee84ebec 100644
--- a/app/create_db.py
+++ b/app/create_db.py
@@ -819,7 +819,7 @@ def update_db_v_6_3_11():
 def update_db_v_6_3_12():
 	try:
 		ProvisionParam.delete().where(
-			(ProvisionParam.provider == 'gcore') *
+			(ProvisionParam.provider == 'gcore') &
 			(ProvisionParam.optgroup == 'Russia and CIS')
 		).execute()
 	except Exception as e:
diff --git a/app/modules/provisioning/do.py b/app/modules/provisioning/do.py
index 5bd215d6..66673d73 100644
--- a/app/modules/provisioning/do.py
+++ b/app/modules/provisioning/do.py
@@ -54,7 +54,6 @@ def edit_workspace() -> None:
     workspace = form.getvalue('doeditworkspace')
     group = form.getvalue('do_edit_group')
     provider = form.getvalue('do_edit_provider')
-    region = form.getvalue('do_edit_regions')
     size = form.getvalue('do_edit_size')
     oss = form.getvalue('do_edit_oss')
     ssh_name = form.getvalue('do_edit_ssh_name')
diff --git a/app/modules/provisioning/server.py b/app/modules/provisioning/server.py
index 1df59bc7..85627881 100644
--- a/app/modules/provisioning/server.py
+++ b/app/modules/provisioning/server.py
@@ -65,7 +65,7 @@ def create_server() -> None:
     output, stderr = server_mod.subprocess_execute(cmd)
 
     if stderr != '':
-        prov_common.show_error(stderr, group, workspace, provider)
+        prov_common.show_error(stderr, group, workspace, provider_id)
     else:
         if cloud == 'aws':
             cmd = 'cd scripts/terraform/ && sudo terraform state show module.aws_module.aws_eip.floating_ip[0]|grep -Eo "[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}"'