Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

This commit is contained in:
Uwe Steinmann 2020-12-18 12:45:56 +01:00
commit d6106c0673

View File

@ -603,7 +603,7 @@ $(document).ready( function() {
$options[] = array("-1", getMLText("choose_user")); $options[] = array("-1", getMLText("choose_user"));
$options[] = array("0", getMLText("add_user")); $options[] = array("0", getMLText("add_user"));
foreach ($users as $currUser) { foreach ($users as $currUser) {
$options[] = array($currUser->getID(), htmlspecialchars($currUser->getLogin()), $seluser && $currUser->getID()==$seluser->getID(), array(array('data-subtitle', htmlspecialchars($currUser->getFullName())))); $options[] = array($currUser->getID(), htmlspecialchars($currUser->getLogin().' - '.$currUser->getFullName()), $seluser && $currUser->getID()==$seluser->getID(), array(array('data-subtitle', htmlspecialchars($currUser->getEmail()))));
} }
$this->formField( $this->formField(
null, //getMLText("selection"), null, //getMLText("selection"),