Better handle of no repository or user locked case

pydio · Sep 10, 2014 · da79633 · da79633 · c12simple · Sep 11, 2014
1 parent bd2f014
commit da79633
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 13 deletions.
diff --git a/core/src/core/classes/class.AJXP_Controller.php b/core/src/core/classes/class.AJXP_Controller.php
@@ -94,7 +94,7 @@ public static function filterRegistryFromRole(&$registry)
         }
         $parameters = $loggedUser->mergedRole->listParameters();
         foreach ($parameters as $scope => $paramsPlugs) {
-            if ($scope == AJXP_REPO_SCOPE_ALL || $scope == $crtRepoId || ($crtRepo->hasParent() && $scope == AJXP_REPO_SCOPE_SHARED)) {
+            if ($scope == AJXP_REPO_SCOPE_ALL || $scope == $crtRepoId || ($crtRepo!=null && $crtRepo->hasParent() && $scope == AJXP_REPO_SCOPE_SHARED)) {
                 foreach ($paramsPlugs as $plugId => $params) {
                     foreach ($params as $name => $value) {
                         // Search exposed plugin_configs, replace if necessary.

diff --git a/core/src/core/classes/class.ConfService.php b/core/src/core/classes/class.ConfService.php
@@ -563,7 +563,9 @@ protected function initRepositoriesListInst($scope = "user", $includeShared = tr
     {
         // APPEND CONF FILE REPOSITORIES
         $loggedUser = AuthService::getLoggedUser();
+        $l = $loggedUser->getLock();
         $objList = array();
+        if(!empty($l)) return $objList;
         foreach ($this->configs["DEFAULT_REPOSITORIES"] as $index=>$repository) {
             $repo = self::createRepositoryFromArray($index, $repository);
             if($scope == "user" && $loggedUser != null && !self::repositoryIsAccessible($index, $repo, $loggedUser)){

diff --git a/core/src/plugins/core.conf/class.AbstractConfDriver.php b/core/src/plugins/core.conf/class.AbstractConfDriver.php
@@ -1110,10 +1110,13 @@ public function switchAction($action, $httpVars, $fileVars)
             case "load_repository_info":
 
                 $data = array();
-                $users = AuthService::countUsersForRepository(ConfService::getRepository()->getId(), true);
-                $data["core.users"] = $users;
-                if(isSet($httpVars["collect"]) && $httpVars["collect"] == "true"){
-                    AJXP_Controller::applyHook("repository.load_info", array(&$data));
+                $repo = ConfService::getRepository();
+                if($repo != null){
+                    $users = AuthService::countUsersForRepository(ConfService::getRepository()->getId(), true);
+                    $data["core.users"] = $users;
+                    if(isSet($httpVars["collect"]) && $httpVars["collect"] == "true"){
+                        AJXP_Controller::applyHook("repository.load_info", array(&$data));
+                    }
                 }
                 HTMLWriter::charsetHeader("application/json");
                 echo json_encode($data);

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
@@ -143,11 +143,13 @@ Class.create("Ajaxplorer", {
         if(this.user && this.user.getActiveRepository()){
             var repoList = this.user.getRepositoriesList();
             var activeRepo = repoList.get(this.user.getActiveRepository());
-            var slug = activeRepo.getSlug();
-            if(!activeRepo.getAccessType().startsWith("ajxp_")){
-                slug = "ws-" + slug;
+            if(activeRepo){
+                var slug = activeRepo.getSlug();
+                if(!activeRepo.getAccessType().startsWith("ajxp_")){
+                    slug = "ws-" + slug;
+                }
+                this.router.navigate(slug);
             }
-            this.router.navigate(slug);
         }
         var navigate = function(repList, repId){
             if(repId === false){

diff --git a/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.InfoPanel.js b/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.InfoPanel.js
@@ -154,9 +154,11 @@ Class.create("InfoPanel", AjxpPane, {
         var repoOptions = {};
         if(ajaxplorer.user && ajaxplorer.user.getActiveRepository()){
             var repo = ajaxplorer.user.repositories.get(ajaxplorer.user.getActiveRepository());
-            repoOptions = {
-                ws_label: repo.getLabel(),
-                ws_badge: repo.getHtmlBadge()
+            if(repo){
+                repoOptions = {
+                    ws_label: repo.getLabel(),
+                    ws_badge: repo.getHtmlBadge()
+                }
             }
         }