summaryrefslogtreecommitdiffstats
path: root/apps/files
diff options
context:
space:
mode:
authorblizzz <blizzz@owncloud.com>2012-11-22 02:40:23 -0800
committerblizzz <blizzz@owncloud.com>2012-11-22 02:40:23 -0800
commitd4ec77e08b6f6d0e1c9fc570199bcd915b25671e (patch)
treea446f3eaf6ee35f5f89682c19d8cf21e6f0c002f /apps/files
parent54356636e41d95abd9cb37fe628c9e8b02ca2166 (diff)
parent02bc44090017d457fbcf59ec965a0a98ebf82bb3 (diff)
downloadnextcloud-server-d4ec77e08b6f6d0e1c9fc570199bcd915b25671e.tar.gz
nextcloud-server-d4ec77e08b6f6d0e1c9fc570199bcd915b25671e.zip
Merge pull request #482 from eMerzh/fix_prevent_shared_folder
Show error message to prevent adding a shared folder in the root dir fix...
Diffstat (limited to 'apps/files')
-rw-r--r--apps/files/js/files.js4
1 files changed, 4 insertions, 0 deletions
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index bb80841055b..2b250e0c7c5 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -509,6 +509,10 @@ $(document).ready(function() {
$('#notification').text(t('files','Invalid name, \'/\' is not allowed.'));
$('#notification').fadeIn();
return;
+ } else if( type == 'folder' && $('#dir').val() == '/' && $(this).val() == 'Shared') {
+ $('#notification').text(t('files','Invalid folder name. Usage of "Shared" is reserved by Owncloud'));
+ $('#notification').fadeIn();
+ return;
}
var name = getUniqueName($(this).val());
if (name != $(this).val()) {