Skip to content

Allow selecting permissions before sharing #1836

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
rullzer wants to merge 1 commit into from
Closed

Allow selecting permissions before sharing #1836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
121 changes: 106 additions & 15 deletions core/js/sharedialogview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,34 @@
'<div class="resharerInfoView subView"></div>' +
'{{#if isSharingAllowed}}' +
'<label for="shareWith-{{cid}}" class="hidden-visually">{{shareLabel}}</label>' +
'<div class="oneline">' +
'<div class="oneline shareInput">' +
' <a href="#"><span class="preSharePermissions"></span></a>' +
'<div class="popovermenu bubble hidden menu">' +
'<ul>' +
'<li>' +
'<span class="sharePermission">' +
'<input id="sharePermission-read-{{cid}}" type="checkbox" name="share" class="permissions checkbox" checked="checked" disabled="disabled" data-permissions="{{readPermission}}"/>' +
'<label for="sharePermission-read-{{cid}}">{{readLabel}}</label>' +
'</span>' +
'</li>' +
'{{#if canEdit}}' +
'<li>' +
'<span class="sharePermission">' +
'<input id="sharePermission-edit-{{cid}}" type="checkbox" name="share" class="permissions checkbox" checked="checked" data-permissions="{{editPermission}}"/>' +
'<label for="sharePermission-edit-{{cid}}">{{editLabel}}</label>' +
'</span>' +
'</li>' +
'{{/if}}' +
'{{#if canShare}}' +
'<li>' +
'<span class="sharePermission">' +
'<input id="sharePermission-share-{{cid}}" type="checkbox" name="share" class="permissions checkbox" checked="checked" data-permissions="{{sharePermission}}"/>' +
'<label for="sharePermission-share-{{cid}}">{{shareLabel}}</label>' +
'</span>' +
'</li>' +
'{{/if}}' +
'</ul>' +
'</div>' +
' <input id="shareWith-{{cid}}" class="shareWithField" type="text" placeholder="{{sharePlaceholder}}" />' +
' <span class="shareWithLoading icon-loading-small hidden"></span>'+
'{{{remoteShareInfo}}}' +
Expand Down Expand Up @@ -74,7 +101,9 @@
mailView: undefined,

events: {
'input .shareWithField': 'onShareWithFieldChanged'
'input .shareWithField': 'onShareWithFieldChanged',
'click .preSharePermissions': 'onTogglePermissionsMenu',
'click .permissions': 'onPermissionChange',
},

initialize: function(options) {
Expand Down Expand Up @@ -297,18 +326,25 @@
$loading.removeClass('hidden')
.addClass('inlineblock');

this.model.addShare(s.item.value, {success: function() {
$(e.target).val('')
.attr('disabled', false);
$loading.addClass('hidden')
.removeClass('inlineblock');
}, error: function(obj, msg) {
OC.Notification.showTemporary(msg);
$(e.target).attr('disabled', false)
.autocomplete('search', $(e.target).val());
$loading.addClass('hidden')
.removeClass('inlineblock');
}});
var permissions = $(this.$el.find('.preSharePermissions')).data('permissions');
var attributes = s.item.value;
attributes.permissions = permissions;

this.model.addShare(attributes, {
success: function() {
$(e.target).val('')
.attr('disabled', false);
$loading.addClass('hidden')
.removeClass('inlineblock');
},
error: function(obj, msg) {
OC.Notification.showTemporary(msg);
$(e.target).attr('disabled', false)
.autocomplete('search', $(e.target).val());
$loading.addClass('hidden')
.removeClass('inlineblock');
}
});
},

_toggleLoading: function(state) {
Expand Down Expand Up @@ -339,14 +375,40 @@
render: function() {
var baseTemplate = this._getTemplate('base', TEMPLATE_BASE);

var editPermission = 0;
if (this.model.updatePermissionPossible()) {
editPermission |= OC.PERMISSION_UPDATE;
}
if (this.model.createPermissionPossible()) {
editPermission |= OC.PERMISSION_CREATE;
}
if (this.model.deletePermissionPossible()) {
editPermission |= OC.PERMISSION_DELETE;
}

var canShare = this.configModel.get('isResharingAllowed') && this.model.sharePermissionPossible();

this.$el.html(baseTemplate({
cid: this.cid,
shareLabel: t('core', 'Share'),
sharePlaceholder: this._renderSharePlaceholderPart(),
remoteShareInfo: this._renderRemoteShareInfoPart(),
isSharingAllowed: this.model.sharePermissionPossible()
isSharingAllowed: this.model.sharePermissionPossible(),
readLabel: t('core', 'Read'),
editLabel: t('core', 'Edit'),
readPermission: OC.PERMISSION_READ,
sharePermission: OC.PERMISSION_SHARE,
editPermission: editPermission,
canEdit: editPermission !== 0,
canShare: canShare
}));

var permissions = OC.PERMISSION_READ | editPermission;
if (canShare) {
permissions |= OC.PERMISSION_SHARE;
}
this.updatePermissions(permissions);

var $shareField = this.$el.find('.shareWithField');
if ($shareField.length) {
$shareField.autocomplete({
Expand Down Expand Up @@ -442,6 +504,35 @@
*/
_getRemoteShareInfoTemplate: function() {
return this._getTemplate('remoteShareInfo', TEMPLATE_REMOTE_SHARE_INFO);
},

onTogglePermissionsMenu: function(event) {
event.preventDefault();
event.stopPropagation();
var $element = $(event.target);
var $div = $element.closest('.shareInput');
var $menu = $div.find('.popovermenu');

OC.showMenu(null, $menu);
this._menuOpen = true;
},

onPermissionChange: function(event) {
var $element = $(event.target);
var $div = $element.closest('.shareInput');

var permissions = 0;
$('.permissions', $div).filter(':checked').each(function(index, checkbox) {
permissions |= $(checkbox).data('permissions');
});

this.updatePermissions(permissions);
},

updatePermissions: function(permissions) {
var el = $(this.$el.find('.preSharePermissions'));
el.html(permissions);
el.data('permissions', permissions);
}
});

Expand Down
7 changes: 4 additions & 3 deletions core/js/shareitemmodel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,9 +147,10 @@
},

addShare: function(attributes, options) {
var shareType = attributes.shareType;
options = options || {};
attributes = _.extend({}, attributes);
attributes = _.extend({
permissions: OC.PERMISSION_ALL
}, attributes);

// Default permissions are Edit (CRUD) and Share
// Check if these permissions are possible
Expand All @@ -167,7 +168,7 @@
permissions = permissions | OC.PERMISSION_SHARE;
}

attributes.permissions = permissions;
attributes.permissions &= permissions;
if (_.isUndefined(attributes.path)) {
attributes.path = this.fileInfoModel.getFullPath();
}
Expand Down