lib/client
Aleksander Machniak
machniak at kolabsys.com
Thu Mar 15 14:10:24 CET 2012
lib/client/kolab_client_task_user.php | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
New commits:
commit d3826335efc98f92ef760fbb747ee2fbf608dcdc
Author: Aleksander Machniak <alec at alec.pl>
Date: Thu Mar 15 14:09:46 2012 +0100
Display account type in user edit form (#633)
diff --git a/lib/client/kolab_client_task_user.php b/lib/client/kolab_client_task_user.php
index a58c091..503c1bf 100644
--- a/lib/client/kolab_client_task_user.php
+++ b/lib/client/kolab_client_task_user.php
@@ -213,6 +213,7 @@ class kolab_client_task_user extends kolab_client_task
// field-to-section map and fields order
$fields = array(
'user_type_id' => 'personal',
+ 'user_type_id_name' => 'personal',
'givenname' => 'personal',
'sn' => 'personal',
'displayname' => 'personal',
@@ -367,6 +368,13 @@ class kolab_client_task_user extends kolab_client_task
// remove password
$data['userpassword'] = '';
+
+ // Add user type name
+ $_fields['user_type_id_name'] = array(
+ 'label' => 'user.user_type_id',
+ 'section' => 'personal',
+ 'value' => $accttypes[$utype]['content'],
+ );
}
// Sort
@@ -392,7 +400,11 @@ class kolab_client_task_user extends kolab_client_task
continue;
}
- $field['label'] = kolab_html::escape($this->translate("user.$idx"));
+ if (empty($field['label'])) {
+ $field['label'] = "user.$idx";
+ }
+
+ $field['label'] = kolab_html::escape($this->translate($field['label']));
$field['description'] = "user.$idx.desc";
$field['section'] = $section_idx;
More information about the commits
mailing list