Append the port to the relative url for dev apps with direct connect

disabled.
wocommunity · Feb 21, 2013 · 40df909 · 40df909
1 parent e8bbb56
commit 40df909
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/appserver/ERXWOContext.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/appserver/ERXWOContext.java
@@ -35,6 +35,8 @@ public class ERXWOContext extends ERXAjaxContext implements ERXMutableUserInfoHo
 	private static Observer observer;
 	private boolean _generateCompleteURLs;
 	private boolean _generateCompleteResourceURLs;
+
+	private static final boolean IS_DEV = ERXApplication.isDevelopmentModeSafe();
 
 	public static final String CONTEXT_KEY = "wocontext";
 	public static final String CONTEXT_DICTIONARY_KEY = "ERXWOContext.dict";
@@ -686,4 +688,14 @@ public static String ajaxActionUrl(WOContext context) {
 		return url;
 	}
 
+	@Override
+	protected String relativeURLWithRequestHandlerKey(String requestHandlerKey, String requestHandlerPath, String queryString) {
+		String result = super.relativeURLWithRequestHandlerKey(requestHandlerKey, requestHandlerPath, queryString);
+		if(IS_DEV && !WOApplication.application().isDirectConnectEnabled()) {
+			String extension = WOApplication.application().applicationExtension();
+			Number port = WOApplication.application().port();
+			result = result.replace(extension, extension + "/-" + port);
+		}
+		return result;
+	}
 }