Pass application Root for history manager. We should have an htaccess…

… generation at install, as it's getting more complicated to configure.
pydio · Mar 12, 2014 · cf9e67b · cf9e67b
1 parent 3ec5f2f
commit cf9e67b
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/core/src/plugins/gui.ajax/class.AJXP_ClientDriver.php b/core/src/plugins/gui.ajax/class.AJXP_ClientDriver.php
@@ -172,9 +172,14 @@ public function switchAction($action, $httpVars, $fileVars)
                     }
                 }
 
+                $root = $_SERVER['REQUEST_URI'];
+                if(basename($root) == "dashboard" || basename($root) == "settings" || strpos(basename($root), "ws-") === 0){
+                    $root = dirname($root);
+                }
                 $START_PARAMETERS = array(
                     "BOOTER_URL"=>"index.php?get_action=get_boot_conf",
-                    "MAIN_ELEMENT" => "ajxp_desktop"
+                    "MAIN_ELEMENT" => "ajxp_desktop",
+                    "APPLICATION_ROOT" => $root
                 );
                 if (AuthService::usersEnabled()) {
                     AuthService::preLogUser((isSet($httpVars["remote_session"])?$httpVars["remote_session"]:""));

diff --git a/core/src/plugins/gui.ajax/res/js/ajaxplorer.js b/core/src/plugins/gui.ajax/res/js/ajaxplorer.js
diff --git a/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.Ajaxplorer.js b/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.Ajaxplorer.js
@@ -113,7 +113,17 @@ Class.create("Ajaxplorer", {
         });
 
         window.router = new WorkspaceRouter();
-        Backbone.history.start({pushState: true});
+        var appRoot = ajxpBootstrap.parameters.get('APPLICATION_ROOT');
+        if(appRoot && appRoot != "/"){
+            Backbone.history.start({
+                pushState: true,
+                root:appRoot
+            });
+        }else{
+            Backbone.history.start({
+                pushState: true
+            });
+        }
         if(this.user && this.user.getActiveRepository()){
             var repoList = this.user.getRepositoriesList();
             var activeRepo = repoList.get(this.user.getActiveRepository());