extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

* REST Api: allow to create new fields with PATCH for application/json content-type and error on not existing custom fields

Browse Source
This commit is contained in:
ralf 2024-01-08 09:41:43 +02:00
parent 543fb4d342
commit 94670fcf83
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/src/CalDAV/JsBase.php
View File

@ -236,10 +236,10 @@ class JsBase
$contact['#'.$name] = null; $contact['#'.$name] = null;
} }
} }
// report not existing cfs to log // error not existing cfs
if (($not_existing=array_diff(array_keys($cfs), array_keys($definitions)))) if (($not_existing=array_diff(array_keys($cfs), array_keys($definitions))))
{ {
error_log(__METHOD__."() not existing/ignored custom fields: ".implode(', ', $not_existing)); throw new JsParseException("Trying to update not existing custom field(s): ".implode(', ', $not_existing));
} }
return $contact; return $contact;
} }

4
api/src/CalDAV/JsCalendar.php
View File

@ -110,8 +110,8 @@ class JsCalendar extends JsBase
return strpos($key, '/') !== false; return strpos($key, '/') !== false;
})) }))
{ {
// apply patch on JsCard of contact // apply patch on JsEvent
$data = self::patch($data, $old ? self::getJsCalendar($old, false) : [], !$old); $data = self::patch($data, $old ? self::getJsCalendar($old, false) : [], !$old || !$strict);
} }
if (!isset($data['uid'])) $data['uid'] = null; // to fail below, if it does not exist if (!isset($data['uid'])) $data['uid'] = null; // to fail below, if it does not exist

4
api/src/Contacts/JsContact.php
View File

@ -104,7 +104,7 @@ class JsContact extends Api\CalDAV\JsBase
})) }))
{ {
// apply patch on JsCard of contact // apply patch on JsCard of contact
$data = self::patch($data, $old ? self::getJsCard($old, false) : [], !$old); $data = self::patch($data, $old ? self::getJsCard($old, false) : [], !$old || !$strict);
} }
if (!isset($data['uid'])) $data['uid'] = null; // to fail below, if it does not exist if (!isset($data['uid'])) $data['uid'] = null; // to fail below, if it does not exist
@ -188,7 +188,7 @@ class JsContact extends Api\CalDAV\JsBase
break; break;
case 'egroupware.org:customfields': case 'egroupware.org:customfields':
$contact += self::parseCustomfields($value, $strict); $contact += self::parseCustomfields($value);
break; break;
case 'egroupware.org:assistant': case 'egroupware.org:assistant':