diff options
| author | Arthur Schiwon <blizzz@owncloud.com> | 2015-09-14 00:43:11 +0200 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2015-09-16 07:23:28 +0200 |
| commit | 6d832359b6f00bed5b2444b8d3cd0680a459619e (patch) | |
| tree | 3b8707dfb1ce6270b8b9e188a1dd0ca3e1a8d286 | |
| parent | 9fe6d7c568221a77686de80634870e4a40e6ac29 (diff) | |
| download | nextcloud-server-6d832359b6f00bed5b2444b8d3cd0680a459619e.tar.gz nextcloud-server-6d832359b6f00bed5b2444b8d3cd0680a459619e.zip | |
fix allow upload checkbox appeareance
| -rw-r--r-- | apps/files_sharing/js/sharetabview.js | 2 | ||||
| -rw-r--r-- | core/js/shareconfigmodel.js | 2 | ||||
| -rw-r--r-- | core/js/sharedialoglinkshareview.js | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/apps/files_sharing/js/sharetabview.js b/apps/files_sharing/js/sharetabview.js index 6836107306a..9f6c71d1924 100644 --- a/apps/files_sharing/js/sharetabview.js +++ b/apps/files_sharing/js/sharetabview.js @@ -54,7 +54,7 @@ })); var attributes = { - itemType: 'file', + itemType: this.model.isDirectory() ? 'folder' : 'file', itemSource: this.model.get('id'), possiblePermissions: this.model.get('sharePermissions') }; diff --git a/core/js/shareconfigmodel.js b/core/js/shareconfigmodel.js index c6891154c98..16f7e2514d8 100644 --- a/core/js/shareconfigmodel.js +++ b/core/js/shareconfigmodel.js @@ -37,7 +37,7 @@ */ isPublicUploadEnabled: function() { var publicUploadEnabled = $('#filestable').data('allow-public-upload'); - return !_.isUndefined(publicUploadEnabled); + return publicUploadEnabled === 'yes'; }, /** diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js index d95b3d82020..04ea41e5e00 100644 --- a/core/js/sharedialoglinkshareview.js +++ b/core/js/sharedialoglinkshareview.js @@ -29,7 +29,7 @@ ' <span class="icon-loading-small hidden"></span>' + '</div>' + ' {{#if publicUpload}}' + - '<div id="allowPublicUploadWrapper" class="hidden">' + + '<div id="allowPublicUploadWrapper">' + ' <span class="icon-loading-small hidden"></span>' + ' <input type="checkbox" value="1" name="allowPublicUpload" id="sharingDialogAllowPublicUpload" {{{publicUploadChecked}}} />' + ' <label for="sharingDialogAllowPublicUpload">{{publicUploadLabel}}</label>' + |