better handling of cross-domain urls in parametric router, thanks Jonathan

2012-09-11 09:55:58 -05:00
parent e5652e36d5
commit 7ae1147df8
3 changed files with 104 additions and 3 deletions
@@ -895,7 +895,11 @@ class MapUrlIn(object):
        self.domain_controller = None
        self.domain_function = None
        arg0 = self.harg0
-        if (self.host, self.port) in base.domains:
+        if not base.exclusive_domain and base.applications and arg0 in base.applications:
+            self.application = arg0
+        elif not base.exclusive_domain and arg0 and not base.applications:
+            self.application = arg0
+        elif (self.host, self.port) in base.domains:
            (self.application, self.domain_controller, self.domain_function) = base.domains[(self.host, self.port)]
            self.env['domain_application'] = self.application
            self.env['domain_controller'] = self.domain_controller