diff --git a/app/blueprints/packages/packages.py b/app/blueprints/packages/packages.py index 600a208..6ae6d5a 100644 --- a/app/blueprints/packages/packages.py +++ b/app/blueprints/packages/packages.py @@ -173,7 +173,7 @@ def download(package): class PackageForm(FlaskForm): - name = StringField("Name (Technical)", [InputRequired(), Length(1, 20), Regexp("^[a-z0-9_]", 0, "Lower case letters (a-z), digits (0-9), and underscores (_) only")]) + name = StringField("Name (Technical)", [InputRequired(), Length(1, 20), Regexp("^[a-z0-9_]+$", 0, "Lower case letters (a-z), digits (0-9), and underscores (_) only")]) title = StringField("Title (Human-readable)", [InputRequired(), Length(3, 50)]) short_desc = StringField("Short Description (Plaintext)", [InputRequired(), Length(1,200)]) desc = TextAreaField("Long Description (Markdown)", [Optional(), Length(0,10000)]) diff --git a/app/templates/macros/topics.html b/app/templates/macros/topics.html index 987f810..c4fe32d 100644 --- a/app/templates/macros/topics.html +++ b/app/templates/macros/topics.html @@ -54,6 +54,7 @@ {{ topic.title }} {% if topic.wip %}[WIP]{% endif %} + {% if topic.discarded %}[Old]{% endif %} {% if topic.name %}[{{ topic.name }}]{% endif %} {% if show_author %} by {{ topic.author.display_name }} diff --git a/app/templates/packages/create_edit.html b/app/templates/packages/create_edit.html index f356fb6..a293938 100644 --- a/app/templates/packages/create_edit.html +++ b/app/templates/packages/create_edit.html @@ -50,7 +50,7 @@ {% if package and package.approved and not package.checkPerm(current_user, "CHANGE_NAME") %} {{ render_field(form.name, class_="pkg_meta col-sm-3", readonly=True) }} {% else %} - {{ render_field(form.name, class_="pkg_meta col-sm-3") }} + {{ render_field(form.name, class_="pkg_meta col-sm-3", pattern="[a-z0-9_]+", title=_("Lower case letters (a-z), digits (0-9), and underscores (_) only")) }} {% endif %} {{ render_field(form.short_desc, class_="pkg_meta") }}