Skip to content

Commit e12aee3

Browse files
committed
added server validation errors
1 parent 9ecaa39 commit e12aee3

File tree

1 file changed

+13
-46
lines changed

1 file changed

+13
-46
lines changed

events/ui.py

Lines changed: 13 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from flask import Blueprint, redirect, render_template, request, url_for
1+
from flask import Blueprint, flash, redirect, render_template, request, url_for
22
from werkzeug.wrappers import Response
33

44
from auth.auth import is_exec_wrapper
@@ -38,60 +38,34 @@ def create(error: str | None = None) -> str | Response: # noqa: PLR0911
3838
color_colour = color_colour.strip().lower() if color_colour else None
3939

4040
if (colour := validate_colour(text_colour, color_colour)) is not None:
41-
return redirect(
42-
url_for(
43-
"events_ui.create",
44-
error=error,
45-
action="events_ui.create",
46-
method="POST",
47-
event=None,
48-
)
49-
)
41+
flash(colour, "error")
42+
return redirect(url_for("events_ui.create"))
5043

5144
colour = color_colour if color_colour else text_colour
5245

5346
# parse dates and duration
5447
start_time = get_datetime_from_string(request.form["start_time"])
5548
if isinstance(start_time, str):
56-
return redirect(
57-
url_for(
58-
"events_ui.create",
59-
error=start_time,
60-
action="events_ui.create",
61-
method="POST",
62-
event=None,
63-
)
64-
)
49+
flash(start_time, "error")
50+
return redirect(url_for("events_ui.create"))
51+
6552
duration = (
6653
get_timedelta_from_string(request.form["duration"])
6754
if request.form["duration"]
6855
else None
6956
)
7057
if isinstance(duration, str):
71-
return redirect(
72-
url_for(
73-
"events_ui.create",
74-
error=duration,
75-
action="events_ui.create",
76-
method="POST",
77-
event=None,
78-
)
79-
)
58+
flash(duration, "error")
59+
return redirect(url_for("events_ui.create"))
60+
8061
end_time = (
8162
get_datetime_from_string(request.form["end_time"])
8263
if request.form["end_time"]
8364
else None
8465
)
8566
if isinstance(end_time, str):
86-
return redirect(
87-
url_for(
88-
"events_ui.create",
89-
error=end_time,
90-
action="events_ui.create",
91-
method="POST",
92-
event=None,
93-
)
94-
)
67+
flash(end_time, "error")
68+
return redirect(url_for("events_ui.create"))
9569

9670
# parse tags
9771
tags = (
@@ -117,15 +91,8 @@ def create(error: str | None = None) -> str | Response: # noqa: PLR0911
11791

11892
# if failed, redirect to the create page with an error
11993
if isinstance(event, str):
120-
return redirect(
121-
url_for(
122-
"events_ui.create",
123-
error=event,
124-
action="events_ui.create",
125-
method="POST",
126-
event=None,
127-
)
128-
)
94+
flash(event, "error")
95+
return redirect(url_for("events_ui.create", error=event))
12996

13097
# if successful, redirect to the event page
13198
return redirect(

0 commit comments

Comments
 (0)