From 2751095810850cc05e7940cbfaafca2c1a924d3c Mon Sep 17 00:00:00 2001 From: Daniel Date: Mon, 18 Nov 2019 19:46:57 +0100 Subject: [PATCH] small fix in samba global --- dirkules/samba/manager.py | 6 +++--- dirkules/samba/views.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dirkules/samba/manager.py b/dirkules/samba/manager.py index 6125510..01e2f0f 100644 --- a/dirkules/samba/manager.py +++ b/dirkules/samba/manager.py @@ -68,7 +68,7 @@ def set_samba_global(workgroup, name): """ SambaGlobal.query.delete() workgroup = SambaGlobal("workgroup", workgroup) - name = SambaGlobal("server string", "%h {}".format(name)) + name = SambaGlobal("server string", "{}".format(name)) db.session.add(workgroup) db.session.add(name) db.session.commit() @@ -85,8 +85,8 @@ def generate_smb(): workgroup = 'WORKGROUP' server_string = '%h dirkules' else: - workgroup = SambaGlobal.query.get(1) - server_string = SambaGlobal.query.get(2) + workgroup = SambaGlobal.query.get(1).value + server_string = "%h " + str(SambaGlobal.query.get(2).value) f = open("smb.conf.txt", "w") samba_global = open(staticDir + "/conf/samba_global.conf", "r") samba_share = open(staticDir + "/conf/samba_share.conf", "r") diff --git a/dirkules/samba/views.py b/dirkules/samba/views.py index e51a838..08181ab 100644 --- a/dirkules/samba/views.py +++ b/dirkules/samba/views.py @@ -43,8 +43,8 @@ def index(): def config(): form = SambaConfigForm(request.form) if SambaGlobal.query.first() is not None: - form.workgroup.data = SambaGlobal.query.get(1) - form.server_string.data = SambaGlobal.query.get(2) + form.workgroup.data = SambaGlobal.query.get(1).value + form.server_string.data = SambaGlobal.query.get(2).value if request.method == 'POST' and form.validate(): smb_man.set_samba_global(form.workgroup.data, form.server_string.data) return redirect(url_for('.index'))