From 2269f74c27b7de6a4fb2bba9a77ffc3b54ab3ee0 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Wed, 19 Oct 2011 19:07:56 +0200
Subject: Fix changing calendar data

---
 apps/calendar/ajax/activation.php     | 7 +++++--
 apps/calendar/ajax/createcalendar.php | 5 ++++-
 apps/calendar/ajax/updatecalendar.php | 5 ++++-
 3 files changed, 13 insertions(+), 4 deletions(-)

(limited to 'apps/calendar/ajax')

diff --git a/apps/calendar/ajax/activation.php b/apps/calendar/ajax/activation.php
index 89239f21759..72882496ab6 100644
--- a/apps/calendar/ajax/activation.php
+++ b/apps/calendar/ajax/activation.php
@@ -13,5 +13,8 @@ if(!OC_USER::isLoggedIn()) {
 OC_JSON::checkAppEnabled('calendar');
 $calendarid = $_POST['calendarid'];
 OC_Calendar_Calendar::setCalendarActive($calendarid, $_POST['active']);
-$cal = OC_Calendar_Calendar::findCalendar($calendarid);
-echo $cal['active'];
+$calendar = OC_Calendar_Calendar::findCalendar($calendarid);
+OC_JSON::success(array(
+	'active' => $calendar['active'],
+	'eventSource' => OC_Calendar_Calendar::getEventSourceInfo($calendar),
+));
diff --git a/apps/calendar/ajax/createcalendar.php b/apps/calendar/ajax/createcalendar.php
index 3fb2e8398a3..325a5ec35bc 100644
--- a/apps/calendar/ajax/createcalendar.php
+++ b/apps/calendar/ajax/createcalendar.php
@@ -20,4 +20,7 @@ OC_Calendar_Calendar::setCalendarActive($calendarid, 1);
 $calendar = OC_Calendar_Calendar::findCalendar($calendarid);
 $tmpl = new OC_Template('calendar', 'part.choosecalendar.rowfields');
 $tmpl->assign('calendar', $calendar);
-OC_JSON::success(array('data' => $tmpl->fetchPage()));
+OC_JSON::success(array(
+	'page' => $tmpl->fetchPage(),
+	'eventSource' => OC_Calendar_Calendar::getEventSourceInfo($calendar),
+));
diff --git a/apps/calendar/ajax/updatecalendar.php b/apps/calendar/ajax/updatecalendar.php
index a81644ded17..e99ca16e22a 100644
--- a/apps/calendar/ajax/updatecalendar.php
+++ b/apps/calendar/ajax/updatecalendar.php
@@ -20,4 +20,7 @@ OC_Calendar_Calendar::setCalendarActive($calendarid, $_POST['active']);
 $calendar = OC_Calendar_Calendar::findCalendar($calendarid);
 $tmpl = new OC_Template('calendar', 'part.choosecalendar.rowfields');
 $tmpl->assign('calendar', $calendar);
-OC_JSON::success(array('data' => $tmpl->fetchPage()));
+OC_JSON::success(array(
+	'page' => $tmpl->fetchPage(),
+	'eventSource' => OC_Calendar_Calendar::getEventSourceInfo($calendar),
+));
-- 
cgit v1.2.3