save res.message on the user object across a redirect
This commit is contained in:
parent
23195369b1
commit
9922ea3fd8
2 changed files with 11 additions and 1 deletions
|
@ -166,7 +166,13 @@ public class RequestEvaluator implements Runnable {
|
||||||
global.putHiddenProperty("user", esu);
|
global.putHiddenProperty("user", esu);
|
||||||
global.putHiddenProperty ("req", new ESWrapper (req, evaluator));
|
global.putHiddenProperty ("req", new ESWrapper (req, evaluator));
|
||||||
global.putHiddenProperty ("res", new ESWrapper (res, evaluator));
|
global.putHiddenProperty ("res", new ESWrapper (res, evaluator));
|
||||||
if (error != null) res.error = error;
|
if (error != null)
|
||||||
|
res.error = error;
|
||||||
|
if (user.message != null) {
|
||||||
|
// bring over the message from a redirect
|
||||||
|
res.message = user.message;
|
||||||
|
user.message = null;
|
||||||
|
}
|
||||||
global.putHiddenProperty ("path", reqPath);
|
global.putHiddenProperty ("path", reqPath);
|
||||||
global.putHiddenProperty ("app", appnode);
|
global.putHiddenProperty ("app", appnode);
|
||||||
// set and mount the request data object
|
// set and mount the request data object
|
||||||
|
@ -290,6 +296,9 @@ public class RequestEvaluator implements Runnable {
|
||||||
localrtx.timer.endEvent (requestPath+" execute");
|
localrtx.timer.endEvent (requestPath+" execute");
|
||||||
} catch (RedirectException redirect) {
|
} catch (RedirectException redirect) {
|
||||||
res.redirect = redirect.getMessage ();
|
res.redirect = redirect.getMessage ();
|
||||||
|
// if there is a message set, save it on the user object for the next request
|
||||||
|
if (res.message != null)
|
||||||
|
user.message = res.message;
|
||||||
done = true;
|
done = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -21,6 +21,7 @@ public class User implements Serializable {
|
||||||
long onSince, lastTouched;
|
long onSince, lastTouched;
|
||||||
Node cache;
|
Node cache;
|
||||||
DbMapping umap;
|
DbMapping umap;
|
||||||
|
String message;
|
||||||
|
|
||||||
public User (String sid, Application app) {
|
public User (String sid, Application app) {
|
||||||
this.uid = null;
|
this.uid = null;
|
||||||
|
|
Loading…
Add table
Reference in a new issue