[Pkg-owncloud-commits] [owncloud] 385/394: don't show share action for the Shared folder, approved pull request #2265

[David Prévot]

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

taffit pushed a commit to annotated tag v4.5.10
in repository owncloud.

commit 7514cdef946e04db5f603ba966206209422db386
Author: Björn Schießle <schiessle at owncloud.com>
Date:   Wed Mar 13 16:44:28 2013 +0100

    don't show share action for the Shared folder, approved pull request #2265
---
 apps/files/js/fileactions.js |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index e184cbf..6198ec2 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -72,8 +72,9 @@ var FileActions={
 		parent.children('a.name').append('<span class="fileactions" />');
 		var defaultAction=FileActions.getDefault(FileActions.getCurrentMimeType(),FileActions.getCurrentType(), FileActions.getCurrentPermissions());
 		for(name in actions){
-			// NOTE: Temporary fix to prevent rename action in root of Shared directory
-			if (name == 'Rename' && $('#dir').val() == '/Shared') {
+			// NOTE: Temporary fix to prevent rename action in root of Shared directory and Shared action for Shared folder
+			if (name == 'Rename' && $('#dir').val() == '/Shared' ||
+					(name == 'Share' &&  $('#dir').val() == '/' && file == 'Shared')) {
 				continue;
 			}
 			if((name=='Download' || actions[name]!=defaultAction) && name!='Delete'){

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