composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
- Now use OQL instead of SibusQL

SVN:trunk[222]
This commit is contained in:
Denis Flaven
2010-01-03 13:39:56 +00:00
parent 015f44784d
commit 95b1ce9030
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
js/wizard.utils.js
View File

@@ -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();
}

2
pages/ajax.render.php
View File

@@ -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())
{