N°5972 - User details: align LDAP and external users with fieldsets

datamodels/2.x/authent-external/model.authent-external.php

@@ -37,24 +37,36 @@ class UserExternal extends User
 	{
 		$aParams = array
 		(
-			"category" => "addon/authentication,grant_by_profile,silo",
-			"key_type" => "autoincrement",
-			"name_attcode" => "login",
-			"state_attcode" => "",
-			"reconc_keys" => array('login'),
-			"db_table" => "",
-			"db_key_field" => "id",
+			"category"            => "addon/authentication,grant_by_profile,silo",
+			"key_type"            => "autoincrement",
+			"name_attcode"        => "login",
+			"state_attcode"       => "",
+			"reconc_keys"         => array('login'),
+			"db_table"            => "",
+			"db_key_field"        => "id",
 			"db_finalclass_field" => "",
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('contactid', 'first_name', 'email', 'login', 'language', 'status', 'profile_list', 'allowed_org_list')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('details',
+			array(
+				'col:col1' =>
+					array(
+						'fieldset:User:info' => array('contactid', 'org_id', 'email', 'login', 'language', 'status'),
+					),
+				'col:col2' =>
+					array(
+						'fieldset:User:profiles' => array('profile_list'),
+					),
+				'allowed_org_list',
+			)
+		); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('first_name', 'last_name', 'login', 'status')); // Attributes to be displayed for a list
 		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('login', 'contactid', 'status')); // Criteria of the std search form
