small fix in samba global

This commit is contained in:
Daniel 2019-11-18 19:46:57 +01:00
parent d7c9931665
commit 2751095810
2 changed files with 5 additions and 5 deletions

View file

@ -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")

View file

@ -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'))