[Pkg-owncloud-commits] [owncloud] 152/199: Fixed sharing permissions

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 85648def56e7ddea8c2c334a5399d0e5090d5208
Author: Vincent Petry <pvince81 at owncloud.com>
Date:   Mon May 19 18:33:43 2014 +0200

    Fixed sharing permissions
---
 apps/files_sharing/js/sharedfilelist.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/files_sharing/js/sharedfilelist.js b/apps/files_sharing/js/sharedfilelist.js
index 9d8c9e3..f3a6d66 100644
--- a/apps/files_sharing/js/sharedfilelist.js
+++ b/apps/files_sharing/js/sharedfilelist.js
@@ -133,8 +133,7 @@
 					/* jshint camelcase: false */
 					var file = {
 						id: share.file_source,
-						mtime: share.stime * 1000,
-						permissions: share.permissions
+						mtime: share.stime * 1000
 					};
 					if (share.item_type === 'folder') {
 						file.type = 'dir';
@@ -156,11 +155,13 @@
 						file.share.ownerDisplayName = share.displayname_owner;
 						file.name = OC.basename(share.file_target);
 						file.path = OC.dirname(share.file_target);
+						file.permissions = share.permissions;
 					}
 					else {
 						file.share.targetDisplayName = share.share_with_displayname;
 						file.name = OC.basename(share.path);
 						file.path = OC.dirname(share.path);
+						file.permissions = OC.PERMISSION_ALL;
 					}
 					return file;
 				})

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git