From 952832f6ffb6e897d8e59b19e8826929cb61d618 Mon Sep 17 00:00:00 2001
From: Mike McKay <mfmckay@wustl.edu>
Date: Mon, 29 Aug 2016 15:58:40 -0500
Subject: [PATCH] Updated max sessions description to indicate that you need to
restart Tomcat for it to take effect.
---
src/main/java/org/nrg/xnat/services/XnatAppInfo.java | 3 +++
.../resources/META-INF/xnat/preferences/site-config.properties | 2 +-
.../resources/META-INF/xnat/spawner/site-admin-elements.yaml | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/nrg/xnat/services/XnatAppInfo.java b/src/main/java/org/nrg/xnat/services/XnatAppInfo.java
index f6231161..363ac008 100644
--- a/src/main/java/org/nrg/xnat/services/XnatAppInfo.java
+++ b/src/main/java/org/nrg/xnat/services/XnatAppInfo.java
@@ -147,6 +147,9 @@ public class XnatAppInfo {
catch(InvalidPreferenceName e){
_log.error("",e);
}
+ catch(NullPointerException e){
+ _log.error("Error getting site config preferences.",e);
+ }
}
}
}
diff --git a/src/main/resources/META-INF/xnat/preferences/site-config.properties b/src/main/resources/META-INF/xnat/preferences/site-config.properties
index 455f70e1..ecf3d0e0 100644
--- a/src/main/resources/META-INF/xnat/preferences/site-config.properties
+++ b/src/main/resources/META-INF/xnat/preferences/site-config.properties
@@ -23,7 +23,7 @@ UI.show-left-bar-search=true
UI.show-left-bar-browse=true
UI.show-manage-files=true
UI.allow-non-admin-project-creation=true
-UI.login_failure_message=Your login attempt failed because the username and password combination you provided was invalid. After %d failed login attempts, your user account will be locked. If you believe your account is currently locked, you can:<ul><li>Unlock it by resetting your password</li><li>Wait one hour for it to unlock automatically</li></ul>
+UI.login_failure_message=Your login attempt failed because the username and password combination you provided was invalid or the site is currently at the maximum number of user sessions. After %d failed login attempts, your user account will be locked. If you believe your account is currently locked, you can:<ul><li>Unlock it by resetting your password</li><li>Wait one hour for it to unlock automatically</li></ul>
# Indicates whether access to the list of system users should be restricted to site administrators only.
restrictUserListAccessToAdmins=false
diff --git a/src/main/resources/META-INF/xnat/spawner/site-admin-elements.yaml b/src/main/resources/META-INF/xnat/spawner/site-admin-elements.yaml
index eaca9408..463a79e0 100644
--- a/src/main/resources/META-INF/xnat/spawner/site-admin-elements.yaml
+++ b/src/main/resources/META-INF/xnat/spawner/site-admin-elements.yaml
@@ -320,7 +320,7 @@ userLoginsSessionControls:
kind: panel.input.number
name: ":sessions.concurrent_max"
label: Maximum Concurrent Sessions
- description: The maximum number of permitted sessions a user can have open simultaneously
+ description: The maximum number of permitted sessions a user can have open simultaneously. You must restart Tomcat for changes to this to take effect.
loginFailureMessage:
kind: panel.textarea
name: ":UI.login_failure_message"
--
GitLab