From e53482289a758a88518afb69900dd2b04a1b4549 Mon Sep 17 00:00:00 2001
From: Ralf Becker <RalfBecker@outdoor-training.de>
Date: Fri, 3 Aug 2018 15:38:34 +0200
Subject: [PATCH] fix not displayed requrested and comment

---
 admin/inc/class.admin_account.inc.php |  6 +++++-
 admin/inc/class.admin_cmds.inc.php    |  3 +--
 admin/templates/default/cmds.xet      |  2 +-
 api/js/jsapi/egw_user.js              | 22 ++++++++++++++++++++--
 4 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/admin/inc/class.admin_account.inc.php b/admin/inc/class.admin_account.inc.php
index f738b26dd0..bb746533a8 100644
--- a/admin/inc/class.admin_account.inc.php
+++ b/admin/inc/class.admin_account.inc.php
@@ -204,7 +204,11 @@ class admin_account
 			$account['account_groups'][] = $account['account_primary_group'];
 		}
 
-		$cmd = new admin_cmd_edit_user((int)$content['account_id'], $account, null, null, $old);
+		$cmd = new admin_cmd_edit_user(array(
+			'account' => (int)$content['account_id'],
+			'set' => $account,
+			'old' => $old,
+		)+(array)$content['admin_cmd']);
 		$cmd->run();
 
 		Api\Json\Response::get()->call('egw.refresh', '', 'admin', $cmd->account, $content['account_id'] ? 'edit' : 'add');
diff --git a/admin/inc/class.admin_cmds.inc.php b/admin/inc/class.admin_cmds.inc.php
index a67281bb42..7720aec09e 100644
--- a/admin/inc/class.admin_cmds.inc.php
+++ b/admin/inc/class.admin_cmds.inc.php
@@ -5,9 +5,8 @@
  * @link http://www.egroupware.org
  * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
  * @package admin
- * @copyright (c) 2007-16 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @copyright (c) 2007-18 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
- * @version $Id$
  */
 
 use EGroupware\Api;
diff --git a/admin/templates/default/cmds.xet b/admin/templates/default/cmds.xet
index 7922c32f48..8622c5aaad 100644
--- a/admin/templates/default/cmds.xet
+++ b/admin/templates/default/cmds.xet
@@ -29,7 +29,7 @@
 				</row>
 				<row class="row $row_cont[class]">
 					<description id="${row}[title]" statustext="$row_cont[data]"/>
-					<url-email id="${row}[requested]" options=",,,$row_cont[requested_email]" readonly="true"/>
+					<url-email id="${row}[requested_email]" readonly="true" statustext="$row_cont[comment]"/>
 					<date-time id="${row}[scheduled]" readonly="true"/>
 					<select id="${row}[remote_id]" readonly="true"/>
 					<date-time id="${row}[created]" readonly="true"/>
diff --git a/api/js/jsapi/egw_user.js b/api/js/jsapi/egw_user.js
index e7df87542e..c1e77cdec0 100644
--- a/api/js/jsapi/egw_user.js
+++ b/api/js/jsapi/egw_user.js
@@ -198,18 +198,36 @@ egw.extend('user', egw.MODULE_GLOBAL, function()
 		 *
 		 * @param {et2_widget} _src_widget widget to select the user
 		 * @param {string} _target_name name of widget to set the data
-		 * @param {string} _field name of data to set eg. "account_email"
+		 * @param {string} _field name of data to set eg. "account_email" or "{account_fullname} <{account_email}>"
 		 */
 		set_account_data: function(_src_widget, _target_name, _field)
 		{
 			var user = _src_widget.get_value();
 			var target = _src_widget.getRoot().getWidgetById(_target_name);
+			var field = _field;
 
 			if (user && target)
 			{
 				egw.accountData(user, _field, false, function(_data)
 				{
-					target.set_value(_data[user]);
+					var data;
+					if (field.indexOf('{') == -1)
+					{
+						data = _data[user];
+					}
+					else
+					{
+						data = field;
+						var match;
+						while((match = data.match(/{([^}]+)}/)))
+						{
+							egw.accountData(user, match[1], false, function(_data)
+							{
+								data = data.replace(/{([^}]+)}/, _data[user]);
+							});
+						}
+					}
+					target.set_value(data);
 				});
 			};
 		},