aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2019-05-01 15:35:20 +0200
committerMario Vavti <mario@mariovavti.com>2019-05-01 15:35:20 +0200
commit9594ce9a8a1295a1e085bc53ab93a77055de2a77 (patch)
tree2e9b32607c6e551b5554f6ca9ad416dfcee56ccb
parentb8d8887d5a97d458ffeff8bf36c8feb5843f1dd4 (diff)
downloadvolse-hubzilla-9594ce9a8a1295a1e085bc53ab93a77055de2a77.tar.gz
volse-hubzilla-9594ce9a8a1295a1e085bc53ab93a77055de2a77.tar.bz2
volse-hubzilla-9594ce9a8a1295a1e085bc53ab93a77055de2a77.zip
calendar merge: fix event_xchan mixup
-rw-r--r--Zotlabs/Module/Channel_calendar.php6
-rw-r--r--view/tpl/cdav_calendar.tpl20
2 files changed, 13 insertions, 13 deletions
diff --git a/Zotlabs/Module/Channel_calendar.php b/Zotlabs/Module/Channel_calendar.php
index 7fa03fb34..a600adbfa 100644
--- a/Zotlabs/Module/Channel_calendar.php
+++ b/Zotlabs/Module/Channel_calendar.php
@@ -147,11 +147,6 @@ class Channel_calendar extends \Zotlabs\Web\Controller {
}
return;
}
-
- if($x[0]['event_xchan'] !== $channel['xchan_hash']) {
- notice( t('Not allowed.') . EOL);
- return;
- }
$acl->set($x[0]);
@@ -570,7 +565,6 @@ class Channel_calendar extends \Zotlabs\Web\Controller {
'd' => $d,
'editable' => $edit ? true : false,
- 'className' => 'channel_calendar_id_' . $rr['id'],
'is_first'=>$is_first,
'item'=>$rr,
diff --git a/view/tpl/cdav_calendar.tpl b/view/tpl/cdav_calendar.tpl
index 827c57b96..9641e2ab5 100644
--- a/view/tpl/cdav_calendar.tpl
+++ b/view/tpl/cdav_calendar.tpl
@@ -6,6 +6,7 @@ var views = {'dayGridMonth' : '{{$month}}', 'timeGridWeek' : '{{$week}}', 'timeG
var event_id;
var event_uri;
+var event_xchan;
var contact_allow = [];
var group_allow = [];
@@ -128,6 +129,7 @@ $(document).ready(function() {
$('#event_submit').val('update_event').html('{{$update}}');
$('#dbtn-acl').addClass('d-none');
event_id = event.extendedProps.item ? event.extendedProps.item.id : 0;
+ event_xchan = event.extendedProps.item ? event.extendedProps.item.event_xchan : '';
contact_allow = event.extendedProps.contact_allow || [];
group_allow = event.extendedProps.group_allow || [];
@@ -144,7 +146,7 @@ $(document).ready(function() {
$('#id_description').attr('disabled', false);
$('#id_location').attr('disabled', false);
- if(calendar_id == 'channel_calendar' && !event.ui.startEditable) {
+ if(calendar_id === 'channel_calendar' && !event.ui.startEditable) {
$('#event_submit').hide();
}
}
@@ -177,12 +179,13 @@ $(document).ready(function() {
$('#id_dtend').val(dtend.toUTCString());
event_id = event.extendedProps.item ? event.extendedProps.item.id : 0;
+ event_xchan = event.extendedProps.item ? event.extendedProps.item.event_xchan : '';
if(event.extendedProps.calendar_id === 'channel_calendar') {
$.post( 'channel_calendar', {
'event_id': event_id,
'event_hash': event_uri,
- 'xchan': '{{$channel_hash}}',
+ 'xchan': event_xchan,
//'mid': mid,
'type': 'event',
'preview': 0,
@@ -224,12 +227,13 @@ $(document).ready(function() {
$('#id_dtend').val(dtend.toUTCString());
event_id = event.extendedProps.item ? event.extendedProps.item.id : 0;
+ event_xchan = event.extendedProps.item ? event.extendedProps.item.event_xchan : '';
if(event.extendedProps.calendar_id === 'channel_calendar') {
$.post( 'channel_calendar', {
'event_id': event_id,
'event_hash': event_uri,
- 'xchan': '{{$channel_hash}}',
+ 'xchan': event_xchan,
//'mid': mid,
'type': 'event',
'preview': 0,
@@ -315,6 +319,8 @@ $(document).ready(function() {
event_id = resource.id;
event_uri = resource.event_hash;
+ event_xchan = resource.event_xchan;
+
$('#calendar_select').val('channel_calendar').attr('disabled', true);
$('#id_title').val(resource.summary);
$('#id_dtstart').val(new Date(resource.dtstart).toUTCString());
@@ -323,7 +329,7 @@ $(document).ready(function() {
$('#id_description').val(resource.description);
$('#id_location').val(resource.location);
- if(resource.event_xchan !== '{{$channel_hash}}')
+ if(event_xchan !== '{{$channel_hash}}')
$('#event_submit').hide();
else
$('#event_submit').html('{{$update}}');
@@ -380,7 +386,7 @@ function updateSize() {
}
function on_submit() {
- if($('#calendar_select').val() == 'channel_calendar') {
+ if($('#calendar_select').val() === 'channel_calendar') {
if(new_event_id) {
$("input[name='contact_allow[]']").each(function() {
contact_allow.push($(this).val());
@@ -399,7 +405,7 @@ function on_submit() {
$.post( 'channel_calendar', {
'event_id': event_id,
'event_hash': event_uri,
- 'xchan': '{{$channel_hash}}',
+ 'xchan': event_xchan,
//'mid': mid,
'type': 'event',
'preview': 0,
@@ -447,7 +453,7 @@ function on_submit() {
}
function on_delete() {
- if($('#calendar_select').val() == 'channel_calendar') {
+ if($('#calendar_select').val() === 'channel_calendar') {
$.get('channel_calendar/drop/' + event_uri, function() {
var eventSource = calendar.getEventSourceById('channel_calendar');
eventSource.refetch();