gs-watch: fixed a bug for user sign-up

genericsystem · Aug 17, 2017 · 2b885f4 · 2b885f4
1 parent 0f256a9
commit 2b885f4
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/gs-watch/src/main/java/org/genericsystem/watch/gui/utils/ContextActionCustom.java b/gs-watch/src/main/java/org/genericsystem/watch/gui/utils/ContextActionCustom.java
@@ -178,10 +178,6 @@ public void accept(Context context, Tag tag) {
 				}
 				if (psw1 != null) {
 					if (!psw1.isEmpty()) {
-						invalidConfirmPassword.setText(context, "Password can not be empty");
-						invalidUsername.addStyle(context, "display", "none");
-						invalidConfirmPassword.addStyle(context, "display", "inline");
-					} else {
 						if (psw1.equals(psw2)) {
 							invalidUsername.addStyle(context, "display", "none");
 							invalidConfirmPassword.addStyle(context, "display", "none");
@@ -202,6 +198,10 @@ public void accept(Context context, Tag tag) {
 							invalidConfirmPassword.addStyle(context, "display", "inline");
 							context.unmount();
 						}
+					} else { // Password not null, but empty
+						invalidConfirmPassword.setText(context, "Password can not be empty");
+						invalidUsername.addStyle(context, "display", "none");
+						invalidConfirmPassword.addStyle(context, "display", "inline");
 					}
 				} else { // Empty password
 					invalidConfirmPassword.setText(context, "Password can not be empty");