aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJulius Härtl <jus@bitgrid.net>2018-10-31 11:23:23 +0100
committerJulius Härtl <jus@bitgrid.net>2018-11-01 12:36:26 +0100
commit94e8cd5cacb8ed789c42d263aea0ed7d3a59a3f2 (patch)
tree37a4003334725bf55bd6eaa432f6bba96a528f07 /core
parentaa92a00129239a6059ba8b6e202dda5133b6aeb1 (diff)
downloadnextcloud-server-94e8cd5cacb8ed789c42d263aea0ed7d3a59a3f2.tar.gz
nextcloud-server-94e8cd5cacb8ed789c42d263aea0ed7d3a59a3f2.zip
Do not set indeterminate state for file shares
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'core')
-rw-r--r--core/js/sharedialogshareelistview.js4
-rw-r--r--core/js/shareitemmodel.js6
2 files changed, 9 insertions, 1 deletions
diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js
index 2627d5fa662..7026387284d 100644
--- a/core/js/sharedialogshareelistview.js
+++ b/core/js/sharedialogshareelistview.js
@@ -460,7 +460,9 @@
var $edit = _this.$('#canEdit-' + _this.cid + '-' + sharee.shareId);
if($edit.length === 1) {
$edit.prop('checked', sharee.editPermissionState === 'checked');
- $edit.prop('indeterminate', sharee.editPermissionState === 'indeterminate');
+ if (sharee.isFolder) {
+ $edit.prop('indeterminate', sharee.editPermissionState === 'indeterminate');
+ }
}
});
this.$('.popovermenu').on('afterHide', function() {
diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
index c28d85efbf0..7d6fdd0a7de 100644
--- a/core/js/shareitemmodel.js
+++ b/core/js/shareitemmodel.js
@@ -614,6 +614,12 @@
var hcp = this.hasCreatePermission(shareIndex);
var hup = this.hasUpdatePermission(shareIndex);
var hdp = this.hasDeletePermission(shareIndex);
+ if (this.isFile()) {
+ if (hcp || hup || hdp) {
+ return 'checked';
+ }
+ return '';
+ }
if (!hcp && !hup && !hdp) {
return '';
}