rysiek
/
owncalendar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

last permission setting woes resolved

master
Michał 'rysiek' Woźniak 2014-01-25 02:57:50 +01:00
parent ec95de9d2c
commit 286a5cb263
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
js/calendar.js
View File

@ -618,8 +618,9 @@ Calendar={
var shareWith = selected.item.value.shareWith;
$(this).val(shareWith);
var shareWithInput = $(this)
// Default permissions are Read and Share
var permissions = OC.PERMISSION_READ | OC.PERMISSION_SHARE;
// getting the default permissions from data-permissions
// shouldn't it be OC.PERMISSION_READ | OC.PERMISSION_SHARE instead, as a sensible default?
var permissions = $(this).data('permissions')
OC.Share.share(itemType, itemSource, shareType, shareWith, permissions, function(data) {
console.log('PERMISSIONS: ' + permissions)
// we need to "fix" the share-can-edit-ITEMPTYPE-ITEMSOURCE-0 checkbox and label
@ -654,6 +655,9 @@ Calendar={
.find('.share-options input[name="share"]')
.prop('checked', permissions & OC.PERMISSION_SHARE)
.end()
.find('.share-options input[name="edit"]')
.prop('checked', permissions & ( OC.PERMISSION_CREATE | OC.PERMISSION_UPDATE | OC.PERMISSION_DELETE ) )
.end()
// handle the share-can-edit-ITEMPTYPE-ITEMSOURCE-0 checkbox and label
.find('#' + editCheckboxIdStub + '0')
.prop('id', editCheckboxIdStub + curEditCheckboxId)
@ -680,32 +684,28 @@ Calendar={
$(document)
.off('change', '.shared-with-entry-container input:checkbox[data-permissions]')
.on('change', '.shared-with-entry-container input:checkbox[data-permissions]', function(){
console.log('PERMISSIONS!')
// get the data
var container = $(this).parents('li').first();
var permissions = parseInt(container.data('permissions'));
var permissions = parseInt(container.attr('data-permissions'));
var itemType = container.data('item-type');
var shareType = container.data('share-type');
var itemSource = container.data('item');
var shareWith = container.data('share-with');
var permission = null;
if($(this).hasClass('update')) {
permission = OC.PERMISSION_UPDATE;
permission = OC.PERMISSION_DELETE;
} else if($(this).hasClass('share')) {
permission = OC.PERMISSION_SHARE;
}
// This is probably not the right way, but it works :-P
var permission = $(this).data('permissions');
// find the required perms
if($(this).is(':checked')) {
permissions += permission;
permissions |= permission;
} else {
permissions -= permission;
permissions &= ~permission;
}
container.data('permissions',permissions);
console.log('setting permissions to: ' + permissions)
// save current permissions on the container
container.attr('data-permissions', permissions);
//OC.Share.setPermissions(itemType, itemSource, shareType, shareWith, permissions);
// run the request
OC.Share.setPermissions(itemType, itemSource, shareType, shareWith, permissions);
});
// using .off() to make sure the event is only attached once

4
templates/part.internalshare.php
View File

@ -33,7 +33,7 @@
data-item-source="<?php p($_['item_id']); ?>"
data-item-type="<?php p($_['item_type']); ?>"
data-link="true"
data-permissions="<?php p($_['permissions']) ?>"
data-permissions="<?php p($sharee['permissions']); ?>"
title="<?php p($sharee['share_with']); ?>"
class="shared-with-entry-container <?php if($i === 0): ?>stub<?php endif; ?>">
<!-- the username -->
@ -51,7 +51,7 @@
-->
<input type="checkbox" class="permissions"
<?php if(empty($_['basic_edit_options'])): ?>
name="edit" checked="checked" disabled="disabled"
name="edit" <?php if ($sharee['permissions'] & (OCP\PERMISSION_UPDATE | OCP\PERMISSION_CREATE | OCP\PERMISSION_DELETE ) ): ?> checked="checked"<?php endif; ?> disabled="disabled"
<?php else: ?>
name="update" data-permissions="2" <?php p(($sharee['permissions'] & OCP\PERMISSION_UPDATE?'checked="checked"':''))?> id="share-can-edit-<?php p($_['item_type']); ?>-<?php p($_['item_id']); ?>-<?php p($i); ?>"
<?php endif; ?>