gunnar: server/kolab-webclient/turba/patches/turba-2.3.3 t_turba_HK_GW_AlternativeNameDetailView.diff, NONE, 1.1 series, 1.2, 1.3
cvs at kolab.org
cvs at kolab.org
Wed Mar 10 06:19:26 CET 2010
Author: gunnar
Update of /kolabrepository/server/kolab-webclient/turba/patches/turba-2.3.3
In directory doto:/tmp/cvs-serv29256/patches/turba-2.3.3
Modified Files:
series
Added Files:
t_turba_HK_GW_AlternativeNameDetailView.diff
Log Message:
kolab/issue3859 ([turba] optimized formatName function and fallback to company attribute)
--- NEW FILE: t_turba_HK_GW_AlternativeNameDetailView.diff ---
From: Gunnar Wrobel <p at rdus.de>
Subject: [PATCH] t/turba/HK/GW/AlternativeNameDetailView
Also display the alternative name in the detail view.
kolab/issue3859 ([turba] optimized formatName function and fallback to company attribute)
ISSUE: https://issues.kolab.org/issue3859
STATUS: SUBMIT
Signed-off-by: Gunnar Wrobel <p at rdus.de>
--- a/contact.php 2010-03-10 06:06:29.000000000 +0100
+++ b/contact.php 2010-03-10 06:09:21.000000000 +0100
@@ -122,9 +122,16 @@
if (!$print_view) {
echo $tabs->render($viewName);
}
+
+if ($contact->hasValue('name')) {
+ $name = $contact->getValue('name');
+} elseif (isset($contact->driver->alternativeName) &&
+ $contact->hasValue($contact->driver->alternativeName)) {
+ $name = $contact->getValue($contact->driver->alternativeName);
+}
echo '<h1 class="header">' . $own_link
- . ($contact->getValue('name')
- ? htmlspecialchars($contact->getValue('name'))
+ . ($name
+ ? htmlspecialchars($name)
: '<em>' . _("Blank name") . '</em>')
. $own_icon . '</h1>';
$view->html();
Index: series
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/turba/patches/turba-2.3.3/series,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- series 9 Mar 2010 21:38:27 -0000 1.2
+++ series 10 Mar 2010 05:19:24 -0000 1.3
@@ -1,4 +1,5 @@
t_turba_HK_GW_AllowAttributeDefaults.diff
t_turba_HK_GW_FixAddressbookDeletion.diff
t_turba_HK_GW_SyncMLrefresh.diff
-t_turba_HK_GW_ConfigurationOverride.php
\ No newline at end of file
+t_turba_HK_GW_ConfigurationOverride.php
+t_turba_HK_GW_AlternativeNameDetailView.diff
\ No newline at end of file
More information about the commits
mailing list