PVince81 helped with debug and now we have a "share with link" field in the sharing dialog in calendar, yay!
parent
b23f507fac
commit
c1fff28919
|
@ -583,7 +583,7 @@ Calendar={
|
|||
var newitem = '<li data-item-type="event"'
|
||||
+ 'data-share-with="'+shareWith+'" '
|
||||
+ 'data-permissions="'+permissions+'" '
|
||||
+ 'data-share-type="'+shareType+'">'
|
||||
+ 'data-share-type="'+shareType+'" data-link="true">'
|
||||
+ shareWith
|
||||
+ (shareType === OC.Share.SHARE_TYPE_GROUP ? ' ('+t('core', 'group')+')' : '')
|
||||
+ '<span class="shareactions">'
|
||||
|
|
|
@ -22,3 +22,4 @@
|
|||
<div id="fullcalendar"></div>
|
||||
<div id="dialog_holder"></div>
|
||||
<div id="appsettings" class="popup topright hidden"></div>
|
||||
<input type="hidden" name="allowShareWithLink" id="allowShareWithLink" value="yes" />
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
<td width="20px">
|
||||
<?php if($_['calendar']['permissions'] & OCP\PERMISSION_SHARE) { ?>
|
||||
<a href="#" class="share" data-item-type="calendar" data-item="<?php p($_['calendar']['id']); ?>"
|
||||
data-possible-permissions="<?php p($_['calendar']['permissions']) ?>"
|
||||
data-possible-permissions="<?php p($_['calendar']['permissions']) ?>" data-link="true"
|
||||
title="<?php p($l->t('Share Calendar')) ?>" class="action permanent" style="background-image: url(<?php print_unescaped((!$_['shared']) ? OCP\Util::imagePath('core', 'actions/share.svg') : OCP\Util::imagePath('core', 'actions/shared.svg')) ?>);"></a>
|
||||
<?php } ?>
|
||||
</td>
|
||||
|
|
|
@ -37,6 +37,7 @@ if(is_array($sharedwithByEvent)) {
|
|||
<li data-share-with="<?php p($sharee['share_with']); ?>"
|
||||
data-item="<?php p($eventid); ?>"
|
||||
data-item-type="event"
|
||||
data-link="true"
|
||||
data-permissions="<?php p($sharee['permissions']); ?>"
|
||||
data-share-type="<?php p($sharee['share_type']); ?>">
|
||||
<?php p($sharee['share_with'] . ($sharee['share_type'] == OCP\Share::SHARE_TYPE_GROUP ? ' (group)' : '')); ?>
|
||||
|
@ -70,6 +71,7 @@ if(is_array($sharedwithByEvent)) {
|
|||
<li data-share-with="<?php p($sharee['share_with']); ?>"
|
||||
data-item="<?php p($calid); ?>"
|
||||
data-item-type="calendar"
|
||||
data-link="true"
|
||||
data-permissions="<?php p($sharee['permissions']); ?>"
|
||||
data-share-type="<?php p($sharee['share_type']); ?>">
|
||||
<?php p($sharee['share_with'] . ($sharee['share_type'] == OCP\Share::SHARE_TYPE_GROUP ? ' (group)' : '')); ?>
|
||||
|
|
Loading…
Reference in New Issue