From 95b1ce9030946cc3952dada4f2286cebb98fc273 Mon Sep 17 00:00:00 2001
From: Denis Flaven <denis.flaven@combodo.com>
Date: Sun, 3 Jan 2010 13:39:56 +0000
Subject: [PATCH] - Fix the dialog to manage n-n links: don't display again
 objects that are already linked. - Now use OQL instead of SibusQL

SVN:trunk[222]
---
 js/wizard.utils.js    | 4 ++--
 pages/ajax.render.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/js/wizard.utils.js b/js/wizard.utils.js
index fcb873863..02a7d00c4 100644
--- a/js/wizard.utils.js
+++ b/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();
 }
 
diff --git a/pages/ajax.render.php b/pages/ajax.render.php
index 0c52e4d15..3ac20e6a9 100644
--- a/pages/ajax.render.php
+++ b/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())
 	{