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

1. fixed 'not shared with anybody' message when event is link-shared via calendar in the event edit form (part.share.php); 2. permission checkboxes now properly set upon internal sharing via JS

master
Michał 'rysiek' Woźniak 2014-01-25 02:12:42 +01:00
parent 94379d3f78
commit ec95de9d2c
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
js/calendar.js
View File

@ -621,6 +621,7 @@ Calendar={
// Default permissions are Read and Share
var permissions = OC.PERMISSION_READ | OC.PERMISSION_SHARE;
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
var editCheckboxIdStub = 'share-can-edit-' + itemType + '-' + itemSource + '-'
var curEditCheckboxId = $(shareWithInput).parents('.share-interface-container.internal-share').find('.shared-with-entry-container').length
@ -642,16 +643,16 @@ Calendar={
.html(shareWith + (shareType === OC.Share.SHARE_TYPE_GROUP ? ' ('+t('core', 'group')+')' : ''))
.end()
.find('.share-options input[name="create"]')
.prop('checked', true) // TODO base that on what we get in response?
.prop('checked', permissions & OC.PERMISSION_CREATE)
.end()
.find('.share-options input[name="update"]')
.prop('checked', true) // TODO base that on what we get in response?
.prop('checked', permissions & OC.PERMISSION_UPDATE)
.end()
.find('.share-options input[name="delete"]')
.prop('checked', true) // TODO base that on what we get in response?
.prop('checked', permissions & OC.PERMISSION_DELETE)
.end()
.find('.share-options input[name="share"]')
.prop('checked', true) // TODO base that on what we get in response?
.prop('checked', permissions & OC.PERMISSION_SHARE)
.end()
// handle the share-can-edit-ITEMPTYPE-ITEMSOURCE-0 checkbox and label
.find('#' + editCheckboxIdStub + '0')

2
templates/part.share.php
View File

@ -94,7 +94,7 @@ $tmpl->printpage();
</li>
<?php endif; ?>
</ul>
<?php if(!$calsharees) {
<?php if(!$calsharees and !$linkSharedCalendar) {
$nobody = $l->t('Not shared with anyone via calendar');
print_unescaped('<div>' . OC_Util::sanitizeHTML($nobody) . '</div>');
} ?>