mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Show which parent folder is shared with the user in the sharing drop down

This commit is contained in:
Michael Gapczynski 2011-08-08 15:49:16 -04:00
parent 968f1282ce
commit 23c8d7b3fb
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/files_sharing/ajax/getitem.php
View File

@ -9,12 +9,14 @@ $source = $userDirectory.$_GET['source'];
$users = OC_Share::getMySharedItem($source);
$source = dirname($source);
while ($source != "" && $source != "/" && $source != "." && $source != $userDirectory) {
$parentUsers = array();
$values = array_values(OC_Share::getMySharedItem($source));
for ($i = 0; $i < count($values); $i++) {
$parentUsers[basename($source)."-".$i] = $values[$i];
if (count($values) > 0) {
$parentUsers = array();
for ($i = 0; $i < count($values); $i++) {
$parentUsers[basename($source)."-".$i] = $values[$i];
}
$users = array_merge($users, $parentUsers);
}
$users = array_merge($users, $parentUsers);
$source = dirname($source);
}
echo json_encode($users);

5
apps/files_sharing/js/share.js
View File

@ -128,10 +128,7 @@ function createShareDropdown(filenames, files) {
$.each(users, function(index, row) {
if (typeof(index) == 'string') {
// TODO typeof not always working, group together users that have parent folders shared with them
list += "<li>disabled";
list += index;
list += row.uid_shared_with;
list += "</li>";
list += "<li>Parent folder "+index.substr(0, index.lastIndexOf('-'))+" shared with "+row.uid_shared_with+"</li>";
} else {
list += "<li data-uid_shared_with='"+row.uid_shared_with+"'>";
list += row.uid_shared_with;