From b2da2f769a896af5a139e6ce426e835b6c60aca9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Tue, 12 Mar 2013 17:28:36 +0100 Subject: [PATCH 1/2] don't add share action to the Shared folder --- apps/files/js/fileactions.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js index 38f5bab6f7..3c4fa08bf1 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -112,7 +112,7 @@ var FileActions = { addAction(name, action); } }); - if(actions.Share){ + if(actions.Share && file !== 'Shared'){ addAction('Share', actions.Share); } From e5f40ddaae1004835600f3b5a44bc1bdaea59d63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Wed, 13 Mar 2013 11:33:20 +0100 Subject: [PATCH 2/2] only prevent shared action for the Shared folder in the root dir --- apps/files/js/fileactions.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js index 3c4fa08bf1..f3264da5a1 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -112,7 +112,7 @@ var FileActions = { addAction(name, action); } }); - if(actions.Share && file !== 'Shared'){ + if(actions.Share && !($('#dir').val() === '/' && file === 'Shared')){ addAction('Share', actions.Share); }