N°9934 - Tickets are no more automatically resolved on iTop Combodo

application/cmdbabstract.class.inc.php

@@ -3983,27 +3983,6 @@ HTML;
 				$sTagSetJson = utils::ReadPostedParam("attr_{$sFormPrefix}{$sAttCode}", null, 'raw_data');
 				if ($sTagSetJson !== null) { // bulk modify, direct linked set not handled
 					$value = json_decode($sTagSetJson, true);
-					if ($this->IsNew()) {
-						if (is_array($value['orig_value'])) {
-							foreach ($value['orig_value'] as $val) {
-								if (!in_array($val, $value['removed'])) {
-									$value['added'][] = $val;
-								}
-							}
-						}
-					} else {
-						$aCurrentValues = $this->Get($sAttCode)->GetValues();
-						foreach ($value['orig_value'] as $val) {
-							if (!in_array($val, $aCurrentValues) && !in_array($val, $value['removed']) && !in_array($val, $value['added'])) {
-								$value['added'][] = $val;
-							}
-						}
-						foreach ($aCurrentValues as $val) {
-							if (!in_array($val, $value['orig_value']) && !in_array($val, $value['removed']) && !in_array($val, $value['added'])) {
-								$value['removed'][] = $val;
-							}
-						}
-					}
 				}
 				break;
 

core/metamodel.class.php

@@ -1642,7 +1642,7 @@ abstract class MetaModel
 		if ($sFilterCode == 'id') {
 			return true;
 		}
-		if (array_key_exists($sClass, self::$m_aMagicFields) && array_key_exists($sFilterCode, self::$m_aMagicFields[$sClass])) {
+		if (array_key_exists($sClass, self::$m_aMagicFields) && in_array($sFilterCode, self::$m_aMagicFields[$sClass])) {
 			return true;
 		}
 		if (array_key_exists($sClass, self::$m_aFilterForbiddenAttributes) && array_key_exists($sFilterCode, self::$m_aFilterForbiddenAttributes[$sClass])) {
@@ -2963,6 +2963,7 @@ abstract class MetaModel
 						self::$m_aMagicFields[] = $sClass;
 					}
 					self::$m_aMagicFields[$sClass][] = $sCode;
+					self::$m_aAttribOrigins[$sClass][$sCode] = self::$m_aAttribOrigins[$sClass][$sAttCode] ;
 				}
 				if (!$oAttDef->IsSearchable()) {
 					if (!array_key_exists($sClass, self::$m_aFilterForbiddenAttributes)) {

core/oqlactualclasstreeresolver.class.inc.php

@@ -65,10 +65,10 @@ class OQLActualClassTreeResolver
 			}
 			// Attributes can be stored in attributes list or for magic ones into filter codes list.
 			$sOriginClass = null;
-			if (MetaModel::IsValidAttCode($sClass, $sAttCode)) {
+			if (MetaModel::IsValidAttCode($sClass, $sAttCode) || MetaModel::IsValidFilterCode($sClass, $sAttCode)) {
 				$sOriginClass = MetaModel::GetAttributeOrigin($sClass, $sAttCode);
 			} elseif ($sAttCode == 'id') {
-				$sOriginClass = $sClass;
+				$sOriginClass = MetaModel::GetRootClass($sClass);
 			} else {
 				continue;
 			}

datamodels/2.x/itop-backup/status.php

@@ -21,6 +21,7 @@
 use Combodo\iTop\Application\UI\Base\Component\Alert\AlertUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\Button\ButtonUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\DataTable\DataTableUIBlockFactory;
+use Combodo\iTop\Application\UI\Base\Component\FieldSet\FieldSet;
 use Combodo\iTop\Application\UI\Base\Component\Panel\PanelUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\Spinner\SpinnerUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\Title\TitleUIBlockFactory;
@@ -409,11 +410,8 @@ JS
 
 	$sEnvironment = addslashes(utils::GetCurrentEnvironment());
 
-	$oBackupModalSpinner = SpinnerUIBlockFactory::MakeMedium(null, $sPleaseWaitBackup);
-	$sBackupModalSpinnerHtml = BlockRenderer::RenderBlockTemplates($oBackupModalSpinner);
-
-	$oRestoreModalSpinner = SpinnerUIBlockFactory::MakeMedium(null, $sPleaseWaitRestore);
-	$sRestoreModalSpinnerHtml = BlockRenderer::RenderBlockTemplates($oRestoreModalSpinner);
+	$oModalSpinner = SpinnerUIBlockFactory::MakeMedium(null, $sPleaseWaitBackup);
+	$sModalSpinnerHtml = BlockRenderer::RenderBlockTemplates($oModalSpinner);
 
 	$oP->add_script(
 		<<<JS
@@ -426,7 +424,7 @@ function LaunchBackupNow()
 	{
 		const oModal = CombodoModal.OpenModal({
 				title: '$sBackUpNow',
-				content: `$sBackupModalSpinnerHtml`
+				content: `$sModalSpinnerHtml`
 		});
 
 		var oParams = {};
@@ -452,10 +450,10 @@ function LaunchRestoreNow(sBackupFile, sConfirmationMessage)
 	{
 		return;
 	}
-    
+
 	const oModal = CombodoModal.OpenModal({
 		title: '$sRestore',
-		content: `$sRestoreModalSpinnerHtml`
+		content: '<i class="ajax-spin fas fa-sync-alt fa-spin"></i> $sPleaseWaitRestore'
 	});
 
 	$('#backup_success').addClass('ibo-is-hidden');