]> source.dussan.org Git - nextcloud-server.git/commitdiff
Calendar: Fix missing template parameter 'shared' for new and update calendar
authorBart Visscher <bartv@thisnet.nl>
Thu, 21 Jun 2012 21:20:09 +0000 (23:20 +0200)
committerBart Visscher <bartv@thisnet.nl>
Thu, 21 Jun 2012 21:30:04 +0000 (23:30 +0200)
apps/calendar/ajax/calendar/new.php
apps/calendar/ajax/calendar/update.php

index 278c8e5520bb99d40b567b740e8942b37ee21ae1..e77d4ebff03cc6bd55dfaef0a5433a2f5442a3b7 100644 (file)
@@ -31,7 +31,13 @@ OC_Calendar_Calendar::setCalendarActive($calendarid, 1);
 $calendar = OC_Calendar_Calendar::find($calendarid);
 $tmpl = new OCP\Template('calendar', 'part.choosecalendar.rowfields');
 $tmpl->assign('calendar', $calendar);
+if(OC_Calendar_Share::allUsersSharedwith($calendarid, OC_Calendar_Share::CALENDAR) == array()){
+       $shared = false;
+}else{
+       $shared = true;
+}
+$tmpl->assign('shared', $shared);
 OCP\JSON::success(array(
        'page' => $tmpl->fetchPage(),
        'eventSource' => OC_Calendar_Calendar::getEventSourceInfo($calendar),
-));
\ No newline at end of file
+));
index 5cf63d396f7253a48229f1b6902886f7c2c00f26..a2c898c8075c2e08ac8eefe5f33eea0d5d4b7726 100644 (file)
@@ -36,7 +36,13 @@ OC_Calendar_Calendar::setCalendarActive($calendarid, $_POST['active']);
 $calendar = OC_Calendar_App::getCalendar($calendarid);
 $tmpl = new OCP\Template('calendar', 'part.choosecalendar.rowfields');
 $tmpl->assign('calendar', $calendar);
+if(OC_Calendar_Share::allUsersSharedwith($calendarid, OC_Calendar_Share::CALENDAR) == array()){
+       $shared = false;
+}else{
+       $shared = true;
+}
+$tmpl->assign('shared', $shared);
 OCP\JSON::success(array(
        'page' => $tmpl->fetchPage(),
        'eventSource' => OC_Calendar_Calendar::getEventSourceInfo($calendar),
-));
\ No newline at end of file
+));