Fix rebase

pages/UI.php

@@ -1355,99 +1355,3 @@ try {
 	IssueLog::Debug('UI.php operation='.$sOperationToLog.', error='.$e->getMessage()."\n".$sErrorStackTrace, LogChannels::CONSOLE);
 }
 
-class UI
-{
-	/**
-	 * Operation select_for_modify_all
-	 *
-	 * @param iTopWebPage $oP
-	 *
-	 * @throws \ApplicationException
-	 * @throws \ArchivedObjectException
-	 * @throws \CoreException
-	 * @throws \OQLException
-	 */
-	public static function OperationSelectForModifyAll(iTopWebPage $oP): void
-	{
-		$oP->DisableBreadCrumb();
-		$oP->set_title(Dict::S('UI:ModifyAllPageTitle'));
-		$sFilter = utils::ReadParam('filter', '', false, utils::ENUM_SANITIZATION_FILTER_RAW_DATA);
-		if (empty($sFilter)) {
-			throw new ApplicationException(Dict::Format('UI:Error:1ParametersMissing', 'filter'));
-		}
-		$oFilter = DBObjectSearch::unserialize($sFilter); //TODO : check that the filter is valid
-		// Add user filter
-		$oFilter->UpdateContextFromUser();
-		$oChecker = new ActionChecker($oFilter, UR_ACTION_BULK_MODIFY);
-		$sClass = $oFilter->GetClass();
-		$sClassName = MetaModel::GetName($sClass);
-
-		$aDisplayParams = [
-			'icon' => MetaModel::GetClassIcon($sClass, false),
-			'title' => Dict::Format('UI:Modify_ObjectsOf_Class', $sClassName),
-		];
-		DisplayMultipleSelectionForm($oP, $oFilter, 'form_for_modify_all', $oChecker, [], $aDisplayParams);
-	}
-
-	/**
-	 * Operation form_for_modify_all
-	 *
-	 * @param iTopWebPage $oP
-	 * @param \ApplicationContext $oAppContext
-	 *
-	 * @throws \ArchivedObjectException
-	 * @throws \CoreException
-	 * @throws \CoreUnexpectedValue
-	 * @throws \MySQLException
-	 * @throws \OQLException
-	 */
-	public static function OperationFormForModifyAll(iTopWebPage $oP, ApplicationContext $oAppContext): void
-	{
-		$oP->DisableBreadCrumb();
-		$sFilter = utils::ReadParam('filter', '', false, utils::ENUM_SANITIZATION_FILTER_RAW_DATA);
-		$sClass = utils::ReadParam('class', '', false, utils::ENUM_SANITIZATION_FILTER_CLASS);
-		$oFullSetFilter = DBObjectSearch::unserialize($sFilter);
-		// Add user filter
-		$oFullSetFilter->UpdateContextFromUser();
-		$aSelectedObj = utils::ReadMultipleSelection($oFullSetFilter);
-		$sCancelUrl = "./UI.php?operation=search&filter=".urlencode($sFilter).$oAppContext->GetForLink(true);
-		$aContext = ['filter' => utils::EscapeHtml($sFilter)];
-		cmdbAbstractObject::DisplayBulkModifyForm($oP, $sClass, $aSelectedObj, 'preview_or_modify_all', $sCancelUrl, [], $aContext);
-	}
-
-	/**
-	 * Operation preview_or_modify_all
-	 *
-	 * @param iTopWebPage $oP
-	 * @param \ApplicationContext $oAppContext
-	 *
-	 * @throws \ApplicationException
-	 * @throws \ArchivedObjectException
-	 * @throws \CoreCannotSaveObjectException
-	 * @throws \CoreException
-	 * @throws \DictExceptionMissingString
-	 * @throws \OQLException
-	 */
-	public static function OperationPreviewOrModifyAll(iTopWebPage $oP, ApplicationContext $oAppContext): void
-	{
-		$oP->DisableBreadCrumb();
-		$sFilter = utils::ReadParam('filter', '', false, 'raw_data');
-		$oFilter = DBObjectSearch::unserialize($sFilter); // TO DO : check that the filter is valid
-		// Add user filter
-		$oFilter->UpdateContextFromUser();
-
-		$sClass = utils::ReadParam('class', '', false, 'class');
-		$bPreview = utils::ReadParam('preview_mode', '');
-		$sSelectedObj = utils::ReadParam('selectObj', '', false, 'raw_data');
-		if (empty($sClass) || empty($sSelectedObj)) { // TO DO: check that the class name is valid !
-			throw new ApplicationException(Dict::Format('UI:Error:2ParametersMissing', 'class', 'selectObj'));
-		}
-		$aSelectedObj = explode(',', $sSelectedObj);
-		$sCancelUrl = "./UI.php?operation=search&filter=".urlencode($sFilter).$oAppContext->GetForLink(true);
-		$aContext = [
-			'filter'    => utils::EscapeHtml($sFilter),
-			'selectObj' => $sSelectedObj,
-		];
-		cmdbAbstractObject::DoBulkModify($oP, $sClass, $aSelectedObj, 'preview_or_modify_all', $bPreview, $sCancelUrl, $aContext);
-	}
-}

sources/Controller/UI.php

@@ -9,7 +9,6 @@ use Combodo\iTop\Application\WebPage\WebPage;
 
 class UI
 {
-
 	/**
 	 * Operation select_for_modify_all
 	 *
@@ -124,7 +123,7 @@ class UI
 	{
 		$oAppContext = new ApplicationContext();
 		$iBulkActionAllowed = $oChecker->IsAllowed();
-	$aExtraParams = array('selection_type' => 'multiple', 'selection_mode' => true, 'display_limit' => false, 'menu' => false);
+		$aExtraParams = ['selection_type' => 'multiple', 'selection_mode' => true, 'display_limit' => false, 'menu' => false];
 		if ($iBulkActionAllowed == UR_ALLOWED_DEPENDS) {
 			$aExtraParams['selection_enabled'] = $oChecker->GetAllowedIDs();
 		} else {

sources/Core/AttributeDefinition/AttributeObjectKey.php

@@ -114,4 +114,8 @@ class AttributeObjectKey extends AttributeDBFieldVoid
 
 		return (int)$proposedValue;
 	}
+	public function GetTargetClass($iType = EXTKEY_RELATIVE)
+	{
+		return '';
+	}
 }

synchro/replica.php

@@ -65,16 +65,8 @@ try {
 				throw new ApplicationException(Dict::Format('UI:Error:1ParametersMissing', 'oql'));
 			}
 			$oFilter = DBObjectSearch::FromOQL($sOQL);
-			$oBlock1 = new DisplayBlock($oFilter, 'search', false, ['menu' => false, 'table_id' => '1']);
+			$oBlock1 = new DisplayBlock($oFilter, 'search', false, ['menu' => true, 'table_id' => '1']);
 			$oBlock1->Display($oP, 0);
-			$oP->add('<p class="page-header">'.MetaModel::GetClassIcon('SynchroReplica').Dict::S('Core:SynchroReplica:ListOfReplicas').'</p>');
-			$iSourceId = utils::ReadParam('datasource', null);
-			if ($iSourceId != null) {
-				$oSource = MetaModel::GetObject('SynchroDataSource', $iSourceId);
-				$oP->p(Dict::Format('Core:SynchroReplica:BackToDataSource', $oSource->GetHyperlink()).'</a>');
-			}
-			$oBlock = new DisplayBlock($oFilter, 'list', false, ['menu' => false]);
-			$oBlock->Display($oP, 1);
 			break;
 
 		case 'delete':