Skip to content

Default share perms #28619

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

Merged
PVince81 merged 8 commits into from
Sep 4, 2017
Merged

Default share perms #28619

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0805ef5
Expose capabilities in core JS
Aug 8, 2017
4527cd5
Add setting for default share permissions
Aug 8, 2017
8e0bbe4
Details default share permissions in settings page
Sep 1, 2017
a186fa1
OCS API now uses default share perms if none passed at creation time
Sep 1, 2017
56c0634
Improve default share perms section layout
Sep 1, 2017
7674147
Fix share capabilities JS tests
Sep 1, 2017
d9178c8
Fix share API unit tests due to default perms setting
Sep 1, 2017
9e60e86
Tweak layout and wording of defualt file share permissions
Sep 4, 2017
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
Prev Previous commit
Next Next commit
Add setting for default share permissions
  • Loading branch information
Vincent Petry committed Sep 1, 2017
commit 4527cd50f8bc618d9ab95b58b00b5e6f18d0f7c5
2 changes: 2 additions & 0 deletions apps/files_sharing/lib/Capabilities.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@ public function getCapabilities() {
$res['resharing'] = $this->config->getAppValue('core', 'shareapi_allow_resharing', 'yes') === 'yes';

$res['group_sharing'] = $this->config->getAppValue('core', 'shareapi_allow_group_sharing', 'yes') === 'yes';

$res['default_permissions'] = (int)$this->config->getAppValue('core', 'shareapi_default_permissions', \OCP\Constants::PERMISSION_ALL);
}

//Federated sharing
Expand Down
14 changes: 8 additions & 6 deletions core/js/shareitemmodel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,23 +126,25 @@
options = options || {};
attributes = _.extend({}, attributes);

var defaultPermissions = OC.getCapabilities()['files_sharing']['default_permissions'] || OC.PERMISSION_ALL;

// Default permissions are Edit (CRUD) and Share
// Check if these permissions are possible
var permissions = OC.PERMISSION_READ;
var possiblePermissions = OC.PERMISSION_READ;
if (this.updatePermissionPossible()) {
permissions = permissions | OC.PERMISSION_UPDATE;
possiblePermissions = possiblePermissions | OC.PERMISSION_UPDATE;
}
if (this.createPermissionPossible()) {
permissions = permissions | OC.PERMISSION_CREATE;
possiblePermissions = possiblePermissions | OC.PERMISSION_CREATE;
}
if (this.deletePermissionPossible()) {
permissions = permissions | OC.PERMISSION_DELETE;
possiblePermissions = possiblePermissions | OC.PERMISSION_DELETE;
}
if (this.configModel.get('isResharingAllowed') && (this.sharePermissionPossible())) {
permissions = permissions | OC.PERMISSION_SHARE;
possiblePermissions = possiblePermissions | OC.PERMISSION_SHARE;
}

attributes.permissions = permissions;
attributes.permissions = defaultPermissions & possiblePermissions;
if (_.isUndefined(attributes.path)) {
attributes.path = this.fileInfoModel.getFullPath();
}
Expand Down
5 changes: 5 additions & 0 deletions settings/templates/panels/admin/filesharing.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,11 @@
value="1" <?php if ($_['allowGroupSharing'] === 'yes') print_unescaped('checked="checked"'); ?> />
<label for="allowGroupSharing"><?php p($l->t('Allow sharing with groups'));?></label><br />
</p>
<p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden');?>">
<input type="checkbox" name="shareapi_default_permissions" id="shareApiDefaultPermissions" class="checkbox"
value="31" <?php if ($_['shareapiDefaultPermissions'] === 31) print_unescaped('checked="checked"'); ?> />
<label for="shareApiDefaultPermissions"><?php p($l->t('Newly created local shares are read-write by default'));?></label><br/>
</p>
<p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden');?>">
<input type="checkbox" name="shareapi_only_share_with_group_members" id="onlyShareWithGroupMembers" class="checkbox"
value="1" <?php if ($_['onlyShareWithGroupMembers']) print_unescaped('checked="checked"'); ?> />
Expand Down