From a62ba7752bf2a56c6325bc34fb1dce04d02323ff Mon Sep 17 00:00:00 2001 From: INOPIAE Date: Thu, 18 Jul 2019 14:38:45 +0200 Subject: [PATCH] upd: restructure order of data checks Get the order of possible error messages in order with the form fields Change-Id: Iaf8b5027000ac860d45b0cdc11db1802781fc3c6 --- src/club/wpia/gigi/pages/main/Signup.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/club/wpia/gigi/pages/main/Signup.java b/src/club/wpia/gigi/pages/main/Signup.java index cbe96c0e..8cfaa2c4 100644 --- a/src/club/wpia/gigi/pages/main/Signup.java +++ b/src/club/wpia/gigi/pages/main/Signup.java @@ -114,14 +114,6 @@ public class Signup extends Form { ga.mergeInto(new GigiApiException("Entered date of birth exceeds the maximum age set in our policies. Please check your DoB is correct and contact support if the issue persists.")); } - if ( !"1".equals(req.getParameter("tos_agree"))) { - ga.mergeInto(new GigiApiException("Acceptance of the ToS is required to continue.")); - } - - if ( !"1".equals(req.getParameter("dp_agree"))) { - ga.mergeInto(new GigiApiException("Acceptance of the Data Protection Policy is required to continue.")); - } - if (email.equals("")) { ga.mergeInto(new GigiApiException("Email Address was blank")); } @@ -132,6 +124,15 @@ public class Signup extends Form { } else if ( !pw1.equals(pw2)) { ga.mergeInto(new GigiApiException("Passwords don't match")); } + + if ( !"1".equals(req.getParameter("tos_agree"))) { + ga.mergeInto(new GigiApiException("Acceptance of the ToS is required to continue.")); + } + + if ( !"1".equals(req.getParameter("dp_agree"))) { + ga.mergeInto(new GigiApiException("Acceptance of the Data Protection Policy is required to continue.")); + } + if ( !ga.isEmpty()) { throw ga; } -- 2.39.2