From 90e44fd0829945d30530cc2ac6ca906d0c28872a Mon Sep 17 00:00:00 2001 From: Daniel Date: Fri, 10 May 2019 16:07:56 +0200 Subject: [PATCH] added samba inputs --- dirkules/templates/_formhelpers.html | 2 +- dirkules/templates/base.html | 2 +- dirkules/templates/samba_add.html | 18 ++++++++---- dirkules/validation/validators.py | 41 ++++++++++++++++++---------- 4 files changed, 42 insertions(+), 21 deletions(-) diff --git a/dirkules/templates/_formhelpers.html b/dirkules/templates/_formhelpers.html index 65df4af..2cf60fa 100644 --- a/dirkules/templates/_formhelpers.html +++ b/dirkules/templates/_formhelpers.html @@ -1,5 +1,5 @@ {% macro render_field(field) %} - {% if field.type == 'StringField' %} + {% if (field.type == 'StringField' or field.type == 'IntegerField') %} {% if field.errors %}
{% else %} diff --git a/dirkules/templates/base.html b/dirkules/templates/base.html index 387aa7f..746aeb6 100644 --- a/dirkules/templates/base.html +++ b/dirkules/templates/base.html @@ -19,7 +19,7 @@
{% endblock %} diff --git a/dirkules/validation/validators.py b/dirkules/validation/validators.py index f5ba3c7..bc8af98 100644 --- a/dirkules/validation/validators.py +++ b/dirkules/validation/validators.py @@ -1,4 +1,4 @@ -from wtforms import Form, StringField, BooleanField, validators +from wtforms import Form, StringField, BooleanField, IntegerField, validators class CleaningForm(Form): @@ -16,22 +16,35 @@ class CleaningForm(Form): class samba_cleaning_form(Form): workgroup = StringField("workgroup", [validators.required(message="Bitte Feld ausfüllen!"), - validators.Regexp('^[a-z]+$', message="Bitte nur Kleinbuchstaben eingeben."), - validators.Length(max=255, message="Eingabe zu lang")], + validators.Regexp('^[a-z]+$', message="Bitte nur Kleinbuchstaben eingeben."), + validators.Length(max=255, message="Eingabe zu lang")], render_kw={"placeholder": "Nichts..."}) server_string = StringField("server string", [validators.required(message="Bitte Feld ausfüllen!"), - validators.Regexp('^[a-z]+$', message="Bitte nur Kleinbuchstaben eingeben."), - validators.Length(max=255, message="Eingabe zu lang")], - render_kw={"placeholder": "Nichts..."}) + validators.Regexp('^[a-z]+$', + message="Bitte nur Kleinbuchstaben eingeben."), + validators.Length(max=255, message="Eingabe zu lang")], + render_kw={"placeholder": "Nichts..."}) + class SambaAddForm(Form): - jobname = StringField("Job Name", [validators.required(message="Bitte Feld ausfüllen!"), - validators.none_of('123456789/\\.', - "Bitte ausschließlich Buchstaben eingeben!"), - validators.Length(max=255, message="Eingabe zu lang")], - render_kw={"placeholder": "Dowloads Verzeichnis"}) + name = StringField("Name der Freigabe", [validators.required(message="Bitte Feld ausfüllen!"), + validators.Length(max=255, message="Eingabe zu lang")], + render_kw={"placeholder": "Bilder"}) + writeable = BooleanField("Schreibzugriff") + recycling = BooleanField("Papierkorb") + btrfs = BooleanField("BtrFS Optimierungen (Vorsicht!)") + # additional path = StringField("Pfad", [validators.required(message="Bitte Feld ausfüllen!"), - validators.none_of('\\', "Bitte kein \\"), validators.Length(max=255, message="Eingabe zu lang")], - render_kw={"placeholder": "/media/downloads/"}) - active = BooleanField("Sofort aktvieren (Vorsicht!)", render_kw={"placeholder": "/media/downloads/"}) \ No newline at end of file + render_kw={"placeholder": "/media/Bilder"}) + user = StringField("Berechtigte Nutzer", [validators.required(message="Bitte Feld ausfüllen!"), + validators.Length(max=255, message="Eingabe zu lang")], + render_kw={"placeholder": "sambadaniel"}) + create_mask = IntegerField("Dateimaske", [validators.Optional(), + validators.NumberRange(min=4, max=4, + message="Bitte 4 Zahlen eingeben!")], + render_kw={"placeholder": "0600"}) + dir_mask = IntegerField("Ordnermaske", [validators.Optional(), + validators.NumberRange(min=4, max=4, + message="Bitte 4 Zahlen eingeben!")], + render_kw={"placeholder": "0700"})