gunnar: server/kolab-webclient/turba/patches/turba-2.3.3 series, NONE, 1.1 t_turba_HK_GW_AllowAttributeDefaults.diff, NONE, 1.1 t_turba_HK_GW_FixAddressbookDeletion.diff, NONE, 1.1 t_turba_HK_GW_SyncMLrefresh.diff, NONE, 1.1
cvs at kolab.org
cvs at kolab.org
Fri Jan 22 23:08:39 CET 2010
- Previous message: gunnar: server/kolab-webclient/patches/1.2.0/KOLAB t_turba_HK_GW_AllowAttributeDefaults.diff, 1.1, NONE t_turba_HK_GW_AutomaticFreeBusyUrl.diff, 1.1, NONE t_turba_HK_GW_FixAddressbookDeletion.diff, 1.1, NONE t_turba_HK_GW_FixSyncMLAttributeDeletion.diff, 1.1, NONE t_turba_HK_GW_PhotoSupport.diff, 1.1, NONE t_turba_HK_GW_SyncMLrefresh.diff, 1.1, NONE
- Next message: gunnar: server/kolab-webclient/patches/1.2.0/KOLAB t_Kolab__Format_HK_GW_HandleEmptyXmlParserReturn.diff, 1.1, NONE t_framework_HK_GW_Kolab__Format_ImprovedPreferencesHandling.diff, 1.1, NONE t_framework_HK_GW_framework_Kolab__Format_WS.diff, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: gunnar
Update of /kolabrepository/server/kolab-webclient/turba/patches/turba-2.3.3
In directory doto:/tmp/cvs-serv22877/kolab-webclient/turba/patches/turba-2.3.3
Added Files:
series t_turba_HK_GW_AllowAttributeDefaults.diff
t_turba_HK_GW_FixAddressbookDeletion.diff
t_turba_HK_GW_SyncMLrefresh.diff
Log Message:
Merge patches into the turba package and remove the obsolete ones.
--- NEW FILE: series ---
t_turba_HK_GW_AllowAttributeDefaults.diff
t_turba_HK_GW_FixAddressbookDeletion.diff
t_turba_HK_GW_SyncMLrefresh.diff
--- NEW FILE: t_turba_HK_GW_AllowAttributeDefaults.diff ---
From: Gunnar Wrobel <p at rdus.de>
Subject: [PATCH] t/turba/HK/GW/AllowAttributeDefaults
Allow attribute default values for the turba source configuration.
kolab/issue3439 (FreeBusy display in web client and fbview depends on kolabHomeServer in LDAP)
ISSUE: https://www.intevation.de/roundup/kolab/issue3439
STATUS: SUBMIT
Signed-off-by: Gunnar Wrobel <p at rdus.de>
---
lib/Object.php | 6 +++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/lib/Object.php b/lib/Object.php
index 57c9368..68b537d 100644
--- a/lib/Object.php
+++ b/lib/Object.php
@@ -115,7 +115,11 @@ class Turba_Object {
is_array($this->driver->map[$attribute])) {
$args = array();
foreach ($this->driver->map[$attribute]['fields'] as $field) {
- $args[] = $this->getValue($field);
+ $value = $this->getValue($field);
+ if (empty($value) && isset($this->driver->map[$attribute]['defaults'][$field])) {
+ $value = $this->driver->map[$attribute]['defaults'][$field];
+ }
+ $args[] = $value;
}
return trim(vsprintf($this->driver->map[$attribute]['format'], $args), " \t\n\r\0\x0B,");
} elseif (!isset($this->attributes[$attribute])) {
--
tg: (d84b81d..) t/turba/HK/GW/AllowAttributeDefaults (depends on: t/Kolab_Storage/HK/GW/TestingFixes)
--
TOPGIT patch commit log
=======================
commit d3e51ed7f0eb792de6a84975e6ae51199ed1b7cb
Author: Gunnar Wrobel <p at rdus.de>
Date: Sun Apr 26 12:55:30 2009 +0200
Allow attribute default values for the turba source configuration.
kolab/issue3439 (FreeBusy display in web client and fbview depends on kolabHomeServer in LDAP)
ISSUE: https://www.intevation.de/roundup/kolab/issue3439
--- NEW FILE: t_turba_HK_GW_FixAddressbookDeletion.diff ---
From: Gunnar Wrobel <p at rdus.de>
Subject: [PATCH] t/turba/HK/GW/FixAddressbookDeletion
Fixes a Kolab specific problem with addressbook deletion. The fix is considered a hack by upstream and needs to be fixed at some point.
Signed-off-by: Gunnar Wrobel <p at rdus.de>
---
lib/Driver/share.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/lib/Driver/share.php b/lib/Driver/share.php
index 57222a4..2776a8f 100644
--- a/lib/Driver/share.php
+++ b/lib/Driver/share.php
@@ -145,7 +145,7 @@ class Turba_Driver_share extends Turba_Driver {
function _deleteAll($sourceName = null)
{
if (is_null($sourceName)) {
- $sourceName = $this->getContactOwner();
+ $sourceName = $this->getName();
}
return $this->_driver->_deleteAll($sourceName);
}
--
tg: (6938161..) t/turba/HK/GW/FixAddressbookDeletion (depends on: master)
--
TOPGIT patch commit log
=======================
commit cd7fd7431e30f5d645276f3b7cafe12935bcb836
Author: Gunnar Wrobel <p at rdus.de>
Date: Sun Feb 1 23:48:17 2009 +0000
Added patch turba/HK-GW-Fix_address_book_deletion_2.patch from the mercurial release queue.
--- NEW FILE: t_turba_HK_GW_SyncMLrefresh.diff ---
From: Gunnar Wrobel <p at rdus.de>
Subject: [PATCH] t/turba/HK/GW/SyncMLrefresh
Refresh addressbooks before running a synchronization.
Signed-off-by: Gunnar Wrobel <p at rdus.de>
---
lib/Driver/kolab.php | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/lib/Driver/kolab.php b/lib/Driver/kolab.php
index f97f75a..786f2e2 100644
--- a/lib/Driver/kolab.php
+++ b/lib/Driver/kolab.php
@@ -56,6 +56,7 @@ class Turba_Driver_kolab extends Turba_Driver {
}
$this->_wrapper = &new $wrapper($this->name, $this->_kolab);
+ $this->_wrapper->connect();
}
/**
--
tg: (015e842..) t/turba/HK/GW/SyncMLrefresh (depends on: t/turba/HK/GW/FixSyncMLAttributeDeletion)
--
TOPGIT patch commit log
=======================
commit d59cb82e5725f53d3f6fa2a84e17ad3e46078e99
Author: Gunnar Wrobel <p at rdus.de>
Date: Sun Feb 1 23:53:10 2009 +0000
Added patch turba/HK-GW-SyncML_refresh.patch from the mercurial release queue.
- Previous message: gunnar: server/kolab-webclient/patches/1.2.0/KOLAB t_turba_HK_GW_AllowAttributeDefaults.diff, 1.1, NONE t_turba_HK_GW_AutomaticFreeBusyUrl.diff, 1.1, NONE t_turba_HK_GW_FixAddressbookDeletion.diff, 1.1, NONE t_turba_HK_GW_FixSyncMLAttributeDeletion.diff, 1.1, NONE t_turba_HK_GW_PhotoSupport.diff, 1.1, NONE t_turba_HK_GW_SyncMLrefresh.diff, 1.1, NONE
- Next message: gunnar: server/kolab-webclient/patches/1.2.0/KOLAB t_Kolab__Format_HK_GW_HandleEmptyXmlParserReturn.diff, 1.1, NONE t_framework_HK_GW_Kolab__Format_ImprovedPreferencesHandling.diff, 1.1, NONE t_framework_HK_GW_framework_Kolab__Format_WS.diff, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the commits
mailing list