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

Commit

Permalink
Add user / group identifier in listing - Close #479
Browse files Browse the repository at this point in the history
  • Loading branch information
cdujeu committed Oct 28, 2014
1 parent a715497 commit 34385ad
Showing 1 changed file with 5 additions and 1 deletion.
Expand Up @@ -1823,13 +1823,15 @@ public function listUsers($root, $child, $hashValue = null, $returnNodes = false
$allNodes = array();
$columns = '<columns switchDisplayMode="list" switchGridMode="filelist" template_name="ajxp_conf.users">
<column messageId="ajxp_conf.6" attributeName="ajxp_label" sortType="String" defaultWidth="40%"/>
<column messageId="ajxp_conf.102" attributeName="object_id" sortType="String" defaultWidth="10%"/>
<column messageId="ajxp_conf.7" attributeName="isAdmin" sortType="String" defaultWidth="10%"/>
<column messageId="ajxp_conf.70" attributeName="ajxp_roles" sortType="String" defaultWidth="15%"/>
<column messageId="ajxp_conf.62" attributeName="rights_summary" sortType="String" defaultWidth="15%"/>
</columns>';
if (AuthService::driverSupportsAuthSchemes()) {
$columns = '<columns switchDisplayMode="list" switchGridMode="filelist" template_name="ajxp_conf.users_authscheme">
<column messageId="ajxp_conf.6" attributeName="ajxp_label" sortType="String" defaultWidth="40%"/>
<column messageId="ajxp_conf.102" attributeName="object_id" sortType="String" defaultWidth="10%"/>
<column messageId="ajxp_conf.115" attributeName="auth_scheme" sortType="String" defaultWidth="5%"/>
<column messageId="ajxp_conf.7" attributeName="isAdmin" sortType="String" defaultWidth="5%"/>
<column messageId="ajxp_conf.70" attributeName="ajxp_roles" sortType="String" defaultWidth="15%"/>
Expand Down Expand Up @@ -1859,7 +1861,8 @@ public function listUsers($root, $child, $hashValue = null, $returnNodes = false
$nodeKey = "/data/".$root."/".ltrim($groupId,"/");
$meta = array(
"icon" => "users-folder.png",
"ajxp_mime" => "group"
"ajxp_mime" => "group",
"object_id" => $groupId
);
if(in_array($nodeKey, $this->currentBookmarks)) $meta = array_merge($meta, array("ajxp_bookmarked" => "true", "overlay_icon" => "bookmark.png"));
$xml = AJXP_XMLWriter::renderNode($nodeKey,
Expand Down Expand Up @@ -1915,6 +1918,7 @@ public function listUsers($root, $child, $hashValue = null, $returnNodes = false
$meta = array(
"isAdmin" => $mess[($isAdmin?"ajxp_conf.14":"ajxp_conf.15")],
"icon" => $icon.".png",
"object_id" => $userId,
"auth_scheme" => ($scheme != null? $scheme : ""),
"rights_summary" => $rightsString,
"ajxp_roles" => implode(", ", $roles),
Expand Down

2 comments on commit 34385ad

@Nanomani
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cdujeu
thx :-)

PS : last few days Pydio-latest.zip is the code for Pydio 5.2.5
is it normal ? how can i downloaded latest Pydio 5.3.x

@cdujeu
Copy link
Member Author

@cdujeu cdujeu commented on 34385ad Oct 28, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you're right, my bad.
Next build should be back on develop branch. Now triggered automatically on each commit.
-c

Please sign in to comment.