- Fix the dialog to manage n-n links: don't display again objects that are already linked.

- Now use OQL instead of SibusQL

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@222 a333f486-631f-4898-b8df-5754b55c2be0

js/wizard.utils.js

@@ -34,8 +34,8 @@ function ManageObjects(sTitle, sClass, sId, sExtKeyToRemote)
 	{
 		aObjList[0] = 0;
 	}
-	Manage_LoadSelect('selected_objects_'+sId, sClass+': pkey IN {' + aObjList.join(', ') + '}');
-	Manage_LoadSelect('available_objects_'+sId, sClass);
+	Manage_LoadSelect('selected_objects_'+sId, 'SELECT '+sClass+' WHERE id IN (' + aObjList.join(', ') + ')'); // id is a reserved keyword always representing the primary key
+	Manage_LoadSelect('available_objects_'+sId, 'SELECT '+sClass+' WHERE id NOT IN (' + aObjList.join(', ') + ')');
 	$('#ManageObjectsDlg_'+sId).jqmShow();
 }
 

pages/ajax.render.php

@@ -262,7 +262,7 @@ switch($operation)
 	break;
 
 	case 'combo_options':
-	$oFilter = CMDBSearchFilter::FromSibusQL($sFilter);
+	$oFilter = CMDBSearchFilter::FromOQL($sFilter);
 	$oSet = new CMDBObjectSet($oFilter);
 	while( $oObj = $oSet->fetch())
 	{