From 1095a049a63e4286da620b914c23411ea7a02e64 Mon Sep 17 00:00:00 2001 From: François Schmidts Date: Sat, 10 Oct 2015 12:59:32 +0200 Subject: base category creation/edition --- src/web/forms.py | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'src/web/forms.py') diff --git a/src/web/forms.py b/src/web/forms.py index 447a54e9..d901f260 100644 --- a/src/web/forms.py +++ b/src/web/forms.py @@ -27,7 +27,7 @@ __copyright__ = "Copyright (c) Cedric Bonhomme" __license__ = "GPLv3" -from flask import flash, request, url_for, redirect +from flask import flash, url_for, redirect from flask.ext.wtf import Form from flask.ext.babel import lazy_gettext from wtforms import TextField, TextAreaField, PasswordField, BooleanField, \ @@ -57,7 +57,9 @@ class SignupForm(Form): def validate(self): validated = super(SignupForm, self).validate() if self.nickname.data != User.make_valid_nickname(self.nickname.data): - self.nickname.errors.append(lazy_gettext('This nickname has invalid characters. Please use letters, numbers, dots and underscores only.')) + self.nickname.errors.append(lazy_gettext( + 'This nickname has invalid characters. ' + 'Please use letters, numbers, dots and underscores only.')) validated = False return validated @@ -102,7 +104,6 @@ class SigninForm(RedirectForm): return False else: flash(lazy_gettext('Invalid email or password'), 'danger') - #self.email.errors.append("Invalid email or password") return False @@ -124,7 +125,9 @@ class UserForm(Form): def validate(self): validated = super(UserForm, self).validate() if self.nickname.data != User.make_valid_nickname(self.nickname.data): - self.nickname.errors.append(lazy_gettext('This nickname has invalid characters. Please use letters, numbers, dots and underscores only.')) + self.nickname.errors.append(lazy_gettext( + 'This nickname has invalid characters. ' + 'Please use letters, numbers, dots and underscores only.')) validated = False return validated @@ -168,10 +171,10 @@ class AddFeedForm(Form): enabled = BooleanField(lazy_gettext("Check for updates"), default=True) submit = SubmitField(lazy_gettext("Save")) - def validate(self): - if not super(AddFeedForm, self).validate(): - return False - return True + +class AddCategoryForm(Form): + name = TextField(lazy_gettext("Name")) + submit = SubmitField(lazy_gettext("Sign up")) class InformationMessageForm(Form): @@ -201,5 +204,4 @@ class RecoverPasswordForm(Form): return False else: flash(lazy_gettext('Invalid email.'), 'danger') - #self.email.errors.append("Invalid email") return False -- cgit From f81d231465e7a3d7b4f434f266a5a733fa45ec9b Mon Sep 17 00:00:00 2001 From: François Schmidts Date: Sun, 11 Oct 2015 01:41:20 +0200 Subject: assigning categories to feeds and articles --- src/web/forms.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'src/web/forms.py') diff --git a/src/web/forms.py b/src/web/forms.py index d901f260..f57b31d0 100644 --- a/src/web/forms.py +++ b/src/web/forms.py @@ -31,7 +31,7 @@ from flask import flash, url_for, redirect from flask.ext.wtf import Form from flask.ext.babel import lazy_gettext from wtforms import TextField, TextAreaField, PasswordField, BooleanField, \ - SubmitField, IntegerField, validators, HiddenField + SubmitField, IntegerField, SelectField, validators, HiddenField from flask.ext.wtf.html5 import EmailField from flask_wtf import RecaptchaField @@ -170,6 +170,13 @@ class AddFeedForm(Form): site_link = TextField(lazy_gettext("Site link"), [validators.Optional()]) enabled = BooleanField(lazy_gettext("Check for updates"), default=True) submit = SubmitField(lazy_gettext("Save")) + category_id = SelectField(lazy_gettext("Category of the feed"), + [validators.Optional()]) + + def set_category_choices(self, categories): + self.category_id.choices = [('0', 'No Category')] + self.category_id.choices += [(str(cat.id), cat.name) + for cat in categories] class AddCategoryForm(Form): -- cgit From 7cbbcb59f4c434fbd7e74e85c90e98fadd189b65 Mon Sep 17 00:00:00 2001 From: François Schmidts Date: Mon, 12 Oct 2015 17:48:41 +0200 Subject: adding, improving UI to manage categories --- src/web/forms.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/web/forms.py') diff --git a/src/web/forms.py b/src/web/forms.py index f57b31d0..9dbf1b5f 100644 --- a/src/web/forms.py +++ b/src/web/forms.py @@ -38,6 +38,7 @@ from flask_wtf import RecaptchaField from web import utils from web.models import User + class SignupForm(Form): """ Sign up form (registration to jarr). @@ -63,6 +64,7 @@ class SignupForm(Form): validated = False return validated + class RedirectForm(Form): """ Secure back redirects with WTForms. @@ -80,6 +82,7 @@ class RedirectForm(Form): target = utils.get_redirect_target() return redirect(target or url_for(endpoint, **values)) + class SigninForm(RedirectForm): """ Sign in form (connection to jarr). @@ -179,9 +182,9 @@ class AddFeedForm(Form): for cat in categories] -class AddCategoryForm(Form): +class CategoryForm(Form): name = TextField(lazy_gettext("Name")) - submit = SubmitField(lazy_gettext("Sign up")) + submit = SubmitField(lazy_gettext("Submit")) class InformationMessageForm(Form): -- cgit