From 035e58634642cba2c5557082f3e21ca26919d054 Mon Sep 17 00:00:00 2001
From: Mike McKay <mfmckay@wustl.edu>
Date: Mon, 25 Jul 2016 16:24:30 -0500
Subject: [PATCH] XNAT-4419 Modified message that was showing up when users
were not correctly auto-enabled via par to make it less confusing. I also
fixed the PAR code so it shouldn't get this message anymore, but I modified
this message so that it does not definitely state that the account has been
disabled due to inactivity when there is no check that this is the reason for
the disabled account.
---
.../nrg/xnat/turbine/modules/screens/InactiveAccount.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/nrg/xnat/turbine/modules/screens/InactiveAccount.java b/src/main/java/org/nrg/xnat/turbine/modules/screens/InactiveAccount.java
index f87e5295..1dfa4a3b 100644
--- a/src/main/java/org/nrg/xnat/turbine/modules/screens/InactiveAccount.java
+++ b/src/main/java/org/nrg/xnat/turbine/modules/screens/InactiveAccount.java
@@ -19,8 +19,6 @@ package org.nrg.xnat.turbine.modules.screens;/*
* Created 10/29/13 12:00 PM
*/
-import java.sql.SQLException;
-
import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.turbine.modules.screens.VelocitySecureScreen;
@@ -36,6 +34,8 @@ import org.nrg.xdat.turbine.utils.AdminUtils;
import org.nrg.xdat.turbine.utils.TurbineUtils;
import org.nrg.xft.security.UserI;
+import java.sql.SQLException;
+
public class InactiveAccount extends VelocitySecureScreen {
@Override
@@ -53,7 +53,7 @@ public class InactiveAccount extends VelocitySecureScreen {
!TurbineUtils.getUser(data).getUsername().equalsIgnoreCase("guest") &&
!TurbineUtils.HasPassedParameter("a", data) && !TurbineUtils.HasPassedParameter("s", data)) {
context.put("login", TurbineUtils.getUser(data).getUsername());
- context.put("topMessage", "Your account has been disabled due to inactivity.<br>" +
+ context.put("topMessage", "Your account is not currently enabled, possibly due to inactivity.<br>" +
"Enter your email address to send a reactivation email.");
} else {
UserI user = XDAT.getUserDetails();
@@ -103,7 +103,7 @@ public class InactiveAccount extends VelocitySecureScreen {
}
}
}
- context.put("topMessage", "Your account has been disabled due to inactivity.<br>" +
+ context.put("topMessage", "Your account is not currently enabled, possibly due to inactivity.<br>" +
"Enter your email address to resend the verification email.");
}
} catch (Exception e) {
--
GitLab