Branch 'dev/edit-existing-entries' - lib/api
Jeroen van Meeuwen
vanmeeuwen at kolabsys.com
Sun Apr 1 02:38:03 CEST 2012
lib/api/kolab_api_service_group.php | 12 ++++++++++--
lib/api/kolab_api_service_user.php | 12 ++++++++++--
2 files changed, 20 insertions(+), 4 deletions(-)
New commits:
commit 687f5e1088d27fe5d8aad7478254f4281f347a84
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Sun Apr 1 02:37:35 2012 +0200
Attributes posted and also "static" forms should be preserved (as posted)
diff --git a/lib/api/kolab_api_service_group.php b/lib/api/kolab_api_service_group.php
index 3e82f0d..9ff1835 100644
--- a/lib/api/kolab_api_service_group.php
+++ b/lib/api/kolab_api_service_group.php
@@ -91,7 +91,11 @@ class kolab_api_service_group extends kolab_api_service
if (isset($gta['fields'])) {
foreach ($gta['fields'] as $key => $value) {
- $group_attributes[$key] = $gta['fields'][$key];
+ if (empty($postdata[$key])) {
+ $group_attributes[$key] = $gta['fields'][$key];
+ } else {
+ $group_attributes[$key] = $postdata[$key];
+ }
}
}
@@ -193,7 +197,11 @@ class kolab_api_service_group extends kolab_api_service
if (isset($gta['fields'])) {
foreach ($gta['fields'] as $key => $value) {
- $group_attributes[$key] = $gta['fields'][$key];
+ if (empty($postdata[$key])) {
+ $group_attributes[$key] = $gta['fields'][$key];
+ } else {
+ $group_attributes[$key] = $postdata[$key];
+ }
}
$group_attributes[$unique_attr] = $postdata[$unique_attr];
diff --git a/lib/api/kolab_api_service_user.php b/lib/api/kolab_api_service_user.php
index a5c58e2..0bce631 100644
--- a/lib/api/kolab_api_service_user.php
+++ b/lib/api/kolab_api_service_user.php
@@ -98,7 +98,11 @@ class kolab_api_service_user extends kolab_api_service
if (isset($uta['fields'])) {
foreach ($uta['fields'] as $key => $value) {
- $user_attributes[$key] = $uta['fields'][$key];
+ if (empty($postdata[$key])) {
+ $user_attributes[$key] = $uta['fields'][$key];
+ } else {
+ $user_attributes[$key] = $uta['fields'][$key];
+ }
}
}
@@ -204,7 +208,11 @@ class kolab_api_service_user extends kolab_api_service
if (isset($uta['fields'])) {
foreach ($uta['fields'] as $key => $value) {
- $user_attributes[$key] = $uta['fields'][$key];
+ if (empty($postdata[$key])) {
+ $user_attributes[$key] = $uta['fields'][$key];
+ } else {
+ $user_attributes[$key] = $postdata[$key];
+ }
}
$user_attributes[$unique_attr] = $postdata[$unique_attr];
More information about the commits
mailing list