wbrawner/tasks
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #164 from Henni/sabre-upgrade2.1

Browse source 
Fixing the update for Sabre 2.1
This commit is contained in:
raimund-schluessler 2015-05-17 18:46:50 +02:00
commit 453daa35dc
2 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
controller/helper.php
View file

@ -37,10 +37,10 @@ Class Helper {
$task = array( 'id' => $id );
$task['calendarid'] = $calendarId;
$task['type'] = 'task';
$task['name'] = $vtodo->SUMMARY;
$task['created'] = $vtodo->CREATED;
$task['note'] = $vtodo->DESCRIPTION;
$task['location'] = $vtodo->LOCATION;
$task['name'] = (string) $vtodo->SUMMARY;
$task['created'] = (string) $vtodo->CREATED;
$task['note'] = (string) $vtodo->DESCRIPTION;
$task['location'] = (string) $vtodo->LOCATION;
$task['categories'] = $vtodo->CATEGORIES->getParts();
$start = $vtodo->DTSTART;
if ($start) {

21
controller/taskscontroller.php
View file

@ -163,7 +163,7 @@ class TasksController extends Controller {
$vcalendar = \OC_Calendar_App::getVCalendar($taskId);
$vtodo = $vcalendar->VTODO;
if($isStarred){
$vtodo->setString('PRIORITY',1);
$vtodo->PRIORITY = 1;
}else{
$vtodo->__unset('PRIORITY');
}
@ -207,7 +207,7 @@ class TasksController extends Controller {
$vcalendar = \OC_Calendar_App::getVCalendar($taskId);
$vtodo = $vcalendar->VTODO;
if (!empty($percent_complete)) {
$vtodo->setString('PERCENT-COMPLETE', $percent_complete);
$vtodo->{'PERCENT-COMPLETE'} = $percent_complete;
}else{
$vtodo->__unset('PERCENT-COMPLETE');
}
@ -215,10 +215,10 @@ class TasksController extends Controller {
$vtodo->STATUS = 'COMPLETED';
$vtodo->COMPLETED = new \DateTime('now', new \DateTimeZone('UTC'));
} elseif ($percent_complete != 0) {
$vtodo->setString('STATUS', 'IN-PROCESS');
$vtodo->STATUS = 'IN-PROCESS';
unset($vtodo->COMPLETED);
} else{
$vtodo->setString('STATUS', 'NEEDS-ACTION');
$vtodo->STATUS = 'NEEDS-ACTION';
unset($vtodo->COMPLETED);
}
\OC_Calendar_Object::edit($taskId, $vcalendar->serialize());
@ -326,7 +326,7 @@ class TasksController extends Controller {
try {
$vcalendar = \OC_Calendar_App::getVCalendar($taskId);
$vtodo = $vcalendar->VTODO;
$vtodo->setString('SUMMARY', $taskName);
$vtodo->SUMMARY = $taskName;
\OC_Calendar_Object::edit($taskId, $vcalendar->serialize());
} catch(\Exception $e) {
// throw new BusinessLayerException($e->getMessage());
@ -362,7 +362,7 @@ class TasksController extends Controller {
try {
$vcalendar = \OC_Calendar_App::getVCalendar($taskId);
$vtodo = $vcalendar->VTODO;
$vtodo->setString('DESCRIPTION', $note);
$vtodo->DESCRIPTION = $note;
\OC_Calendar_Object::edit($taskId, $vcalendar->serialize());
} catch(\Exception $e) {
// throw new BusinessLayerException($e->getMessage());
@ -450,9 +450,8 @@ class TasksController extends Controller {
try{
if($valarm == null) {
$valarm = $vcalendar->createComponent('VALARM');
$valarm->setString('ACTION', $action);
$valarm->setString('DESCRIPTION', 'Default Event Notification');
$valarm->setString('');
$valarm->ACTION = $action;
$valarm->DESCRIPTION = 'Default Event Notification';
$vtodo->add($valarm);
} else {
unset($valarm->TRIGGER);
@ -522,7 +521,7 @@ class TasksController extends Controller {
try {
$vcalendar = \OC_Calendar_App::getVCalendar($taskId);
$vtodo = $vcalendar->VTODO;
$vtodo->setString('CATEGORIES', $categories);
$vtodo->CATEGORIES = $categories;
\OC_Calendar_Object::edit($taskId, $vcalendar->serialize());
} catch(\Exception $e) {
// throw new BusinessLayerException($e->getMessage());
@ -540,7 +539,7 @@ class TasksController extends Controller {
try {
$vcalendar = \OC_Calendar_App::getVCalendar($taskId);
$vtodo = $vcalendar->VTODO;
$vtodo->setString('LOCATION', $location);
$vtodo->LOCATION = $location;
\OC_Calendar_Object::edit($taskId, $vcalendar->serialize());
} catch(\Exception $e) {
// throw new BusinessLayerException($e->getMessage());