Changes GetAsCSV() to AttributeEnum->GetValueLabel()

Co-authored-by: Thomas Casteleyn <thomas.casteleyn@super-visions.com>

.doc/itop-version-history.md

@@ -2,17 +2,13 @@
 
 ```mermaid
 %%{init: { 'logLevel': 'debug', 'theme': 'base', 'themeVariables': {
-              'git0': '#7ccf00',
-              'git1': '#7ccf00',
-              'git2': '#99a1af',
-              'git3': '#99a1af',
-              'git4': '#99a1af',
-              'git5': '#99a1af',
-              'git6': '#99a1af',
-              'git7': '#99a1af',
-              'git8': '#99a1af',
-              'git9': '#99a1af',
-              'git10': '#99a1af'
+              'git0': 'lawngreen',
+              'git3': 'dodgerblue',
+              'git4': 'grey',
+              'git5': 'grey',
+              'git6': 'grey',
+              'git7': 'grey',
+              'git8': 'grey'
        }, 'gitGraph': {'showBranches': true,'mainBranchName': 'develop','rotateCommitLabel': true}} }%%
 gitGraph
     commit id: "2016-07-06" tag: "2.3.0" type: HIGHLIGHT
@@ -110,11 +106,6 @@ gitGraph
     commit id: "2025-09-25" tag: "2.7.13"
     checkout support/3.2
     commit id: "2026-04-27 " tag: "3.2.3"
-    checkout support/3.2.3
-    commit id: "2026-05-25 " tag: "3.2.3-1"
-    commit id: "2026-07-17 " tag: "3.2.3-2"
-    checkout develop
-    commit id: "2026-07-23" tag: "3.3.0-beta1"
 ```
 
 To learn more, check the [iTop community versions history on the official wiki](https://www.itophub.io/wiki/page?id=latest:release:start).

.github/pull_request_template.md

@@ -9,6 +9,11 @@ Any PRs not following the guidelines or with missing information will not be con
 
 ## Base information
 
+| Question                                                       | Answer 
+|----------------------------------------------------------------|--------
+| Related to a SourceForge thread / Another PR / A GitHub Issue / Combodo ticket? | <!-- Put the URL -->                 |
+| Type of change?                                                | Bug fix / Enhancement / Translations
+
 | Question                                                                        | Answer                               |
 |---------------------------------------------------------------------------------|--------------------------------------|
 | Related to a SourceForge thread / Another PR / A GitHub Issue / Combodo ticket? | <!-- Put the URL -->                 |

addons/userrights/userrightsprofile.class.inc.php

@@ -582,30 +582,16 @@ class UserRightsProfile extends UserRightsAddOnAPI
 	 */
 	public function ListProfiles($oUser)
 	{
-		if (!array_key_exists('profile_list', $oUser->ListChanges())) {
-			// Profiles list is not modified on the $oUser object, we can use DBObjectSearch with `all data` capabilities
-			// Note: This is the default behavior
-			$aRet = [];
-			$oSearch = new DBObjectSearch('URP_UserProfile');
-			$oSearch->AllowAllData();
-			$oSearch->NoContextParameters();
-			$oSearch->Addcondition('userid', $oUser->GetKey(), '=');
-			$oProfiles = new DBObjectSet($oSearch);
-			while ($oUserProfile = $oProfiles->Fetch()) {
-				$aRet[$oUserProfile->Get('profileid')] = $oUserProfile->Get('profileid_friendlyname');
-			}
-
-			return $aRet;
-		} else {
-			// Profiles list must be computed with memory changes.
-			// Note: this is a bit tricky because the user object may have been modified in memory (e.g. a profile added or removed) and we need to take that into account
-			$aRet = [];
-			$oProfilesSet = $oUser->Get('profile_list');
-			foreach ($oProfilesSet as $oUserProfile) {
-				$aRet[$oUserProfile->Get('profileid')] = $oUserProfile->Get('profileid_friendlyname');
-			}
-			return $aRet;
+		$aRet = [];
+		$oSearch = new DBObjectSearch('URP_UserProfile');
+		$oSearch->AllowAllData();
+		$oSearch->NoContextParameters();
+		$oSearch->Addcondition('userid', $oUser->GetKey(), '=');
+		$oProfiles = new DBObjectSet($oSearch);
+		while ($oUserProfile = $oProfiles->Fetch()) {
+			$aRet[$oUserProfile->Get('profileid')] = $oUserProfile->Get('profileid_friendlyname');
 		}
+		return $aRet;
 	}
 
 	public function GetSelectFilter($oUser, $sClass, $aSettings = [])
@@ -719,23 +705,26 @@ class UserRightsProfile extends UserRightsAddOnAPI
 	protected function GetUserActionGrant($oUser, $sClass, $iActionCode)
 	{
 		$this->LoadCache();
-		if (count($oUser->ListChanges()) === 0) {
-			// load and cache permissions for the current user on the given class
-			if (isset($this->m_aObjectActionGrants[$oUser->GetKey()][$sClass][$iActionCode])) {
-				$aTest = $this->m_aObjectActionGrants[$oUser->GetKey()][$sClass][$iActionCode];
-				if (is_array($aTest)) {
-					return $aTest;
-				}
+
+		// load and cache permissions for the current user on the given class
+		//
+		$iUser = $oUser->GetKey();
+		if (isset($this->m_aObjectActionGrants[$iUser][$sClass][$iActionCode])) {
+			$aTest = $this->m_aObjectActionGrants[$iUser][$sClass][$iActionCode];
+			if (is_array($aTest)) {
+				return $aTest;
 			}
 		}
 
 		$sAction = self::$m_aActionCodes[$iActionCode];
 
 		$bStatus = null;
-
-		$aProfileList = $this->GetProfileList($oUser);
+		// Cache user's profiles
+		if (false === array_key_exists($iUser, $this->aUsersProfilesList)) {
+			$this->aUsersProfilesList[$iUser] = UserRights::ListProfiles($oUser);
+		}
 		// Call the API of UserRights because it caches the list for us
-		foreach ($aProfileList as $iProfile => $oProfile) {
+		foreach ($this->aUsersProfilesList[$iUser] as $iProfile => $oProfile) {
 			$bGrant = $this->GetProfileActionGrant($iProfile, $sClass, $sAction);
 			if (!is_null($bGrant)) {
 				if ($bGrant) {
@@ -753,9 +742,7 @@ class UserRightsProfile extends UserRightsAddOnAPI
 		$aRes = [
 			'permission' => $iPermission,
 		];
-		if (count($oUser->ListChanges()) === 0) {
-			$this->m_aObjectActionGrants[$oUser->GetKey()][$sClass][$iActionCode] = $aRes;
-		}
+		$this->m_aObjectActionGrants[$iUser][$sClass][$iActionCode] = $aRes;
 		return $aRes;
 	}
 
@@ -837,14 +824,18 @@ class UserRightsProfile extends UserRightsAddOnAPI
 	{
 		$this->LoadCache();
 		// Note: this code is VERY close to the code of IsActionAllowed()
+		$iUser = $oUser->GetKey();
 
-		$aProfileList  = $this->GetProfileList($oUser);
+		// Cache user's profiles
+		if (false === array_key_exists($iUser, $this->aUsersProfilesList)) {
+			$this->aUsersProfilesList[$iUser] = UserRights::ListProfiles($oUser);
+		}
 
 		// Note: The object set is ignored because it was interesting to optimize for huge data sets
 		//       and acceptable to consider only the root class of the object set
 		$bStatus = null;
 		// Call the API of UserRights because it caches the list for us
-		foreach ($aProfileList as $iProfile => $oProfile) {
+		foreach ($this->aUsersProfilesList[$iUser] as $iProfile => $oProfile) {
 			$bGrant = $this->GetClassStimulusGrant($iProfile, $sClass, $sStimulusCode);
 			if (!is_null($bGrant)) {
 				if ($bGrant) {
@@ -902,25 +893,6 @@ class UserRightsProfile extends UserRightsAddOnAPI
 		}
 		return $bHasSharing;
 	}
-
-	/**
-	 * @param \User $oUser
-	 *
-	 * @return array
-	 * @throws \Exception
-	 */
-	public function GetProfileList(User $oUser): array
-	{
-		if (count($oUser->ListChanges()) === 0) { // if user is already in db and not changed
-			$iUser = $oUser->GetKey();
-			if (false === array_key_exists($iUser, $this->aUsersProfilesList)) {
-				$aProfiles = UserRights::ListProfiles($oUser);
-				$this->aUsersProfilesList[$iUser] = $aProfiles;
-			}
-			return $this->aUsersProfilesList[$iUser];
-		}
-		return UserRights::ListProfiles($oUser);
-	}
 }
 
 UserRights::SelectModule('UserRightsProfile');

application/applicationextension/backoffice/iBackofficeSassExtension.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Implement this interface to add sass files (SCSS) to the backoffice pages.
+ * Implement this interface to add sass file (SCSS) to the backoffice pages.
  * example: return "css/setup.scss"
  *
  * @api
@@ -11,9 +11,9 @@
 interface iBackofficeSassExtension
 {
 	/**
-	 * @return array An array of relative paths (from loaded import paths) to the files to compile and include
-	 * @see \iTopWebPage::$a_linked_stylesheets
+	 * @return string
+	 * @see \iTopWebPage::$a_styles
 	 * @api
 	 */
-	public function GetSassRelPaths(): array;
+	public function GetSass(): string;
 }

application/cmdbabstract.class.inc.php

@@ -1046,7 +1046,7 @@ HTML
 							// Add extra data for markup generation
 							// - Attribute code and AttributeDef. class
 							$val['attcode'] = $sAttCode;
-							$val['atttype'] = $oAttDef->GetTypeShortClassName();
+							$val['atttype'] = $oAttDef->GetType();
 							$val['attlabel'] = $sAttLabel;
 							$val['attflags'] = ($bEditMode) ? $this->GetFormAttributeFlags($sAttCode) : OPT_ATT_READONLY;
 
@@ -1535,6 +1535,190 @@ HTML
 		return $sHtml;
 	}
 
+	/**
+	 * @param WebPage $oPage
+	 * @param \CMDBObjectSet $oSet
+	 * @param array $aParams
+	 *
+	 * @throws \Exception
+	 *  only used in old and deprecated export.php
+	 *
+	 * @internal Only to be used by `/webservices/export.php` : this is a legacy method that produces wrong HTML (no TR on table body rows)
+	 */
+	public static function DisplaySetAsHTMLSpreadsheet(WebPage $oPage, CMDBObjectSet $oSet, $aParams = [])
+	{
+		$oPage->add(self::GetSetAsHTMLSpreadsheet($oSet, $aParams));
+	}
+
+	/**
+	 * Spreadsheet output: designed for end users doing some reporting
+	 * Then the ids are excluded and replaced by the corresponding friendlyname
+	 *
+	 * @param \DBObjectSet $oSet
+	 * @param array $aParams
+	 *
+	 * @return string
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \MissingQueryArgument
+	 * @throws \MySQLException
+	 * @throws \MySQLHasGoneAwayException
+	 * @throws \Exception
+	 *
+	 * @internal Only to be used by `/webservices/export.php` : this is a legacy method that produces wrong HTML (no TR on table body rows)
+	 */
+	public static function GetSetAsHTMLSpreadsheet(DBObjectSet $oSet, $aParams = [])
+	{
+		$aFields = null;
+		if (isset($aParams['fields']) && (strlen($aParams['fields']) > 0)) {
+			$aFields = explode(',', $aParams['fields']);
+		}
+
+		$bFieldsAdvanced = false;
+		if (isset($aParams['fields_advanced'])) {
+			$bFieldsAdvanced = (bool)$aParams['fields_advanced'];
+		}
+
+		$bLocalize = true;
+		if (isset($aParams['localize_values'])) {
+			$bLocalize = (bool)$aParams['localize_values'];
+		}
+
+		$aList = [];
+
+		$aClasses = $oSet->GetFilter()->GetSelectedClasses();
+		$aAuthorizedClasses = [];
+		foreach ($aClasses as $sAlias => $sClassName) {
+			if (UserRights::IsActionAllowed($sClassName, UR_ACTION_READ, $oSet) != UR_ALLOWED_NO) {
+				$aAuthorizedClasses[$sAlias] = $sClassName;
+			}
+		}
+		$aHeader = [];
+		foreach ($aAuthorizedClasses as $sAlias => $sClassName) {
+			$aList[$sAlias] = [];
+
+			foreach (MetaModel::ListAttributeDefs($sClassName) as $sAttCode => $oAttDef) {
+				if (is_null($aFields) || (count($aFields) == 0)) {
+					// Standard list of attributes (no link sets)
+					if ($oAttDef->IsScalar() && ($oAttDef->IsWritable() || $oAttDef->IsExternalField())) {
+						$sAttCodeEx = $oAttDef->IsExternalField() ? $oAttDef->GetKeyAttCode().'->'.$oAttDef->GetExtAttCode() : $sAttCode;
+
+						$aList[$sAlias][$sAttCodeEx] = $oAttDef;
+
+						if ($bFieldsAdvanced && $oAttDef->IsExternalKey(EXTKEY_RELATIVE)) {
+							$sRemoteClass = $oAttDef->GetTargetClass();
+							foreach (MetaModel::GetReconcKeys($sRemoteClass) as $sRemoteAttCode) {
+								$aList[$sAlias][$sAttCode.'->'.$sRemoteAttCode] = MetaModel::GetAttributeDef(
+									$sRemoteClass,
+									$sRemoteAttCode
+								);
+							}
+						}
+					}
+				} else {
+					// User defined list of attributes
+					if (in_array($sAttCode, $aFields) || in_array($sAlias.'.'.$sAttCode, $aFields)) {
+						$aList[$sAlias][$sAttCode] = $oAttDef;
+					}
+				}
+			}
+			// Replace external key by the corresponding friendly name (if not already in the list)
+			foreach ($aList[$sAlias] as $sAttCode => $oAttDef) {
+				if ($oAttDef->IsExternalKey()) {
+					unset($aList[$sAlias][$sAttCode]);
+					$sFriendlyNameAttCode = $sAttCode.'_friendlyname';
+					if (!array_key_exists(
+						$sFriendlyNameAttCode,
+						$aList[$sAlias]
+					) && MetaModel::IsValidAttCode($sClassName, $sFriendlyNameAttCode)) {
+						$oFriendlyNameAtt = MetaModel::GetAttributeDef($sClassName, $sFriendlyNameAttCode);
+						$aList[$sAlias][$sFriendlyNameAttCode] = $oFriendlyNameAtt;
+					}
+				}
+			}
+
+			foreach ($aList[$sAlias] as $sAttCodeEx => $oAttDef) {
+				$sColLabel = $bLocalize ? MetaModel::GetLabel($sClassName, $sAttCodeEx) : $sAttCodeEx;
+
+				$oFinalAttDef = $oAttDef->GetFinalAttDef();
+				if (get_class($oFinalAttDef) == 'AttributeDateTime') {
+					$aHeader[] = $sColLabel.' ('.Dict::S('UI:SplitDateTime-Date').')';
+					$aHeader[] = $sColLabel.' ('.Dict::S('UI:SplitDateTime-Time').')';
+				} else {
+					$aHeader[] = $sColLabel;
+				}
+			}
+		}
+
+		$sHtml = "<table border=\"1\">\n";
+		$sHtml .= "<tr>\n";
+		$sHtml .= "<td>".implode("</td><td>", $aHeader)."</td>\n";
+		$sHtml .= "</tr>\n";
+		$oSet->Seek(0);
+		while ($aObjects = $oSet->FetchAssoc()) {
+			$aRow = [];
+			foreach ($aAuthorizedClasses as $sAlias => $sClassName) {
+				$oObj = $aObjects[$sAlias];
+				foreach ($aList[$sAlias] as $sAttCodeEx => $oAttDef) {
+					if (is_null($oObj)) {
+						$aRow[] = '<td></td>';
+					} else {
+						$oFinalAttDef = $oAttDef->GetFinalAttDef();
+						if (get_class($oFinalAttDef) == 'AttributeDateTime') {
+							$sDate = $oObj->Get($sAttCodeEx);
+							if ($sDate === null) {
+								$aRow[] = '<td></td>';
+								$aRow[] = '<td></td>';
+							} else {
+								$iDate = AttributeDateTime::GetAsUnixSeconds($sDate);
+								$aRow[] = '<td>'.date(
+									'Y-m-d',
+									$iDate
+								).'</td>'; // Format kept as-is for 100% backward compatibility of the exports
+								$aRow[] = '<td>'.date(
+									'H:i:s',
+									$iDate
+								).'</td>'; // Format kept as-is for 100% backward compatibility of the exports
+							}
+						} else {
+							if ($oAttDef instanceof AttributeCaseLog) {
+								$rawValue = $oObj->Get($sAttCodeEx);
+								$outputValue = str_replace(
+									"\n",
+									"<br/>",
+									utils::EscapeHtml($rawValue->__toString())
+								);
+								// Trick for Excel: treat the content as text even if it begins with an equal sign
+								$aRow[] = '<td x:str>'.$outputValue.'</td>';
+							} else {
+								$rawValue = $oObj->Get($sAttCodeEx);
+								// Due to custom formatting rules, empty friendlynames may be rendered as non-empty strings
+								// let's fix this and make sure we render an empty string if the key == 0
+								if ($oAttDef instanceof AttributeExternalField && $oAttDef->IsFriendlyName()) {
+									$sKeyAttCode = $oAttDef->GetKeyAttCode();
+									if ($oObj->Get($sKeyAttCode) == 0) {
+										$rawValue = '';
+									}
+								}
+								if ($bLocalize) {
+									$outputValue = utils::EscapeHtml($oFinalAttDef->GetEditValue($rawValue));
+								} else {
+									$outputValue = utils::EscapeHtml($rawValue);
+								}
+								$aRow[] = '<td>'.$outputValue.'</td>';
+							}
+						}
+					}
+				}
+			}
+			$sHtml .= implode("\n", $aRow);
+			$sHtml .= "</tr>\n";
+		}
+		$sHtml .= "</table>\n";
+
+		return $sHtml;
+	}
+
 	/**
 	 * @param WebPage $oPage
 	 * @param \CMDBObjectSet $oSet
@@ -4323,7 +4507,7 @@ HTML;
 
 			$oDivField = FieldUIBlockFactory::MakeLarge("");
 			//	UIContentBlockUIBlockFactory::MakeStandard(null,["field_container field_large"]);
-			$oDivField->AddDataAttribute("attribute-type", $oAttDef->GetTypeShortClassName());
+			$oDivField->AddDataAttribute("attribute-type", $oAttDef->GetType());
 			$oDivField->AddDataAttribute("attribute-label", $sAttMetaDataLabel);
 			$oDivField->AddDataAttribute("attribute-flag-hidden", false);
 			$oDivField->AddDataAttribute("attribute-flag-read-only", false);

application/dashboard.class.inc.php

@@ -501,7 +501,7 @@ EOF
 	 */
 	public function Render($oPage, $bEditMode = false, $aExtraParams = [], $bCanEdit = true)
 	{
-		$aExtraParams['dashboard_div_id'] = utils::Sanitize($aExtraParams['dashboard_div_id'] ?? $this->GetId(), $this->GetId(), utils::ENUM_SANITIZATION_FILTER_ELEMENT_IDENTIFIER);
+		$aExtraParams['dashboard_div_id'] = utils::Sanitize($aExtraParams['dashboard_div_id'] ?? null, $this->GetId(), utils::ENUM_SANITIZATION_FILTER_ELEMENT_IDENTIFIER);
 
 		/** @var \DashboardLayoutMultiCol $oLayout */
 		$oLayout = new $this->sLayoutClass();

application/displayblock.class.inc.php

@@ -1707,7 +1707,7 @@ JS
 		$oBlock->bAdvancedMode = utils::ReadParam('advanced', false);
 
 		$oBlock->sCsvFile = strtolower($this->m_oFilter->GetClass()).'.csv';
-		$oBlock->sDownloadLink = utils::GetAbsoluteUrlAppRoot().'webservices/export-v2.php?expression='.urlencode($this->m_oFilter->ToOQL(true)).'&format=csv&filename='.urlencode($oBlock->sCsvFile);
+		$oBlock->sDownloadLink = utils::GetAbsoluteUrlAppRoot().'webservices/export.php?expression='.urlencode($this->m_oFilter->ToOQL(true)).'&format=csv&filename='.urlencode($oBlock->sCsvFile);
 		$oBlock->sLinkToToggle = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=search'.$oAppContext->GetForLink(true).'&filter='.rawurlencode($this->m_oFilter->serialize()).'&format=csv';
 		// Pass the parameters via POST, since expression may be very long
 		$aParamsToPost = [
@@ -1724,7 +1724,7 @@ JS
 			$oBlock->sLinkToToggle = $oBlock->sLinkToToggle.'&advanced=1';
 			$oBlock->sChecked = '';
 		}
-		$oBlock->sAjaxLink = utils::GetAbsoluteUrlAppRoot().'webservices/export-v2.php';
+		$oBlock->sAjaxLink = utils::GetAbsoluteUrlAppRoot().'webservices/export.php';
 
 		$oBlock->sCharsetNotice = false;
 		$oBlock->sJsonParams = json_encode($aParamsToPost);

application/loginwebpage.class.inc.php

@@ -25,11 +25,11 @@
  */
 
 use Combodo\iTop\Application\Branding;
+use Combodo\iTop\Application\Helper\Session;
 use Combodo\iTop\Application\WebPage\ErrorPage;
 use Combodo\iTop\Application\WebPage\NiceWebPage;
 use Combodo\iTop\Service\Events\EventData;
 use Combodo\iTop\Service\Events\EventService;
-use Combodo\iTop\Service\Session\Session;
 
 /**
  * Web page used for displaying the login form
@@ -369,7 +369,16 @@ class LoginWebPage extends NiceWebPage
 	public static function ResetSession()
 	{
 		// Unset all of the session variables.
-		Session::UnsetAll();
+		Session::Unset('auth_user');
+		Session::Unset('login_state');
+		Session::Unset('can_logoff');
+		Session::Unset('archive_mode');
+		Session::Unset('impersonate_user');
+		Session::Unset('PluginProperties');
+		Session::Unset('UrlMakerClass');
+		Session::Unset('itop_env');
+		Session::Unset('obj_messages');
+		Session::Unset('profile_list');
 		UserRights::_ResetSessionCache();
 		// If it's desired to kill the session, also delete the session cookie.
 		// Note: This will destroy the session, and not just the session data!

application/query.class.inc.php

@@ -113,43 +113,17 @@ abstract class Query extends cmdbAbstractObject
 			]
 		));
 
-		MetaModel::Init_AddAttribute(new AttributeExternalKey(
-			"owner_id",
-			[
-				"targetclass" => 'Contact',
-				"allowed_values" => null,
-				"sql" => 'owner_id',
-				"is_null_allowed" => true,
-				"depends_on" => [],
-				"display_style" => 'select',
-				"always_load_in_tables" => false,
-				"on_target_delete" => DEL_AUTO,
-			]
-		));
-
-		MetaModel::Init_AddAttribute(new AttributeEnumSet(
-			"usages",
-			[
-				"allowed_values" => null,
-				"possible_values" => new ValueSetEnumPadded("export,reference,notif,draft,dashlet"),
-				"sql" => "usages",
-				"depends_on" => [],
-				"is_null_allowed" => true,
-				"max_items" => 12,
-			]
-		));
-
 		// Display lists
 		MetaModel::Init_SetZListItems(
 			'details',
-			['name', 'is_template', 'owner_id', 'usages', 'description']
+			['name', 'is_template', 'description']
 		); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', ['description', 'usages']); // Attributes to be displayed for a list
+		MetaModel::Init_SetZListItems('list', ['description']); // Attributes to be displayed for a list
 		// Search criteria
 		MetaModel::Init_SetZListItems('standard_search', ['name', 'description', 'is_template']); // Criteria of the std search form
 		MetaModel::Init_SetZListItems(
 			'default_search',
-			['name', 'description', 'is_template', 'owner_id', 'usages']
+			['name', 'description', 'is_template']
 		); // Criteria of the default search form
 		// MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
 	}
@@ -169,15 +143,6 @@ abstract class Query extends cmdbAbstractObject
 		return parent::GetAttributeFlags($sAttCode, $aReasons, $sTargetState);
 	}
 
-	public function GetInitialStateAttributeFlags($sAttCode, &$aReasons = [])
-	{
-		// read only attribute
-		if (in_array($sAttCode, ['export_count', 'export_last_date', 'export_last_user_id'])) {
-			return OPT_ATT_READONLY;
-		}
-		return parent::GetInitialStateAttributeFlags($sAttCode, $aReasons);
-	}
-
 	/**
 	 * Return export url.
 	 *
@@ -249,15 +214,15 @@ class QueryOQL extends Query
 		MetaModel::Init_SetZListItems(
 			'details',
 			[
-				'col:col1' => ['fieldset:Query:baseinfo' => ['name', 'is_template', 'owner_id', 'usages', 'description', 'oql', 'fields']],
+				'col:col1' => ['fieldset:Query:baseinfo' => ['name', 'is_template', 'description', 'oql', 'fields']],
 				'col:col2' => ['fieldset:Query:exportInfo' => ['export_count', 'export_last_date', 'export_last_user_id', 'export_last_user_contact']],
 			]
 		); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', ['description', 'usages']); // Attributes to be displayed for a list
+		MetaModel::Init_SetZListItems('list', ['description']); // Attributes to be displayed for a list
 		// Search criteria
 		MetaModel::Init_SetZListItems(
 			'standard_search',
-			['name', 'description', 'is_template', 'owner_id', 'usages', 'oql']
+			['name', 'description', 'is_template', 'fields', 'oql']
 		); // Criteria of the std search form
 	}
 

application/ui.extkeywidget.class.inc.php

@@ -284,7 +284,8 @@ class UIExtKeyWidget
 				if ($bAddingValue) {
 					$aArguments = [];
 					foreach ($aAdditionalField as $sAdditionalField) {
-						array_push($aArguments, $oObj->Get($sAdditionalField));
+						$oAttrDef = MetaModel::GetAttributeDef(get_class($oObj), $sAdditionalField);
+						array_push($aArguments, $oAttrDef->GetValueLabel($oObj->Get($sAdditionalField)));
 					}
 					$aOption['additional_field'] = utils::HtmlEntities(utils::VSprintf($sFormatAdditionalField, $aArguments));
 				}

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "24e7507794b971955358df5f2b143ac4",
+    "content-hash": "1cca58a0e26794fb9c546a001f7f7de8",
     "packages": [
         {
             "name": "apereo/phpcas",
@@ -5570,16 +5570,16 @@
         },
         {
             "name": "twig/twig",
-            "version": "v3.28.0",
+            "version": "v3.24.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/twigphp/Twig.git",
-                "reference": "597c12ed286fb9d1701a36684ce6e0cbe28ebc8b"
+                "reference": "a6769aefb305efef849dc25c9fd1653358c148f0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/597c12ed286fb9d1701a36684ce6e0cbe28ebc8b",
-                "reference": "597c12ed286fb9d1701a36684ce6e0cbe28ebc8b",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/a6769aefb305efef849dc25c9fd1653358c148f0",
+                "reference": "a6769aefb305efef849dc25c9fd1653358c148f0",
                 "shasum": ""
             },
             "require": {
@@ -5634,7 +5634,7 @@
             ],
             "support": {
                 "issues": "https://github.com/twigphp/Twig/issues",
-                "source": "https://github.com/twigphp/Twig/tree/v3.28.0"
+                "source": "https://github.com/twigphp/Twig/tree/v3.24.0"
             },
             "funding": [
                 {
@@ -5646,7 +5646,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-07-03T20:44:34+00:00"
+            "time": "2026-03-17T21:31:11+00:00"
         }
     ],
     "packages-dev": [

core/cmdbsource.class.inc.php

@@ -916,9 +916,7 @@ class CMDBSource
 		$aColumn = [];
 		$aData = self::QueryToArray($sSql);
 		foreach ($aData as $aRow) {
-			if ($aRow[$col] !== null) {
-				$aColumn[] = $aRow[$col];
-			}
+			@$aColumn[] = $aRow[$col];
 		}
 		return $aColumn;
 	}

core/dbobject.class.php

@@ -730,8 +730,13 @@ abstract class DBObject implements iDisplay
 	public function SetTrim($sAttCode, $sValue)
 	{
 		$oAttDef = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
-
-		$this->Set($sAttCode, $oAttDef->TrimValue($sValue));
+		$iMaxSize = $oAttDef->GetMaxSize();
+		$sLength = mb_strlen($sValue);
+		if ($iMaxSize && ($sLength > $iMaxSize)) {
+			$sMessage = " -truncated ($sLength chars)";
+			$sValue = mb_substr($sValue, 0, $iMaxSize - mb_strlen($sMessage)).$sMessage;
+		}
+		$this->Set($sAttCode, $sValue);
 	}
 
 	/**
@@ -2033,7 +2038,7 @@ abstract class DBObject implements iDisplay
 				}
 			}
 			if (!is_null($iMaxSize = $oAtt->GetMaxSize())) {
-				$iLen = $oAtt->GetSize($toCheck);
+				$iLen = mb_strlen($toCheck);
 				if ($iLen > $iMaxSize) {
 					return "String too long (found $iLen, limited to $iMaxSize)";
 				}

core/dbobjectsearch.class.php

@@ -1935,8 +1935,9 @@ class DBObjectSearch extends DBSearch
 
 	/**
 	 * @inheritDoc
+	 * @return DBObjectSearch
 	 */
-	protected function ApplyDataFilters(): DBSearch
+	protected function ApplyDataFilters(): DBObjectSearch
 	{
 		if ($this->IsAllDataAllowed() || $this->IsDataFiltered()) {
 			return $this;

core/dbunionsearch.class.php

@@ -676,8 +676,9 @@ class DBUnionSearch extends DBSearch
 
 	/**
 	 * @inheritDoc
+	 * @return DBUnionSearch
 	 */
-	protected function ApplyDataFilters(): DBSearch
+	protected function ApplyDataFilters(): DBUnionSearch
 	{
 		if ($this->IsAllDataAllowed() || $this->IsDataFiltered()) {
 			return $this;

core/inlineimage.class.inc.php

@@ -434,7 +434,7 @@ JS
 	 * Resize an image so that it fits the maximum width/height defined in the config file
 	 * @param ormDocument $oImage The original image stored as an array (content / mimetype / filename)
 	 * @return ormDocument The resampled image (or the original one if it already fit)
-	 * @deprecated 3.3.0 Use ormDocument::ResizeImageToFit instead
+	 * @deprecated since 3.3.0 Replaced by ormDocument::ResizeImageToFit
 	 */
 	public static function ResizeImageToFit(ormDocument $oImage, &$aDimensions = null)
 	{

core/log.class.inc.php

@@ -614,13 +614,6 @@ class LogChannels
 	 * @since 3.2.0
 	 */
 	public const SECURITY = 'Security';
-
-	/**
-	 * For Session parameters
-	 *
-	 * @Since 3.3.0
-	 */
-	public const SESSION_PARAMETERS = 'SessionParameters';
 }
 
 abstract class LogAPI

core/metamodel.class.php

@@ -5761,37 +5761,36 @@ abstract class MetaModel
 
 		self::$m_sEnvironment = $sEnvironment;
 
-		if (!defined('MODULESROOT')) {
-			define('MODULESROOT', APPROOT.'env-'.self::$m_sEnvironment.'/');
+		try {
+			if (!defined('MODULESROOT')) {
+				define('MODULESROOT', APPROOT.'env-'.self::$m_sEnvironment.'/');
 
-			self::$m_bTraceSourceFiles = $bTraceSourceFiles;
+				self::$m_bTraceSourceFiles = $bTraceSourceFiles;
 
-			// $config can be either a filename, or a Configuration object (volatile!)
-			if ($config instanceof Config) {
-				self::LoadConfig($config, $bAllowCache);
-			} else {
-				self::LoadConfig(new Config($config), $bAllowCache);
+				// $config can be either a filename, or a Configuration object (volatile!)
+				if ($config instanceof Config) {
+					self::LoadConfig($config, $bAllowCache);
+				} else {
+					self::LoadConfig(new Config($config), $bAllowCache);
+				}
+
+				if ($bModelOnly) {
+					return;
+				}
 			}
 
-			if ($bModelOnly) {
-				// Event service must be initialized after the MetaModel startup, otherwise it cannot discover classes implementing the iEventServiceSetup interface
-				EventService::InitService();
-				EventService::FireEvent(new EventData(ApplicationEvents::APPLICATION_EVENT_METAMODEL_STARTED));
-				return;
+			CMDBSource::SelectDB(self::$m_sDBName);
+
+			foreach (MetaModel::EnumPlugins('ModuleHandlerApiInterface') as $oPHPClass) {
+				$oPHPClass::OnMetaModelStarted();
 			}
+
+			ExpressionCache::Warmup();
+		} finally {
+			// Event service must be initialized after the MetaModel startup, otherwise it cannot discover classes implementing the iEventServiceSetup interface
+			EventService::InitService();
+			EventService::FireEvent(new EventData(ApplicationEvents::APPLICATION_EVENT_METAMODEL_STARTED));
 		}
-
-		CMDBSource::SelectDB(self::$m_sDBName);
-
-		foreach (MetaModel::EnumPlugins('ModuleHandlerApiInterface') as $oPHPClass) {
-			$oPHPClass::OnMetaModelStarted();
-		}
-
-		ExpressionCache::Warmup();
-
-		// Event service must be initialized after the MetaModel startup, otherwise it cannot discover classes implementing the iEventServiceSetup interface
-		EventService::InitService();
-		EventService::FireEvent(new EventData(ApplicationEvents::APPLICATION_EVENT_METAMODEL_STARTED));
 	}
 
 	/**

core/ormdocument.class.inc.php

@@ -408,7 +408,7 @@ class ormDocument
 	 * @param int $iMaxImageHeight Maximum height for the resized image
 	 * @param array|null $aFinalDimensions Image dimensions after resizing or null if unable to read the image
 	 * @return ormDocument The resampled image
-	 * @since 3.3.0 N°3124
+	 *
 	 */
 	public function ResizeImageToFit(int $iMaxWidth, int $iMaxHeight, array|null &$aFinalDimensions = null): static
 	{

core/tabularbulkexport.class.inc.php

@@ -8,13 +8,6 @@
 use Combodo\iTop\Application\UI\Base\Component\Input\InputUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\UIContentBlockUIBlockFactory;
 use Combodo\iTop\Application\WebPage\WebPage;
-use Combodo\iTop\Core\AttributeDefinition\AttributeExternalField;
-use Combodo\iTop\Core\AttributeDefinition\AttributeExternalKey;
-use Combodo\iTop\Core\AttributeDefinition\AttributeFriendlyName;
-use Combodo\iTop\Core\AttributeDefinition\AttributeHierarchicalKey;
-use Combodo\iTop\Core\AttributeDefinition\AttributeLinkedSet;
-use Combodo\iTop\Core\AttributeDefinition\AttributeStopWatch;
-use Combodo\iTop\Core\AttributeDefinition\AttributeSubItem;
 
 /**
  * Bulk export: Tabular export: abstract base class for all "tabular" exports.
@@ -98,8 +91,8 @@ abstract class TabularBulkExport extends BulkExport
 	{
 		$aResult = [];
 		switch (get_class($oAttDef)) {
-			case AttributeExternalKey::class:
-			case AttributeHierarchicalKey::class:
+			case 'AttributeExternalKey':
+			case 'AttributeHierarchicalKey':
 
 				$bAddFriendlyName = true;
 				$oKeyAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
@@ -149,7 +142,7 @@ abstract class TabularBulkExport extends BulkExport
 				}
 				break;
 
-			case AttributeStopWatch::class:
+			case 'AttributeStopWatch':
 				foreach (MetaModel::ListAttributeDefs($sClass) as $sSubAttCode => $oSubAttDef) {
 					if ($oSubAttDef instanceof AttributeSubItem) {
 						if ($oSubAttDef->GetParentAttCode() == $sAttCode) {

core/trigger.class.inc.php

@@ -39,7 +39,7 @@ abstract class Trigger extends cmdbAbstractObject
 			"category"                   => "grant_by_profile,core/cmdb",
 			"key_type"                   => "autoincrement",
 			"name_attcode"               => "description",
-			"complementary_name_attcode" => ['finalclass', 'complement'],
+			"complementary_name_attcode" => ['finalclass', 'target_class'],
 			"state_attcode"              => "",
 			"reconc_keys"                => ['description'],
 			"db_table"                   => "priv_trigger",
@@ -174,7 +174,7 @@ abstract class TriggerOnObject extends Trigger
 			"category"            => "grant_by_profile,core/cmdb",
 			"key_type"            => "autoincrement",
 			"name_attcode"        => "description",
-			"complementary_name_attcode" => ['finalclass', 'complement'],
+			"complementary_name_attcode" => ['finalclass', 'target_class'],
 			"state_attcode"       => "",
 			"reconc_keys" => ['description'],
 			"db_table"            => "priv_trigger_onobject",
@@ -401,7 +401,7 @@ class TriggerOnPortalUpdate extends TriggerOnObject
 			"category" => "grant_by_profile,core/cmdb,application",
 			"key_type" => "autoincrement",
 			"name_attcode" => "description",
-			"complementary_name_attcode" => ['finalclass', 'complement'],
+			"complementary_name_attcode" => ['finalclass', 'target_class'],
 			"state_attcode" => "",
 			"reconc_keys" => ['description'],
 			"db_table" => "priv_trigger_onportalupdate",
@@ -434,7 +434,7 @@ abstract class TriggerOnStateChange extends TriggerOnObject
 			"category" => "grant_by_profile,core/cmdb",
 			"key_type" => "autoincrement",
 			"name_attcode" => "description",
-			"complementary_name_attcode" => ['finalclass', 'complement'],
+			"complementary_name_attcode" => ['finalclass', 'target_class'],
 			"state_attcode" => "",
 			"reconc_keys" => ['description'],
 			"db_table" => "priv_trigger_onstatechange",
@@ -469,7 +469,7 @@ class TriggerOnStateEnter extends TriggerOnStateChange
 			"category" => "grant_by_profile,core/cmdb,application",
 			"key_type" => "autoincrement",
 			"name_attcode" => "description",
-			"complementary_name_attcode" => ['finalclass', 'complement'],
+			"complementary_name_attcode" => ['finalclass', 'target_class'],
 			"state_attcode" => "",
 			"reconc_keys" => ['description'],
 			"db_table" => "priv_trigger_onstateenter",
@@ -503,7 +503,7 @@ class TriggerOnStateLeave extends TriggerOnStateChange
 			"category" => "grant_by_profile,core/cmdb,application",
 			"key_type" => "autoincrement",
 			"name_attcode" => "description",
-			"complementary_name_attcode" => ['finalclass', 'complement'],
+			"complementary_name_attcode" => ['finalclass', 'target_class'],
 			"state_attcode" => "",
 			"reconc_keys" => ['description'],
 			"db_table" => "priv_trigger_onstateleave",
@@ -537,7 +537,7 @@ class TriggerOnObjectCreate extends TriggerOnObject
 			"category" => "grant_by_profile,core/cmdb,application",
 			"key_type" => "autoincrement",
 			"name_attcode" => "description",
-			"complementary_name_attcode" => ['finalclass', 'complement'],
+			"complementary_name_attcode" => ['finalclass', 'target_class'],
 			"state_attcode" => "",
 			"reconc_keys" => ['description'],
 			"db_table" => "priv_trigger_onobjcreate",
@@ -572,7 +572,7 @@ class TriggerOnObjectDelete extends TriggerOnObject
 			"category" => "grant_by_profile,core/cmdb,application",
 			"key_type" => "autoincrement",
 			"name_attcode" => "description",
-			"complementary_name_attcode" => ['finalclass', 'complement'],
+			"complementary_name_attcode" => ['finalclass', 'target_class'],
 			"state_attcode" => "",
 			"reconc_keys" => ['description'],
 			"db_table" => "priv_trigger_onobjdelete",
@@ -607,7 +607,7 @@ class TriggerOnObjectUpdate extends TriggerOnObject
 			"category" => "grant_by_profile,core/cmdb,application",
 			"key_type" => "autoincrement",
 			"name_attcode" => "description",
-			"complementary_name_attcode" => ['finalclass', 'complement'],
+			"complementary_name_attcode" => ['finalclass', 'target_class'],
 			"state_attcode" => "",
 			"reconc_keys" => ['description'],
 			"db_table" => "priv_trigger_onobjupdate",
@@ -695,7 +695,7 @@ class TriggerOnObjectMention extends TriggerOnObject
 			"category" => "grant_by_profile,core/cmdb,application",
 			"key_type" => "autoincrement",
 			"name_attcode" => "description",
-			"complementary_name_attcode" => ['finalclass', 'complement'],
+			"complementary_name_attcode" => ['finalclass', 'target_class'],
 			"state_attcode" => "",
 			"reconc_keys" => ['description'],
 			"db_table" => "priv_trigger_onobjmention",
@@ -773,7 +773,7 @@ class TriggerOnAttributeBlobDownload extends TriggerOnObject
 			"category" => "grant_by_profile,core/cmdb,application",
 			"key_type" => "autoincrement",
 			"name_attcode" => "description",
-			"complementary_name_attcode" => ['finalclass', 'complement'],
+			"complementary_name_attcode" => ['finalclass', 'target_class'],
 			"state_attcode" => "",
 			"reconc_keys" => ['description'],
 			"db_table" => "priv_trigger_onattblobdownload",
@@ -852,7 +852,7 @@ class TriggerOnThresholdReached extends TriggerOnObject
 			"category" => "grant_by_profile,core/cmdb,application",
 			"key_type" => "autoincrement",
 			"name_attcode" => "description",
-			"complementary_name_attcode" => ['finalclass', 'complement'],
+			"complementary_name_attcode" => ['finalclass', 'target_class'],
 			"state_attcode" => "",
 			"reconc_keys" => ['description'],
 			"db_table" => "priv_trigger_threshold",

core/userrights.class.inc.php

@@ -1530,37 +1530,6 @@ class UserRights
 		}
 	}
 
-	/**
-	 * @param User $oUser
-	 * @param array $aExcludedProfilesId Administrator by default, but can also be other proofiles depending on needs (e.g. power portal user or REST profile)
-	 * @return bool
-	 * @throws ArchivedObjectException
-	 * @throws CoreException
-	 * @throws CoreUnexpectedValue
-	 * @throws MySQLException
-	 */
-	public static function IsUserReadOnly(User $oUser, array $aExcludedProfilesId = [1]): bool
-	{
-		$oUserProfiles = $oUser->Get('profile_list');
-		$oUserRights = UserRights::GetModuleInstance();
-		while ($oUserProfile = $oUserProfiles->Fetch()) {
-			$iProfileId = $oUserProfile->Get('profileid');
-			if (in_array($iProfileId, $aExcludedProfilesId)) {
-				return false;
-			}
-			foreach (MetaModel::GetClasses('bizmodel,grant_by_profile') as $sClass) {
-				foreach (['w', 'bw', 'd', 'bd'] as $sWriteActionCode) {
-					$bIsGranted = $oUserRights->GetProfileActionGrant($iProfileId, $sClass, $sWriteActionCode);
-					if ($bIsGranted === true) {
-						return false;
-					}
-				}
-			}
-		}
-
-		return true;
-	}
-
 	/**
 	 * @param string $sClass
 	 * @param int $iActionCode see UR_ACTION_* constants

core/valuesetdef.class.inc.php

@@ -404,7 +404,8 @@ class ValueSetObjects extends ValueSetDefinition
 			if (count($aAdditionalField) > 0) {
 				$aArguments = [];
 				foreach ($aAdditionalField as $sAdditionalField) {
-					array_push($aArguments, $oObject->Get($sAdditionalField));
+					$oAttrDef = MetaModel::GetAttributeDef(get_class($oObject), $sAdditionalField);
+					array_push($aArguments, $oAttrDef->GetValueLabel($oObject->Get($sAdditionalField)));
 				}
 				$aData['additional_field'] = utils::VSprintf($sFormatAdditionalField, $aArguments);
 			} else {

css/backoffice/application/_user-rights.scss

@@ -4,7 +4,7 @@
  */
 
 $ibo-user-rights--padding-x: $ibo-spacing-400 !default;
-$ibo-user-rights--padding-y: $ibo-spacing-100 !default;
+$ibo-user-rights--padding-y: $ibo-spacing-200 !default;
 $ibo-user-rights--border-radius: $ibo-border-radius-400 !default;
 
 $ibo-user-rights--is-success--background-color: $ibo-color-success-100 !default;
@@ -18,8 +18,6 @@ $ibo-user-rights--is-failure--border-color: $ibo-color-danger-500 !default;
 $ibo-user-rights--is-failure--border: 1px solid $ibo-user-rights--is-failure--border-color !default;
 
 .ibo-user-rights {
-  display: inline-flex;
-  align-items: baseline;
   padding: $ibo-user-rights--padding-y $ibo-user-rights--padding-x;
   border-radius: $ibo-user-rights--border-radius;
   &.ibo-is-success {

css/backoffice/components/_badge.scss

@@ -19,8 +19,6 @@ $ibo-badge-colors: (
 		'orange' : ($ibo-color-orange-100, $ibo-color-orange-900),
 		'red': ($ibo-color-red-100, $ibo-color-red-900),
 		'pink': ($ibo-color-pink-100, $ibo-color-pink-900),
-		'purple': ($ibo-color-purple-100, $ibo-color-purple-900),
-		'yellow': ($ibo-color-yellow-200, $ibo-color-yellow-900),
 ) !default;
 
 

css/backoffice/components/_form.scss

@@ -8,74 +8,70 @@
   padding-bottom: 14px;
 }
 
-// WIP SDK Forms
-//form[is="itop-form-element"] {
-//
-//  .help-text{
-//    padding: 1px 5px;
-//    background-color: #d7e3f8;
-//    border: 1px solid #c6e7f5;
-//    border-radius: 5px;
-//    margin: 5px 0;
-//    font-size: 0.9em;
-//  }
-//
-//  .form-error ul{
-//    padding: 1px 5px;
-//    background-color: #f8d7da;
-//    border: 1px solid #f5c6cb;
-//    border-radius: 5px;
-//    margin: 5px 0;
-//    font-size: 0.9em;
-//  }
-//
-//  .subform{
-//    background-color: #efefef;
-//    border-radius: 5px;
-//    padding: 10px;
-//  }
-//
-//  .form-buttons{
-//    margin: 20px 0;
-//  }
-//
-//  .form select{
-//    padding: 0;
-//    overflow-y: auto;
-//  }
-//
-//  .form select option{
-//    height: 30px;
-//    display: flex;
-//    align-items: center;
-//  }
-//
-//  .turbo-refreshing{
-//    opacity: .5;
-//  }
-//
-//  .ibo-field legend{
-//    margin-top: 24px;
-//  }
-//
-//  collection-entry-element {
-//    margin-top: 8px;
-//    display: block;
-//    padding: 10px 10px;
-//    background-color: #f5f5f5;
-//    border-radius: 5px;
-//  }
-//  .ts-control{
-//    height: auto;
-//    min-height: 30px;
-//  }
-//
-//  .ibo-form-actions > .ibo-button > span{
-//    margin-right: 5px;
-//  }
-//
-//  .ibo-form textarea{
-//    resize: vertical;
-//  }
-//
-//}
+.help-text{
+  padding: 1px 5px;
+  background-color: #d7e3f8;
+  border: 1px solid #c6e7f5;
+  border-radius: 5px;
+  margin: 5px 0;
+  font-size: 0.9em;
+}
+
+.form-error ul{
+  padding: 1px 5px;
+  background-color: #f8d7da;
+  border: 1px solid #f5c6cb;
+  border-radius: 5px;
+  margin: 5px 0;
+  font-size: 0.9em;
+}
+
+.subform{
+  background-color: #efefef;
+  border-radius: 5px;
+  padding: 10px;
+}
+
+.form-buttons{
+  margin: 20px 0;
+}
+
+.form select{
+  padding: 0;
+  overflow-y: auto;
+}
+
+.form select option{
+  height: 30px;
+  display: flex;
+  align-items: center;
+}
+
+.turbo-refreshing{
+  opacity: .5;
+}
+
+.ibo-field legend{
+  margin-top: 24px;
+}
+
+collection-entry-element {
+  margin-top: 8px;
+  display: block;
+  padding: 10px 10px;
+  background-color: #f5f5f5;
+  border-radius: 5px;
+}
+.ts-control{
+  height: auto;
+  min-height: 30px;
+}
+
+.ibo-form-actions > .ibo-button > span{
+  margin-right: 5px;
+}
+
+.ibo-form textarea{
+  resize: vertical;
+}
+

css/backoffice/components/input/_input-select-icon.scss

@@ -3,9 +3,9 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
-$ibo-input-select-icon--max-height: 100% !default;
-$ibo-input-select-icon--max-width: 100% !default;
-$ibo-input-select-icon--padding-right: $ibo-spacing-200 !default;
+$ibo-input-select-icon--menu--icon--max-height: 100% !default;
+$ibo-input-select-icon--menu--icon--max-width: 100% !default;
+$ibo-input-select-icon--icon--padding-right: $ibo-spacing-200 !default;
 
 $ibo-input-select-icon--menu--z-index: 21 !default;
 $ibo-input-select-icon--menu--max-height: 300px !default;
@@ -18,9 +18,9 @@ $ibo-input-select-icon--menu--icon--margin-right: 10px !default;
   display: inline-flex;
   text-align: left;
 	>img{
-		max-height: $ibo-input-select-icon--max-height;
-		max-width: $ibo-input-select-icon--max-width;
-		padding-right: $ibo-input-select-icon--padding-right;
+		max-height: $ibo-input-select-icon--menu--icon--max-height;
+		max-width: $ibo-input-select-icon--menu--icon--max-width;
+		padding-right: $ibo-input-select-icon--icon--padding-right;
 	}
   >span{
     overflow: hidden;

css/backoffice/vendors/ckeditor/_overloads.scss

@@ -70,7 +70,7 @@ $ibo-vendors-ckeditor--ck-mentions--item--padding-y: $ibo-spacing-200 !default;
   }
 }
 
-.ck-editor__editable_inline:not(.ck-comment__input *), .ck-source-editing-area {
+.ck-editor__editable_inline:not(.ck-comment__input *) {
   height: 200px;
 }
 
@@ -84,6 +84,11 @@ $ibo-vendors-ckeditor--ck-mentions--item--padding-y: $ibo-spacing-200 !default;
   }
 }
 
+// N°7552 Allow source editing area to be scrollable in full screen
+.ck-maximize_editor_main .ck-source-editing-area textarea{
+  overflow: auto !important;
+}
+
 /* Mentions */
 .ck-mentions {
   .ck-button {

css/common/utils/helpers/_text-decoration.scss

@@ -4,7 +4,7 @@
  */
 
 /* SCSS variables */
-$common-has-description--content: "?" !default;
+$common-has-description--content: "\1F6C8" !default;
 $common-has-description--padding-left: $common-spacing-200 !default;
 $common-has-description--color: $common-color-grey-600 !default;
 $common-has-description--font-size: 0.7em !default; /* Font size is em on purpose as we want it to be proportional to its context */

css/common/utils/helpers/_typography.scss

@@ -11,9 +11,6 @@
  *
  * Usage: @extend %common-font-size-XXX;
  */
-%common-font-size-20 {
-  font-size: $common-font-size-20;
-}
 %common-font-size-50 {
   font-size: $common-font-size-50;
 }

css/setup.scss

@@ -611,6 +611,32 @@ body {
 .setup-extension--missing .setup-extension--icon{
 	color:#a00000;
 }
+.setup-extension-tag {
+  display: inline-flex;
+	background-color: grey;
+	border-radius: 8px;
+	padding-left: 3px;
+	padding-right: 3px;
+	margin-right: 3px;
+	&.installed{
+		background-color:#9eff9e
+	}
+	&.notinstalled{
+		background-color:#ed9eff
+	}
+	&.tobeinstalled{
+		background-color:#9ef0ff
+	}
+	&.tobeuninstalled{
+		background-color:#ff9e9e
+	}
+	&.notuninstallable{
+		background-color:#ffc98c
+	}
+	&.removed{
+		background-color: #969594
+	}
+}
 
 .ibo-extension-details {
 	align-items: flex-start;

datamodels/2.x/authent-cas/dictionaries/zh_cn.dict.authent-cas.php

@@ -6,9 +6,8 @@
  * @copyright Copyright (C) 2010-2024 Combodo SAS
  * @license    https://opensource.org/licenses/AGPL-3.0
  */
-
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'CAS:Error:UserNotAllowed' => '用户被禁止登录',
-	'CAS:Login:SignIn' => '使用 CAS 登录',
-	'CAS:Login:SignInTooltip' => '点击这里使用 CAS 服务器认证',
+	'CAS:Login:SignIn' => '使用CAS登录',
+	'CAS:Login:SignInTooltip' => '点击这里使用CAS服务器认证',
 ]);

datamodels/2.x/authent-external/dictionaries/zh_cn.dict.authent-external.php

@@ -5,8 +5,10 @@
  *
  * @copyright Copyright (C) 2010-2024 Combodo SAS
  * @license    https://opensource.org/licenses/AGPL-3.0
+ *
+ */
+/**
  * @author Robert Deng <denglx@gmail.com>
- * This file is part of iTop.
  *
  * iTop is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -21,7 +23,6 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with iTop. If not, see <http://www.gnu.org/licenses/>
  */
-
 // Dictionnay conventions
 // Class:<class_name>
 // Class:<class_name>+
@@ -31,11 +32,9 @@
 // Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
 // Class:<class_name>/Stimulus:<stimulus_code>
 // Class:<class_name>/Stimulus:<stimulus_code>+
-
 //
 // Class: UserExternal
 //
-
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:UserExternal' => '外部用户',
 	'Class:UserExternal+' => '用户在'.ITOP_APPLICATION_SHORT.'外部验证身份',

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

@@ -14,7 +14,7 @@
 Dict::Add('RU RU', 'Russian', 'Русский', [
 	'Class:UserLDAP' => 'Пользователь LDAP',
 	'Class:UserLDAP+' => 'Пользователь, аутентифицируемый через LDAP',
-	'UserLDAP:server' => 'Особенности LDAP',
+	'UserLDAP:server' => 'LDAP specifics~~',
 ]);
 
 //
@@ -22,6 +22,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', [
 //
 
 Dict::Add('RU RU', 'Russian', 'Русский', [
-	'Class:UserLDAP/Attribute:ldap_server' => 'Сервер LDAP',
-	'Class:UserLDAP/Attribute:ldap_server+' => '',
+	'Class:UserLDAP/Attribute:ldap_server' => 'Ldap server~~',
+	'Class:UserLDAP/Attribute:ldap_server+' => '~~',
 ]);

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

@@ -6,6 +6,7 @@
  * @copyright Copyright (C) 2010-2024 Combodo SAS
  * @license    https://opensource.org/licenses/AGPL-3.0
  * @author Robert Deng <denglx@gmail.com>
+ *
  * This file is part of iTop.
  *
  * iTop is free software; you can redistribute it and/or modify
@@ -21,7 +22,6 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with iTop. If not, see <http://www.gnu.org/licenses/>
  */
-
 // Dictionnay conventions
 // Class:<class_name>
 // Class:<class_name>+
@@ -31,15 +31,13 @@
 // Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
 // Class:<class_name>/Stimulus:<stimulus_code>
 // Class:<class_name>/Stimulus:<stimulus_code>+
-
 //
 // Class: UserLDAP
 //
-
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'Class:UserLDAP' => 'LDAP 用户',
-	'Class:UserLDAP+' => '用户身份由 LDAP 认证',
-	'UserLDAP:server' => 'LDAP 详情',
+	'Class:UserLDAP' => 'LDAP用户',
+	'Class:UserLDAP+' => '用户身份由LDAP认证',
+	'UserLDAP:server' => 'LDAP详情',
 ]);
 
 //
@@ -47,6 +45,6 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 //
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'Class:UserLDAP/Attribute:ldap_server' => 'LDAP 服务器',
-	'Class:UserLDAP/Attribute:ldap_server+' => '',
+	'Class:UserLDAP/Attribute:ldap_server' => 'Ldap server~~',
+	'Class:UserLDAP/Attribute:ldap_server+' => '~~',
 ]);

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

@@ -24,11 +24,11 @@ Dict::Add('RU RU', 'Russian', 'Русский', [
 	'Class:UserLocal/Attribute:expiration/Value:never_expire+' => '',
 	'Class:UserLocal/Attribute:expiration/Value:force_expire' => 'Истёкший',
 	'Class:UserLocal/Attribute:expiration/Value:force_expire+' => '',
-	'Class:UserLocal/Attribute:expiration/Value:otp_expire' => 'Одноразовый пароль',
-	'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => 'Пароль не может быть изменён пользователем.',
+	'Class:UserLocal/Attribute:expiration/Value:otp_expire' => 'One-time Password~~',
+	'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => 'Password cannot be changed by the user.~~',
 	'Class:UserLocal/Attribute:password_renewed_date' => 'Дата изменения пароля',
 	'Class:UserLocal/Attribute:password_renewed_date+' => 'Когда пароль был изменен в последний раз',
 	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Пароль должен содержать не менее 12 символов и включать прописные, строчные, числовые и специальные символы.',
 	'UserLocal:password:expiration' => 'Поля требуют наличия доп. расширения',
-	'Class:UserLocal/Error:OneTimePasswordChangeIsNotAllowed' => 'Установка срока действия пароля "Одноразовый пароль" для своей собственной учётной записи не разрешена',
+	'Class:UserLocal/Error:OneTimePasswordChangeIsNotAllowed' => 'Setting password expiration to "One-time password" is not allowed for your own User~~',
 ]);

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

@@ -6,6 +6,7 @@
  * @copyright Copyright (C) 2010-2024 Combodo SAS
  * @license    https://opensource.org/licenses/AGPL-3.0
  * @author Robert Deng <denglx@gmail.com>
+ *
  * This file is part of iTop.
  *
  * iTop is free software; you can redistribute it and/or modify
@@ -21,7 +22,6 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with iTop. If not, see <http://www.gnu.org/licenses/>
  */
-
 // Dictionnay conventions
 // Class:<class_name>
 // Class:<class_name>+
@@ -31,19 +31,16 @@
 // Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
 // Class:<class_name>/Stimulus:<stimulus_code>
 // Class:<class_name>/Stimulus:<stimulus_code>+
-
 //
 // Class: UserLocal
 //
-
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:UserLocal' => ITOP_APPLICATION_SHORT.' 用户',
 	'Class:UserLocal+' => '用户由'.ITOP_APPLICATION_SHORT.'验证身份',
 	'Class:UserLocal/Attribute:password' => '密码',
 	'Class:UserLocal/Attribute:password+' => '用于验证用户身份的字符串',
-
-	'Class:UserLocal/Attribute:expiration' => '密码过期时间',
-	'Class:UserLocal/Attribute:expiration+' => '密码过期状态 (需要扩展才能生效)',
+	'Class:UserLocal/Attribute:expiration' => '密码过期',
+	'Class:UserLocal/Attribute:expiration+' => '密码过期状态 (需要一个扩展才能生效)',
 	'Class:UserLocal/Attribute:expiration/Value:can_expire' => '允许过期',
 	'Class:UserLocal/Attribute:expiration/Value:can_expire+' => '',
 	'Class:UserLocal/Attribute:expiration/Value:never_expire' => '永不过期',
@@ -52,9 +49,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:UserLocal/Attribute:expiration/Value:force_expire+' => '',
 	'Class:UserLocal/Attribute:expiration/Value:otp_expire' => '一次性密码',
 	'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => '用户不允许修改密码.',
-	'Class:UserLocal/Attribute:password_renewed_date' => '密码更新时间',
+	'Class:UserLocal/Attribute:password_renewed_date' => '密码更新',
 	'Class:UserLocal/Attribute:password_renewed_date+' => '上次修改密码的时间',
-
 	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => '密码必须至少12个字符, 包含大小写, 数字和特殊字符.',
 	'UserLocal:password:expiration' => '下面的区域需要插件扩展',
 	'Class:UserLocal/Error:OneTimePasswordChangeIsNotAllowed' => '不允许用户为自己设置 "一次性密码" 的失效期限',

datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/ru.dict.combodo-backoffice-darkmoon-theme.php

@@ -11,5 +11,5 @@
  *
  */
 Dict::Add('RU RU', 'Russian', 'Русский', [
-	'theme:darkmoon' => 'Тёмная луна',
+	'theme:darkmoon' => 'Dark moon~~',
 ]);

datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/zh_cn.dict.combodo-backoffice-darkmoon-theme.php

@@ -21,7 +21,6 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with iTop. If not, see <http://www.gnu.org/licenses/>
  */
-
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'theme:darkmoon' => 'Dark moon',
 ]);

datamodels/2.x/combodo-backoffice-fullmoon-high-contrast-theme/dictionaries/ru.dict.combodo-backoffice-fullmoon-high-contrast-theme.php

@@ -23,5 +23,5 @@
  */
 
 Dict::Add('RU RU', 'Russian', 'Русский', [
-	'theme:fullmoon-high-contrast' => 'Fullmoon (высокая контрастность)',
+	'theme:fullmoon-high-contrast' => 'Fullmoon (High contrast)~~',
 ]);

datamodels/2.x/combodo-backoffice-fullmoon-protanopia-deuteranopia-theme/dictionaries/ru.dict.combodo-backoffice-fullmoon-protanopia-deuteranopia-theme.php

@@ -23,5 +23,5 @@
  */
 
 Dict::Add('RU RU', 'Russian', 'Русский', [
-	'theme:fullmoon-protanopia-deuteranopia' => 'Fullmoon (протанопия и дейтеранопия)',
+	'theme:fullmoon-protanopia-deuteranopia' => 'Fullmoon (Protanopia & Deuteranopia)~~',
 ]);

datamodels/2.x/combodo-backoffice-fullmoon-tritanopia-theme/dictionaries/ru.dict.combodo-backoffice-fullmoon-tritanopia-theme.php

@@ -23,5 +23,5 @@
  */
 
 Dict::Add('RU RU', 'Russian', 'Русский', [
-	'theme:fullmoon-tritanopia' => 'Fullmoon (тританопия)',
+	'theme:fullmoon-tritanopia' => 'Fullmoon (Tritanopia)~~',
 ]);

datamodels/2.x/combodo-data-feature-removal/dictionaries/en.dict.combodo-data-feature-removal.php

@@ -20,7 +20,6 @@ Dict::Add('EN US', 'English', 'English', [
 
 	'DataFeatureRemoval:Features:Title' => 'Extensions',
 	'DataFeatureRemoval:Result:Title' => 'Modification requested',
-	'DataFeatureRemoval:NoResult:Title' => 'No modification requested',
 	'DataFeatureRemoval:Execution:Title' => 'Deletion Executions',
 	'DataFeatureRemoval:Analysis:Title' => 'Analysis result',
 	'DataFeatureRemoval:Analysis:Subtitle' => 'Review all elements requiring attention',
@@ -40,14 +39,6 @@ Dict::Add('EN US', 'English', 'English', [
 	'DataFeatureRemoval:CleanupComplete:Title' => 'All clear.',
 	'DataFeatureRemoval:CompilComplete' => 'Compilation successful. No Cleanup needed. You can proceed to setup.',
 
-	'DataFeatureRemoval:Compile:InProgress' => 'Compilation in progress...',
-	'DataFeatureRemoval:Compile:Success' => 'Compilation successful',
-	'DataFeatureRemoval:Compile:Error' => 'Compilation error',
-
-	'DataFeatureRemoval:RunAudit:InProgress' => 'Analysis in progress...',
-	'DataFeatureRemoval:RunAudit:Success' => 'Analysis completed',
-	'DataFeatureRemoval:RunAudit:Error' => 'Error during analysis',
-
 	'UI:Button:Analyze' => 'Analyze',
 	'UI:Button:ModifyChoices' => 'Change my selection',
 	'UI:Button:AnalyzeAndSetup' => 'Analyze and go to setup',

datamodels/2.x/combodo-data-feature-removal/dictionaries/fr.dict.combodo-data-feature-removal.php

@@ -20,7 +20,6 @@ Dict::Add('FR FR', 'French', 'Français', [
 
 	'DataFeatureRemoval:Features:Title' => 'Extensions',
 	'DataFeatureRemoval:Result:Title' => 'Modification demandée',
-	'DataFeatureRemoval:NoResult:Title' => 'Aucune modification demandée',
 	'DataFeatureRemoval:Execution:Title' => 'Suppressions',
 	'DataFeatureRemoval:Analysis:Title' => 'Résultat de l’analyse',
 	'DataFeatureRemoval:Analysis:Subtitle' => 'Vérifier les éléments à nettoyer',
@@ -40,14 +39,6 @@ Dict::Add('FR FR', 'French', 'Français', [
 	'DataFeatureRemoval:CleanupComplete:Title' => 'All clear.',
 	'DataFeatureRemoval:CompilComplete' => 'Compilation successful. No Cleanup needed. You can proceed to setup.',
 
-	'DataFeatureRemoval:Compile:InProgress' => 'Compilation en cours...',
-	'DataFeatureRemoval:Compile:Success' => 'Compilation terminée',
-	'DataFeatureRemoval:Compile:Error' => 'Erreur lors de la compilation',
-
-	'DataFeatureRemoval:RunAudit:InProgress' => 'Analyse en cours...',
-	'DataFeatureRemoval:RunAudit:Success' => 'Analyse terminée',
-	'DataFeatureRemoval:RunAudit:Error' => 'Erreur lors de l\'analyse',
-
 	'UI:Button:Analyze' => 'Analyser',
 	'UI:Button:ModifyChoices' => 'Modifier la sélection',
 	'UI:Button:AnalyzeAndSetup' => 'Analyser et ouvrir l’assistant de configuration',

datamodels/2.x/combodo-data-feature-removal/dictionaries/ru.dict.combodo-data-feature-removal.php

@@ -1,75 +0,0 @@
-<?php
-
-/**
- * @copyright   Copyright (C) 2010-2025 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-/**
- * Localized data
- */
-/**
- * @author Vladimir Kunin <v.b.kunin@gmail.com>
- *
- */
-
-Dict::Add('RU RU', 'Russian', 'Русский', [
-	'Menu:DataFeatureRemovalMenu' => 'Управление расширениями',
-	'combodo-data-feature-removal/Operation:Main/Title' => 'Управление расширениями',
-
-	'DataFeatureRemoval:Main:Title' => 'Управление расширениями',
-	'DataFeatureRemoval:Main:SubTitle' => 'Включение и отключение расширений, установленных в вашем iTop',
-	'DataFeatureRemoval:Failure:Title' => 'Ошибки пробного удаления расширений',
-	'DataFeatureRemoval:Helper:Title' => 'Проверьте, есть ли данные или зависимости, мешающие добавить/удалить расширение.',
-
-	'DataFeatureRemoval:Features:Title' => 'Расширения',
-	'DataFeatureRemoval:Result:Title' => 'Запрошено изменение',
-	'DataFeatureRemoval:NoResult:Title' => 'Изменений не запрошено',
-	'DataFeatureRemoval:Execution:Title' => 'Выполнения удаления',
-	'DataFeatureRemoval:Analysis:Title' => 'Результат анализа',
-	'DataFeatureRemoval:Analysis:Subtitle' => 'Просмотрите все элементы, требующие внимания',
-	'DataFeatureRemoval:Analysis:SubTitle' => 'Элементов для очистки перед продолжением: %1$s',
-
-	'DataFeatureRemoval:DeletionPlan:Title' => 'План удаления данных',
-	'DataFeatureRemoval:DeletionPlan:SubTitle' => 'Строк для очистки перед продолжением: %1$s',
-	'DataFeatureRemoval:DoDeletion:Title' => 'Выполнить удаление',
-	'DataFeatureRemoval:DoDeletion:SubTitle' => 'Удалить все записи из базы данных',
-	'DataFeatureRemoval:DeletionPlan:Error:Issues' => 'Некоторые объекты нужно удалить вручную перед очисткой',
-
-	'DataFeatureRemoval:Table:Analysis:ClassName' => 'Элемент для удаления',
-	'DataFeatureRemoval:Table:Analysis:FeatureName' => 'Название расширения',
-	'DataFeatureRemoval:Table:Analysis:Module' => 'Название модуля',
-	'DataFeatureRemoval:Table:Analysis:Occurrence' => 'Количество',
-
-	'DataFeatureRemoval:CleanupComplete:Title' => 'Всё чисто.',
-	'DataFeatureRemoval:CompilComplete' => 'Компиляция выполнена успешно. Очистка не требуется. Можно переходить к установке.',
-
-	'DataFeatureRemoval:Compile:InProgress' => 'Идёт компиляция...',
-	'DataFeatureRemoval:Compile:Success' => 'Компиляция выполнена успешно',
-	'DataFeatureRemoval:Compile:Error' => 'Ошибка компиляции',
-
-	'DataFeatureRemoval:RunAudit:InProgress' => 'Идёт анализ...',
-	'DataFeatureRemoval:RunAudit:Success' => 'Анализ завершён',
-	'DataFeatureRemoval:RunAudit:Error' => 'Ошибка при анализе',
-
-	'UI:Button:Analyze' => 'Анализировать',
-	'UI:Button:ModifyChoices' => 'Изменить выбор',
-	'UI:Button:AnalyzeAndSetup' => 'Анализировать и перейти к установке',
-	'UI:Button:PlanDeletion' => 'Продолжить удаление',
-	'UI:Button:DoDeletion' => 'Продолжить удаление',
-	'UI:Button:BackToMain' => 'Изменить выбор',
-	'UI:Button:Setup' => 'Запустить установку',
-
-	'UI:Action:ForceUninstall' => 'Принудительно удалить',
-	'UI:Action:MoreInfo' => 'Подробнее',
-
-	'DataFeatureRemoval:Table:Empty' => 'Нет данных для удаления',
-
-	'DataFeatureRemoval:Column:Class' => 'Класс',
-	'DataFeatureRemoval:Column:DeleteCount' => 'Записей к удалению',
-	'DataFeatureRemoval:Column:UpdateCount' => 'Записей к обновлению',
-	'DataFeatureRemoval:Column:IssueCount' => 'Найдено проблем, мешающих автоматической очистке',
-
-	'DataFeatureRemoval:Column:DeletedCount' => 'Удалено записей',
-	'DataFeatureRemoval:Column:UpdatedCount' => 'Обновлено записей',
-]);

datamodels/2.x/combodo-data-feature-removal/dictionaries/zh_cn.dict.combodo-data-feature-removal.php

@@ -1,62 +0,0 @@
-<?php
-
-/**
- * @copyright   Copyright (C) 2010-2025 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-/**
- * Localized data
- */
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'Menu:DataFeatureRemovalMenu' => '扩展管理',
-	'combodo-data-feature-removal/Operation:Main/Title' => '扩展管理',
-
-	'DataFeatureRemoval:Main:Title' => '扩展管理',
-	'DataFeatureRemoval:Main:SubTitle' => '切换安装在您的 iTop 上的扩展',
-	'DataFeatureRemoval:Failure:Title' => '扩展预删除错误',
-	'DataFeatureRemoval:Helper:Title' => '分析是否有任何数据或依赖关系阻止您添加/删除扩展。',
-
-	'DataFeatureRemoval:Features:Title' => '扩展',
-	'DataFeatureRemoval:Result:Title' => '请求的修改',
-	'DataFeatureRemoval:Execution:Title' => '删除执行',
-	'DataFeatureRemoval:Analysis:Title' => '分析结果',
-	'DataFeatureRemoval:Analysis:Subtitle' => '审查所有需要关注的元素',
-	'DataFeatureRemoval:Analysis:SubTitle' => '%1$s 个元素需要在继续之前清理',
-
-	'DataFeatureRemoval:DeletionPlan:Title' => '数据删除计划',
-	'DataFeatureRemoval:DeletionPlan:SubTitle' => '%1$s 行需要在继续之前清理',
-	'DataFeatureRemoval:DoDeletion:Title' => '执行删除',
-	'DataFeatureRemoval:DoDeletion:SubTitle' => '从数据库中删除所有条目',
-	'DataFeatureRemoval:DeletionPlan:Error:Issues' => '某些对象必须在清理前手动删除',
-
-	'DataFeatureRemoval:Table:Analysis:ClassName' => '要删除的元素',
-	'DataFeatureRemoval:Table:Analysis:FeatureName' => '扩展名称',
-	'DataFeatureRemoval:Table:Analysis:Module' => '模块名称',
-	'DataFeatureRemoval:Table:Analysis:Occurrence' => '出现次数',
-
-	'DataFeatureRemoval:CleanupComplete:Title' => '全部清除.',
-	'DataFeatureRemoval:CompilComplete' => '编译成功. 无需清理. 您可以继续进行设置.',
-
-	'UI:Button:Analyze' => '分析',
-	'UI:Button:ModifyChoices' => '改变我的选择',
-	'UI:Button:AnalyzeAndSetup' => '分析并进入设置',
-	'UI:Button:PlanDeletion' => '继续删除',
-	'UI:Button:DoDeletion' => '继续删除',
-	'UI:Button:BackToMain' => '改变我的选择',
-	'UI:Button:Setup' => '运行安装向导',
-
-	'UI:Action:ForceUninstall' => '强制卸载',
-	'UI:Action:MoreInfo' => '更多信息',
-
-	'DataFeatureRemoval:Table:Empty' => '没有数据需要删除',
-
-	'DataFeatureRemoval:Column:Class' => '类',
-	'DataFeatureRemoval:Column:DeleteCount' => '待删除的条目',
-	'DataFeatureRemoval:Column:UpdateCount' => '待更新的条目',
-	'DataFeatureRemoval:Column:IssueCount' => '发现阻止自动清理的问题',
-
-	'DataFeatureRemoval:Column:DeletedCount' => '已删除的条目',
-	'DataFeatureRemoval:Column:UpdatedCount' => '已更新的条目',
-]);

datamodels/2.x/combodo-data-feature-removal/src/Controller/DataFeatureRemovalController.php

@@ -8,6 +8,7 @@
 namespace Combodo\iTop\DataFeatureRemoval\Controller;
 
 require_once APPROOT.'setup/feature_removal/SetupAudit.php';
+require_once APPROOT.'setup/feature_removal/DryRemovalRuntimeEnvironment.php';
 
 use Combodo\iTop\Application\Helper\Session;
 use Combodo\iTop\Application\TwigBase\Controller\Controller;
@@ -17,8 +18,7 @@ use Combodo\iTop\DataFeatureRemoval\Helper\DataFeatureRemovalHelper;
 use Combodo\iTop\DataFeatureRemoval\Helper\DataFeatureRemovalLog;
 use Combodo\iTop\DataFeatureRemoval\Service\DataCleanupService;
 use Combodo\iTop\DataFeatureRemoval\Service\DataFeatureRemoverExtensionService;
-use Combodo\iTop\DataFeatureRemoval\Service\StaticDeletionPlan;
-use Combodo\iTop\Service\Session\SessionParameters;
+use Combodo\iTop\Setup\FeatureRemoval\DryRemovalRuntimeEnvironment;
 use Combodo\iTop\Setup\FeatureRemoval\SetupAudit;
 use ContextTag;
 use CoreException;
@@ -37,22 +37,15 @@ class DataFeatureRemovalController extends Controller
 	private array $aCountClassesToCleanup = [];
 	private array $aAnalysisDataTable = [];
 	private array $aDeletionExecutionSummary = [];
+	private ?RuntimeEnvironment $oRuntimeEnvironment = null;
 
 	private int $iCount = 0;
 	private int $iColumnCount = 2;
-	private RunTimeEnvironment $oRuntimeEnvironment;
 
 	public function OperationMain($sErrorMessage = null): void
 	{
 		$aParams = [];
 
-		SetupUtils::EraseSetupToken();
-		$oParameters = new SessionParameters(SetupUtils::SESSION_PARAMETERS_NAME);
-		$oParameters->Erase();
-		Session::Unset('aDeletionExecutionSummary');
-		Session::Set('bForceCompilation', true);
-		$oParameters->SetParameter('return_application', 'DataFeatureRemoval');
-
 		$this->AddAnalyzeParams();
 		$aParams['sTransactionId'] = utils::GetNewTransactionId();
 		$aParams['iColumnCount'] = $this->iColumnCount;
@@ -64,6 +57,7 @@ class DataFeatureRemovalController extends Controller
 		$aParams['sSetupUrl'] = utils::GetAbsoluteUrlAppRoot().'setup';
 		$aParams['iCount'] = $this->iCount;
 
+		Session::Set('bForceCompilation', true);
 		$this->AddLinkedStylesheet(utils::GetAbsoluteUrlModulesRoot().DataFeatureRemovalHelper::MODULE_NAME.'/assets/css/DataFeatureRemoval.css');
 		$this->AddLinkedScript(utils::GetAbsoluteUrlModulesRoot().DataFeatureRemovalHelper::MODULE_NAME.'/assets/js/DataFeatureRemoval.js');
 		$this->DisplayPage($aParams);
@@ -97,7 +91,7 @@ class DataFeatureRemovalController extends Controller
 		}
 
 		// Display changed extensions
-		$aSetupParameterNames = [
+		$aHiddenInputNames = [
 			'selected_extensions' => '[]',
 			'selected_modules' => '[]',
 			'display_choices' => '',
@@ -111,38 +105,91 @@ class DataFeatureRemovalController extends Controller
 			'target_env' => ITOP_DEFAULT_ENV,
 		];
 
-		$oParameters = new SessionParameters(SetupUtils::SESSION_PARAMETERS_NAME);
-		foreach ($aSetupParameterNames as $sInputName => $defaultValue) {
-			$oParameters->SetParameter($sInputName, $oParameters->GetParameter($sInputName, $defaultValue));
+		$aHiddenInputs = [];
+		foreach ($aHiddenInputNames as $sInputName => $defaultValue) {
+			$aHiddenInputs[$sInputName] = utils::ReadPostedParam($sInputName, $defaultValue, utils::ENUM_SANITIZATION_FILTER_RAW_DATA);
 		}
+		$aParams['aHiddenInputs'] = $aHiddenInputs;
 
-		$aAddedExtensions = json_decode($oParameters->GetParameter('added_extensions', '[]'), true);
-		$aRemovedExtensions = json_decode($oParameters->GetParameter('removed_extensions', '[]'), true);
-		if ('[]' === $oParameters->GetParameter('selected_modules', '[]')) {
+		$aAddedExtensions = json_decode($aHiddenInputs['added_extensions'], true);
+
+		$aRemovedExtensions = json_decode($aHiddenInputs['removed_extensions'], true);
+		if ("[]" === $aHiddenInputs['selected_modules']) {
 			//it does not come from setup
 			// we get extensions from 1st screen uiblocks
 			$this->ReadExtensionsDiff();
-			$oParameters->SetParameter('force-uninstall', $this->bForcedUninstallation ? 'on' : '');
+			$aHiddenInputs['force-uninstall'] = $this->bForcedUninstallation ? 'on' : '';
 			$aAddedExtensions = $this->aExtensionsToCheck['to_be_installed'];
-			$oParameters->SetParameter('added_extensions', $this->ConvertIntoSetupFormat($aAddedExtensions));
+			$aHiddenInputs['added_extensions'] = $this->ConvertIntoSetupFormat($aAddedExtensions);
 
 			$aRemovedExtensions = $this->aExtensionsToCheck['to_be_removed'];
-			$oParameters->SetParameter('removed_extensions', $this->ConvertIntoSetupFormat($aRemovedExtensions));
-
-			$aExtensionsNotUninstallable = $this->aExtensionsToCheck['extensions_not_uninstallable'];
-			$oParameters->SetParameter('extensions_not_uninstallable', $this->ConvertIntoSetupFormat($aExtensionsNotUninstallable));
+			$aHiddenInputs['removed_extensions'] = $this->ConvertIntoSetupFormat($aRemovedExtensions);
 		}
 
+		$aRemoveExtensionCodes = array_keys($aRemovedExtensions);
+
+		$aParams['aAddedExtensions'] = $aAddedExtensions;
+		$aParams['aRemovedExtensions'] = $aRemovedExtensions;
+
 		DataFeatureRemovalLog::Debug(__METHOD__.' Extensions given in parameter', null, [
 			'added_extensions' => $aAddedExtensions,
 			'removed_extensions' => $aRemovedExtensions]);
 
 		$aParams['sTransactionId'] = utils::GetNewTransactionId();
 		$aParams['iColumnCount'] = $this->iColumnCount;
-		$aAvailableExtensions = $this->GetExtensionsDiff($aAddedExtensions, $aRemovedExtensions);
-		$aParams['aAvailableExtensionsCount'] = count($aAvailableExtensions);
-		$aParams['aAvailableExtensions'] = $this->SplitArrayIntoColumns($aAvailableExtensions, $this->iColumnCount);
-		$aParams['sAjaxURL'] = utils::GetAbsoluteUrlModulePage(DataFeatureRemovalHelper::MODULE_NAME, 'index.php');
+		$aParams['aAvailableExtensions'] = $this->SplitArrayIntoColumns($this->GetExtensionsDiff($aAddedExtensions, $aRemovedExtensions), $this->iColumnCount);
+
+		$bForceCompilation = Session::Get('bForceCompilation', false);
+		try {
+			$this->Compile($aAddedExtensions, $aRemoveExtensionCodes, $bForceCompilation);
+		} catch (CoreException $e) {
+			$aParams['DataFeatureRemovalErrorMessage'] = $e->getHtmlDesc();
+			$this->DisplayPage($aParams, 'AnalysisResult');
+			return;
+		} catch (Exception $e) {
+			$aParams['DataFeatureRemovalErrorMessage'] = $e->getMessage();
+			$this->DisplayPage($aParams, 'AnalysisResult');
+			return;
+		}
+
+		if ("[]" === $aHiddenInputs['selected_modules']) {
+			//to make setup redirection work, we need to pass complex data structures to setup wizards (ie extension/module lists)
+			$oConfig = MetaModel::GetConfig();
+			$aSelectedExtensions = DataFeatureRemoverExtensionService::GetInstance()->GetExtensionMap()->GetSelectedExtensions($oConfig, array_keys($aAddedExtensions), array_keys($aRemovedExtensions));
+			$aHiddenInputs['selected_extensions'] = $this->ConvertIntoSetupFormat($aSelectedExtensions);
+
+			$oRunTimeEnvironment = $this->GetRuntimeEnvironment($aAddedExtensions, $aRemovedExtensions);
+			$aSearchDirs = [$oRunTimeEnvironment->GetBuildDir()];
+			$aSelectedModules = $oRunTimeEnvironment->GetModulesToLoadFromChoices($oConfig, $aSelectedExtensions, $aSearchDirs);
+			$aHiddenInputs['selected_modules'] = $this->ConvertIntoSetupFormat($aSelectedModules);
+		}
+
+		$sSourceEnv = MetaModel::GetEnvironment();
+		$oSetupAudit = new SetupAudit($sSourceEnv);
+		$aGetRemovedClasses = array_keys($oSetupAudit->RunDataAudit());
+		DataFeatureRemovalLog::Debug(__METHOD__, null, ['aGetRemovedClasses' => $aGetRemovedClasses]);
+
+		$aParams['aClasses'] = $aGetRemovedClasses;
+
+		new ContextTag(ContextTag::TAG_SETUP);
+		$aParams['sLaunchSetupUrl'] = utils::GetAbsoluteUrlAppRoot().'setup/wizard.php';
+		$aParams['aSetupParams'] = [
+			"_class" => "WizStepLandingBeforeAudit",
+			"operation" => "next",
+		];
+
+		foreach ($aHiddenInputs as $sInputName => $sInputValue) {
+			$aParams['aSetupParams']["_params[$sInputName]"] = $sInputValue;
+		}
+
+		[$aParams['aDeletionPlanSummary'], $aParams['iQueryCount'], $aParams['bDeletionPossible']] = $this->GetDeletionPlanSummaryTable($aGetRemovedClasses);
+		[$aParams['aDeletionExecutionSummary'], $aParams['bHasDeletionExecution']] = $this->GetExecutionSummaryTable();
+		$aParams['bDeletionNeeded'] = ($aParams['iQueryCount'] > 0);
+		Session::Set('aDeletionExecutionSummary', serialize($this->aDeletionExecutionSummary));
+
+		if (!$aParams['bDeletionNeeded']) {
+			SetupUtils::CreateSetupToken();
+		}
 
 		$this->DisplayPage($aParams, 'AnalysisResult');
 	}
@@ -150,124 +197,53 @@ class DataFeatureRemovalController extends Controller
 	private function ConvertIntoSetupFormat(array $aData): string
 	{
 		$aNewData = [];
-		foreach ($aData as $sCode => $sLabel) {
-			$aNewData[] = sprintf('"%s":"%s"', $sCode, $sLabel);
+		foreach ($aData as $k => $sVal) {
+			$aNewData[] = sprintf('"%s":"%s"', $k, $sVal);
 		}
 
 		return "{".implode(',', $aNewData)."}";
 	}
 
 	/**
-	 * @return void
-	 * @throws \ConfigException
-	 * @throws \CoreException
+* @param array $aAddedExtensions
+* @param array $aRemovedExtensions
+* @param bool $bForceCompilation
+* @return void
+* @throws \ConfigException
+* @throws \CoreException
 	 */
-	public function OperationAjaxCompile(): void
+	private function Compile(array $aAddedExtensions, array $aRemovedExtensions, bool $bForceCompilation = true): void
 	{
-		$aParams = [];
-		//to make setup redirection work, we need to pass complex data structures to setup wizards (ie extension/module lists)
 		$sSourceEnv = MetaModel::GetEnvironment();
-		$oRuntimeEnvironment = new RunTimeEnvironment($sSourceEnv, false);
-
-		$oParameters = new SessionParameters(SetupUtils::SESSION_PARAMETERS_NAME);
-		$aSelectedModules = json_decode($oParameters->GetParameter('selected_modules', '[]'), true);
-		$aSelectedExtensions = json_decode($oParameters->GetParameter('selected_extensions', '[]'), true);
-		$aAddedExtensions = json_decode($oParameters->GetParameter('added_extensions', '[]'), true);
-		$aRemovedExtensions = json_decode($oParameters->GetParameter('removed_extensions', '[]'), true);
-
-		try {
-			$this->ValidateTransactionId();
-
-			$oConfig = MetaModel::GetConfig();
-			if (count($aSelectedModules) === 0) {
-				$aSelectedExtensions = DataFeatureRemoverExtensionService::GetInstance()->GetExtensionMap()->GetSelectedExtensions($oConfig, array_keys($aAddedExtensions), array_keys($aRemovedExtensions));
-				$oParameters->SetParameter('selected_extensions', $this->ConvertIntoSetupFormat($aSelectedExtensions));
-			}
-
-			$sBuildDir = APPROOT."/env-$sSourceEnv-build";
-			if (! is_dir($sBuildDir)) {
-				SetupUtils::builddir($sBuildDir);
-			}
-			$bIsDirEmpty = count(scandir($sBuildDir)) === 2;
-			$bForceCompilation = Session::Get('bForceCompilation', false);
-			if ($bIsDirEmpty || $bForceCompilation) {
-				$oRuntimeEnvironment->CopySetupFiles();
-				if (count($aSelectedModules) === 0) {
-					$aSelectedModules = $oRuntimeEnvironment->GetModulesToLoadFromChoices($oConfig, $aSelectedExtensions);
-				}
-
-				DataFeatureRemovalLog::Debug(
-					__METHOD__,
-					null,
-					['sSourceEnv' => $sSourceEnv, 'sBuildDir' => $sBuildDir, 'bIsDirEmpty' => $bIsDirEmpty, glob("$sBuildDir/*")]
-				);
-				$oRuntimeEnvironment->DoCompile($aSelectedExtensions, $aRemovedExtensions, $aSelectedModules, MFCompiler::CanUseSymbolicLinks());
-				Session::Unset('bForceCompilation');
-			} else {
-				if (count($aSelectedModules) === 0) {
-					$aSelectedModules = $oRuntimeEnvironment->GetModulesToLoadFromChoices($oConfig, $aSelectedExtensions);
-				}
-			}
-		} catch (CoreException $e) {
-			$aParams['error_message'] = $e->getHtmlDesc();
-		} catch (Exception $e) {
-			$aParams['error_message'] = $e->getMessage();
+		$sBuildDir = APPROOT."/env-$sSourceEnv-build";
+		if (! is_dir($sBuildDir)) {
+			SetupUtils::builddir($sBuildDir);
 		}
+		$bIsDirEmpty = count(scandir($sBuildDir)) === 2;
 
-		$aParams['success_message'] = Dict::S('DataFeatureRemoval:Compile:Success');
-		$aParams['transaction_id'] = utils::GetNewTransactionId();
-
-		$oParameters->SetParameter('selected_modules', json_encode($aSelectedModules));
-		$this->DisplayJSONPage($aParams);
+		if ($bIsDirEmpty || $bForceCompilation) {
+			DataFeatureRemovalLog::Debug(
+				__METHOD__,
+				null,
+				['sSourceEnv' => $sSourceEnv, 'sBuildDir' => $sBuildDir, 'bIsDirEmpty' => $bIsDirEmpty, glob("$sBuildDir/*")]
+			);
+			$this->GetRuntimeEnvironment($aAddedExtensions, $aRemovedExtensions)->CompileFrom($sSourceEnv);
+		}
 	}
 
-	public function OperationAjaxRunAudit(): void
+	private function GetRuntimeEnvironment(array $aAddedExtensions, array $aRemovedExtensions): RunTimeEnvironment
 	{
-		$oParameters = new SessionParameters(SetupUtils::SESSION_PARAMETERS_NAME);
-		$aParams = [];
-		$aPageParams = [];
-		try {
-			$this->ValidateTransactionId();
-
+		if (is_null($this->oRuntimeEnvironment)) {
 			$sSourceEnv = MetaModel::GetEnvironment();
-			$oSetupAudit = new SetupAudit($sSourceEnv);
-			$aRemovedClasses = array_keys($oSetupAudit->RunDataAudit());
-			$oParameters->SetParameter('classes', $aRemovedClasses);
-
-			new ContextTag(ContextTag::TAG_SETUP);
-			$aPageParams['sLaunchSetupUrl'] = utils::GetAbsoluteUrlAppRoot().'setup/wizard.php';
-			$aPageParams['aSetupParams'] = [
-				"_class" => "WizStepLandingBeforeAudit",
-				"operation" => "next",
-			];
-			$aPageParams['sTransactionId'] = utils::GetNewTransactionId();
-
-			$aDeletionPlanSummaryEntities = $this->GetDeletionPlanSummaryEntities($aRemovedClasses);
-			[$aPageParams['aDeletionPlanSummary'], $aPageParams['iQueryCount'], $aPageParams['bDeletionPossible']] = $this->GetDeletionPlanSummaryTable($aDeletionPlanSummaryEntities);
-			[$aPageParams['aDeletionExecutionSummary'], $aPageParams['bHasDeletionExecution']] = $this->GetExecutionSummaryTable();
-			$aPageParams['bDeletionNeeded'] = ($aPageParams['iQueryCount'] > 0);
-
-			if (!$aPageParams['bDeletionNeeded']) {
-				// Erase session setup parameters
-				SetupUtils::CreateSetupToken();
-			}
-
-			$this->DisplayAjaxPage($aPageParams, 'AjaxRunAudit');
-			return;
-		} catch (CoreException $e) {
-			$aParams['error_message'] = $e->getHtmlDesc();
-		} catch (Exception $e) {
-			$aParams['error_message'] = $e->getMessage();
+			$this->oRuntimeEnvironment = new DryRemovalRuntimeEnvironment($sSourceEnv, $aAddedExtensions, $aRemovedExtensions);
 		}
 
-		$this->DisplayJSONPage($aParams);
+		return $this->oRuntimeEnvironment;
 	}
 
 	private function GetExecutionSummaryTable(): array
 	{
-		$sName = 'ExecutionSummary';
-
-		$this->aDeletionExecutionSummary = unserialize(Session::Get('aDeletionExecutionSummary') ?? serialize([]));
+		$sName = 'ExcutionSummary';
 
 		$aTableData = [];
 		if (count($this->aDeletionExecutionSummary) === 0) {
@@ -293,15 +269,11 @@ class DataFeatureRemovalController extends Controller
 
 	}
 
-	private function GetDeletionPlanSummaryEntities(array $aRemovedClasses): array
-	{
-		$oDataCleanupService = new StaticDeletionPlan();
-		return $oDataCleanupService->GetCleanupSummary($aRemovedClasses);
-	}
-
-	private function GetDeletionPlanSummaryTable(array $aDeletionPlanSummaryEntities): array
+	private function GetDeletionPlanSummaryTable(array $aRemovedClasses): array
 	{
 		$sName = 'DeletionPlanSummary';
+		$oDataCleanupService = new DataCleanupService();
+		$aDeletionPlanSummaryEntities = $oDataCleanupService->GetCleanupSummary($aRemovedClasses);
 		$aColumns = ['Class', 'Delete Count' , 'Update Count', 'Issue Count'];
 		$aRows = [];
 		$iQueryCount = 0;
@@ -324,10 +296,9 @@ class DataFeatureRemovalController extends Controller
 	{
 		$this->ValidateTransactionId();
 
-		$this->aDeletionExecutionSummary = unserialize(Session::Get('aDeletionExecutionSummary') ?? serialize([]));
+		$this->aDeletionExecutionSummary = unserialize(Session::Get('aDeletionExecutionSummary'));
 		Session::Unset('aDeletionExecutionSummary');
-		$oParameters = new SessionParameters(SetupUtils::SESSION_PARAMETERS_NAME);
-		$aClasses = $oParameters->GetParameter('classes', []);
+		$aClasses = utils::ReadPostedParam('classes', null, utils::ENUM_SANITIZATION_FILTER_CLASS);
 
 		$oDataCleanupService = new DataCleanupService();
 		$aDeletionExecutionSummary = $oDataCleanupService->ExecuteCleanup($aClasses);
@@ -342,7 +313,6 @@ class DataFeatureRemovalController extends Controller
 			$oSummary->iTotalUpdateCount += $oExecutionSummary->iUpdateCount;
 		}
 
-		Session::Set('aDeletionExecutionSummary', serialize($this->aDeletionExecutionSummary));
 		$this->OperationAnalysisResult();
 	}
 
@@ -368,7 +338,6 @@ class DataFeatureRemovalController extends Controller
 					'uninstallable' => $oExtension->CanBeUninstalled(),
 					'remote' => $oExtension->IsRemote(),
 					'missing' => $oExtension->bRemovedFromDisk,
-					'dependency_issue' => $oExtension->HasDependencyIssue(),
 				],
 
 			];
@@ -436,11 +405,12 @@ class DataFeatureRemovalController extends Controller
 
 	/**
 	 * Read extensions selected from posted parameters
+	 * @return int Number of extensions to be added or removed
 	 */
-	public function ReadExtensionsDiff(): void
+	public function ReadExtensionsDiff(): int
 	{
 		if (!is_null($this->aExtensionsToCheck)) {
-			return;
+			return count($this->aExtensionsToCheck['to_be_installed']) + count($this->aExtensionsToCheck['to_be_removed']);
 		}
 
 		$aAvailableExtensions = $this->GetAvailableExtensions();
@@ -448,7 +418,6 @@ class DataFeatureRemovalController extends Controller
 		$this->aExtensionsToCheck = [
 			'to_be_installed' => [],
 			'to_be_removed' => [],
-			'extensions_not_uninstallable' => [],
 		];
 		foreach ($aAvailableExtensions as $sCode => &$aExtensionData) {
 			if (!isset($aSelectedExtensionsFromUI[$sCode])) {
@@ -462,15 +431,13 @@ class DataFeatureRemovalController extends Controller
 				if (! $this->bForcedUninstallation && $aExtensionData['extra_flags']['uninstallable']) {
 					$this->bForcedUninstallation = true;
 				}
-				if (false === $aExtensionData['extra_flags']['uninstallable'] || true === $aExtensionData['extra_flags']['remote']) {
-					$this->aExtensionsToCheck['extensions_not_uninstallable'][] = $sCode;
-				}
 			} elseif (!$aExtensionData['installed'] && $aSelectedExtensionsFromUI[$sCode] === 'on') {
 				$aExtensionData['extra_flags']['selected'] = true;
 				$sLabel = $aAvailableExtensions[$sCode]['label'];
 				$this->aExtensionsToCheck['to_be_installed'][$sCode] = $sLabel;
 			}
 		}
+		return count($this->aExtensionsToCheck['to_be_installed']) + count($this->aExtensionsToCheck['to_be_removed']);
 	}
 
 	/**

datamodels/2.x/combodo-data-feature-removal/src/Entity/DeletionPlanEntity.php

@@ -1,37 +0,0 @@
-<?php
-
-/*
- * @copyright   Copyright (C) 2010-2026 Combodo SAS
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-namespace Combodo\iTop\DataFeatureRemoval\Entity;
-
-class DeletionPlanEntity
-{
-	public readonly DeletionPlanItem $oDelete;
-	public readonly DeletionPlanItem $oUpdate;
-	public readonly DeletionPlanItem $oIssue;
-
-	/**
-	 * @param \Combodo\iTop\DataFeatureRemoval\Entity\DeletionPlanItem $oDelete
-	 * @param \Combodo\iTop\DataFeatureRemoval\Entity\DeletionPlanItem $oUpdate
-	 * @param \Combodo\iTop\DataFeatureRemoval\Entity\DeletionPlanItem $oIssue
-	 */
-	public function __construct()
-	{
-		$this->oDelete = $oDelete ?? new DeletionPlanItem();
-		$this->oUpdate = $oUpdate ?? new DeletionPlanItem();
-		$this->oIssue = $oIssue ?? new DeletionPlanItem();
-	}
-
-	public function TotalCount(): int
-	{
-		return $this->oDelete->Count() + $this->oUpdate->Count() + $this->oIssue->Count();
-	}
-
-	public function FilterUpdatesByDeletes()
-	{
-		$this->oUpdate->FilterBy($this->oDelete);
-	}
-}

datamodels/2.x/combodo-data-feature-removal/src/Entity/DeletionPlanItem.php

@@ -1,36 +0,0 @@
-<?php
-
-/*
- * @copyright   Copyright (C) 2010-2026 Combodo SAS
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-namespace Combodo\iTop\DataFeatureRemoval\Entity;
-
-class DeletionPlanItem
-{
-	public array $aIds = [];
-
-	/**
-	 * @param array $aIds
-	 */
-	public function __construct(array $aIds = [])
-	{
-		$this->aIds = $aIds;
-	}
-
-	public function Merge(DeletionPlanItem $oItem): void
-	{
-		$this->aIds = array_unique(array_merge($this->aIds, $oItem->aIds));
-	}
-
-	public function Count(): int
-	{
-		return count($this->aIds);
-	}
-
-	public function FilterBy(DeletionPlanItem $oItem): void
-	{
-		$this->aIds = array_diff($this->aIds, $oItem->aIds);
-	}
-}

datamodels/2.x/combodo-data-feature-removal/src/Service/DataCleanupService.php

@@ -134,6 +134,10 @@ class DataCleanupService
 				/** @var DBObject $oDependentObj */
 				while ($oDependentObj = $oSet->Fetch()) {
 					$iDeletePropagationOption = $oExtKeyAttDef->GetDeletionPropagationOption();
+					if ($iDeletePropagationOption == DEL_MANUAL) {
+						$this->oObjectService->SetIssue(get_class($oDependentObj));
+						continue;
+					}
 
 					if ($oExtKeyAttDef->IsNullAllowed()) {
 						// Optional external key, list to reset
@@ -148,12 +152,6 @@ class DataCleanupService
 							return false;
 						}
 					} else {
-						// Mandatory external key
-						if ($iDeletePropagationOption == DEL_MANUAL) {
-							// Cannot be deleted automatically, must be handled manually
-							$this->oObjectService->SetIssue(get_class($oDependentObj));
-							continue;
-						}
 						// Propagate deletion only if not visited
 						if ($this->IsVisited($oDependentObj)) {
 							continue;

datamodels/2.x/combodo-data-feature-removal/src/Service/StaticDeletionPlan.php

@@ -1,221 +0,0 @@
-<?php
-
-/*
- * @copyright   Copyright (C) 2010-2026 Combodo SAS
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-namespace Combodo\iTop\DataFeatureRemoval\Service;
-
-use CMDBSource;
-use Combodo\iTop\DataFeatureRemoval\Entity\DataCleanupSummaryEntity;
-use Combodo\iTop\DataFeatureRemoval\Entity\DeletionPlanEntity;
-use Combodo\iTop\DataFeatureRemoval\Entity\DeletionPlanItem;
-use MetaModel;
-
-class StaticDeletionPlan
-{
-	/** @var array<DeletionPlanEntity> */
-	private array $aDeletionPlan = [];
-
-	/**
-	 * Get a summary of the deletion plan computed for the classes.
-	 * The result is used for display
-	 *
-	 * @param array|null $aClasses
-	 *
-	 * @return array<\Combodo\iTop\DataFeatureRemoval\Entity\DataCleanupSummaryEntity>
-	 * @throws \CoreException
-	 */
-	public function GetCleanupSummary(?array $aClasses): array
-	{
-		$aSummary = [];
-		$aDeletionPlan = $this->GetStaticDeletionPlan($aClasses ?? []);
-
-		foreach ($aDeletionPlan as $sClass => $oDeletionPlanEntity) {
-			if ($oDeletionPlanEntity->TotalCount() === 0) {
-				continue;
-			}
-			$oDeletionPlanEntity->FilterUpdatesByDeletes();
-			$oDataCleanupSummary = new DataCleanupSummaryEntity($sClass);
-			$oDataCleanupSummary->iUpdateCount = $oDeletionPlanEntity->oUpdate->Count();
-			$oDataCleanupSummary->iDeleteCount = $oDeletionPlanEntity->oDelete->Count();
-			$oDataCleanupSummary->iIssueCount = $oDeletionPlanEntity->oIssue->Count();
-
-			$aSummary[$sClass] = $oDataCleanupSummary;
-		}
-
-		return $aSummary;
-	}
-
-	/**
-	 * @param array $aClasses Classes to clean entirely
-	 *
-	 * @return array ['class' => DeletionPlanEntity];
-	 *
-	 * @throws \CoreException
-	 */
-	public function GetStaticDeletionPlan(array $aClasses): array
-	{
-		foreach ($aClasses as $sClass) {
-			$oDeletionPlanItem = $this->GetInitialClassDeletionPlan($sClass);
-			// N°9831 Do not overwrite existing entity as it may already exist for this class if a previously processed class references it (issues/updates already accumulated must be kept)
-			if (false === array_key_exists($sClass, $this->aDeletionPlan)) {
-				$this->aDeletionPlan[$sClass] = new DeletionPlanEntity();
-			}
-			$this->aDeletionPlan[$sClass]->oDelete->Merge($oDeletionPlanItem);
-
-			$this->DeletionPlanForReferencingClasses($sClass);
-		}
-
-		return $this->aDeletionPlan;
-	}
-
-	private function DeletionPlanForReferencingClasses(string $sClass): void
-	{
-		$sIdsToRemove = implode(', ', $this->aDeletionPlan[$sClass]->oDelete->aIds);
-		$aReferencingMe = MetaModel::EnumReferencingClasses($sClass);
-		foreach ($aReferencingMe as $sRemoteClass => $aExtKeys) {
-			if (!isset($this->aDeletionPlan[$sRemoteClass])) {
-				$this->aDeletionPlan[$sRemoteClass] =  new DeletionPlanEntity();
-			}
-			$oDeletionPlanEntity = $this->aDeletionPlan[$sRemoteClass];
-			/** @var \AttributeExternalKey $oExtKeyAttDef */
-			foreach ($aExtKeys as $sExtKeyAttCode => $oExtKeyAttDef) {
-				// skip if this external key is behind an external field
-				if (!$oExtKeyAttDef->IsExternalKey(EXTKEY_ABSOLUTE)) {
-					continue;
-				}
-
-				if ($oExtKeyAttDef->IsNullAllowed()) {
-					// update
-					$oUpdateItem = $this->UpdateExtKeyNullable($sRemoteClass, $sExtKeyAttCode, $sIdsToRemove);
-					$oDeletionPlanEntity->oUpdate->Merge($oUpdateItem);
-				} else {
-					// delete
-					$aRemoteIdsToRemove = $this->GetRemoteIdsForExtKey($sRemoteClass, $sExtKeyAttCode, $sIdsToRemove);
-
-					$iDeletePropagationOption = $oExtKeyAttDef->GetDeletionPropagationOption();
-					if ($iDeletePropagationOption == DEL_MANUAL) {
-						// Issue, do not recurse
-						$oDeletionPlanItem = new DeletionPlanItem(aIds: $aRemoteIdsToRemove);
-						$oDeletionPlanEntity->oIssue->Merge($oDeletionPlanItem);
-						continue;
-					}
-
-					if (($iDeletePropagationOption == DEL_MOVEUP) && ($oExtKeyAttDef->IsHierarchicalKey())) {
-						// update hierarchical keys due to row cleanup in the same table
-						$sTargetIdsToRemove = implode(',', $this->aDeletionPlan[$sRemoteClass]->oDelete->aIds);
-						$oUpdateItem = $this->UpdateHierarchicalExtKey($sRemoteClass, $sExtKeyAttCode, $sTargetIdsToRemove);
-						$oDeletionPlanEntity->oUpdate->Merge($oUpdateItem);
-					}
-
-					// Delete entries in Remote Class
-					if (count($aRemoteIdsToRemove) !== 0) {
-						$oDeletionPlanEntity->oDelete->Merge(new DeletionPlanItem($aRemoteIdsToRemove));
-						// Infinite loops do not occurs due to the datamodel structure
-						$this->DeletionPlanForReferencingClasses($sRemoteClass);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * @param string $sRemoteClass
-	 * @param string $sExtKeyAttCode
-	 * @param string $sIdsToRemoveInTargetClass
-	 *
-	 * @return \Combodo\iTop\DataFeatureRemoval\Entity\DeletionPlanItem
-	 * @throws \CoreException
-	 */
-	public function UpdateExtKeyNullable(string $sRemoteClass, string $sExtKeyAttCode, string $sIdsToRemoveInTargetClass): DeletionPlanItem
-	{
-		$aIds = $this->GetRemoteIdsForExtKey($sRemoteClass, $sExtKeyAttCode, $sIdsToRemoveInTargetClass);
-
-		return new DeletionPlanItem($aIds);
-	}
-
-	/**
-	 * @param string $sRemoteClass
-	 * @param string $sExtKeyAttCode
-	 * @param string $sIdsToRemoveInTargetClass
-	 *
-	 * @return \Combodo\iTop\DataFeatureRemoval\Entity\DeletionPlanItem
-	 * @throws \CoreException
-	 * @throws \MySQLException
-	 */
-	public function UpdateHierarchicalExtKey(string $sRemoteClass, string $sExtKeyAttCode, string $sIdsToRemoveInTargetClass): DeletionPlanItem
-	{
-		[$sDBTable, $sDBField, $sDBKey] = $this->GetDBInfoForAttcode($sRemoteClass, $sExtKeyAttCode);
-
-		$sSQL = <<<SQL
-SELECT `$sDBKey`
-FROM `$sDBTable` AS `updated`
-INNER JOIN `$sDBTable` AS `removed` ON `updated`.`$sDBField` = `removed`.`$sDBKey`
-WHERE `removed`.`$sDBKey` IN ($sIdsToRemoveInTargetClass)
-SQL;
-		$aIds = CMDBSource::QueryToCol($sSQL, $sDBKey);
-
-		return new DeletionPlanItem($aIds);
-	}
-
-	/**
-	 * @param string $sRemoteClass
-	 * @param string $sExtKeyAttCode
-	 * @param string $sIdsToRemoveInTargetClass
-	 *
-	 * @return array
-	 * @throws \CoreException
-	 * @throws \MySQLException
-	 */
-	public function GetRemoteIdsForExtKey(string $sRemoteClass, string $sExtKeyAttCode, string $sIdsToRemoveInTargetClass): array
-	{
-		if (\utils::IsNullOrEmptyString($sIdsToRemoveInTargetClass)) {
-			return [];
-		}
-		[$sDBTable, $sDBField, $sDBKey] = $this->GetDBInfoForAttcode($sRemoteClass, $sExtKeyAttCode);
-		$sSQL = "SELECT `$sDBKey` FROM `$sDBTable` WHERE `$sDBField` IN ($sIdsToRemoveInTargetClass)";
-
-		return CMDBSource::QueryToCol($sSQL, $sDBKey);
-	}
-
-	/**
-	 * @param string $sClass
-	 *
-	 * @return \Combodo\iTop\DataFeatureRemoval\Entity\DeletionPlanItem
-	 * @throws \CoreException
-	 * @throws \MySQLException
-	 */
-	public function GetInitialClassDeletionPlan(string $sClass): DeletionPlanItem
-	{
-		$sTable = MetaModel::DBGetTable($sClass);
-		$sDBKey = MetaModel::DBGetKey($sClass);
-		$sSQL = "SELECT `$sDBKey` FROM `$sTable`";
-		$aIds = CMDBSource::QueryToCol($sSQL, $sDBKey);
-
-		return new DeletionPlanItem($aIds);
-	}
-
-	/**
-	 * Get database table for an attcode
-	 *
-	 * @param string $sClass
-	 * @param string $sExtKeyAttCode
-	 *
-	 * @return array
-	 * @throws \CoreException
-	 * @throws \Exception
-	 */
-	public function GetDBInfoForAttcode(string $sClass, string $sExtKeyAttCode): array
-	{
-		$sOriginClass = MetaModel::GetAttributeOrigin($sClass, $sExtKeyAttCode);
-		$sDBTable = MetaModel::DBGetTable($sOriginClass);
-		$oAttDef = MetaModel::GetAttributeDef($sOriginClass, $sExtKeyAttCode);
-		// External key is on a single DB column
-		$sDBField = array_keys($oAttDef->GetSQLColumns())[0];
-		$sDBKey = MetaModel::DBGetKey($sClass);
-		return [$sDBTable, $sDBField, $sDBKey];
-	}
-
-}

datamodels/2.x/combodo-data-feature-removal/templates/AjaxRunAudit.html.twig

@@ -1,34 +0,0 @@
-{# @copyright   Copyright (C) 2010-2026 Combodo SARL #}
-{# @license     http://opensource.org/licenses/AGPL-3.0 #}
-
-{% if bDeletionNeeded %}
-    {% UIFieldSet Standard {sLegend:'DataFeatureRemoval:DeletionPlan:Title'|dict_s} %}
-        {% UIDataTable ForForm { sRef:'aDeletionPlanSummary', aColumns:aDeletionPlanSummary.Columns, aData:aDeletionPlanSummary.Data} %}{% EndUIDataTable %}
-    {% EndUIFieldSet %}
-    {% if bDeletionPossible %}
-        {% UIForm Standard {} %}
-            {% UIInput ForHidden { sName:'transaction_id', sValue:sTransactionId} %}
-            {% UIInput ForHidden { sName:'operation', sValue:'DoDeletion'} %}
-            {% UIToolbar ForButton {} %}
-                {% UIButton ForPrimaryAction {sLabel:'UI:Button:DoDeletion'|dict_s, sName:'btn_deletion', sId:'btn_deletion', bIsSubmit:true} %}
-            {% EndUIToolbar %}
-        {% EndUIForm %}
-    {% else %}
-        {% UIAlert ForFailure { sTitle: '', sContent: 'DataFeatureRemoval:DeletionPlan:Error:Issues'|dict_s } %}{% EndUIAlert %}
-    {% endif %}
-{% else %}
-    {% UIAlert ForSuccess { sTitle:'DataFeatureRemoval:CleanupComplete:Title'|dict_s, sContent:'DataFeatureRemoval:CompilComplete'|dict_s } %}{% EndUIAlert %}
-
-    {% UIForm Standard {sId:'launch-setup-form', Action:sLaunchSetupUrl, EncType: 'application/x-www-form-urlencoded'} %}
-        {% for sKey, sValue in aSetupParams %}
-            {% UIInput ForHidden { sName:sKey, sValue:sValue } %}
-        {% endfor %}
-        {% UIButton ForPrimaryAction {sLabel:'UI:Button:Setup'|dict_s, sName:'btn_setup', sId:'btn_setup', bIsSubmit:true} %}
-    {% EndUIForm %}
-{% endif %}
-
-{% if bHasDeletionExecution %}
-    {% UIFieldSet Standard {sLegend:'DataFeatureRemoval:Execution:Title'|dict_s} %}
-    {% UIDataTable ForForm { sRef:'aDeletionExecutionSummary', aColumns:aDeletionExecutionSummary.Columns, aData:aDeletionExecutionSummary.Data} %}{% EndUIDataTable %}
-    {% EndUIFieldSet %}
-{% endif %}

datamodels/2.x/combodo-data-feature-removal/templates/AnalysisResult.html.twig

@@ -1,31 +1,15 @@
 {# @copyright   Copyright (C) 2010-2026 Combodo SARL #}
 {# @license     http://opensource.org/licenses/AGPL-3.0 #}
 
+
+
 {% UIPanel ForInformation { sTitle:'DataFeatureRemoval:Analysis:Title'|dict_s, sSubTitle: 'DataFeatureRemoval:Analysis:Subtitle'|dict_s} %}
     {% if null != DataFeatureRemovalErrorMessage %}
         <div id="feature_removal_error_msg_div" style="display:block">
             {% UIAlert ForFailure { sTitle:'DataFeatureRemoval:Failure:Title'|dict_s, sId: 'feature_removal_error_msg', sContent:DataFeatureRemovalErrorMessage } %}
             {% EndUIAlert %}
         </div>
-    {% endif %}
 
-    {% UIAlert ForInformation { sTitle: '', sId: 'ajax_compile_in_progress_msg', AddCSSClasses: ['ibo-is-hidden', 'ibo-is-html-content'] } %}
-        {{ 'DataFeatureRemoval:Compile:InProgress'|dict_s }}
-        {% UISpinner Standard { } %}
-    {% EndUIAlert %}
-    {% UIAlert ForSuccess { sTitle:'success', sId: 'ajax_compile_success_msg', AddCSSClasses: ['ibo-is-hidden', 'ibo-is-html-content'] } %}{% EndUIAlert %}
-    {% UIAlert ForFailure { sTitle:'error', sId: 'ajax_compile_error_msg', AddCSSClasses: ['ibo-is-hidden', 'ibo-is-html-content'] } %}{% EndUIAlert %}
-
-    {% UIAlert ForInformation { sTitle: '', sId: 'ajax_run_audit_in_progress_msg', AddCSSClasses: ['ibo-is-hidden', 'ibo-is-html-content'] } %}
-        {{ 'DataFeatureRemoval:RunAudit:InProgress'|dict_s }}
-        {% UISpinner Standard { } %}
-    {% EndUIAlert %}
-    {% UIAlert ForSuccess { sTitle:'DataFeatureRemoval:RunAudit:Success'|dict_s, sId: 'ajax_run_audit_success_msg', AddCSSClasses: ['ibo-is-hidden', 'ibo-is-html-content'] } %}{% EndUIAlert %}
-    {% UIAlert ForFailure { sTitle:'error', sId: 'ajax_run_audit_error_msg', AddCSSClasses: ['ibo-is-hidden', 'ibo-is-html-content'] } %}{% EndUIAlert %}
-
-    {% if aAvailableExtensionsCount == 0 %}
-        {% UITitle Neutral { sTitle:'DataFeatureRemoval:NoResult:Title'|dict_s, iLevel:2 } %}{% EndUITitle %}
-    {% else %}
         {% UIPanel Neutral { sTitle:'DataFeatureRemoval:Result:Title'|dict_s, sSubTitle: '' } %}
             {% UIMultiColumn Standard {} %}
                 {% for iColumnIndex in 0..iColumnCount-1 %}
@@ -41,9 +25,67 @@
                 {% endfor %}
             {% EndUIMultiColumn %}
         {% EndUIPanel %}
-    {% endif %}
+    {% else %}
+        {% UIPanel Neutral { sTitle:'DataFeatureRemoval:Result:Title'|dict_s, sSubTitle: '' } %}
+            {% UIMultiColumn Standard {} %}
+                {% for iColumnIndex in 0..iColumnCount-1 %}
+                    {% UIColumn Standard {} %}
+                    {% for aExtension in aAvailableExtensions[iColumnIndex] %}
+                        {% if aExtension['installed'] %}
+                            {% UIExtensionDetails Installed { sCode : aExtension['code'], sLabel : aExtension['label'], sDescription : aExtension['description'], aMetaData : [aExtension['version'], aExtension['source']], aExtraFlags : aExtension['extra_flags']} %}{% EndUIExtensionDetails %}
+                        {% else %}
+                            {% UIExtensionDetails NotInstalled { sCode : aExtension['code'], sLabel : aExtension['label'], sDescription : aExtension['description'], aMetaData : [aExtension['version'], aExtension['source']], aExtraFlags : aExtension['extra_flags']} %}{% EndUIExtensionDetails %}
+                        {% endif %}
+                    {% endfor %}
+                    {% EndUIColumn %}
+                {% endfor %}
+            {% EndUIMultiColumn %}
+        {% EndUIPanel %}
 
-    <div id="ajax_run_audit" class="ibo-block"></div>
+        {% if bDeletionNeeded %}
+            {% UIFieldSet Standard {sLegend:'DataFeatureRemoval:DeletionPlan:Title'|dict_s} %}
+                {% UIDataTable ForForm { sRef:'aDeletionPlanSummary', aColumns:aDeletionPlanSummary.Columns, aData:aDeletionPlanSummary.Data} %}{% EndUIDataTable %}
+            {% EndUIFieldSet %}
+            {% if bDeletionPossible %}
+                {% UIForm Standard {} %}
+                    {% UIInput ForHidden { sName:'transaction_id', sValue:sTransactionId} %}
+                    {% UIInput ForHidden { sName:'operation', sValue:'DoDeletion'} %}
+                    {% for sKey, sClass in aClasses %}
+                        {% UIInput ForHidden { sName:"classes[" ~ sKey ~ "]", sValue:sClass } %}
+                    {% endfor %}
+                    {% for sCode, sLabel in aAddedExtensions %}
+                        {% UIInput ForHidden { sName:"aAddedExtensions[" ~ sCode ~ "]", sValue:sLabel } %}
+                    {% endfor %}
+                    {% for sCode, sLabel in aRemovedExtensions %}
+                        {% UIInput ForHidden { sName:"aRemovedExtensions[" ~ sCode ~ "]", sValue:sLabel } %}
+                    {% endfor %}
+                    {% for sInputName, sValue in aHiddenInputs %}
+                        {% UIInput ForHidden { sName:sInputName, sValue:sValue } %}
+                    {% endfor %}
+                    {% UIToolbar ForButton {} %}
+                        {% UIButton ForPrimaryAction {sLabel:'UI:Button:DoDeletion'|dict_s, sName:'btn_deletion', sId:'btn_deletion', bIsSubmit:true} %}
+                    {% EndUIToolbar %}
+                {% EndUIForm %}
+            {% else %}
+                {% UIAlert ForFailure { sContent: 'DataFeatureRemoval:DeletionPlan:Error:Issues'|dict_s } %}{% EndUIAlert %}
+            {% endif %}
+        {% else %}
+            {% UIAlert ForSuccess { sTitle:'DataFeatureRemoval:CleanupComplete:Title'|dict_s, sContent:'DataFeatureRemoval:CompilComplete'|dict_s, sId:value } %}{% EndUIAlert %}
+
+            {% UIForm Standard {'sId':'launch-setup-form', Action:sLaunchSetupUrl, 'EncType': 'application/x-www-form-urlencoded'} %}
+                {% for sKey, sValue in aSetupParams %}
+                    {% UIInput ForHidden { sName:sKey, sValue:sValue } %}
+                {% endfor %}
+                {% UIButton ForPrimaryAction {sLabel:'UI:Button:Setup'|dict_s, sName:'btn_setup', sId:'btn_setup', bIsSubmit:true} %}
+            {% EndUIForm %}
+        {% endif %}
+
+        {% if bHasDeletionExecution %}
+            {% UIFieldSet Standard {sLegend:'DataFeatureRemoval:Execution:Title'|dict_s} %}
+                {% UIDataTable ForForm { sRef:'aDeletionExecutionSummary', aColumns:aDeletionExecutionSummary.Columns, aData:aDeletionExecutionSummary.Data} %}{% EndUIDataTable %}
+            {% EndUIFieldSet %}
+        {% endif %}
+    {% endif %}
 
     {% UIForm Standard {} %}
         {% UIInput ForHidden { sName:'transaction_id', sValue:sTransactionId} %}

datamodels/2.x/combodo-data-feature-removal/templates/AnalysisResult.ready.js.twig

@@ -1,56 +0,0 @@
-{# @copyright   Copyright (C) 2010-2026 Combodo SARL #}
-{# @license     http://opensource.org/licenses/AGPL-3.0 #}
-
-function ajax_run_audit(sTransactionId) {
-    $('#ajax_run_audit_in_progress_msg').removeClass('ibo-is-hidden');
-    $.post(
-        '{{ sAjaxURL|raw }}',
-        { operation: 'ajax_run_audit', transaction_id: sTransactionId },
-        function (data) {
-            $('#ajax_run_audit_in_progress_msg').addClass('ibo-is-hidden');
-
-            if (data.error_message) {
-                $('#ajax_run_audit_error_msg .ibo-alert--title').html(data.error_message);
-                $('#ajax_run_audit_error_msg').removeClass('ibo-is-hidden');
-            } else {
-                $('#ajax_run_audit_success_msg').removeClass('ibo-is-hidden');
-                $('#ajax_run_audit').html(data);
-            }
-        }
-    )
-    .fail(function() {
-        $('#ajax_run_audit_in_progress_msg').addClass('ibo-is-hidden');
-        $('#ajax_run_audit_error_msg .ibo-alert--title').html('{{ 'DataFeatureRemoval:RunAudit:Error'|dict_s }}');
-        $('#ajax_run_audit_error_msg').removeClass('ibo-is-hidden');
-    });
-}
-
-function ajax_compile() {
-    $('#ajax_compile_in_progress_msg').removeClass('ibo-is-hidden');
-
-    $.post(
-        '{{ sAjaxURL|raw }}',
-        { operation: 'ajax_compile', transaction_id: '{{ sTransactionId }}' },
-        function (data) {
-            $('#ajax_compile_in_progress_msg').addClass('ibo-is-hidden');
-
-            if (data.error_message) {
-                $('#ajax_compile_error_msg .ibo-alert--title').html(data.error_message);
-                $('#ajax_compile_error_msg').removeClass('ibo-is-hidden');
-            } else {
-                $('#ajax_compile_success_msg .ibo-alert--title').html(data.success_message);
-                $('#ajax_compile_success_msg').removeClass('ibo-is-hidden');
-
-                ajax_run_audit(data.transaction_id);
-            }
-        },
-        'json'
-    )
-    .fail(function() {
-        $('#ajax_compile_in_progress_msg').addClass('ibo-is-hidden');
-        $('#ajax_compile_error_msg .ibo-alert--title').html('{{ 'DataFeatureRemoval:Compile:Error'|dict_s }}');
-        $('#ajax_compile_error_msg').removeClass('ibo-is-hidden');
-    });
-}
-
-ajax_compile();

datamodels/2.x/combodo-data-feature-removal/templates/Features.html.twig

@@ -5,6 +5,7 @@
 {% UIForm Standard {} %}
     {% UIInput ForHidden {sName:'operation', sValue:'AnalysisResult'} %}
     {% UIInput ForHidden {sName:'transaction_id', sValue:sTransactionId} %}
+    {% UIInput ForHidden {sName:'return_application', sValue:'itop'} %}
 
 	{% UIPanel Neutral { sTitle:'DataFeatureRemoval:Features:Title'|dict_s, sSubTitle: '' } %}
 		{% UIMultiColumn Standard {} %}

datamodels/2.x/combodo-data-feature-removal/vendor/composer/autoload_classmap.php

@@ -8,8 +8,6 @@ $baseDir = dirname($vendorDir);
 return array(
     'Combodo\\iTop\\DataFeatureRemoval\\Controller\\DataFeatureRemovalController' => $baseDir . '/src/Controller/DataFeatureRemovalController.php',
     'Combodo\\iTop\\DataFeatureRemoval\\Entity\\DataCleanupSummaryEntity' => $baseDir . '/src/Entity/DataCleanupSummaryEntity.php',
-    'Combodo\\iTop\\DataFeatureRemoval\\Entity\\DeletionPlanEntity' => $baseDir . '/src/Entity/DeletionPlanEntity.php',
-    'Combodo\\iTop\\DataFeatureRemoval\\Entity\\DeletionPlanItem' => $baseDir . '/src/Entity/DeletionPlanItem.php',
     'Combodo\\iTop\\DataFeatureRemoval\\Helper\\DataFeatureRemovalConfig' => $baseDir . '/src/Helper/DataFeatureRemovalConfig.php',
     'Combodo\\iTop\\DataFeatureRemoval\\Helper\\DataFeatureRemovalException' => $baseDir . '/src/Helper/DataFeatureRemovalException.php',
     'Combodo\\iTop\\DataFeatureRemoval\\Helper\\DataFeatureRemovalHelper' => $baseDir . '/src/Helper/DataFeatureRemovalHelper.php',
@@ -18,7 +16,6 @@ return array(
     'Combodo\\iTop\\DataFeatureRemoval\\Service\\DataFeatureRemoverExtensionService' => $baseDir . '/src/Service/DataFeatureRemoverExtensionService.php',
     'Combodo\\iTop\\DataFeatureRemoval\\Service\\ObjectService' => $baseDir . '/src/Service/ObjectService.php',
     'Combodo\\iTop\\DataFeatureRemoval\\Service\\ObjectServiceSummary' => $baseDir . '/src/Service/ObjectServiceSummary.php',
-    'Combodo\\iTop\\DataFeatureRemoval\\Service\\StaticDeletionPlan' => $baseDir . '/src/Service/StaticDeletionPlan.php',
     'Combodo\\iTop\\DataFeatureRemoval\\Service\\iObjectService' => $baseDir . '/src/Service/iObjectService.php',
     'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',
 );

datamodels/2.x/combodo-data-feature-removal/vendor/composer/autoload_static.php

@@ -23,8 +23,6 @@ class ComposerStaticInit4f96a7199e2c0d90e547333758b26464
     public static $classMap = array (
         'Combodo\\iTop\\DataFeatureRemoval\\Controller\\DataFeatureRemovalController' => __DIR__ . '/../..' . '/src/Controller/DataFeatureRemovalController.php',
         'Combodo\\iTop\\DataFeatureRemoval\\Entity\\DataCleanupSummaryEntity' => __DIR__ . '/../..' . '/src/Entity/DataCleanupSummaryEntity.php',
-        'Combodo\\iTop\\DataFeatureRemoval\\Entity\\DeletionPlanEntity' => __DIR__ . '/../..' . '/src/Entity/DeletionPlanEntity.php',
-        'Combodo\\iTop\\DataFeatureRemoval\\Entity\\DeletionPlanItem' => __DIR__ . '/../..' . '/src/Entity/DeletionPlanItem.php',
         'Combodo\\iTop\\DataFeatureRemoval\\Helper\\DataFeatureRemovalConfig' => __DIR__ . '/../..' . '/src/Helper/DataFeatureRemovalConfig.php',
         'Combodo\\iTop\\DataFeatureRemoval\\Helper\\DataFeatureRemovalException' => __DIR__ . '/../..' . '/src/Helper/DataFeatureRemovalException.php',
         'Combodo\\iTop\\DataFeatureRemoval\\Helper\\DataFeatureRemovalHelper' => __DIR__ . '/../..' . '/src/Helper/DataFeatureRemovalHelper.php',
@@ -33,7 +31,6 @@ class ComposerStaticInit4f96a7199e2c0d90e547333758b26464
         'Combodo\\iTop\\DataFeatureRemoval\\Service\\DataFeatureRemoverExtensionService' => __DIR__ . '/../..' . '/src/Service/DataFeatureRemoverExtensionService.php',
         'Combodo\\iTop\\DataFeatureRemoval\\Service\\ObjectService' => __DIR__ . '/../..' . '/src/Service/ObjectService.php',
         'Combodo\\iTop\\DataFeatureRemoval\\Service\\ObjectServiceSummary' => __DIR__ . '/../..' . '/src/Service/ObjectServiceSummary.php',
-        'Combodo\\iTop\\DataFeatureRemoval\\Service\\StaticDeletionPlan' => __DIR__ . '/../..' . '/src/Service/StaticDeletionPlan.php',
         'Combodo\\iTop\\DataFeatureRemoval\\Service\\iObjectService' => __DIR__ . '/../..' . '/src/Service/iObjectService.php',
         'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
     );

datamodels/2.x/combodo-db-tools/dictionaries/ru.dict.combodo-db-tools.php

@@ -16,8 +16,8 @@ Dict::Add('RU RU', 'Russian', 'Русский', [
 	'DBTools:Class' => 'Класс',
 	'DBTools:Title' => 'Инструменты обслуживания базы данных',
 	'DBTools:ErrorsFound' => 'Найденные ошибки',
-	'DBTools:Indication' => 'Важно: после исправления ошибок в базе данных нужно будет запустить анализ заново, так как появятся новые несоответствия',
-	'DBTools:Disclaimer' => 'ВНИМАНИЕ: СДЕЛАЙТЕ РЕЗЕРВНУЮ КОПИЮ БАЗЫ ДАННЫХ ПЕРЕД ЗАПУСКОМ ИСПРАВЛЕНИЙ',
+	'DBTools:Indication' => 'Important: after fixing errors in the database you\'ll have to run the analysis again as new inconsistencies will be generated~~',
+	'DBTools:Disclaimer' => 'DISCLAIMER: BACKUP YOUR DATABASE BEFORE RUNNING THE FIXES~~',
 	'DBTools:Error' => 'Ошибка',
 	'DBTools:Count' => 'Количество',
 	'DBTools:SQLquery' => 'SQL-запрос',
@@ -28,23 +28,23 @@ Dict::Add('RU RU', 'Russian', 'Русский', [
 	'DBTools:ShowIds' => 'Подробный вид',
 	'DBTools:ShowReport' => 'Отчёт',
 	'DBTools:IntegrityCheck' => 'Проверка целостности',
-	'DBTools:FetchCheck' => 'Проверка выборки (долго)',
-	'DBTools:SelectAnalysisType' => 'Выберите тип анализа',
+	'DBTools:FetchCheck' => 'Fetch Check (long)~~',
+	'DBTools:SelectAnalysisType' => 'Select analysis type~~',
 	'DBTools:Analyze' => 'Анализировать',
 	'DBTools:Details' => 'Показать подробности',
 	'DBTools:ShowAll' => 'Показать все ошибки',
 	'DBTools:Inconsistencies' => 'Несоответствия базы данных',
-	'DBTools:DetailedErrorTitle' => 'Ошибок (%2$s) в классе %1$s: %3$s',
-	'DBTools:DetailedErrorLimit' => 'Список ограничен %1$s ошибками',
+	'DBTools:DetailedErrorTitle' => '%2$s error(s) in class %1$s: %3$s~~',
+	'DBTools:DetailedErrorLimit' => 'List limited to %1$s errors~~',
 	'DBAnalyzer-Integrity-OrphanRecord' => 'Сиротская запись в `%1$s`, она должна иметь свой аналог в таблице `%2$s`',
 	'DBAnalyzer-Integrity-InvalidExtKey' => 'Недопустимый внешний ключ %1$s (столбец: `%2$s.%3$s`)',
 	'DBAnalyzer-Integrity-MissingExtKey' => 'Отсутствует внешний ключ %1$s (столбец: `%2$s.%3$s`)',
 	'DBAnalyzer-Integrity-InvalidValue' => 'Недопустимое значение для %1$s (столбец: `%2$s.%3$s`)',
 	'DBAnalyzer-Integrity-UsersWithoutProfile' => 'Некоторые учетные записи пользователей не имеют профилей',
-	'DBAnalyzer-Integrity-HKInvalid' => 'Повреждён иерархический ключ `%1$s`',
-	'DBAnalyzer-Fetch-Count-Error' => 'Ошибка количества выборки в `%1$s`: получено записей %2$d / посчитано %3$d',
-	'DBAnalyzer-Integrity-FinalClass' => 'Поле `%2$s`.`%1$s` должно иметь то же значение, что и `%3$s`.`%1$s`',
-	'DBAnalyzer-Integrity-RootFinalClass' => 'Поле `%2$s`.`%1$s` должно содержать допустимый класс',
+	'DBAnalyzer-Integrity-HKInvalid' => 'Broken hierarchical key `%1$s`~~',
+	'DBAnalyzer-Fetch-Count-Error' => 'Fetch count error in `%1$s`, %2$d entries fetched / %3$d counted~~',
+	'DBAnalyzer-Integrity-FinalClass' => 'Field `%2$s`.`%1$s` must have the same value as `%3$s`.`%1$s`~~',
+	'DBAnalyzer-Integrity-RootFinalClass' => 'Field `%2$s`.`%1$s` must contain a valid class~~',
 ]);
 
 // Database Info

datamodels/2.x/combodo-db-tools/dictionaries/zh_cn.dict.combodo-db-tools.php

@@ -33,10 +33,10 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'DBTools:Disclaimer' => '免责申明: 在应用修复之前, 应先备份数据库',
 	'DBTools:Error' => '错误',
 	'DBTools:Count' => '个数',
-	'DBTools:SQLquery' => 'SQL 查询',
-	'DBTools:FixitSQLquery' => '用于修复问题的 SQL 查询(说明)',
-	'DBTools:SQLresult' => 'SQL 结果',
-	'DBTools:NoError' => '数据库 OK',
+	'DBTools:SQLquery' => 'SQL查询',
+	'DBTools:FixitSQLquery' => '修复问题的SQL查询 (指示)',
+	'DBTools:SQLresult' => 'SQL结果',
+	'DBTools:NoError' => '数据库正确',
 	'DBTools:HideIds' => '错误列表',
 	'DBTools:ShowIds' => '详细视图',
 	'DBTools:ShowReport' => '报告',
@@ -73,7 +73,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 // Lost attachments
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'DBTools:LostAttachments' => '附件缺失',
-	'DBTools:LostAttachments:Disclaimer' => '可以在此搜索数据库中丢失或错放的附件. 请注意, 这不是数据恢复工具, 无法恢复已删除的数据.',
+	'DBTools:LostAttachments:Disclaimer' => '可以在此搜索数据库中丢失或错放的附件. 这不是数据恢复工具, 其无法恢复已删除的数据.',
 
 	'DBTools:LostAttachments:Button:Analyze' => '分析',
 	'DBTools:LostAttachments:Button:Restore' => '还原',

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

@@ -90,6 +90,6 @@ Dict::Add('FR FR', 'French', 'Français', [
 	'Class:TriggerOnAttachmentDelete'                         => 'Déclencheur sur la suppression d\'une pièce jointe',
 	'Class:TriggerOnAttachmentDelete+'                        => 'Déclencheur sur la suppression d\'une pièce jointe d\'un objet',
 	'Class:TriggerOnAttachmentDelete/Attribute:file_in_email' => 'Ajoute le fichier supprimé dans l\'email',
-	'Class:TriggerOnAttachmentDelete/Attribute:file_in_email+' => 'Si coché, le fichier supprimé sera automatiquement joint à l\'email quand une action email sera lancée',
+	'Class:TriggerOnAttachmentDelete/Attribute:file_in_email+' => 'If checked, the deleted file will be automatically attached to the email when an email action is triggered~~',
 	'Class:TriggerOnObject:TriggerClassAttachment/ReadOnlyMessage' => 'Les Triggers sur les objets ne sont pas autorisés sur la classe Attachement. Veuillez utiliser les triggers spécifiques pour cette classe',
 ]);

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

@@ -26,12 +26,12 @@ Dict::Add('RU RU', 'Russian', 'Русский', [
 	'Attachments:NoAttachment' => 'Нет вложений.',
 	'Attachments:PreviewNotAvailable' => 'Предварительный просмотр не доступен для этого типа вложений.',
 	'Attachments:Error:FileTooLarge' => 'Файл слишком велик для загрузки. %1$s',
-	'Attachments:Error:UploadedFileEmpty' => 'Полученный файл пуст и не может быть прикреплён.
-Либо вы загрузили пустой файл,
-либо обратитесь к администратору '.ITOP_APPLICATION_SHORT.' — возможно, диск сервера '.ITOP_APPLICATION_SHORT.' переполнен.',
-	'Attachments:Render:Icons' => 'Отображать как иконки',
-	'Attachments:Render:Table' => 'Отображать как список',
-	'UI:Attachments:DropYourFileHint' => 'Перетащите файлы в любое место этой области',
+	'Attachments:Error:UploadedFileEmpty' => 'The received file is empty and cannot be attached.
+Either you have pushed an empty file,
+or ask your '.ITOP_APPLICATION_SHORT.' administrator if the '.ITOP_APPLICATION_SHORT.' server disk is full.~~',
+	'Attachments:Render:Icons' => 'Display as icons~~',
+	'Attachments:Render:Table' => 'Display as list~~',
+	'UI:Attachments:DropYourFileHint' => 'Drop files anywhere in this area~~',
 ]);
 
 //
@@ -62,7 +62,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', [
 	'Attachments:File:Uploader' => 'Пользователь',
 	'Attachments:File:Size' => 'Размер',
 	'Attachments:File:MimeType' => 'Тип',
-	'Attachments:File:DownloadsCount' => 'Скачиваний',
+	'Attachments:File:DownloadsCount' => 'Downloads~~',
 ]);
 //
 // Class: Attachment
@@ -82,15 +82,15 @@ Dict::Add('RU RU', 'Russian', 'Русский', [
 //
 
 Dict::Add('RU RU', 'Russian', 'Русский', [
-	'Class:TriggerOnAttachmentDownload' => 'Триггер (на скачивание вложения объекта)',
-	'Class:TriggerOnAttachmentDownload+' => 'Триггер на скачивание вложения объекта заданного класса (или его дочернего класса)',
-	'Class:TriggerOnAttachmentCreate'                         => 'Триггер (на создание вложения объекта)',
-	'Class:TriggerOnAttachmentCreate+'                        => 'Триггер на создание вложения объекта',
-	'Class:TriggerOnAttachmentCreate/Attribute:file_in_email' => 'Добавлять файл в email',
-	'Class:TriggerOnAttachmentCreate/Attribute:file_in_email+' => 'Если отмечено, файл будет автоматически прикреплён к письму при срабатывании действия email',
-	'Class:TriggerOnAttachmentDelete'                         => 'Триггер (на удаление вложения объекта)',
-	'Class:TriggerOnAttachmentDelete+'                        => 'Триггер на удаление вложения объекта',
-	'Class:TriggerOnAttachmentDelete/Attribute:file_in_email' => 'Добавлять удалённый файл в email',
-	'Class:TriggerOnAttachmentDelete/Attribute:file_in_email+' => 'Если отмечено, удалённый файл будет автоматически прикреплён к письму при срабатывании действия email',
-	'Class:TriggerOnObject:TriggerClassAttachment/ReadOnlyMessage' => 'Триггер на объект не допускается для класса Attachment. Используйте специальный триггер',
+	'Class:TriggerOnAttachmentDownload' => 'Trigger (on object\'s attachment download)~~',
+	'Class:TriggerOnAttachmentDownload+' => 'Trigger on object\'s attachment download of [a child class of] the given class~~',
+	'Class:TriggerOnAttachmentCreate'                         => 'Trigger (on object\'s attachment creation)~~',
+	'Class:TriggerOnAttachmentCreate+'                        => 'Trigger on object\'s attachment creation~~',
+	'Class:TriggerOnAttachmentCreate/Attribute:file_in_email' => 'Add file in email~~',
+	'Class:TriggerOnAttachmentCreate/Attribute:file_in_email+' => 'If checked, the file will be automatically attached to the email when an email action is triggered~~',
+	'Class:TriggerOnAttachmentDelete'                         => 'Trigger (on object\'s attachment deletion)~~',
+	'Class:TriggerOnAttachmentDelete+'                        => 'Trigger on object\'s attachment deletion~~',
+	'Class:TriggerOnAttachmentDelete/Attribute:file_in_email' => 'Add deleted file in email~~',
+	'Class:TriggerOnAttachmentDelete/Attribute:file_in_email+' => 'If checked, the deleted file will be automatically attached to the email when an email action is triggered~~',
+	'Class:TriggerOnObject:TriggerClassAttachment/ReadOnlyMessage' => 'Trigger on object is not allowed on class Attachment. Please use specific trigger~~',
 ]);

datamodels/2.x/itop-attachments/src/Trigger/TriggerOnAttachmentCreate.php

@@ -24,7 +24,7 @@ class TriggerOnAttachmentCreate extends TriggerOnObject
 			"category"            => "grant_by_profile,core/cmdb,application",
 			"key_type"            => "autoincrement",
 			"name_attcode"        => "description",
-			"complementary_name_attcode" => ['finalclass', 'complement'],
+			"complementary_name_attcode" => ['finalclass', 'target_class'],
 			"state_attcode"       => "",
 			"reconc_keys"         => ['description'],
 			"db_table"            => "priv_trigger_onattcreate",

datamodels/2.x/itop-attachments/src/Trigger/TriggerOnAttachmentDelete.php

@@ -24,7 +24,7 @@ class TriggerOnAttachmentDelete extends TriggerOnObject
 			"category"            => "grant_by_profile,core/cmdb,application",
 			"key_type"            => "autoincrement",
 			"name_attcode"        => "description",
-			"complementary_name_attcode" => ['finalclass', 'complement'],
+			"complementary_name_attcode" => ['finalclass', 'target_class'],
 			"state_attcode"       => "",
 			"reconc_keys"         => ['description'],
 			"db_table"            => "priv_trigger_onattdelete",

datamodels/2.x/itop-attachments/src/Trigger/TriggerOnAttachmentDownload.php

@@ -19,7 +19,7 @@ class TriggerOnAttachmentDownload extends TriggerOnAttributeBlobDownload
 			"category" => "grant_by_profile,core/cmdb,application",
 			"key_type" => "autoincrement",
 			"name_attcode" => "description",
-			"complementary_name_attcode" => ['finalclass', 'complement'],
+			"complementary_name_attcode" => ['finalclass', 'target_class'],
 			"state_attcode" => "",
 			"reconc_keys" => ['description'],
 			"db_table" => "priv_trigger_onattdownload",

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

@@ -20,7 +20,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', [
 	'bkp-mysqldump-ok' => 'Утилита mysqldump найдена: %1$s',
 	'bkp-mysqldump-notfound' => 'Утилиту mysqldump найти не удалось: %1$s - пожалуйста, убедитесь в том, что она установлена, и путь до директории с бинарными файлами добавлен в PATH, либо измените параметр mysql_bindir в файле конфигурации.',
 	'bkp-mysqldump-issue' => 'Утилита mysqldump на может быть запущена (retcode=%1$d) Пожалуйста, убедитесь в том, что она установлена, и путь до директории с бинарными файлами добавлен в PATH, либо измените параметр mysql_bindir в файле конфигурации.',
-	'bkp-missing-dir' => 'Целевой каталог <code>%1$s</code> не найден',
+	'bkp-missing-dir' => 'The target directory <code>%1$s</code> could not be found~~',
 	'bkp-free-disk-space' => '<b>%1$s свободно</b> в <code>%2$s</code>',
 	'bkp-dir-not-writeable' => '%1$s недоступен для записи',
 	'bkp-wrong-format-spec' => 'Неправильный формат шаблона названия файлов резервных копий (%1$s). Будет использован шаблон по умолчанию: %2$s',
@@ -38,7 +38,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', [
 	'bkp-status-backups-manual' => 'Резервное копирование вручную',
 	'bkp-status-backups-none' => 'Резервных копий ещё нет',
 	'bkp-next-backup' => 'Следующее резервное копирование будет выполняться в <b>%1$s</b> (%2$s) в %3$s',
-	'bkp-next-backup-unknown' => 'Следующее резервное копирование пока <b>не запланировано</b>.',
+	'bkp-next-backup-unknown' => 'The next backup is <b>not scheduled</b> yet.~~',
 	'bkp-button-backup-now' => 'Запустить сейчас!',
 	'bkp-button-restore-now' => 'Восстановить!',
 	'bkp-confirm-backup' => 'Пожалуйста, подтвердите, что вы хотите выполнить резервное копирование прямо сейчас.',

datamodels/2.x/itop-bridge-cmdb-services/dictionaries/ru.dict.itop-bridge-cmdb-services.php

@@ -14,7 +14,7 @@
 Dict::Add('RU RU', 'Russian', 'Русский', [
 	'Class:lnkFunctionalCIToProviderContract' => 'Связь Функциональная КЕ/Договор с поставщиком',
 	'Class:lnkFunctionalCIToProviderContract+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Name' => '%1$s / %2$s',
+	'Class:lnkFunctionalCIToProviderContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Договор с поставщиком',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Договор с поставщиком',
@@ -32,7 +32,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', [
 Dict::Add('RU RU', 'Russian', 'Русский', [
 	'Class:lnkFunctionalCIToService' => 'Связь Функциональная КЕ/Услуга',
 	'Class:lnkFunctionalCIToService+' => '',
-	'Class:lnkFunctionalCIToService/Name' => '%1$s / %2$s',
+	'Class:lnkFunctionalCIToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Услуга',
 	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
 	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Услуга',

datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/ru.dict.itop-bridge-cmdb-ticket.php

@@ -14,7 +14,7 @@
 Dict::Add('RU RU', 'Russian', 'Русский', [
 	'Class:lnkFunctionalCIToTicket' => 'Связь Функциональная КЕ/Тикет',
 	'Class:lnkFunctionalCIToTicket+' => '',
-	'Class:lnkFunctionalCIToTicket/Name' => '%1$s / %2$s',
+	'Class:lnkFunctionalCIToTicket/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => 'Тикет',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => '',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => 'Тикет',

datamodels/2.x/itop-change-mgmt-itil/dictionaries/cs.dict.itop-change-mgmt-itil.php

@@ -21,11 +21,11 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', [
 	'Menu:SearchChanges' => 'Hledat změny',
 	'Menu:SearchChanges+' => 'Hledat změnové tikety',
 	'Menu:Change:Shortcuts' => 'Odkazy',
-	'Menu:Change:Shortcuts+' => 'Shortcuts to predefined sets of Changes~~',
+	'Menu:Change:Shortcuts+' => '',
 	'Menu:WaitingAcceptance' => 'Změny čekající na přijetí',
 	'Menu:WaitingAcceptance+' => '',
 	'Menu:WaitingApproval' => 'Změny čekající na schválení',
-	'Menu:WaitingApproval+' => 'Changes in planned status~~',
+	'Menu:WaitingApproval+' => '',
 	'Menu:Changes' => 'Otevřené změny',
 	'Menu:Changes+' => 'Všechny otevřené změny',
 	'Menu:MyChanges' => 'Změny přidělené mně',

datamodels/2.x/itop-change-mgmt-itil/dictionaries/da.dict.itop-change-mgmt-itil.php

@@ -20,11 +20,11 @@ Dict::Add('DA DA', 'Danish', 'Dansk', [
 	'Menu:SearchChanges' => 'Søg efter Changes',
 	'Menu:SearchChanges+' => 'Søg efter Change Tickets',
 	'Menu:Change:Shortcuts' => 'Genveje',
-	'Menu:Change:Shortcuts+' => 'Shortcuts to predefined sets of Changes~~',
+	'Menu:Change:Shortcuts+' => '',
 	'Menu:WaitingAcceptance' => 'Changes, som afventer accept',
 	'Menu:WaitingAcceptance+' => '',
 	'Menu:WaitingApproval' => 'Changes, som afventer godkendelse',
-	'Menu:WaitingApproval+' => 'Changes in planned status~~',
+	'Menu:WaitingApproval+' => '',
 	'Menu:Changes' => 'Offene Changes',
 	'Menu:Changes+' => 'Alle åbne Changes',
 	'Menu:MyChanges' => 'Mine Changes',

datamodels/2.x/itop-change-mgmt-itil/dictionaries/de.dict.itop-change-mgmt-itil.php

@@ -19,8 +19,8 @@ Dict::Add('DE DE', 'German', 'Deutsch', [
 	'Menu:NewChange+' => 'Einen neuen Change erstellen',
 	'Menu:SearchChanges' => 'Suche nach Changes',
 	'Menu:SearchChanges+' => 'Unter den bestehenden Changes suchen',
-	'Menu:Change:Shortcuts' => 'Changes~~',
-	'Menu:Change:Shortcuts+' => 'Shortcuts to predefined sets of Changes~~',
+	'Menu:Change:Shortcuts' => 'Shortcuts',
+	'Menu:Change:Shortcuts+' => '',
 	'Menu:WaitingAcceptance' => 'Changes, die auf Annahme warten',
 	'Menu:WaitingAcceptance+' => 'Changes, die auf Annahme warten',
 	'Menu:WaitingApproval' => 'Changes, die auf Genehmigung warten',

datamodels/2.x/itop-change-mgmt-itil/dictionaries/en.dict.itop-change-mgmt-itil.php

@@ -30,16 +30,16 @@ Dict::Add('EN US', 'English', 'English', [
 	'Menu:NewChange+' => 'Create a new change ticket',
 	'Menu:SearchChanges' => 'Search for changes',
 	'Menu:SearchChanges+' => 'Search for change tickets',
-	'Menu:Change:Shortcuts' => 'Changes',
-	'Menu:Change:Shortcuts+' => 'Shortcuts to predefined sets of Changes',
+	'Menu:Change:Shortcuts' => 'Shortcuts',
+	'Menu:Change:Shortcuts+' => '',
 	'Menu:WaitingAcceptance' => 'Changes awaiting acceptance',
 	'Menu:WaitingAcceptance+' => '',
 	'Menu:WaitingApproval' => 'Changes awaiting approval',
-	'Menu:WaitingApproval+' => 'Changes in planned status',
+	'Menu:WaitingApproval+' => '',
 	'Menu:Changes' => 'Open changes',
-	'Menu:Changes+' => 'All changes which are not in closed status',
+	'Menu:Changes+' => 'All open changes',
 	'Menu:MyChanges' => 'Changes assigned to me',
-	'Menu:MyChanges+' => 'Non-closed changes assigned to me (as an Agent)',
+	'Menu:MyChanges+' => 'Changes assigned to me (as Agent)',
 	'UI-ChangeManagementOverview-ChangeByCategory-last-7-days' => 'Changes by category for the last 7 days',
 	'UI-ChangeManagementOverview-Last-7-days' => 'Number of changes for the last 7 days',
 	'UI-ChangeManagementOverview-ChangeByDomain-last-7-days' => 'Changes by domain for the last 7 days',

datamodels/2.x/itop-change-mgmt-itil/dictionaries/en_gb.dict.itop-change-mgmt-itil.php

@@ -30,16 +30,16 @@ Dict::Add('EN GB', 'British English', 'British English', [
 	'Menu:NewChange+' => 'Create a new change ticket',
 	'Menu:SearchChanges' => 'Search for changes',
 	'Menu:SearchChanges+' => 'Search for change tickets',
-	'Menu:Change:Shortcuts' => 'Changes~~',
-	'Menu:Change:Shortcuts+' => 'Shortcuts to predefined sets of Changes~~',
+	'Menu:Change:Shortcuts' => 'Shortcuts',
+	'Menu:Change:Shortcuts+' => '',
 	'Menu:WaitingAcceptance' => 'Changes awaiting acceptance',
 	'Menu:WaitingAcceptance+' => '',
 	'Menu:WaitingApproval' => 'Changes awaiting approval',
-	'Menu:WaitingApproval+' => 'Changes in planned status~~',
+	'Menu:WaitingApproval+' => '',
 	'Menu:Changes' => 'Open changes',
-	'Menu:Changes+' => 'All changes which are not in closed status',
+	'Menu:Changes+' => 'All open changes',
 	'Menu:MyChanges' => 'Changes assigned to me',
-	'Menu:MyChanges+' => 'Non-closed changes assigned to me (as an Agent)',
+	'Menu:MyChanges+' => 'Changes assigned to me (as Agent)',
 	'UI-ChangeManagementOverview-ChangeByCategory-last-7-days' => 'Changes by category for the last 7 days',
 	'UI-ChangeManagementOverview-Last-7-days' => 'Number of changes for the last 7 days',
 	'UI-ChangeManagementOverview-ChangeByDomain-last-7-days' => 'Changes by domain for the last 7 days',

datamodels/2.x/itop-change-mgmt-itil/dictionaries/fr.dict.itop-change-mgmt-itil.php

@@ -18,16 +18,16 @@ Dict::Add('FR FR', 'French', 'Français', [
 	'Menu:NewChange+' => 'Créer un nouveau ticket de changement',
 	'Menu:SearchChanges' => 'Rechercher des changements',
 	'Menu:SearchChanges+' => 'Rechercher parmi les tickets de changement',
-	'Menu:Change:Shortcuts' => 'Changements',
-	'Menu:Change:Shortcuts+' => 'Raccourcis vers différents groupes de changements',
-	'Menu:WaitingAcceptance' => 'En attente de validation',
-	'Menu:WaitingAcceptance+' => 'Changements à l\'état nouveau, en attente d\'acceptation',
-	'Menu:WaitingApproval' => 'En attente d\'approbation',
-	'Menu:WaitingApproval+' => 'Changements dans l\'état programmé, en attente d\'approbation',
-	'Menu:Changes' => 'En cours',
-	'Menu:Changes+' => 'Tickets de changement qui ne sont pas dans l\'état fermé',
-	'Menu:MyChanges' => 'Qui me sont assignés',
-	'Menu:MyChanges+' => 'Changements ni fermés, ni résolus, dont je suis l\'agent assigné',
+	'Menu:Change:Shortcuts' => 'Raccourcis',
+	'Menu:Change:Shortcuts+' => '',
+	'Menu:WaitingAcceptance' => 'Changements en attente d\'acceptance',
+	'Menu:WaitingAcceptance+' => 'Changements en attente d\'acceptance',
+	'Menu:WaitingApproval' => 'Changements en attente d\'approbation',
+	'Menu:WaitingApproval+' => 'Changements en attente d\'approbation',
+	'Menu:Changes' => 'Changements ouverts',
+	'Menu:Changes+' => 'Tickets de changement ouverts',
+	'Menu:MyChanges' => 'Mes changements',
+	'Menu:MyChanges+' => 'Tickets de changement qui me sont assignés',
 	'UI-ChangeManagementOverview-ChangeByCategory-last-7-days' => 'Changements par catégorie',
 	'UI-ChangeManagementOverview-Last-7-days' => 'Changements par jour',
 	'UI-ChangeManagementOverview-ChangeByDomain-last-7-days' => 'Changements par domaine',

datamodels/2.x/itop-change-mgmt-itil/dictionaries/it.dict.itop-change-mgmt-itil.php

@@ -19,11 +19,11 @@ Dict::Add('IT IT', 'Italian', 'Italiano', [
 	'Menu:SearchChanges' => 'Cerca per cambi',
 	'Menu:SearchChanges+' => 'Cerca i cambi per tickets',
 	'Menu:Change:Shortcuts' => 'Scorciatoie',
-	'Menu:Change:Shortcuts+' => 'Shortcuts to predefined sets of Changes~~',
+	'Menu:Change:Shortcuts+' => '',
 	'Menu:WaitingAcceptance' => 'Modifiche in attesa di accettazione',
 	'Menu:WaitingAcceptance+' => '',
 	'Menu:WaitingApproval' => 'Modifiche in attesa di approvazione',
-	'Menu:WaitingApproval+' => 'Changes in planned status~~',
+	'Menu:WaitingApproval+' => '',
 	'Menu:Changes' => 'Modifiche aperte',
 	'Menu:Changes+' => 'Tutte le Modifiche aperte',
 	'Menu:MyChanges' => 'Modifiche assegnate a me',

datamodels/2.x/itop-change-mgmt-itil/dictionaries/ja.dict.itop-change-mgmt-itil.php

@@ -19,13 +19,13 @@ Dict::Add('JA JP', 'Japanese', '日本語', [
 	'Menu:SearchChanges' => '変更検索',
 	'Menu:SearchChanges+' => '変更チケット検索',
 	'Menu:Change:Shortcuts' => 'ショートカット',
-	'Menu:Change:Shortcuts+' => 'Shortcuts to predefined sets of Changes~~',
+	'Menu:Change:Shortcuts+' => '',
 	'Menu:WaitingAcceptance' => '受理待ちの変更',
 	'Menu:WaitingAcceptance+' => '',
 	'Menu:WaitingApproval' => '承認待ちの変更',
-	'Menu:WaitingApproval+' => 'Changes in planned status~~',
+	'Menu:WaitingApproval+' => '',
 	'Menu:Changes' => 'オープン状態の変更',
-	'Menu:Changes+' => 'All changes which are not in closed status~~',
+	'Menu:Changes+' => '',
 	'Menu:MyChanges' => '担当している変更',
 	'Menu:MyChanges+' => '担当している変更(エージェントとして)',
 	'UI-ChangeManagementOverview-ChangeByCategory-last-7-days' => '最近7日間のカテゴリ別の変更',

datamodels/2.x/itop-change-mgmt-itil/dictionaries/nl.dict.itop-change-mgmt-itil.php

@@ -21,11 +21,11 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', [
 	'Menu:SearchChanges' => 'Zoek naar changes',
 	'Menu:SearchChanges+' => 'Zoek naar changes',
 	'Menu:Change:Shortcuts' => 'Snelkoppelingen',
-	'Menu:Change:Shortcuts+' => 'Shortcuts to predefined sets of Changes~~',
+	'Menu:Change:Shortcuts+' => '',
 	'Menu:WaitingAcceptance' => 'Changes die acceptatie vereisen',
 	'Menu:WaitingAcceptance+' => '',
 	'Menu:WaitingApproval' => 'Changes die goedkeuring vereisen',
-	'Menu:WaitingApproval+' => 'Changes in planned status~~',
+	'Menu:WaitingApproval+' => '',
 	'Menu:Changes' => 'Open changes',
 	'Menu:Changes+' => 'Alle open changes',
 	'Menu:MyChanges' => 'Changes toegewezen aan mij',

datamodels/2.x/itop-change-mgmt-itil/dictionaries/pl.dict.itop-change-mgmt-itil.php

@@ -19,11 +19,11 @@ Dict::Add('PL PL', 'Polish', 'Polski', [
 	'Menu:SearchChanges' => 'Szukaj zmian',
 	'Menu:SearchChanges+' => 'Szukaj zgłoszeń zmian',
 	'Menu:Change:Shortcuts' => 'Skróty',
-	'Menu:Change:Shortcuts+' => 'Shortcuts to predefined sets of Changes~~',
+	'Menu:Change:Shortcuts+' => '',
 	'Menu:WaitingAcceptance' => 'Zmiany do akceptacji',
 	'Menu:WaitingAcceptance+' => '',
 	'Menu:WaitingApproval' => 'Zmiany do zatwierdzenia',
-	'Menu:WaitingApproval+' => 'Changes in planned status~~',
+	'Menu:WaitingApproval+' => '',
 	'Menu:Changes' => 'Otwarte zmiany',
 	'Menu:Changes+' => 'Wszystkie otwarte zmiany',
 	'Menu:MyChanges' => 'Zmiany przypisane do mnie',

datamodels/2.x/itop-change-mgmt-itil/dictionaries/pt_br.dict.itop-change-mgmt-itil.php

@@ -19,13 +19,13 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', [
 	'Menu:SearchChanges' => 'Pesquisar por mudanças',
 	'Menu:SearchChanges+' => 'Pesquisar por solicitações de mudança',
 	'Menu:Change:Shortcuts' => 'Atalhos',
-	'Menu:Change:Shortcuts+' => 'Shortcuts to predefined sets of Changes~~',
+	'Menu:Change:Shortcuts+' => '',
 	'Menu:WaitingAcceptance' => 'Mudanças aguardando aceitação',
 	'Menu:WaitingAcceptance+' => '',
 	'Menu:WaitingApproval' => 'Mudanças aguardando aprovação',
-	'Menu:WaitingApproval+' => 'Changes in planned status~~',
+	'Menu:WaitingApproval+' => '',
 	'Menu:Changes' => 'Mudanças abertas',
-	'Menu:Changes+' => 'All changes which are not in closed status~~',
+	'Menu:Changes+' => '',
 	'Menu:MyChanges' => 'Mudanças atribuídas a mim',
 	'Menu:MyChanges+' => 'Mudanças atribuídas a mim (como Agente)',
 	'UI-ChangeManagementOverview-ChangeByCategory-last-7-days' => 'Mudanças por categoria nos últimos 7 dias',

datamodels/2.x/itop-change-mgmt-itil/dictionaries/sk.dict.itop-change-mgmt-itil.php

@@ -23,11 +23,11 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', [
 	'Menu:WaitingAcceptance' => 'Zmeny očakávajúce prijatie',
 	'Menu:WaitingAcceptance+' => '~~',
 	'Menu:WaitingApproval' => 'Zmeny očakávajúce schválenie',
-	'Menu:WaitingApproval+' => 'Changes in planned status~~',
+	'Menu:WaitingApproval+' => '~~',
 	'Menu:Changes' => 'Otvorené zmeny',
-	'Menu:Changes+' => 'All changes which are not in closed status~~',
+	'Menu:Changes+' => 'All open changes~~',
 	'Menu:MyChanges' => 'Zmeny pridelené mne',
-	'Menu:MyChanges+' => 'Non-closed changes assigned to me (as an Agent)~~',
+	'Menu:MyChanges+' => 'Changes assigned to me (as Agent)~~',
 	'UI-ChangeManagementOverview-ChangeByCategory-last-7-days' => 'Zmeny podľa kategórie za posledných 7 dní',
 	'UI-ChangeManagementOverview-Last-7-days' => 'Počet zmien za posledných 7 dní',
 	'UI-ChangeManagementOverview-ChangeByDomain-last-7-days' => 'Zmeny podľa domény za posledných 7 dní',

datamodels/2.x/itop-change-mgmt-itil/dictionaries/tr.dict.itop-change-mgmt-itil.php

@@ -20,13 +20,13 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', [
 	'Menu:SearchChanges' => 'Değişiklik ara',
 	'Menu:SearchChanges+' => 'Değişiklik isteği ara',
 	'Menu:Change:Shortcuts' => 'Kısayollar',
-	'Menu:Change:Shortcuts+' => 'Shortcuts to predefined sets of Changes~~',
+	'Menu:Change:Shortcuts+' => '',
 	'Menu:WaitingAcceptance' => 'Kabul bekleyen değişiklik talepleri',
 	'Menu:WaitingAcceptance+' => '',
 	'Menu:WaitingApproval' => 'Onay bekleyen değişiklik talepleri',
-	'Menu:WaitingApproval+' => 'Changes in planned status~~',
+	'Menu:WaitingApproval+' => '',
 	'Menu:Changes' => 'Açık değişiklikler',
-	'Menu:Changes+' => 'All changes which are not in closed status~~',
+	'Menu:Changes+' => '',
 	'Menu:MyChanges' => 'Bana atanan değişiklik istekleri',
 	'Menu:MyChanges+' => 'Bana atanan değişiklik istekleri',
 	'UI-ChangeManagementOverview-ChangeByCategory-last-7-days' => 'Son 7 gün için kategoriye göre değişiklikler',

datamodels/2.x/itop-change-mgmt-itil/dictionaries/zh_cn.dict.itop-change-mgmt-itil.php

@@ -27,24 +27,24 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Menu:Change:Overview' => '概况',
 	'Menu:Change:Overview+' => '',
 	'Menu:NewChange' => '新建变更',
-	'Menu:NewChange+' => '新建变更工单',
+	'Menu:NewChange+' => '新建变更',
 	'Menu:SearchChanges' => '搜索变更',
-	'Menu:SearchChanges+' => '搜索变更工单',
-	'Menu:Change:Shortcuts' => '变更',
-	'Menu:Change:Shortcuts+' => '快速访问预定义的变更数据',
+	'Menu:SearchChanges+' => '搜索变更',
+	'Menu:Change:Shortcuts' => '快捷方式',
+	'Menu:Change:Shortcuts+' => '',
 	'Menu:WaitingAcceptance' => '等待审核的变更',
 	'Menu:WaitingAcceptance+' => '',
 	'Menu:WaitingApproval' => '等待批准的变更',
-	'Menu:WaitingApproval+' => '处于计划状态的变更',
-	'Menu:Changes' => '所有待处理的变更',
-	'Menu:Changes+' => '所有待处理的变更',
+	'Menu:WaitingApproval+' => '',
+	'Menu:Changes' => '所有打开的变更',
+	'Menu:Changes+' => '所有打开的变更',
 	'Menu:MyChanges' => '分配给我的变更',
 	'Menu:MyChanges+' => '分配给我的变更 (作为办理人)',
 	'UI-ChangeManagementOverview-ChangeByCategory-last-7-days' => '最近一周的变更 (按类型)',
 	'UI-ChangeManagementOverview-Last-7-days' => '最近一周的变更 (按数量)',
 	'UI-ChangeManagementOverview-ChangeByDomain-last-7-days' => '最近一周的变更 (按范围)',
 	'UI-ChangeManagementOverview-ChangeByStatus-last-7-days' => '最近一周的变更 (按状态)',
-	'Tickets:Related:OpenChanges' => '待处理的变更',
+	'Tickets:Related:OpenChanges' => '打开的变更',
 	'Tickets:Related:RecentChanges' => '最近的变更 (72小时)',
 ]);
 
@@ -132,7 +132,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:Change/Attribute:related_incident_list' => '相关事件',
 	'Class:Change/Attribute:related_incident_list+' => '此变更相关的所有事件',
 	'Class:Change/Attribute:child_changes_list' => '子变更',
-	'Class:Change/Attribute:child_changes_list+' => '此变更相关的子变更',
+	'Class:Change/Attribute:child_changes_list+' => '此变更相关的字变更',
 	'Class:Change/Attribute:parent_id_friendlyname' => '父级变更昵称',
 	'Class:Change/Attribute:parent_id_friendlyname+' => '',
 	'Class:Change/Attribute:parent_id_finalclass_recall' => '变更类型',

datamodels/2.x/itop-change-mgmt/dictionaries/cs.dict.itop-change-mgmt.php

@@ -21,11 +21,11 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', [
 	'Menu:SearchChanges' => 'Hledat změny',
 	'Menu:SearchChanges+' => 'Hledat změnové tikety',
 	'Menu:Change:Shortcuts' => 'Odkazy',
-	'Menu:Change:Shortcuts+' => 'Shortcuts to predefined sets of Changes~~',
+	'Menu:Change:Shortcuts+' => '',
 	'Menu:WaitingAcceptance' => 'Změny čekající na přijetí',
 	'Menu:WaitingAcceptance+' => '',
 	'Menu:WaitingApproval' => 'Změny čekající na schválení',
-	'Menu:WaitingApproval+' => 'Changes in planned status~~',
+	'Menu:WaitingApproval+' => '',
 	'Menu:Changes' => 'Otevřené změny',
 	'Menu:Changes+' => 'Všechny otevřené změny',
 	'Menu:MyChanges' => 'Změny přidělené mně',

datamodels/2.x/itop-change-mgmt/dictionaries/da.dict.itop-change-mgmt.php

@@ -20,13 +20,13 @@ Dict::Add('DA DA', 'Danish', 'Dansk', [
 	'Menu:SearchChanges' => 'Søg efter Changes',
 	'Menu:SearchChanges+' => '',
 	'Menu:Change:Shortcuts' => 'Genveje',
-	'Menu:Change:Shortcuts+' => 'Shortcuts to predefined sets of Changes~~',
+	'Menu:Change:Shortcuts+' => '',
 	'Menu:WaitingAcceptance' => 'Changes der afventer accept',
 	'Menu:WaitingAcceptance+' => '',
 	'Menu:WaitingApproval' => 'Changes der afventer godkendelse',
-	'Menu:WaitingApproval+' => 'Changes in planned status~~',
+	'Menu:WaitingApproval+' => '',
 	'Menu:Changes' => 'Åbne Changes',
-	'Menu:Changes+' => 'All changes which are not in closed status~~',
+	'Menu:Changes+' => '',
 	'Menu:MyChanges' => 'Changes tildelt til mig',
 	'Menu:MyChanges+' => '',
 	'UI-ChangeManagementOverview-ChangeByCategory-last-7-days' => 'Changes de sidste 7 dage efter kategori',

datamodels/2.x/itop-change-mgmt/dictionaries/de.dict.itop-change-mgmt.php

@@ -19,8 +19,8 @@ Dict::Add('DE DE', 'German', 'Deutsch', [
 	'Menu:NewChange+' => 'Einen neuen Change erstellen',
 	'Menu:SearchChanges' => 'Suche nach Changes',
 	'Menu:SearchChanges+' => 'Unter den bestehenden Changes suchen',
-	'Menu:Change:Shortcuts' => 'Changes~~',
-	'Menu:Change:Shortcuts+' => 'Shortcuts to predefined sets of Changes~~',
+	'Menu:Change:Shortcuts' => 'Shortcuts',
+	'Menu:Change:Shortcuts+' => '',
 	'Menu:WaitingAcceptance' => 'Changes, die auf Annahme warten',
 	'Menu:WaitingAcceptance+' => 'Changes, die auf Annahme warten',
 	'Menu:WaitingApproval' => 'Changes, die auf Genehmigung warten',

datamodels/2.x/itop-change-mgmt/dictionaries/en.dict.itop-change-mgmt.php

@@ -30,16 +30,16 @@ Dict::Add('EN US', 'English', 'English', [
 	'Menu:NewChange+' => 'Create a new change ticket',
 	'Menu:SearchChanges' => 'Search for changes',
 	'Menu:SearchChanges+' => 'Search for change tickets',
-	'Menu:Change:Shortcuts' => 'Changes',
-	'Menu:Change:Shortcuts+' => 'Shortcuts to predefined sets of Changes',
-	'Menu:WaitingAcceptance' => 'Awaiting acceptance',
+	'Menu:Change:Shortcuts' => 'Shortcuts',
+	'Menu:Change:Shortcuts+' => '',
+	'Menu:WaitingAcceptance' => 'Changes awaiting acceptance',
 	'Menu:WaitingAcceptance+' => '',
-	'Menu:WaitingApproval' => 'Awaiting approval',
-	'Menu:WaitingApproval+' => 'Changes in planned status',
-	'Menu:Changes' => 'Open',
-	'Menu:Changes+' => 'All changes which are not in closed status',
-	'Menu:MyChanges' => 'Assigned to me',
-	'Menu:MyChanges+' => 'Non-closed changes assigned to me (as an Agent)',
+	'Menu:WaitingApproval' => 'Changes awaiting approval',
+	'Menu:WaitingApproval+' => '',
+	'Menu:Changes' => 'Open changes',
+	'Menu:Changes+' => 'All open changes',
+	'Menu:MyChanges' => 'Changes assigned to me',
+	'Menu:MyChanges+' => 'Changes assigned to me (as Agent)',
 	'UI-ChangeManagementOverview-ChangeByCategory-last-7-days' => 'Changes by category for the last 7 days',
 	'UI-ChangeManagementOverview-Last-7-days' => 'Number of changes for the last 7 days',
 	'UI-ChangeManagementOverview-ChangeByDomain-last-7-days' => 'Changes by domain for the last 7 days',

datamodels/2.x/itop-change-mgmt/dictionaries/en_gb.dict.itop-change-mgmt.php

@@ -30,16 +30,16 @@ Dict::Add('EN GB', 'British English', 'British English', [
 	'Menu:NewChange+' => 'Create a new change ticket',
 	'Menu:SearchChanges' => 'Search for changes',
 	'Menu:SearchChanges+' => 'Search for change tickets',
-	'Menu:Change:Shortcuts' => 'Changes~~',
-	'Menu:Change:Shortcuts+' => 'Shortcuts to predefined sets of Changes~~',
+	'Menu:Change:Shortcuts' => 'Shortcuts',
+	'Menu:Change:Shortcuts+' => '',
 	'Menu:WaitingAcceptance' => 'Changes awaiting acceptance',
 	'Menu:WaitingAcceptance+' => '',
 	'Menu:WaitingApproval' => 'Changes awaiting approval',
-	'Menu:WaitingApproval+' => 'Changes in planned status~~',
+	'Menu:WaitingApproval+' => '',
 	'Menu:Changes' => 'Open changes',
-	'Menu:Changes+' => 'All changes which are not in closed status',
+	'Menu:Changes+' => 'All open changes',
 	'Menu:MyChanges' => 'Changes assigned to me',
-	'Menu:MyChanges+' => 'Non-closed changes assigned to me (as an Agent)',
+	'Menu:MyChanges+' => 'Changes assigned to me (as Agent)',
 	'UI-ChangeManagementOverview-ChangeByCategory-last-7-days' => 'Changes by category for the last 7 days',
 	'UI-ChangeManagementOverview-Last-7-days' => 'Number of changes for the last 7 days',
 	'UI-ChangeManagementOverview-ChangeByDomain-last-7-days' => 'Changes by domain for the last 7 days',

datamodels/2.x/itop-change-mgmt/dictionaries/fr.dict.itop-change-mgmt.php

@@ -18,16 +18,16 @@ Dict::Add('FR FR', 'French', 'Français', [
 	'Menu:NewChange+' => 'Créer un nouveau ticket de changement',
 	'Menu:SearchChanges' => 'Rechercher des changements',
 	'Menu:SearchChanges+' => 'Rechercher parmi les tickets de changement',
-	'Menu:Change:Shortcuts' => 'Changements',
-	'Menu:Change:Shortcuts+' => 'Raccourcis vers différents groupes de changements',
-	'Menu:WaitingAcceptance' => 'En attente d\'acceptation',
-	'Menu:WaitingAcceptance+' => 'Changements en attente d\'acceptation',
-	'Menu:WaitingApproval' => 'En attente d\'approbation',
-	'Menu:WaitingApproval+' => 'Changements dans l\'état planifié',
-	'Menu:Changes' => 'En cours',
-	'Menu:Changes+' => 'Tickets de changement qui ne sont pas dans l\'état fermé',
-	'Menu:MyChanges' => 'Qui me sont assignés',
-	'Menu:MyChanges+' => 'Changements non fermés dont je suis l\'agent assigné',
+	'Menu:Change:Shortcuts' => 'Raccourcis',
+	'Menu:Change:Shortcuts+' => '',
+	'Menu:WaitingAcceptance' => 'Changements en attente d\'acceptance',
+	'Menu:WaitingAcceptance+' => 'Changements en attente d\'acceptance',
+	'Menu:WaitingApproval' => 'Changement en attente d\'approbation',
+	'Menu:WaitingApproval+' => 'Changement en attente d\'approbation',
+	'Menu:Changes' => 'Changements ouverts',
+	'Menu:Changes+' => 'Tickets de changement ouverts',
+	'Menu:MyChanges' => 'Mes tickets de changement',
+	'Menu:MyChanges+' => 'Tickets de changement qui me sont assignés',
 	'UI-ChangeManagementOverview-ChangeByCategory-last-7-days' => 'Changements par catégorie',
 	'UI-ChangeManagementOverview-Last-7-days' => 'Changements par jour',
 	'UI-ChangeManagementOverview-ChangeByDomain-last-7-days' => 'Changements par domaine',

datamodels/2.x/itop-change-mgmt/dictionaries/it.dict.itop-change-mgmt.php

@@ -23,7 +23,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', [
 	'Menu:WaitingAcceptance' => 'Modifiche in attesa di accettazione',
 	'Menu:WaitingAcceptance+' => '~~',
 	'Menu:WaitingApproval' => 'Modifiche in attesa di approvazione',
-	'Menu:WaitingApproval+' => 'Changes in planned status~~',
+	'Menu:WaitingApproval+' => '~~',
 	'Menu:Changes' => 'Modifiche aperte',
 	'Menu:Changes+' => 'Tutte le Modifiche aperte',
 	'Menu:MyChanges' => 'Modifiche assegnate a me',

datamodels/2.x/itop-change-mgmt/dictionaries/ja.dict.itop-change-mgmt.php

@@ -19,13 +19,13 @@ Dict::Add('JA JP', 'Japanese', '日本語', [
 	'Menu:SearchChanges' => '変更検索',
 	'Menu:SearchChanges+' => '',
 	'Menu:Change:Shortcuts' => 'ショートカット',
-	'Menu:Change:Shortcuts+' => 'Shortcuts to predefined sets of Changes~~',
+	'Menu:Change:Shortcuts+' => '',
 	'Menu:WaitingAcceptance' => '受け付け待ちの変更',
 	'Menu:WaitingAcceptance+' => '',
 	'Menu:WaitingApproval' => '承認待ちの変更',
-	'Menu:WaitingApproval+' => 'Changes in planned status~~',
+	'Menu:WaitingApproval+' => '',
 	'Menu:Changes' => 'オープンな変更',
-	'Menu:Changes+' => 'All changes which are not in closed status~~',
+	'Menu:Changes+' => '',
 	'Menu:MyChanges' => '私に割り当てられた変更',
 	'Menu:MyChanges+' => '',
 	'UI-ChangeManagementOverview-ChangeByCategory-last-7-days' => '最近7日間のカテゴリ別の変更',

datamodels/2.x/itop-change-mgmt/dictionaries/nl.dict.itop-change-mgmt.php

@@ -21,11 +21,11 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', [
 	'Menu:SearchChanges' => 'Zoek naar changes',
 	'Menu:SearchChanges+' => 'Zoek naar changes',
 	'Menu:Change:Shortcuts' => 'Snelkoppelingen',
-	'Menu:Change:Shortcuts+' => 'Shortcuts to predefined sets of Changes~~',
+	'Menu:Change:Shortcuts+' => '',
 	'Menu:WaitingAcceptance' => 'Changes die acceptatie vereisen',
 	'Menu:WaitingAcceptance+' => '',
 	'Menu:WaitingApproval' => 'Changes die goedkeuring vereisen',
-	'Menu:WaitingApproval+' => 'Changes in planned status~~',
+	'Menu:WaitingApproval+' => '',
 	'Menu:Changes' => 'Open changes',
 	'Menu:Changes+' => 'Alle open changes',
 	'Menu:MyChanges' => 'Changes toegewezen aan mij',

datamodels/2.x/itop-change-mgmt/dictionaries/pl.dict.itop-change-mgmt.php

@@ -19,11 +19,11 @@ Dict::Add('PL PL', 'Polish', 'Polski', [
 	'Menu:SearchChanges' => 'Szukaj zmian',
 	'Menu:SearchChanges+' => 'Szukaj zgłoszeń zmian',
 	'Menu:Change:Shortcuts' => 'Skróty',
-	'Menu:Change:Shortcuts+' => 'Shortcuts to predefined sets of Changes~~',
+	'Menu:Change:Shortcuts+' => '',
 	'Menu:WaitingAcceptance' => 'Zmiany do akceptacji',
 	'Menu:WaitingAcceptance+' => '',
 	'Menu:WaitingApproval' => 'Zmiany do zatwierdzenia',
-	'Menu:WaitingApproval+' => 'Changes in planned status~~',
+	'Menu:WaitingApproval+' => '',
 	'Menu:Changes' => 'Otwarte zmiany',
 	'Menu:Changes+' => 'Wszystkie otwarte zmiany',
 	'Menu:MyChanges' => 'Zmiany przypisane do mnie',

datamodels/2.x/itop-change-mgmt/dictionaries/pt_br.dict.itop-change-mgmt.php

@@ -19,11 +19,11 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', [
 	'Menu:SearchChanges' => 'Pesquisar por mudanças',
 	'Menu:SearchChanges+' => 'Pesquisar por solicitações de mudanças',
 	'Menu:Change:Shortcuts' => 'Atalhos',
-	'Menu:Change:Shortcuts+' => 'Shortcuts to predefined sets of Changes~~',
+	'Menu:Change:Shortcuts+' => '',
 	'Menu:WaitingAcceptance' => 'Mudanças aguardando aceitação',
 	'Menu:WaitingAcceptance+' => '',
 	'Menu:WaitingApproval' => 'Mudanças aguardando aprovação',
-	'Menu:WaitingApproval+' => 'Changes in planned status~~',
+	'Menu:WaitingApproval+' => '',
 	'Menu:Changes' => 'Mudanças abertas',
 	'Menu:Changes+' => 'Todas as mudanças abertas',
 	'Menu:MyChanges' => 'Mudanças atribuídas a mim',