Skip to content
This repository was archived by the owner on Nov 25, 2020. It is now read-only.

Commit 773423c

Browse files
committed
Make sure to use ConfService::listRepositoriesWithCriteria() instead of directly conf storage implementation, otherwise the hardcode workspaces/templates may be missing.
1 parent 3c0db46 commit 773423c

File tree

3 files changed

+14
-9
lines changed

3 files changed

+14
-9
lines changed

core/src/plugins/access.ajxp_conf/class.ajxp_confAccessDriver.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1126,9 +1126,10 @@ public function switchAction($action, $httpVars, $fileVars)
11261126
case "get_templates_definition":
11271127

11281128
AJXP_XMLWriter::header("repository_templates");
1129-
$repositories = ConfService::getConfStorageImpl()->listRepositoriesWithCriteria(array(
1129+
$count = 0;
1130+
$repositories = ConfService::listRepositoriesWithCriteria(array(
11301131
"isTemplate" => '1'
1131-
));
1132+
), $count);
11321133
foreach ($repositories as $repo) {
11331134
if(!$repo->isTemplate) continue;
11341135
$repoId = $repo->getUniqueId();
@@ -2035,7 +2036,8 @@ public function listRoles($root, $child, $hashValue = null, $returnNodes = false
20352036
//if(strpos($roleId, "AJXP_GRP_") === 0 && !$this->listSpecialRoles) continue;
20362037
$r = array();
20372038
if(!AuthService::canAdministrate($roleObject)) continue;
2038-
$repos = ConfService::getConfStorageImpl()->listRepositoriesWithCriteria(array("role" => $roleObject));
2039+
$count = 0;
2040+
$repos = ConfService::listRepositoriesWithCriteria(array("role" => $roleObject), $count);
20392041
foreach ($repos as $repoId => $repository) {
20402042
if($repository->getAccessType() == "ajxp_shared") continue;
20412043
if(!$roleObject->canRead($repoId) && !$roleObject->canWrite($repoId)) continue;

core/src/plugins/access.ajxp_user/class.UserDashboardDriver.php

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -284,9 +284,10 @@ public function listUsers()
284284
$loggedUser = AuthService::getLoggedUser();
285285
$users = ConfService::getConfStorageImpl()->getUserChildren($loggedUser->getId()); // AuthService::listUsers();
286286
$mess = ConfService::getMessages();
287-
$repoList = ConfService::getConfStorageImpl()->listRepositoriesWithCriteria(array(
287+
$count = 0;
288+
$repoList = ConfService::listRepositoriesWithCriteria(array(
288289
"owner_user_id" => $loggedUser->getId()
289-
));
290+
), $count);
290291
$userArray = array();
291292
foreach ($users as $userIndex => $userObject) {
292293
$label = $userObject->getId();
@@ -330,9 +331,10 @@ public function listRepositories()
330331
AJXP_XMLWriter::sendFilesListComponentConfig('<columns switchGridMode="filelist"><column messageId="ajxp_conf.8" attributeName="ajxp_label" sortType="String"/><column messageId="user_dash.9" attributeName="parent_label" sortType="String"/><column messageId="user_dash.9" attributeName="repo_accesses" sortType="String"/></columns>');
331332
$repoArray = array();
332333
$loggedUser = AuthService::getLoggedUser();
333-
$repos = ConfService::getConfStorageImpl()->listRepositoriesWithCriteria(array(
334+
$count = 0;
335+
$repos = ConfService::listRepositoriesWithCriteria(array(
334336
"owner_user_id" => $loggedUser->getId()
335-
));
337+
), $count);
336338

337339
$searchAll = ConfService::getCoreConf("CROSSUSERS_ALLGROUPS", "conf");
338340
$displayAll = ConfService::getCoreConf("CROSSUSERS_ALLGROUPS_DISPLAY", "conf");

core/src/plugins/core.conf/class.AbstractConfDriver.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -940,9 +940,10 @@ public function switchAction($action, $httpVars, $fileVars)
940940
case "get_user_templates_definition":
941941

942942
AJXP_XMLWriter::header("repository_templates");
943-
$repositories = ConfService::getConfStorageImpl()->listRepositoriesWithCriteria(array(
943+
$count = 0;
944+
$repositories = ConfService::listRepositoriesWithCriteria(array(
944945
"isTemplate" => 1
945-
));
946+
), $count);
946947
$pServ = AJXP_PluginsService::getInstance();
947948
foreach ($repositories as $repo) {
948949
if(!$repo->isTemplate) continue;

0 commit comments

Comments
 (0)