litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-1396 Change LoginProcessBean so the message is "read-once and clear". Change the method names to reflect this.

Browse source
This commit is contained in:
jeb228 2010-11-24 19:33:03 +00:00
parent c7d6f122b3
commit 9eee0e9516
4 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/login/LoginProcessBean.java
View file

@ -188,20 +188,22 @@ public class LoginProcessBean {
this.messageArguments = args; this.messageArguments = args;
} }
public String getInfoMessage() { public String getInfoMessageAndClear() {
String text = "";
if (message.getMessageLevel() == MLevel.INFO) { if (message.getMessageLevel() == MLevel.INFO) {
return message.formatMessage(messageArguments); text = message.formatMessage(messageArguments);
} else { clearMessage();
return "";
} }
return text;
} }
public String getErrorMessage() { public String getErrorMessageAndClear() {
String text = "";
if (message.getMessageLevel() == MLevel.ERROR) { if (message.getMessageLevel() == MLevel.ERROR) {
return message.formatMessage(messageArguments); text = message.formatMessage(messageArguments);
} else { clearMessage();
return "";
} }
return text;
} }
public String getUsername() { public String getUsername() {

6
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/login/LoginTemplateHelper.java
View file

@ -108,11 +108,11 @@ public class LoginTemplateHelper extends LoginTemplateHelperBase {
trv.put(BODY_FORM_ACTION, getAuthenticateUrl(vreq)); trv.put(BODY_FORM_ACTION, getAuthenticateUrl(vreq));
trv.put(BODY_LOGIN_NAME, bean.getUsername()); trv.put(BODY_LOGIN_NAME, bean.getUsername());
String infoMessage = bean.getInfoMessage(); String infoMessage = bean.getInfoMessageAndClear();
if (!infoMessage.isEmpty()) { if (!infoMessage.isEmpty()) {
trv.put(BODY_INFO_MESSAGE, infoMessage); trv.put(BODY_INFO_MESSAGE, infoMessage);
} }
String errorMessage = bean.getErrorMessage(); String errorMessage = bean.getErrorMessageAndClear();
if (!errorMessage.isEmpty()) { if (!errorMessage.isEmpty()) {
trv.put(BODY_ERROR_MESSAGE, errorMessage); trv.put(BODY_ERROR_MESSAGE, errorMessage);
} }
@ -134,7 +134,7 @@ public class LoginTemplateHelper extends LoginTemplateHelperBase {
trv.put(BODY_FORM_ACTION, getAuthenticateUrl(vreq)); trv.put(BODY_FORM_ACTION, getAuthenticateUrl(vreq));
trv.put(BODY_CANCEL_URL, getCancelUrl(vreq)); trv.put(BODY_CANCEL_URL, getCancelUrl(vreq));
String errorMessage = bean.getErrorMessage(); String errorMessage = bean.getErrorMessageAndClear();
if (!errorMessage.isEmpty()) { if (!errorMessage.isEmpty()) {
trv.put(BODY_ERROR_MESSAGE, errorMessage); trv.put(BODY_ERROR_MESSAGE, errorMessage);
} }

6
webapp/src/edu/cornell/mannlib/vitro/webapp/web/widgets/LoginWidget.java
View file

@ -128,11 +128,11 @@ public class LoginWidget extends Widget {
externalAuthDisplayName); externalAuthDisplayName);
} }
String infoMessage = bean.getInfoMessage(); String infoMessage = bean.getInfoMessageAndClear();
if (!infoMessage.isEmpty()) { if (!infoMessage.isEmpty()) {
values.put(TemplateVariable.INFO_MESSAGE.toString(), infoMessage); values.put(TemplateVariable.INFO_MESSAGE.toString(), infoMessage);
} }
String errorMessage = bean.getErrorMessage(); String errorMessage = bean.getErrorMessageAndClear();
if (!errorMessage.isEmpty()) { if (!errorMessage.isEmpty()) {
values.put(TemplateVariable.ERROR_MESSAGE.toString(), errorMessage); values.put(TemplateVariable.ERROR_MESSAGE.toString(), errorMessage);
} }
@ -158,7 +158,7 @@ public class LoginWidget extends Widget {
values.put(TemplateVariable.FORM_ACTION.toString(), getAuthenticateUrl(request)); values.put(TemplateVariable.FORM_ACTION.toString(), getAuthenticateUrl(request));
values.put(TemplateVariable.CANCEL_URL.toString(), getCancelUrl(request)); values.put(TemplateVariable.CANCEL_URL.toString(), getCancelUrl(request));
String errorMessage = bean.getErrorMessage(); String errorMessage = bean.getErrorMessageAndClear();
if (!errorMessage.isEmpty()) { if (!errorMessage.isEmpty()) {
values.put(TemplateVariable.ERROR_MESSAGE.toString(), errorMessage); values.put(TemplateVariable.ERROR_MESSAGE.toString(), errorMessage);
} }

4
webapp/test/edu/cornell/mannlib/vitro/webapp/controller/edit/AuthenticateTest.java
View file

@ -383,8 +383,8 @@ public class AuthenticateTest extends AbstractTestClass {
} }
LoginProcessBean bean = LoginProcessBean.getBean(request); LoginProcessBean bean = LoginProcessBean.getBean(request);
assertEquals("state", state, bean.getState()); assertEquals("state", state, bean.getState());
assertEquals("info message", infoMessage, bean.getInfoMessage()); assertEquals("info message", infoMessage, bean.getInfoMessageAndClear());
assertEquals("error message", errorMessage, bean.getErrorMessage()); assertEquals("error message", errorMessage, bean.getErrorMessageAndClear());
assertEquals("username", username, bean.getUsername()); assertEquals("username", username, bean.getUsername());
} }