fix issue with error pages

greenlaw110 · greenlaw110 · commit b245cdc5bde3 · 2016-01-14T11:00:20.000+11:00
diff --git a/src/main/java/act/view/SystemImplicitVariableProvider.java b/src/main/java/act/view/SystemImplicitVariableProvider.java
@@ -41,6 +41,12 @@ public Object eval(ActionContext context) {
                     return context;
                 }
             },
+            new ActionViewVarDef("_mailer", MailerContext.class) {
+                @Override
+                public Object eval(ActionContext context) {
+                    return null;
+                }
+            },
             new ActionViewVarDef("_session", H.Session.class) {
                 @Override
                 public Object eval(ActionContext context) {
@@ -74,6 +80,12 @@ public Object eval(MailerContext context) {
                     return context;
                 }
             },
+            new MailerViewVarDef("_action", ActionContext.class) {
+                @Override
+                public Object eval(MailerContext context) {
+                    return null;
+                }
+            },
             new MailerViewVarDef("_from", InternetAddress.class) {
                 @Override
                 public Object eval(MailerContext context) {
diff --git a/src/main/resources/rythm/error/e403.html b/src/main/resources/rythm/error/e403.html
@@ -4,7 +4,7 @@
 @args act.util.ActError _error
 @{
 act.app.SourceInfo sourceInfo = _error.sourceInfo();
-act.route.RouteInfo req = act.route.RouteInfo.of(_ctx);
+act.route.RouteInfo req = act.route.RouteInfo.of(_action);
 List<String> stackTrace = _error.stackTrace();
   }
 
diff --git a/src/main/resources/rythm/error/e404.html b/src/main/resources/rythm/error/e404.html
@@ -37,8 +37,8 @@
 
 @import act.route.*
 @{
-  List<RouteInfo> routes = _ctx.router().debug();
-  act.route.RouteInfo req = RouteInfo.of(_ctx);
+  List<RouteInfo> routes = _action.router().debug();
+  act.route.RouteInfo req = RouteInfo.of(_action);
 }
 
 @def tr(RouteInfo r, String parity) {
diff --git a/src/main/resources/rythm/error/e500.html b/src/main/resources/rythm/error/e500.html
@@ -1,7 +1,7 @@
 @extends(errorPage, header: "500 Internal Error")
 
 @{
-act.route.RouteInfo routeInfo = act.route.RouteInfo.of(_ctx);
+act.route.RouteInfo routeInfo = act.route.RouteInfo.of(_action);
   }
 
 
diff --git a/src/main/resources/rythm/error/errorPage.html b/src/main/resources/rythm/error/errorPage.html
@@ -18,7 +18,7 @@
 if (_error instanceof act.view.RythmError) {
 templateSourceInfo = ((act.view.RythmError) actError).templateSourceInfo();
 }
-act.route.RouteInfo routeInfo = act.route.RouteInfo.of(_ctx);
+act.route.RouteInfo routeInfo = null != _action ? act.route.RouteInfo.of(_action) : null;
 List<String> stackTrace = actError.stackTrace();
   }
 

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`@args act.util.ActError _error`
`5`	`5`	`@{`
`6`	`6`	`act.app.SourceInfo sourceInfo = _error.sourceInfo();`
`7`		`-act.route.RouteInfo req = act.route.RouteInfo.of(_ctx);`
	`7`	`+act.route.RouteInfo req = act.route.RouteInfo.of(_action);`
`8`	`8`	`List<String> stackTrace = _error.stackTrace();`
`9`	`9`	`}`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,8 @@`
`37`	`37`
`38`	`38`	`@import act.route.*`
`39`	`39`	`@{`
`40`		`- List<RouteInfo> routes = _ctx.router().debug();`
`41`		`- act.route.RouteInfo req = RouteInfo.of(_ctx);`
	`40`	`+ List<RouteInfo> routes = _action.router().debug();`
	`41`	`+ act.route.RouteInfo req = RouteInfo.of(_action);`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`@def tr(RouteInfo r, String parity) {`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`@extends(errorPage, header: "500 Internal Error")`
`2`	`2`
`3`	`3`	`@{`
`4`		`-act.route.RouteInfo routeInfo = act.route.RouteInfo.of(_ctx);`
	`4`	`+act.route.RouteInfo routeInfo = act.route.RouteInfo.of(_action);`
`5`	`5`	`}`
`6`	`6`
`7`	`7`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`if (_error instanceof act.view.RythmError) {`
`19`	`19`	`templateSourceInfo = ((act.view.RythmError) actError).templateSourceInfo();`
`20`	`20`	`}`
`21`		`-act.route.RouteInfo routeInfo = act.route.RouteInfo.of(_ctx);`
	`21`	`+act.route.RouteInfo routeInfo = null != _action ? act.route.RouteInfo.of(_action) : null;`
`22`	`22`	`List<String> stackTrace = actError.stackTrace();`
`23`	`23`	`}`
`24`	`24`