-		MetaModel::Init_SetZListItems('advanced_search', array('login', 'contactid')); // Criteria of the advanced search form
+		MetaModel::Init_SetZListItems('standard_search', array('login', 'contactid', 'status', 'org_id')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('advanced_search', array('login', 'contactid', 'status', 'org_id')); // Criteria of the advanced search form
 	}
 
 	/**

datamodels/2.x/authent-ldap/datamodel.authent-ldap.xml

@@ -257,33 +257,58 @@
       <presentation>
         <details>
           <items>
-            <item id="contactid">
+            <item id="col:col1">
               <rank>10</rank>
+              <items>
+                <item id="fieldset:User:info">
+                  <rank>10</rank>
+                  <items>
+                    <item id="contactid">
+                      <rank>10</rank>
+                    </item>
+                    <item id="org_id">
+                      <rank>20</rank>
+                    </item>
+                    <item id="email">
+                      <rank>30</rank>
+                    </item>
+                    <item id="login">
+                      <rank>40</rank>
+                    </item>
+                    <item id="language">
+                      <rank>50</rank>
+                    </item>
+                    <item id="status">
+                      <rank>60</rank>
+                    </item>
+                  </items>
+                </item>
+              </items>
             </item>
-            <item id="org_id">
+            <item id="col:col2">
               <rank>20</rank>
-            </item>
-            <item id="email">
-              <rank>30</rank>
-            </item>
-            <item id="login">
-              <rank>40</rank>
-            </item>
-            <item id="language">
-              <rank>50</rank>
-            </item>
-            <item id="status">
-              <rank>60</rank>
-            </item>
-            <item id="profile_list">
-              <rank>70</rank>
+              <items>
+                <item id="fieldset:User:profiles">
+                  <rank>10</rank>
+                  <items>
+                    <item id="profile_list">
+                      <rank>10</rank>
+                    </item>
+                  </items>
+                </item>
+                <item id="fieldset:UserLDAP:server">
+                  <rank>20</rank>
+                  <items>
+                    <item id="ldap_server">
+                      <rank>10</rank>
+                    </item>
+                  </items>
+                </item>
+              </items>
             </item>
             <item id="allowed_org_list">
               <rank>80</rank>
             </item>
-            <item id="ldap_server">
-              <rank>90</rank>
-            </item>
           </items>
         </details>
         <search>

datamodels/2.x/authent-ldap/dictionaries/en.dict.authent-ldap.php

@@ -38,4 +38,5 @@
 Dict::Add('EN US', 'English', 'English', array(
 	'Class:UserLDAP' => 'LDAP user',
 	'Class:UserLDAP+' => 'User authentified by LDAP',
+	'UserLDAP:server' => 'LDAP specifics',
 ));

datamodels/2.x/authent-ldap/dictionaries/fr.dict.authent-ldap.php

@@ -22,4 +22,5 @@
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:UserLDAP' => 'Utilisateur LDAP',
 	'Class:UserLDAP+' => 'Utilisateur authentifié par un serveur LDAP',
+	'UserLDAP:server' => 'Champs spécifiques pour LDAP',
 ));

datamodels/2.x/authent-local/dictionaries/en.dict.authent-local.php

@@ -55,8 +55,6 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:UserLocal/Attribute:password_renewed_date+' => 'When the password was last changed',
 
 	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Password must be at least 8 characters and include uppercase, lowercase, numeric and special characters.',
-
-	'UserLocal:profiles' => 'Profiles (minimum one)',
 	'UserLocal:password:expiration' => 'The fields below require an extension',
 	'Class:UserLocal/Error:OneTimePasswordChangeIsNotAllowed' => 'Setting password expiration to "One-time password" is not allowed for your own User',
 ));

datamodels/2.x/authent-local/dictionaries/fr.dict.authent-local.php

@@ -39,8 +39,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:UserLocal/Attribute:password_renewed_date+' => 'Dernière date à laquelle le mot de passe a été changé',
 
 	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Le mot de passe doit contenir au moins 8 caractères, avec minuscule, majuscule, nombre et caractère spécial.',
-
-	'UserLocal:profiles' => 'Profils (minimum un)',
 	'UserLocal:password:expiration' => 'Les champs ci-dessous nécessitent une extension',
 	'Class:UserLocal/Error:OneTimePasswordChangeIsNotAllowed' => 'Impossible de mettre "Usage unique" comme validité du mot de passe pour son propre utilisateur.',
 ));

datamodels/2.x/authent-local/model.authent-local.php

@@ -100,15 +100,15 @@ class UserLocal extends UserInternal
 			array(
 				'col:col1' =>
 					array(
-						'fieldset:UserLocal:info' => array('contactid', 'org_id', 'email', 'login', 'password', 'language', 'status', 'allowed_org_list',),
+						'fieldset:User:info' => array('contactid', 'org_id', 'email', 'login', 'password', 'language', 'status'),
 					),
 				'col:col2' =>
 					array(
-						'fieldset:UserLocal:profiles'            => array('profile_list',),
+						'fieldset:User:profiles'                 => array('profile_list',),
 						'fieldset:UserLocal:password:expiration' => array('expiration', 'password_renewed_date',),
 					),
+				'allowed_org_list',
 			)
-
 		); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('first_name', 'last_name', 'login', 'org_id')); // Attributes to be displayed for a list
 		// Search criteria

datamodels/2.x/itop-structure/dictionaries/cs.dict.itop-structure.php

@@ -355,8 +355,8 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Person:info' => 'Obecné informace',
-	'UserLocal:info' => 'General information~~',
-	'Person:personal_info' => 'Personal information~~',
+	'User:info' => 'Obecné informace',
+	'Person:personal_info' => 'Osobní informace',
 	'Person:notifiy' => 'Upozornění',
 ));
 

datamodels/2.x/itop-structure/dictionaries/da.dict.itop-structure.php

@@ -345,7 +345,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Person:info' => 'Almindelig Information',
-	'UserLocal:info' => 'General information~~',
+	'User:info' => 'Almindelig Information',
 	'Person:personal_info' => 'Personal information~~',
 	'Person:notifiy' => 'Underretning',
 ));

datamodels/2.x/itop-structure/dictionaries/de.dict.itop-structure.php

@@ -354,7 +354,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Person:info' => 'Allgemeine Informationen',
-	'UserLocal:info' => 'Allgemeine Informationen',
+	'User:info' => 'Allgemeine Informationen',
 	'Person:personal_info' => 'Persönliche Informationen',
 	'Person:notifiy' => 'Benachrichtigungen',
 ));

datamodels/2.x/itop-structure/dictionaries/en.dict.itop-structure.php

@@ -371,7 +371,8 @@ Dict::Add('EN US', 'English', 'English', array(
 
 Dict::Add('EN US', 'English', 'English', array(
 	'Person:info' => 'General information',
-	'UserLocal:info' => 'General information',
+	'User:info' => 'General information',
+	'User:profiles' => 'Profiles (minimum one)',
 	'Person:personal_info' => 'Personal information',
 	'Person:notifiy' => 'Notification',
 ));

datamodels/2.x/itop-structure/dictionaries/es_cr.dict.itop-structure.php

@@ -341,7 +341,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Person:info' => 'Información General',
-	'UserLocal:info' => 'Información General',
+	'User:info' => 'Información General',
 	'Person:personal_info' => 'Información Personal',
 	'Person:notifiy' => 'Notificación',
 ));

datamodels/2.x/itop-structure/dictionaries/fr.dict.itop-structure.php

@@ -379,7 +379,8 @@ Dict::Add('FR FR', 'French', 'Français', array(
 
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Person:info' => 'Informations générales',
-	'UserLocal:info' => 'Informations générales',
+	'User:info' => 'Informations générales',
+	'User:profiles' => 'Profils (minimum un)',
 	'Person:personal_info' => 'Informations personnelles',
 	'Person:notifiy' => 'Notification',
 ));

datamodels/2.x/itop-structure/dictionaries/hu.dict.itop-structure.php

@@ -347,7 +347,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
     'Person:info' => 'Általános információk',
-    'UserLocal:info' => 'Általános információk',
+    'User:info' => 'Általános információk',
     'Person:personal_info' => 'Személyes információk',
     'Person:notifiy' => 'Értesítés',
 ));

datamodels/2.x/itop-structure/dictionaries/it.dict.itop-structure.php

@@ -347,7 +347,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Person:info' => 'General information~~',
-	'UserLocal:info' => 'General information~~',
+	'User:info' => 'General information~~',
 	'Person:personal_info' => 'Personal information~~',
 	'Person:notifiy' => 'Notification~~',
 ));

datamodels/2.x/itop-structure/dictionaries/ja.dict.itop-structure.php

@@ -347,7 +347,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Person:info' => '情報',
-	'UserLocal:info' => 'General information~~',
+	'User:info' => '情報',
 	'Person:personal_info' => 'Personal information~~',
 	'Person:notifiy' => '通知',
 ));

datamodels/2.x/itop-structure/dictionaries/nl.dict.itop-structure.php

@@ -354,7 +354,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Person:info' => 'Globale informatie',
-	'UserLocal:info' => 'Globale informatie',
+	'User:info' => 'Globale informatie',
 	'Person:personal_info' => 'Persoonlijke informatie',
 	'Person:notifiy' => 'Notificeer',
 ));

datamodels/2.x/itop-structure/dictionaries/pl.dict.itop-structure.php

@@ -358,7 +358,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Person:info' => 'Informacje ogólne',
-	'UserLocal:info' => 'Informacje ogólne',
+	'User:info' => 'Informacje ogólne',
 	'Person:personal_info' => 'Informacje osobiste',
 	'Person:notifiy' => 'Powiadomienie',
 ));

datamodels/2.x/itop-structure/dictionaries/pt_br.dict.itop-structure.php

@@ -348,7 +348,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Person:info' => 'Informações gerais',
-	'UserLocal:info' => 'Informações gerais',
+	'User:info' => 'Informações gerais',
 	'Person:personal_info' => 'Informações pessoais',
 	'Person:notifiy' => 'Notificações',
 ));

datamodels/2.x/itop-structure/dictionaries/ru.dict.itop-structure.php

@@ -335,7 +335,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Person:info' => 'Основная информация',
-	'UserLocal:info' => 'Основная информация',
+	'User:info' => 'Основная информация',
 	'Person:personal_info' => 'Личная информация',
 	'Person:notifiy' => 'Уведомления',
 ));

datamodels/2.x/itop-structure/dictionaries/sk.dict.itop-structure.php

@@ -347,7 +347,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Person:info' => 'Všeobecné informácie',
-	'UserLocal:info' => 'General information~~',
+	'User:info' => 'Všeobecné informácie',
 	'Person:personal_info' => 'Personal information~~',
 	'Person:notifiy' => 'Upozornenie',
 ));

datamodels/2.x/itop-structure/dictionaries/tr.dict.itop-structure.php

@@ -349,7 +349,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Person:info' => 'Genel Bilgi',
-	'UserLocal:info' => 'Genel Bilgi',
+	'User:info' => 'Genel Bilgi',
 	'Person:personal_info' => 'Personal information~~',
 	'Person:notifiy' => 'Bildirim',
 ));

datamodels/2.x/itop-structure/dictionaries/zh_cn.dict.itop-structure.php

@@ -368,7 +368,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Person:info' => '基本信息',
-	'UserLocal:info' => '基本信息',
+	'User:info' => '基本信息',
 	'Person:personal_info' => '个人信息',
 	'Person:notifiy' => '通知',
 ));