almet/ihatemoney
1
0
Fork 0
mirror of https://github.com/spiral-project/ihatemoney.git synced 2025-05-05 12:41:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix error redirection on import

Browse source
This commit is contained in:
Youe Graillot 2021-12-13 04:31:04 +01:00
parent 99a78f86fb
commit 946fa3e8e9
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ihatemoney/tests/common/ihatemoney_testcase.py
View file

@ -74,13 +74,13 @@ class BaseTestCase(TestCase):
follow_redirects=follow_redirects, follow_redirects=follow_redirects,
) )
def import_project(self, id, data, expected_code=200): def import_project(self, id, data, success=True):
resp = self.client.post( resp = self.client.post(
f"/{id}/import", f"/{id}/import",
data=data, data=data,
follow_redirects=True, # follow_redirects=True,
) )
self.assertEqual(resp.status_code, expected_code) self.assertEqual("/{id}/edit" in str(resp.response), not success)
def create_project(self, id, default_currency="XXX", name=None, password=None): def create_project(self, id, default_currency="XXX", name=None, password=None):
name = name or str(id) name = name or str(id)

6
ihatemoney/web.py
View file

@ -444,7 +444,6 @@ def edit_project():
@main.route("/<project_id>/import", methods=["POST"]) @main.route("/<project_id>/import", methods=["POST"])
def import_project(): def import_project():
form = ImportProjectForm() form = ImportProjectForm()
result = 200
if form.validate(): if form.validate():
try: try:
data = form.file.data data = form.file.data
@ -497,13 +496,10 @@ def import_project():
return redirect(url_for("main.list_bills")) return redirect(url_for("main.list_bills"))
except ValueError as b: except ValueError as b:
flash(b.args[0], category="danger") flash(b.args[0], category="danger")
result = 400
else: else:
for component, errors in form.errors.items(): for component, errors in form.errors.items():
flash(_(component + ": ") + ", ".join(errors), category="danger") flash(_(component + ": ") + ", ".join(errors), category="danger")
result = 400 return redirect(request.headers.get("Referer") or url_for(".edit_project"))
return redirect(url_for(".edit_project"), code=result)
@main.route("/<project_id>/delete", methods=["POST"]) @main.route("/<project_id>/delete", methods=["POST"])