From bb1a18f187a8b209bd339de4cdea9d0aa256094b Mon Sep 17 00:00:00 2001
From: Guillaume Lajarige <guillaume.lajarige@combodo.com>
Date: Tue, 6 Mar 2018 14:47:09 +0000
Subject: [PATCH 001/202] SVN:b1162[5385]


From 9de7b4ba355df8edd62600858c0cc7daf1679aca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Tue, 6 Mar 2018 16:18:12 +0000
Subject: [PATCH 002/202] Advanced Search

SVN:b1162[5386]
---
 .../application/search/searchform.class.php   | 63 +++++++++++++++++++
 test/ItopDataTestCase.php                     |  8 ---
 test/application/search/SearchFormTest.php    | 46 ++++++++++++++
 3 files changed, 109 insertions(+), 8 deletions(-)
 create mode 100644 sources/application/search/searchform.class.php
 create mode 100644 test/application/search/SearchFormTest.php

diff --git a/sources/application/search/searchform.class.php b/sources/application/search/searchform.class.php
new file mode 100644
index 000000000..b81fdc097
--- /dev/null
+++ b/sources/application/search/searchform.class.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Copyright (C) 2010-2018 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ *  iTop is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with iTop. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+
+namespace Combodo\iTop\Application\Search;
+
+
+use CMDBObjectSet;
+use CoreException;
+use Dict;
+use MetaModel;
+use WebPage;
+
+class SearchForm
+{
+	public static function GetSearchForm(WebPage $oPage, CMDBObjectSet $oSet, $aExtraParams = array())
+	{
+		$sHtml = '';
+
+		return $sHtml;
+	}
+
+	/**
+	 * @param $sClassName
+	 *
+	 * @throws CoreException
+	 */
+	public static function GetFields($sClassName)
+	{
+		$aFields = array();
+		$aList = MetaModel::GetZListItems($sClassName, 'standard_search');
+		$aAttrDefs = MetaModel::ListAttributeDefs($sClassName);
+		foreach($aList as $sFilterCode)
+		{
+			$aField = array();
+			$aField['code'] = $sFilterCode;
+			$aField['class'] = $sClassName;
+			$aField['class_alias'] = $sClassName;
+			$aField['label'] = Dict::S('Class:'.$sClassName.'/Attribute:'.$sFilterCode);
+		}
+
+		return $aFields;
+	}
+
+}
\ No newline at end of file
diff --git a/test/ItopDataTestCase.php b/test/ItopDataTestCase.php
index 454a5197f..51be8c1c1 100644
--- a/test/ItopDataTestCase.php
+++ b/test/ItopDataTestCase.php
@@ -92,14 +92,6 @@ class ItopDataTestCase extends ItopTestCase
 		return $this->testOrgId;
 	}
 
-    /**
-     * PHPUnit complains that there is no test... so here is a dummy one.
-     */
-    public function testDummy()
-    {
-        $this->assertTrue(true);
-    }
-
     /////////////////////////////////////////////////////////////////////////////
     /// Database Utilities
     /////////////////////////////////////////////////////////////////////////////
diff --git a/test/application/search/SearchFormTest.php b/test/application/search/SearchFormTest.php
new file mode 100644
index 000000000..69f257ff0
--- /dev/null
+++ b/test/application/search/SearchFormTest.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright (C) 2010-2018 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ *  iTop is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with iTop. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+
+namespace Combodo\iTop\Test\UnitTest\Application\Search;
+
+use Combodo\iTop\Application\Search\SearchForm;
+use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
+use Exception;
+
+class SearchFormTest extends ItopDataTestCase
+{
+
+	/**
+	 * @throws Exception
+	 */
+	protected function setUp()
+	{
+		parent::setUp();
+
+		require_once(APPROOT."sources/application/search/searchform.class.php");
+	}
+
+	public function testGetFields()
+	{
+		$this->debug(SearchForm::GetFields('Contact'));
+	}
+}

From e496ab06b2cc672dc807cee5a93c6a638242bab9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Wed, 7 Mar 2018 16:10:09 +0000
Subject: [PATCH 003/202] Advanced Search

SVN:b1162[5388]
---
 application/cmdbabstract.class.inc.php        | 231 +--------
 core/attributedef.class.inc.php               |  18 +
 core/oql/expression.class.inc.php             | 441 ++++++++++++++++--
 .../search/searchform.class.inc.php           | 206 ++++++++
 .../application/search/searchform.class.php   |  63 ---
 test/application/search/SearchFormTest.php    |  39 +-
 6 files changed, 656 insertions(+), 342 deletions(-)
 create mode 100644 sources/application/search/searchform.class.inc.php
 delete mode 100644 sources/application/search/searchform.class.php

diff --git a/application/cmdbabstract.class.inc.php b/application/cmdbabstract.class.inc.php
index 4a34a2f97..429cd435c 100644
--- a/application/cmdbabstract.class.inc.php
+++ b/application/cmdbabstract.class.inc.php
@@ -45,6 +45,7 @@ require_once(APPROOT.'/application/ui.extkeywidget.class.inc.php');
 require_once(APPROOT.'/application/ui.htmleditorwidget.class.inc.php');
 require_once(APPROOT.'/application/datatable.class.inc.php');
 require_once(APPROOT.'/sources/renderer/console/consoleformrenderer.class.inc.php');
+require_once(APPROOT.'/sources/application/search/searchform.class.inc.php');
 
 abstract class cmdbAbstractObject extends CMDBObject implements iDisplay
 {
@@ -1530,235 +1531,7 @@ EOF
 	
 	public static function GetSearchForm(WebPage $oPage, CMDBObjectSet $oSet, $aExtraParams = array())
 	{
-		static $iSearchFormId = 0;
-		$bMultiSelect = false;
-		$oAppContext = new ApplicationContext();
-		$sHtml = '';
-		$numCols=4;
-		$sClassName = $oSet->GetFilter()->GetClass();
-
-		// Romain: temporarily removed the tab "OQL query" because it was not finalized
-		// (especially when used to add a link)
-		/*
-		$sHtml .= "<div class=\"mini_tabs\" id=\"mini_tabs{$iSearchFormId}\"><ul>
-					<li><a href=\"#\" onClick=\"$('div.mini_tab{$iSearchFormId}').toggle();$('#mini_tabs{$iSearchFormId} ul li a').toggleClass('selected');\">".Dict::S('UI:OQLQueryTab')."</a></li>
-					<li><a class=\"selected\" href=\"#\" onClick=\"$('div.mini_tab{$iSearchFormId}').toggle();$('#mini_tabs{$iSearchFormId} ul li a').toggleClass('selected');\">".Dict::S('UI:SimpleSearchTab')."</a></li>
-					</ul></div>\n";
-		*/
-		// Simple search form
-		if (isset($aExtraParams['currentId']))
-		{
-			$sSearchFormId = $aExtraParams['currentId'];
-		}
-		else
-		{
-			$iSearchFormId = $oPage->GetUniqueId();
-			$sSearchFormId = 'SimpleSearchForm'.$iSearchFormId;
-			$sHtml .= "<div id=\"ds_$sSearchFormId\" class=\"mini_tab{$iSearchFormId}\">\n";			
-		}
-		// Check if the current class has some sub-classes
-		if (isset($aExtraParams['baseClass']))
-		{
-			$sRootClass = $aExtraParams['baseClass'];
-		}
-		else
-		{
-			$sRootClass = $sClassName;
-		}
-		$aSubClasses = MetaModel::GetSubclasses($sRootClass);
-		if (count($aSubClasses) > 0)
-		{
-			$aOptions = array();
-			$aOptions[MetaModel::GetName($sRootClass)] = "<option value=\"$sRootClass\">".MetaModel::GetName($sRootClass)."</options>\n";
-			foreach($aSubClasses as $sSubclassName)
-			{
-				$aOptions[MetaModel::GetName($sSubclassName)] = "<option value=\"$sSubclassName\">".MetaModel::GetName($sSubclassName)."</options>\n";
-			}
-			$aOptions[MetaModel::GetName($sClassName)] = "<option selected value=\"$sClassName\">".MetaModel::GetName($sClassName)."</options>\n";
-			ksort($aOptions);
-			$sContext = $oAppContext->GetForLink();
-			$sClassesCombo = "<select name=\"class\" onChange=\"ReloadSearchForm('$sSearchFormId', this.value, '$sRootClass', '$sContext')\">\n".implode('', $aOptions)."</select>\n";
-		}
-		else
-		{
-			$sClassesCombo = MetaModel::GetName($sClassName);
-		}
-		$oUnlimitedFilter = new DBObjectSearch($sClassName);
-		$sAction = (isset($aExtraParams['action'])) ? $aExtraParams['action'] : utils::GetAbsoluteUrlAppRoot().'pages/UI.php';
-		$sHtml .= "<form id=\"fs_{$sSearchFormId}\" action=\"{$sAction}\">\n"; // Don't use $_SERVER['SCRIPT_NAME'] since the form may be called asynchronously (from ajax.php)
-		$sHtml .= "<h2>".Dict::Format('UI:SearchFor_Class_Objects', $sClassesCombo)."</h2>\n";
-		$index = 0;
-		$sHtml .= "<div>\n";
-		$aMapCriteria = array();
-		$aList = MetaModel::GetZListItems($sClassName, 'standard_search');
-		$aConsts = $oSet->ListConstantFields(); // Some fields are constants based on the query/context
-		$sClassAlias = $oSet->GetFilter()->GetClassAlias();
-		foreach($aList as $sFilterCode)
-		{
-			//$oAppContext->Reset($sFilterCode); // Make sure the same parameter will not be passed twice
-			$sHtml .= '<div class="SearchAttribute" style="white-space: nowrap;padding:5px;display:inline-block;">';
-			$sFilterValue = isset($aConsts[$sClassAlias][$sFilterCode]) ? $aConsts[$sClassAlias][$sFilterCode] : '';
-			$sFilterValue = utils::ReadParam($sFilterCode, $sFilterValue, false, 'raw_data');
-			$sFilterOpCode = null; // Use the default 'loose' OpCode
-			if (empty($sFilterValue))
-			{
-				if (isset($aMapCriteria[$sFilterCode]))
-				{
-					if (count($aMapCriteria[$sFilterCode]) > 1)
-					{
-						$sFilterValue = Dict::S('UI:SearchValue:Mixed');
-					}
-					else
-					{
-						$sFilterValue = $aMapCriteria[$sFilterCode][0]['value'];
-						$sFilterOpCode = $aMapCriteria[$sFilterCode][0]['opcode'];
-					}
-					// Todo: Investigate...
-					if ($sFilterCode != 'company')
-					{
-						$oUnlimitedFilter->AddCondition($sFilterCode, $sFilterValue, $sFilterOpCode);
-					}
-				}
-			}
-
-			$oAttDef = MetaModel::GetAttributeDef($sClassName, $sFilterCode);
-			if ($oAttDef->IsExternalKey(EXTKEY_ABSOLUTE))
-			{
-				$oKeyAttDef = $oAttDef->GetFinalAttDef();
-				$sKeyAttClass = $oKeyAttDef->GetHostClass();
-				$sKeyAttCode = $oKeyAttDef->GetCode();
-
-				$sTargetClass = $oKeyAttDef->GetTargetClass();
-				$oSearch = new DBObjectSearch($sTargetClass);
-				$oSearch->SetModifierProperty('UserRightsGetSelectFilter', 'bSearchMode', true);
-				$oAllowedValues = new DBObjectSet($oSearch);
-
-				$iFieldSize = $oKeyAttDef->GetMaxSize();
-				$iMaxComboLength = $oKeyAttDef->GetMaximumComboLength();
-				$sHtml .= "<label>".MetaModel::GetFilterLabel($sKeyAttClass, $sKeyAttCode).":</label>&nbsp;";
-				$aExtKeyParams = $aExtraParams;
-				$aExtKeyParams['iFieldSize'] = $oKeyAttDef->GetMaxSize();
-				$aExtKeyParams['iMinChars'] = $oKeyAttDef->GetMinAutoCompleteChars();
-				$sHtml .= UIExtKeyWidget::DisplayFromAttCode($oPage, $sKeyAttCode, $sKeyAttClass, $oAttDef->GetLabel(), $oAllowedValues, $sFilterValue, $sSearchFormId.'search_'.$sFilterCode, false, $sFilterCode, '', $aExtKeyParams, true);
-			}
-			else
-			{
-				$aAllowedValues = MetaModel::GetAllowedValues_flt($sClassName, $sFilterCode, $aExtraParams);
-				if (is_null($aAllowedValues))
-				{
-					// Any value is possible, display an input box
-					$sHtml .= "<label>".MetaModel::GetFilterLabel($sClassName, $sFilterCode).":</label>&nbsp;<input class=\"textSearch\" name=\"$sFilterCode\" value=\"".htmlentities($sFilterValue, ENT_QUOTES, 'utf-8')."\"/>\n";
-				}
-				else
-				{
-					//Enum field, display a multi-select combo
-					$sValue = "<select class=\"multiselect\" size=\"1\" name=\"{$sFilterCode}[]\" multiple>\n";
-					$bMultiSelect = true;
-					//$sValue .= "<option value=\"\">".Dict::S('UI:SearchValue:Any')."</option>\n";
-					asort($aAllowedValues);
-					foreach($aAllowedValues as $key => $value)
-					{
-						if (is_array($sFilterValue) && in_array($key, $sFilterValue))
-						{
-							$sSelected = ' selected';
-						}
-						else if ($sFilterValue == $key)
-						{
-							$sSelected = ' selected';
-						}
-						else
-						{
-							$sSelected = '';
-						}
-						$sValue .= "<option value=\"$key\"$sSelected>$value</option>\n";
-					}
-					$sValue .= "</select>\n";
-					$sHtml .= "<label>".MetaModel::GetFilterLabel($sClassName, $sFilterCode).":</label>&nbsp;$sValue\n";
-				}				
-			}
-			unset($aExtraParams[$sFilterCode]);
-			
-			// Finally, add a tooltip if one is defined for this attribute definition
-			$sTip = $oAttDef->GetHelpOnSmartSearch();
-			if (strlen($sTip) > 0)
-			{
-				$sTip = addslashes($sTip);
-				$sTip = str_replace(array("\n", "\r"), " ", $sTip);
-				// :input does represent in form visible input (INPUT, SELECT, TEXTAREA)
-				$oPage->add_ready_script("$('form#fs_$sSearchFormId :input[name={$sFilterCode}]').qtip( { content: '$sTip', show: 'mouseover', hide: 'mouseout', style: { name: 'dark', tip: 'leftTop' }, position: { corner: { target: 'rightMiddle', tooltip: 'leftTop' }} } );");
-			}
-			$index++;
-			$sHtml .= '</div> ';
-		}
-		$sHtml .= "</div>\n";
-		$sHtml .= "<p align=\"right\"><input type=\"submit\" value=\"".Dict::S('UI:Button:Search')."\"></p>\n";
-		if (isset($aExtraParams['table_id']))
-		{
-			// Rename to avoid collisions...
-			$aExtraParams['_table_id_'] = $aExtraParams['table_id'];
-			unset($aExtraParams['table_id']);
-		}
-		foreach($aExtraParams as $sName => $sValue)
-		{
-			if (is_scalar($sValue))
-			{
-				$sHtml .= "<input type=\"hidden\" name=\"$sName\" value=\"".htmlentities($sValue, ENT_QUOTES, 'UTF-8')."\" />\n";
-			}
-		}
-		$sHtml .= "<input type=\"hidden\" name=\"class\" value=\"$sClassName\" />\n";
-		$sHtml .= "<input type=\"hidden\" name=\"dosearch\" value=\"1\" />\n";
-		$sHtml .= "<input type=\"hidden\" name=\"operation\" value=\"search_form\" />\n";
-		$sHtml .= $oAppContext->GetForForm();
-		$sHtml .= "</form>\n";		
-		if (!isset($aExtraParams['currentId']))
-		{
-			$sHtml .= "</div><!-- Simple search form -->\n";
-		}
-		if ($bMultiSelect)
-		{
-			$aOptions = array(
-				'header' => true,
-				'checkAllText' => Dict::S('UI:SearchValue:CheckAll'),
-				'uncheckAllText' => Dict::S('UI:SearchValue:UncheckAll'),
-				'noneSelectedText' => Dict::S('UI:SearchValue:Any'),
-				'selectedText' => Dict::S('UI:SearchValue:NbSelected'),
-				'selectedList' => 1,
-			);
-			$sJSOptions = json_encode($aOptions);
-			$oPage->add_ready_script("$('.multiselect').multiselect($sJSOptions);");
-		}
-/*
-		// OQL query builder
-		$sHtml .= "<div id=\"OQLQuery{$iSearchFormId}\" style=\"display:none\" class=\"mini_tab{$iSearchFormId}\">\n";
-		$sHtml .= "<h1>".Dict::S('UI:OQLQueryBuilderTitle')."</h1>\n";
-		$sHtml .= "<form id=\"formOQL{$iSearchFormId}\"><table style=\"width:80%;\"><tr style=\"vertical-align:top\">\n";
-		$sHtml .= "<td style=\"text-align:right\"><label>SELECT&nbsp;</label><select name=\"oql_class\">";
-		$aClasses = MetaModel::EnumChildClasses($sClassName, ENUM_CHILD_CLASSES_ALL);
-		$sSelectedClass = utils::ReadParam('oql_class', $sClassName, false, 'class');
-		$sOQLClause = utils::ReadParam('oql_clause', '', false, 'raw_data');
-		asort($aClasses);
-		foreach($aClasses as $sChildClass)
-		{
-			$sSelected = ($sChildClass == $sSelectedClass) ? 'selected' : '';
-			$sHtml.= "<option value=\"$sChildClass\" $sSelected>".MetaModel::GetName($sChildClass)."</option>\n";
-		}
-		$sHtml .= "</select>&nbsp;</td><td>\n";
-		$sHtml .= "<textarea name=\"oql_clause\" style=\"width:100%\">$sOQLClause</textarea></td></tr>\n";
-		$sHtml .= "<tr><td colspan=\"2\" style=\"text-align:right\"><input type=\"submit\" value=\"".Dict::S('UI:Button:Query')."\"></td></tr>\n";
-		$sHtml .= "<input type=\"hidden\" name=\"dosearch\" value=\"1\" />\n";
-		foreach($aExtraParams as $sName => $sValue)
-		{
-			if (is_scalar($sValue))
-			{
-				$sHtml .= "<input type=\"hidden\" name=\"$sName\" value=\"$sValue\" />\n";
-			}
-		}
-		$sHtml .= "<input type=\"hidden\" name=\"operation\" value=\"search_oql\" />\n";
-		$sHtml .= $oAppContext->GetForForm();
-		$sHtml .= "</table></form>\n";
-		$sHtml .= "</div><!-- OQL query form -->\n";
-*/
-		return $sHtml;
+		return \Combodo\iTop\Application\Search\SearchForm::GetSearchForm($oPage, $oSet, $aExtraParams);
 	}
 
 	/**
diff --git a/core/attributedef.class.inc.php b/core/attributedef.class.inc.php
index 300e70a0c..1f4d439e7 100644
--- a/core/attributedef.class.inc.php
+++ b/core/attributedef.class.inc.php
@@ -111,6 +111,8 @@ define('LINKSET_EDITMODE_ADDREMOVE', 4); // The "linked" objects can be added/re
  */
 abstract class AttributeDefinition
 {
+	const SEARCH_WIDGET_TYPE = 'raw';
+
 	public function GetType()
 	{
 		return Dict::S('Core:'.get_class($this));
@@ -122,6 +124,16 @@ abstract class AttributeDefinition
 
 	abstract public function GetEditClass();
 
+	/**
+	 * Return the search widget type corresponding to this attribute
+	 *
+	 * @return string
+	 */
+	public function GetSearchType()
+	{
+		return static::SEARCH_WIDGET_TYPE;
+	}
+
 	protected $m_sCode;
 	private $m_aParams = array();
 	protected $m_sHostClass = '!undefined!';
@@ -2085,6 +2097,8 @@ class AttributeBoolean extends AttributeInteger
  */
 class AttributeString extends AttributeDBField
 {
+	const SEARCH_WIDGET_TYPE = 'string';
+
 	static public function ListExpectedParams()
 	{
 		return parent::ListExpectedParams();
@@ -3433,6 +3447,8 @@ class AttributeTemplateHTML extends AttributeText
  */
 class AttributeEnum extends AttributeString
 {
+	const SEARCH_WIDGET_TYPE = 'enum';
+
 	static public function ListExpectedParams()
 	{
 		return parent::ListExpectedParams();
@@ -4526,6 +4542,8 @@ class AttributeDeadline extends AttributeDateTime
  */
 class AttributeExternalKey extends AttributeDBFieldVoid
 {
+	const SEARCH_WIDGET_TYPE = 'external_key';
+
 	static public function ListExpectedParams()
 	{
 		return array_merge(parent::ListExpectedParams(), array("targetclass", "is_null_allowed", "on_target_delete"));
diff --git a/core/oql/expression.class.inc.php b/core/oql/expression.class.inc.php
index 80db27c07..65ba8ea7b 100644
--- a/core/oql/expression.class.inc.php
+++ b/core/oql/expression.class.inc.php
@@ -1,5 +1,5 @@
 <?php
-// Copyright (c) 2010-2017 Combodo SARL
+// Copyright (c) 2010-2018 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -21,11 +21,12 @@ class MissingQueryArgument extends CoreException
 {
 }
 
+
 abstract class Expression
 {
 	/**
 	 * Perform a deep clone (as opposed to "clone" which does copy a reference to the underlying objects)
-	 **/	 	
+	 **/
 	public function DeepClone()
 	{
 		return unserialize(serialize($this));
@@ -38,6 +39,16 @@ abstract class Expression
 	// recursive rendering (aArgs used as input by default, or used as output if bRetrofitParams set to True
 	abstract public function Render(&$aArgs = null, $bRetrofitParams = false);
 
+	/**
+	 * @param DBObjectSearch $oSearch
+	 * @param array $aArgs
+	 * @param bool $bRetrofitParams
+	 * @param AttributeDefinition $oAttDef
+	 *
+	 * @return array parameters for the search form
+	 */
+	abstract public function Display($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null);
+
 	/**
 	 * Recursively browse the expression tree
 	 * @param Closure $callback
@@ -46,7 +57,7 @@ abstract class Expression
 	abstract public function Browse(Closure $callback);
 
 	abstract public function ApplyParameters($aArgs);
-	
+
 	// recursively builds an array of class => fieldname
 	abstract public function ListRequiredFields();
 
@@ -54,10 +65,10 @@ abstract class Expression
 	abstract public function CollectUsedParents(&$aTable);
 
 	abstract public function IsTrue();
-	
+
 	// recursively builds an array of [classAlias][fieldName] => value
 	abstract public function ListConstantFields();
-	
+
 	public function RequiresField($sClass, $sFieldName)
 	{
 		// #@# todo - optimize : this is called quite often when building a single query !
@@ -71,6 +82,12 @@ abstract class Expression
 		return base64_encode($this->Render());
 	}
 
+	/**
+	 * @param $sValue
+	 *
+	 * @return Expression
+	 * @throws OQLException
+	 */
 	static public function unserialize($sValue)
 	{
 		return self::FromOQL(base64_decode($sValue));
@@ -119,22 +136,56 @@ abstract class Expression
 	{
 		return new BinaryExpression($this, 'OR', $oExpr);
 	}
-	
+
 	abstract public function RenameParam($sOldName, $sNewName);
 	abstract public function RenameAlias($sOldName, $sNewName);
 
 	/**
 	 * Make the most relevant label, given the value of the expression
-	 * 	 
-	 * @param DBSearch oFilter The context in which this expression has been used	 	
-	 * @param string sValue The value returned by the query, for this expression	 	
-	 * @param string sDefault The default value if no relevant label could be computed	 	
+	 *
+	 * @param DBSearch oFilter The context in which this expression has been used
+	 * @param string sValue The value returned by the query, for this expression
+	 * @param string sDefault The default value if no relevant label could be computed
+	 *
 	 * @return The label
-	 */	
+	 */
 	public function MakeValueLabel($oFilter, $sValue, $sDefault)
 	{
 		return $sDefault;
 	}
+
+	public function GetCriterion($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
+	{
+		return array(
+			'widget' => AttributeDefinition::SEARCH_WIDGET_TYPE,
+			'oql' => $this->Render($aArgs, $bRetrofitParams),
+			'source' => get_class($this),
+		);
+	}
+
+	/**
+	 * Split binary expression on given operator
+	 *
+	 * @param Expression $oExpr
+	 * @param string $sOperator
+	 * @param array $aAndExpr
+	 *
+	 * @return array of expressions
+	 */
+	public static function Split($oExpr, $sOperator = 'AND', &$aAndExpr = array())
+	{
+		if (($oExpr instanceof BinaryExpression) && ($oExpr->GetOperator() == $sOperator))
+		{
+			static::Split($oExpr->GetLeftExpr(), $sOperator, $aAndExpr);
+			static::Split($oExpr->GetRightExpr(), $sOperator, $aAndExpr);
+		}
+		else
+		{
+			$aAndExpr[] = $oExpr;
+		}
+
+		return $aAndExpr;
+	}
 }
 
 class SQLExpression extends Expression
@@ -151,6 +202,11 @@ class SQLExpression extends Expression
 		return false;
 	}
 
+	public function Display($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
+	{
+		return $this->Render($aArgs, $bRetrofitParams);
+	}
+
 	// recursive rendering
 	public function Render(&$aArgs = null, $bRetrofitParams = false)
 	{
@@ -165,7 +221,7 @@ class SQLExpression extends Expression
 	public function ApplyParameters($aArgs)
 	{
 	}
-	
+
 	public function GetUnresolvedFields($sAlias, &$aUnresolved)
 	{
 	}
@@ -183,12 +239,12 @@ class SQLExpression extends Expression
 	public function CollectUsedParents(&$aTable)
 	{
 	}
-	
+
 	public function ListConstantFields()
 	{
 		return array();
 	}
-	
+
 	public function RenameParam($sOldName, $sNewName)
 	{
 		// Do nothing, since there is nothing to rename
@@ -244,7 +300,7 @@ class BinaryExpression extends Expression
 		}
 		return false;
 	}
-	
+
 	public function GetLeftExpr()
 	{
 		return $this->m_oLeftExpr;
@@ -260,6 +316,27 @@ class BinaryExpression extends Expression
 		return $this->m_sOperator;
 	}
 
+	// recursive rendering
+	public function Display($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
+	{
+		$sOperator = Dict::S($this->GetOperator(), " {$this->GetOperator()} ");
+		$oLeftExpr = $this->GetLeftExpr();
+		if ($oLeftExpr instanceof FieldExpression)
+		{
+			$oAttDef = $oLeftExpr->GetAttDef($oSearch->GetJoinedClasses());
+		}
+		$oRightExpr = $this->GetRightExpr();
+		if ($oRightExpr instanceof FieldExpression)
+		{
+			$oAttDef = $oRightExpr->GetAttDef($oSearch->GetJoinedClasses());
+		}
+
+		$sLeft = $oLeftExpr->Display($oSearch, $aArgs, $bRetrofitParams, $oAttDef);
+		$sRight = $oRightExpr->Display($oSearch, $aArgs, $bRetrofitParams, $oAttDef);
+
+		return "({$sLeft}{$sOperator}{$sRight})";
+	}
+
 	// recursive rendering
 	public function Render(&$aArgs = null, $bRetrofitParams = false)
 	{
@@ -295,7 +372,7 @@ class BinaryExpression extends Expression
 			$this->m_oRightExpr->ApplyParameters($aArgs);
 		}
 	}
-	
+
 	public function GetUnresolvedFields($sAlias, &$aUnresolved)
 	{
 		$this->GetLeftExpr()->GetUnresolvedFields($sAlias, $aUnresolved);
@@ -321,7 +398,7 @@ class BinaryExpression extends Expression
 		$this->GetLeftExpr()->CollectUsedParents($aTable);
 		$this->GetRightExpr()->CollectUsedParents($aTable);
 	}
-	
+
 	/**
 	 * List all constant expression of the form <field> = <scalar> or <field> = :<variable>
 	 * Could be extended to support <field> = <function><constant_expression>
@@ -355,7 +432,7 @@ class BinaryExpression extends Expression
 		}
 		return $aResult;
 	}
-	
+
 	public function RenameParam($sOldName, $sNewName)
 	{
 		$this->GetLeftExpr()->RenameParam($sOldName, $sNewName);
@@ -367,6 +444,41 @@ class BinaryExpression extends Expression
 		$this->GetLeftExpr()->RenameAlias($sOldName, $sNewName);
 		$this->GetRightExpr()->RenameAlias($sOldName, $sNewName);
 	}
+
+
+	public function GetCriterion($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
+	{
+		$oLeftExpr = $this->GetLeftExpr();
+		$oRightExpr = $this->GetRightExpr();
+		if ($oLeftExpr instanceof FieldExpression && $oRightExpr instanceof FieldExpression)
+		{
+			// Default criterion (Field OPE Field) is not supported
+			return parent::GetCriterion($oSearch, $aArgs, $bRetrofitParams, $oAttDef);
+		}
+		if ($oLeftExpr instanceof FieldExpression)
+		{
+			$oAttDef = $oLeftExpr->GetAttDef($oSearch->GetJoinedClasses());
+		}
+		if ($oRightExpr instanceof FieldExpression)
+		{
+			$oAttDef = $oRightExpr->GetAttDef($oSearch->GetJoinedClasses());
+		}
+
+		if (is_null($oAttDef))
+		{
+			return parent::GetCriterion($oSearch, $aArgs, $bRetrofitParams, $oAttDef);
+		}
+
+		$aCriteriaLeft = $oLeftExpr->GetCriterion($oSearch, $aArgs, $bRetrofitParams, $oAttDef);
+		$aCriteriaRight = $oRightExpr->GetCriterion($oSearch, $aArgs, $bRetrofitParams, $oAttDef);
+
+		$aCriteria = array_merge($aCriteriaLeft, $aCriteriaRight);
+
+		$aCriteria['operator'] = $this->GetOperator();
+		$aCriteria['oql'] = $this->Render($aArgs, $bRetrofitParams);
+
+		return $aCriteria;
+	}
 }
 
 
@@ -390,6 +502,11 @@ class UnaryExpression extends Expression
 		return $this->m_value;
 	}
 
+	public function Display($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
+	{
+		return $this->Render($aArgs, $bRetrofitParams);
+	}
+
 	// recursive rendering
 	public function Render(&$aArgs = null, $bRetrofitParams = false)
 	{
@@ -404,7 +521,7 @@ class UnaryExpression extends Expression
 	public function ApplyParameters($aArgs)
 	{
 	}
-	
+
 	public function GetUnresolvedFields($sAlias, &$aUnresolved)
 	{
 	}
@@ -427,7 +544,7 @@ class UnaryExpression extends Expression
 	{
 		return array();
 	}
-	
+
 	public function RenameParam($sOldName, $sNewName)
 	{
 		// Do nothing
@@ -451,6 +568,39 @@ class ScalarExpression extends UnaryExpression
 		parent::__construct($value);
 	}
 
+	/**
+	 * @param array $oSearch
+	 * @param array $aArgs
+	 * @param bool $bRetrofitParams
+	 * @param AttributeDefinition $oAttDef
+	 *
+	 * @return array|string
+	 * @throws Exception
+	 */
+	public function Display($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
+	{
+		if (!is_null($oAttDef))
+		{
+			if ($oAttDef->IsExternalKey())
+			{
+				try
+				{
+					/** @var AttributeExternalKey $oAttDef */
+					$sTarget = $oAttDef->GetTargetClass();
+					$oObj = MetaModel::GetObject($sTarget, $this->m_value);
+
+					return $oObj->Get("friendlyname");
+				} catch (CoreException $e)
+				{
+				}
+			}
+
+			return $oAttDef->GetAsPlainText($this->m_value);
+		}
+
+		return $this->Render($aArgs, $bRetrofitParams);
+	}
+
 	// recursive rendering
 	public function Render(&$aArgs = null, $bRetrofitParams = false)
 	{
@@ -469,6 +619,37 @@ class ScalarExpression extends UnaryExpression
 	{
 		return clone $this;
 	}
+
+	public function GetCriterion($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
+	{
+		$aValue = array('value' => $this->GetValue());
+		if (!is_null($oAttDef))
+		{
+			switch (true)
+			{
+				case $oAttDef->IsExternalKey():
+					try
+					{
+						/** @var AttributeExternalKey $oAttDef */
+						$sTarget = $oAttDef->GetTargetClass();
+						$oObj = MetaModel::GetObject($sTarget, $this->GetValue());
+
+						$aValue['label'] = $oObj->Get("friendlyname");
+
+					} catch (Exception $e)
+					{
+						IssueLog::Error($e->getMessage());
+					}
+					break;
+				default:
+					$aValue['label'] = $oAttDef->GetAsPlainText($this->GetValue());
+					break;
+			}
+		}
+
+		return array('values' => array($aValue));
+	}
+
 }
 
 class TrueExpression extends ScalarExpression
@@ -525,6 +706,43 @@ class FieldExpression extends UnaryExpression
 		$this->m_value = $sParent.'.'.$this->m_sName;
 	}
 
+	private function GetClassName($aClasses = array())
+	{
+		if (isset($aClasses[$this->m_sParent]))
+		{
+			return $aClasses[$this->m_sParent];
+		}
+		else
+		{
+			return $this->m_sParent;
+		}
+	}
+
+	/**
+	 * @param DBObjectSearch $oSearch
+	 * @param array $aArgs
+	 * @param bool $bRetrofitParams
+	 * @param AttributeDefinition $oAttDef
+	 *
+	 * @return array|string
+	 * @throws Exception
+	 */
+	public function Display($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
+	{
+		if (empty($this->m_sParent))
+		{
+			return "`{$this->m_sName}`";
+		}
+		$sClass = $this->GetClassName($oSearch->GetJoinedClasses());
+		$sAttName = MetaModel::GetLabel($sClass, $this->m_sName);
+		if ($sClass != $oSearch->GetClass())
+		{
+			$sAttName = MetaModel::GetName($sClass).':'.$sAttName;
+		}
+
+		return $sAttName;
+	}
+
 	// recursive rendering
 	public function Render(&$aArgs = null, $bRetrofitParams = false)
 	{
@@ -535,6 +753,22 @@ class FieldExpression extends UnaryExpression
 		return "`{$this->m_sParent}`.`{$this->m_sName}`";
 	}
 
+	public function GetAttDef($aClasses = array())
+	{
+		if (!empty($this->m_sParent))
+		{
+			$sClass = $this->GetClassName($aClasses);
+			$aAttDefs = MetaModel::ListAttributeDefs($sClass);
+			if (isset($aAttDefs[$this->m_sName]))
+			{
+				return $aAttDefs[$this->m_sName];
+			}
+		}
+
+		return null;
+	}
+
+
 	public function ListRequiredFields()
 	{
 		return array($this->m_sParent.'.'.$this->m_sName);
@@ -565,8 +799,9 @@ class FieldExpression extends UnaryExpression
 		if (!array_key_exists($this->m_sParent, $aTranslationData))
 		{
 			if ($bMatchAll) throw new CoreException('Unknown parent id in translation table', array('parent_id' => $this->m_sParent, 'translation_table' => array_keys($aTranslationData)));
+
 			return clone $this;
-		} 
+		}
 		if (!array_key_exists($this->m_sName, $aTranslationData[$this->m_sParent]))
 		{
 			if (!array_key_exists('*', $aTranslationData[$this->m_sParent]))
@@ -595,12 +830,13 @@ class FieldExpression extends UnaryExpression
 
 	/**
 	 * Make the most relevant label, given the value of the expression
-	 * 	 
-	 * @param DBSearch oFilter The context in which this expression has been used	 	
-	 * @param string sValue The value returned by the query, for this expression	 	
-	 * @param string sDefault The default value if no relevant label could be computed	 	
+	 *
+	 * @param DBSearch oFilter The context in which this expression has been used
+	 * @param string sValue The value returned by the query, for this expression
+	 * @param string sDefault The default value if no relevant label could be computed
+	 *
 	 * @return The label
-	 */	
+	 */
 	public function MakeValueLabel($oFilter, $sValue, $sDefault)
 	{
 		$sAttCode = $this->GetName();
@@ -646,6 +882,12 @@ class FieldExpression extends UnaryExpression
 			$this->m_sParent = $sNewName;
 		}
 	}
+
+
+	public function GetCriterion($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
+	{
+		return array('ref' => $this->GetParent().'.'.$this->GetName());
+	}
 }
 
 // Has been resolved into an SQL expression
@@ -678,7 +920,68 @@ class VariableExpression extends UnaryExpression
 		return false;
 	}
 
-	public function GetName() {return $this->m_sName;}
+	public function GetName()
+	{
+		return $this->m_sName;
+	}
+
+	public function Display($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
+	{
+		$sValue = $this->m_value;
+		if (!is_null($aArgs) && (array_key_exists($this->m_sName, $aArgs)))
+		{
+			$sValue = $aArgs[$this->m_sName];
+		}
+		elseif (($iPos = strpos($this->m_sName, '->')) !== false)
+		{
+			$sParamName = substr($this->m_sName, 0, $iPos);
+			$oObj = null;
+			$sAttCode = 'id';
+			if (array_key_exists($sParamName.'->object()', $aArgs))
+			{
+				$sAttCode = substr($this->m_sName, $iPos + 2);
+				$oObj = $aArgs[$sParamName.'->object()'];
+			}
+			elseif (array_key_exists($sParamName, $aArgs))
+			{
+				$sAttCode = substr($this->m_sName, $iPos + 2);
+				$oObj = $aArgs[$sParamName];
+			}
+			if (!is_null($oObj))
+			{
+				if ($sAttCode == 'id')
+				{
+					$sValue = $oObj->Get("friendlyname");
+				}
+				else
+				{
+					$sValue = $oObj->Get($sAttCode);
+				}
+
+				return $sValue;
+			}
+		}
+		if (!is_null($oAttDef))
+		{
+			if ($oAttDef->IsExternalKey())
+			{
+				try
+				{
+					/** @var AttributeExternalKey $oAttDef */
+					$sTarget = $oAttDef->GetTargetClass();
+					$oObj = MetaModel::GetObject($sTarget, $sValue);
+
+					return $oObj->Get("friendlyname");
+				} catch (CoreException $e)
+				{
+				}
+			}
+
+			return $oAttDef->GetAsPlainText($sValue);
+		}
+
+		return $this->Render($aArgs, $bRetrofitParams);
+	}
 
 	// recursive rendering
 	public function Render(&$aArgs = null, $bRetrofitParams = false)
@@ -729,7 +1032,7 @@ class VariableExpression extends UnaryExpression
 			$this->m_sName = $sNewName;
 		}
 	}
-	
+
 	public function GetAsScalar($aArgs)
 	{
 		$oRet = null;
@@ -798,6 +1101,11 @@ class ListExpression extends Expression
 		return $this->m_aExpressions;
 	}
 
+	public function Display($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
+	{
+		return $this->Render($aArgs, $bRetrofitParams);
+	}
+
 	// recursive rendering
 	public function Render(&$aArgs = null, $bRetrofitParams = false)
 	{
@@ -833,7 +1141,7 @@ class ListExpression extends Expression
 			}
 		}
 	}
-	
+
 	public function GetUnresolvedFields($sAlias, &$aUnresolved)
 	{
 		foreach ($this->m_aExpressions as $oExpr)
@@ -861,7 +1169,7 @@ class ListExpression extends Expression
 		}
 		return $aRes;
 	}
-	
+
 	public function CollectUsedParents(&$aTable)
 	{
 		foreach ($this->m_aExpressions as $oExpr)
@@ -879,7 +1187,7 @@ class ListExpression extends Expression
 		}
 		return $aRes;
 	}
-	
+
 	public function RenameParam($sOldName, $sNewName)
 	{
 		$aRes = array();
@@ -887,7 +1195,7 @@ class ListExpression extends Expression
 		{
 			$this->m_aExpressions[$key] = $oExpr->RenameParam($sOldName, $sNewName);
 		}
-	}	
+	}
 
 	public function RenameAlias($sOldName, $sNewName)
 	{
@@ -896,7 +1204,23 @@ class ListExpression extends Expression
 		{
 			$oExpr->RenameAlias($sOldName, $sNewName);
 		}
-	}	
+	}
+
+	public function GetCriterion($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
+	{
+		$aValues = array();
+
+		foreach($this->m_aExpressions as $oExpression)
+		{
+			$aCrit = $oExpression->GetCriterion($oSearch, $aArgs, $bRetrofitParams, $oAttDef);
+			if (array_key_exists('values', $aCrit))
+			{
+				$aValues = array_merge($aValues, $aCrit['values']);
+			}
+		}
+
+		return array('values' => $aValues);
+	}
 }
 
 
@@ -927,6 +1251,11 @@ class FunctionExpression extends Expression
 		return $this->m_aArgs;
 	}
 
+	public function Display($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
+	{
+		return $this->Render($aArgs, $bRetrofitParams);
+	}
+
 	// recursive rendering
 	public function Render(&$aArgs = null, $bRetrofitParams = false)
 	{
@@ -990,7 +1319,7 @@ class FunctionExpression extends Expression
 		}
 		return $aRes;
 	}
-	
+
 	public function CollectUsedParents(&$aTable)
 	{
 		foreach ($this->m_aArgs as $oExpr)
@@ -1008,7 +1337,7 @@ class FunctionExpression extends Expression
 		}
 		return $aRes;
 	}
-	
+
 	public function RenameParam($sOldName, $sNewName)
 	{
 		foreach ($this->m_aArgs as $key => $oExpr)
@@ -1027,12 +1356,13 @@ class FunctionExpression extends Expression
 
 	/**
 	 * Make the most relevant label, given the value of the expression
-	 * 	 
-	 * @param DBSearch oFilter The context in which this expression has been used	 	
-	 * @param string sValue The value returned by the query, for this expression	 	
-	 * @param string sDefault The default value if no relevant label could be computed	 	
+	 *
+	 * @param DBSearch oFilter The context in which this expression has been used
+	 * @param string sValue The value returned by the query, for this expression
+	 * @param string sDefault The default value if no relevant label could be computed
+	 *
 	 * @return The label
-	 */	
+	 */
 	public function MakeValueLabel($oFilter, $sValue, $sDefault)
 	{
 		static $aWeekDayToString = null;
@@ -1124,6 +1454,11 @@ class IntervalExpression extends Expression
 		return $this->m_sUnit;
 	}
 
+	public function Display($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
+	{
+		return $this->Render($aArgs, $bRetrofitParams);
+	}
+
 	// recursive rendering
 	public function Render(&$aArgs = null, $bRetrofitParams = false)
 	{
@@ -1147,7 +1482,7 @@ class IntervalExpression extends Expression
 			$this->m_oValue->ApplyParameters($aArgs);
 		}
 	}
-		
+
 	public function GetUnresolvedFields($sAlias, &$aUnresolved)
 	{
 		$this->m_oValue->GetUnresolvedFields($sAlias, $aUnresolved);
@@ -1171,16 +1506,16 @@ class IntervalExpression extends Expression
 	{
 		return array();
 	}
-	
+
 	public function RenameParam($sOldName, $sNewName)
 	{
 		$this->m_oValue->RenameParam($sOldName, $sNewName);
-	}	
+	}
 
 	public function RenameAlias($sOldName, $sNewName)
 	{
 		$this->m_oValue->RenameAlias($sOldName, $sNewName);
-	}	
+	}
 }
 
 class CharConcatExpression extends Expression
@@ -1203,6 +1538,11 @@ class CharConcatExpression extends Expression
 		return $this->m_aExpressions;
 	}
 
+	public function Display($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
+	{
+		return $this->Render($aArgs, $bRetrofitParams);
+	}
+
 	// recursive rendering
 	public function Render(&$aArgs = null, $bRetrofitParams = false)
 	{
@@ -1210,7 +1550,7 @@ class CharConcatExpression extends Expression
 		foreach ($this->m_aExpressions as $oExpr)
 		{
 			$sCol = $oExpr->Render($aArgs, $bRetrofitParams);
-			// Concat will be globally NULL if one single argument is null ! 
+			// Concat will be globally NULL if one single argument is null !
 			$aRes[] = "COALESCE($sCol, '')";
 		}
 		return "CAST(CONCAT(".implode(', ', $aRes).") AS CHAR)";
@@ -1293,7 +1633,7 @@ class CharConcatExpression extends Expression
 		{
 			$this->m_aExpressions[$key] = $oExpr->RenameParam($sOldName, $sNewName);
 		}
-	}	
+	}
 
 	public function RenameAlias($sOldName, $sNewName)
 	{
@@ -1301,7 +1641,7 @@ class CharConcatExpression extends Expression
 		{
 			$oExpr->RenameAlias($sOldName, $sNewName);
 		}
-	}	
+	}
 }
 
 
@@ -1315,6 +1655,10 @@ class CharConcatWSExpression extends CharConcatExpression
 		parent::__construct($aExpressions);
 	}
 
+	public function Display($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
+	{
+		return $this->Render($aArgs, $bRetrofitParams);
+	}
 	// recursive rendering
 	public function Render(&$aArgs = null, $bRetrofitParams = false)
 	{
@@ -1322,7 +1666,7 @@ class CharConcatWSExpression extends CharConcatExpression
 		foreach ($this->m_aExpressions as $oExpr)
 		{
 			$sCol = $oExpr->Render($aArgs, $bRetrofitParams);
-			// Concat will be globally NULL if one single argument is null ! 
+			// Concat will be globally NULL if one single argument is null !
 			$aRes[] = "COALESCE($sCol, '')";
 		}
 		$sSep = CMDBSource::Quote($this->m_separator);
@@ -1502,6 +1846,7 @@ class QueryBuilderExpressions
 		{
 			$this->m_aJoinFields[$index] = $oExpression->Translate($aTranslationData, $bMatchAll, $bMarkFieldsAsResolved);
 		}
+
 		foreach($this->m_aClassIds as $sClass => $oExpression)
 		{
 			$this->m_aClassIds[$sClass] = $oExpression->Translate($aTranslationData, $bMatchAll, $bMarkFieldsAsResolved);
diff --git a/sources/application/search/searchform.class.inc.php b/sources/application/search/searchform.class.inc.php
new file mode 100644
index 000000000..be14da78d
--- /dev/null
+++ b/sources/application/search/searchform.class.inc.php
@@ -0,0 +1,206 @@
+<?php
+/**
+ * Copyright (C) 2010-2018 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ *  iTop is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with iTop. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+
+namespace Combodo\iTop\Application\Search;
+
+
+use ApplicationContext;
+use AttributeDefinition;
+use CMDBObjectSet;
+use CoreException;
+use DBObjectSearch;
+use Dict;
+use Expression;
+use IssueLog;
+use MetaModel;
+use TrueExpression;
+use utils;
+use WebPage;
+
+class SearchForm
+{
+	public static function GetSearchForm(WebPage $oPage, CMDBObjectSet $oSet, $aExtraParams = array())
+	{
+		$sHtml = '';
+		$oAppContext = new ApplicationContext();
+		$sClassName = $oSet->GetFilter()->GetClass();
+
+		// Simple search form
+		if (isset($aExtraParams['currentId']))
+		{
+			$sSearchFormId = $aExtraParams['currentId'];
+		}
+		else
+		{
+			$iSearchFormId = $oPage->GetUniqueId();
+			$sSearchFormId = 'SimpleSearchForm'.$iSearchFormId;
+			$sHtml .= "<div id=\"ds_$sSearchFormId\" class=\"mini_tab{$iSearchFormId}\">\n";
+		}
+		// Check if the current class has some sub-classes
+		if (isset($aExtraParams['baseClass']))
+		{
+			$sRootClass = $aExtraParams['baseClass'];
+		}
+		else
+		{
+			$sRootClass = $sClassName;
+		}
+		$aSubClasses = MetaModel::GetSubclasses($sRootClass);
+		if (count($aSubClasses) > 0)
+		{
+			$aOptions = array();
+			$aOptions[MetaModel::GetName($sRootClass)] = "<option value=\"$sRootClass\">".MetaModel::GetName($sRootClass)."</options>\n";
+			foreach($aSubClasses as $sSubclassName)
+			{
+				$aOptions[MetaModel::GetName($sSubclassName)] = "<option value=\"$sSubclassName\">".MetaModel::GetName($sSubclassName)."</options>\n";
+			}
+			$aOptions[MetaModel::GetName($sClassName)] = "<option selected value=\"$sClassName\">".MetaModel::GetName($sClassName)."</options>\n";
+			ksort($aOptions);
+			$sContext = $oAppContext->GetForLink();
+			$sClassesCombo = "<select name=\"class\" onChange=\"ReloadSearchForm('$sSearchFormId', this.value, '$sRootClass', '$sContext')\">\n".implode('',
+					$aOptions)."</select>\n";
+		}
+		else
+		{
+			$sClassesCombo = MetaModel::GetName($sClassName);
+		}
+		$sAction = (isset($aExtraParams['action'])) ? $aExtraParams['action'] : utils::GetAbsoluteUrlAppRoot().'pages/UI.php';
+		$sHtml .= "<form id=\"fs_{$sSearchFormId}\" action=\"{$sAction}\">\n"; // Don't use $_SERVER['SCRIPT_NAME'] since the form may be called asynchronously (from ajax.php)
+		$sHtml .= "<h2>".Dict::Format('UI:SearchFor_Class_Objects', $sClassesCombo)."</h2>\n";
+		$sHtml .= "<div id=\"fs_{$sSearchFormId}_criterion_outer\">\n";
+		$sHtml .= "</div>\n";
+
+
+		$sPrimaryClassName = $oSet->GetClass();
+		$sPrimaryClassAlias = $oSet->GetClassAlias();
+
+
+		$aFields = self::GetFields($sPrimaryClassName, $sPrimaryClassAlias);
+		$oSearch = $oSet->GetFilter();
+		$aCriterion = self::GetCriterion($oSearch);
+
+		$oBaseSearch = $oSearch->DeepClone();
+		$oBaseSearch->ResetCondition();
+
+		$aSearchParams = array(
+			'criterion_outer_selector' => "#fs_{$sSearchFormId}_criterion_outer",
+			array(
+				'search' => array(
+					'fields' => $aFields,
+					'criterion' => $aCriterion,
+					'base_oql' => $oBaseSearch->ToOQL(),
+				)
+			),
+		);
+
+		$oPage->add_ready_script('$("fs_'.$sSearchFormId.'").search_form_handler('.json_encode($aSearchParams).');');
+
+		return $sHtml;
+	}
+
+	/**
+	 * @param $sClassName
+	 *
+	 * @param $sClassAlias
+	 *
+	 * @return array
+	 */
+	public static function GetFields($sClassName, $sClassAlias)
+	{
+		$aFields = array();
+		try
+		{
+			$aList = MetaModel::GetZListItems($sClassName, 'standard_search');
+			$aAttrDefs = MetaModel::ListAttributeDefs($sClassName);
+			foreach($aList as $sFilterCode)
+			{
+				$aField = array();
+				$aField['code'] = $sFilterCode;
+				$aField['class'] = $sClassName;
+				$aField['class_alias'] = $sClassAlias;
+				$aField['label'] = Dict::S('Class:'.$sClassName.'/Attribute:'.$sFilterCode);
+				if (array_key_exists($sFilterCode, $aAttrDefs))
+				{
+					$oAttrDef = $aAttrDefs[$sFilterCode];
+					$aField['widget'] = $oAttrDef->GetSearchType();
+					$aField['allowed_values'] = self::GetFieldAllowedValues($oAttrDef);
+				}
+				else
+				{
+					$aField['widget'] = AttributeDefinition::SEARCH_WIDGET_TYPE;
+				}
+				$aFields[$sClassAlias.'.'.$sFilterCode] = $aField;
+			}
+		} catch (CoreException $e)
+		{
+			IssueLog::Error($e->getMessage());
+		}
+
+		return $aFields;
+	}
+
+	/**
+	 * @param $oAttrDef
+	 *
+	 * @return array
+	 */
+	public static function GetFieldAllowedValues($oAttrDef)
+	{
+		if (method_exists($oAttrDef, 'GetAllowedValuesAsObjectSet'))
+		{
+			$oSet = $oAttrDef->GetAllowedValuesAsObjectSet();
+			if ($oSet->Count() > MetaModel::GetConfig()->Get('max_combo_length'))
+			{
+				return array('autocomplete' => true);
+			}
+		}
+
+		return array('values' => $oAttrDef->GetAllowedValues());
+	}
+
+	/**
+	 * @param DBObjectSearch $oSearch
+	 */
+	public static function GetCriterion($oSearch)
+	{
+		$oExpression = $oSearch->GetCriteria();
+
+		$aOrCriterion = array();
+		$aORExpressions = Expression::Split($oExpression, 'OR');
+		foreach($aORExpressions as $oORSubExpr)
+		{
+			$aAndCriterion = array();
+			$aAndExpressions = Expression::Split($oORSubExpr, 'AND');
+			foreach($aAndExpressions as $oAndSubExpr)
+			{
+				if ($oAndSubExpr instanceof TrueExpression)
+				{
+					continue;
+				}
+				$aAndCriterion[] = $oAndSubExpr->GetCriterion($oSearch);
+			}
+			$aOrCriterion[] = array('and' => $aAndCriterion);
+		}
+
+		return array('or' => $aOrCriterion);
+	}
+}
\ No newline at end of file
diff --git a/sources/application/search/searchform.class.php b/sources/application/search/searchform.class.php
deleted file mode 100644
index b81fdc097..000000000
--- a/sources/application/search/searchform.class.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/**
- * Copyright (C) 2010-2018 Combodo SARL
- *
- * This file is part of iTop.
- *
- *  iTop is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * iTop is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with iTop. If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-
-namespace Combodo\iTop\Application\Search;
-
-
-use CMDBObjectSet;
-use CoreException;
-use Dict;
-use MetaModel;
-use WebPage;
-
-class SearchForm
-{
-	public static function GetSearchForm(WebPage $oPage, CMDBObjectSet $oSet, $aExtraParams = array())
-	{
-		$sHtml = '';
-
-		return $sHtml;
-	}
-
-	/**
-	 * @param $sClassName
-	 *
-	 * @throws CoreException
-	 */
-	public static function GetFields($sClassName)
-	{
-		$aFields = array();
-		$aList = MetaModel::GetZListItems($sClassName, 'standard_search');
-		$aAttrDefs = MetaModel::ListAttributeDefs($sClassName);
-		foreach($aList as $sFilterCode)
-		{
-			$aField = array();
-			$aField['code'] = $sFilterCode;
-			$aField['class'] = $sClassName;
-			$aField['class_alias'] = $sClassName;
-			$aField['label'] = Dict::S('Class:'.$sClassName.'/Attribute:'.$sFilterCode);
-		}
-
-		return $aFields;
-	}
-
-}
\ No newline at end of file
diff --git a/test/application/search/SearchFormTest.php b/test/application/search/SearchFormTest.php
index 69f257ff0..695b6d159 100644
--- a/test/application/search/SearchFormTest.php
+++ b/test/application/search/SearchFormTest.php
@@ -36,11 +36,46 @@ class SearchFormTest extends ItopDataTestCase
 	{
 		parent::setUp();
 
-		require_once(APPROOT."sources/application/search/searchform.class.php");
+		require_once(APPROOT."sources/application/search/searchform.class.inc.php");
 	}
 
+	/**
+	 */
 	public function testGetFields()
 	{
-		$this->debug(SearchForm::GetFields('Contact'));
+		$aFields = SearchForm::GetFields('Contact', 'Contact');
+		$this->debug(json_encode($aFields, JSON_PRETTY_PRINT));
+		$this->assertCount(7, $aFields);
+
+		$oSearch = \DBSearch::FromOQL("SELECT Contact AS C WHERE C.status = 'active'");
+		$aFields = SearchForm::GetFields($oSearch->GetClass(), $oSearch->GetClassAlias());
+		$this->debug(json_encode($aFields, JSON_PRETTY_PRINT));
+	}
+
+	/**
+	 * @dataProvider GetCriterionProvider
+	 * @throws \OQLException
+	 */
+	public function testGetCriterion($sOQL, $iOrCount)
+	{
+		$aCriterion = SearchForm::GetCriterion(\DBObjectSearch::FromOQL($sOQL));
+		$this->debug($sOQL);
+		$this->debug(json_encode($aCriterion, JSON_PRETTY_PRINT));
+		$this->assertCount($iOrCount, $aCriterion['or']);
+	}
+
+	public function GetCriterionProvider()
+	{
+		return array(
+			array('OQL' => "SELECT Contact", 1),
+			array('OQL' => "SELECT Contact WHERE status = 'active'", 1),
+			array('OQL' => "SELECT Contact AS C WHERE C.status = 'active'", 1),
+			array('OQL' => "SELECT Contact WHERE status = 'active' AND name LIKE 'toto%'", 1),
+			array('OQL' => "SELECT Contact WHERE status = 'active' AND org_id = 3", 1),
+			array('OQL' => "SELECT Contact WHERE status IN ('active', 'inactive')", 1),
+			array('OQL' => "SELECT Contact WHERE status = 'active' OR name LIKE 'toto%'", 2),
+			array('OQL' => "SELECT UserRequest WHERE DATE_SUB(NOW(), INTERVAL 14 DAY) < start_date", 1),
+			array('OQL' => "SELECT UserRequest WHERE start_date > '2017-01-01' AND start_date < '2018-01-01'", 1),
+		);
 	}
 }

From b5bcfa8d90eefba10fc0d486c80a6c1de4ec07e9 Mon Sep 17 00:00:00 2001
From: Guillaume Lajarige <guillaume.lajarige@combodo.com>
Date: Wed, 7 Mar 2018 16:21:44 +0000
Subject: [PATCH 004/202] Advanced search: WIP...

SVN:b1162[5389]
---
 .../application/search/searchform.class.inc.php    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/sources/application/search/searchform.class.inc.php b/sources/application/search/searchform.class.inc.php
index be14da78d..76eeebf69 100644
--- a/sources/application/search/searchform.class.inc.php
+++ b/sources/application/search/searchform.class.inc.php
@@ -103,16 +103,16 @@ class SearchForm
 
 		$aSearchParams = array(
 			'criterion_outer_selector' => "#fs_{$sSearchFormId}_criterion_outer",
-			array(
-				'search' => array(
-					'fields' => $aFields,
-					'criterion' => $aCriterion,
-					'base_oql' => $oBaseSearch->ToOQL(),
-				)
+			'search' => array(
+				'fields' => $aFields,
+				'criterion' => $aCriterion,
+				'base_oql' => $oBaseSearch->ToOQL(),
 			),
 		);
 
-		$oPage->add_ready_script('$("fs_'.$sSearchFormId.'").search_form_handler('.json_encode($aSearchParams).');');
+		$oPage->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_handler.js');
+		$oPage->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria.js');
+		$oPage->add_ready_script('$("#fs_'.$sSearchFormId.'").search_form_handler('.json_encode($aSearchParams).');');
 
 		return $sHtml;
 	}

From 118b5c8a7d24ec01e2c2ced105abaaf6bcdf428d Mon Sep 17 00:00:00 2001
From: Guillaume Lajarige <guillaume.lajarige@combodo.com>
Date: Wed, 7 Mar 2018 16:43:20 +0000
Subject: [PATCH 005/202] Advanced search: Initializing javascript widgets.

SVN:b1162[5390]
---
 js/search/search_form_criteria.js | 155 ++++++++++++++++++
 js/search/search_form_handler.js  | 251 ++++++++++++++++++++++++++++++
 2 files changed, 406 insertions(+)
 create mode 100644 js/search/search_form_criteria.js
 create mode 100644 js/search/search_form_handler.js

diff --git a/js/search/search_form_criteria.js b/js/search/search_form_criteria.js
new file mode 100644
index 000000000..27d5e0a87
--- /dev/null
+++ b/js/search/search_form_criteria.js
@@ -0,0 +1,155 @@
+//iTop Search form criteria
+;
+$(function()
+{
+	// the widget definition, where 'itop' is the namespace,
+	// 'search_form_criteria' the widget name
+	$.widget( 'itop.search_form_criteria',
+	{
+		// default options
+		options:
+		{
+			handled_classes: [],
+			get_current_value_callback: 'getCurrentValue',
+			set_current_value_callback: function(me, oEvent, oData){ console.log('Search form criteria: set_current_value_callback must be overloaded, this is the default callback.'); },
+
+			ref: "",
+			operator: "=",
+			values: [],
+			oql: "",
+			is_removable: true,
+		},
+   
+		// the constructor
+		_create: function()
+		{
+			var me = this;
+			
+			this.element
+			.addClass('search_form_criteria');
+
+			// Get/SetCurrentValue callbacks handler
+			this.element
+				.bind('get_current_value set_current_value', function(oEvent, oData){
+					oEvent.stopPropagation();
+
+					var callback = me.options[oEvent.type+'_callback'];
+
+					if(typeof callback === 'string')
+					{
+						return me[callback](oEvent, oData);
+					}
+					else if(typeof callback === 'function')
+					{
+						return callback(me, oEvent, oData);
+					}
+					else
+					{
+						console.log('search form criteria: callback type must be a function or a existing function name of the widget');
+						return false;
+					}
+				});
+
+			this._prepareElement();
+		},
+		// called when created, and later when changing options
+		_refresh: function()
+		{
+
+		},
+		// events bound via _bind are removed automatically
+		// revert other modifications here
+		_destroy: function()
+		{
+			this.element
+			.removeClass('search_form_criteria');
+		},
+		// _setOptions is called with a hash of all options that are changing
+		// always refresh when changing options
+		_setOptions: function()
+		{
+			this._superApply(arguments);
+		},
+		// _setOption is called for each individual option that is changing
+		_setOption: function( key, value )
+		{
+			this._super( key, value );
+		},
+
+
+		getCurrentValue: function()
+		{
+			// TODO
+			// var value = null;
+			//
+			// this.element.find(':input').each(function(iIndex, oElem){
+			// 	if($(oElem).is(':hidden') || $(oElem).is(':text') || $(oElem).is(':password') || $(oElem).is('textarea'))
+			// 	{
+			// 		value = $(oElem).val();
+			// 	}
+			// 	else if($(oElem).is('select'))
+			// 	{
+			// 		if($(oElem).is('select[multiple]'))
+			// 		{
+			// 			value = [];
+			// 			$(oElem).find('option:selected').each(function(){
+			// 				value.push($(this).val());
+			// 			});
+			// 		}
+			// 		else
+			// 		{
+			// 			value = $(oElem).val();
+			// 		}
+			// 	}
+			// 	else if($(oElem).is(':checkbox') || $(oElem).is(':radio'))
+			// 	{
+			// 		if(value === null)
+			// 		{
+			// 			value = [];
+			// 		}
+			// 		if($(oElem).is(':checked'))
+			// 		{
+			// 			value.push($(oElem).val());
+			// 		}
+			// 	}
+			// 	else
+			// 	{
+			// 		console.log('Form field : Input type not handle yet.');
+			// 	}
+			// });
+			//
+			// return value;
+		},
+
+
+		// Prepare DOM element
+		_prepareElement: function()
+		{
+			// Prepare base DOM structure
+			//this.options.ref+' '+this.options.operator+' '+this.options.values
+			this.element
+				.append('<div class="sfc_title"></div>')
+				.append('<div class="sfc_form_group"></div>')
+				.append('<div class="sfc_toggle"><span class="fa fa-caret-down"></span></div>');
+
+			// Removable / locked decoration
+			if(this.options.is_removable === true)
+			{
+				this.element.append('<div class="sfc_close"><span class="fa fa-times"></span></div>');
+			}
+			else
+			{
+				this.element.append('<div class="sfc_locked"><span class="fa fa-lock"></span></div>');
+			}
+
+			// Fill
+		},
+
+
+		// Debug helper
+		showOptions: function()
+		{
+			return this.options;
+		}
+	});
+});
diff --git a/js/search/search_form_handler.js b/js/search/search_form_handler.js
new file mode 100644
index 000000000..d8e2c65aa
--- /dev/null
+++ b/js/search/search_form_handler.js
@@ -0,0 +1,251 @@
+//iTop Search form handler
+;
+$(function()
+{
+	// the widget definition, where 'itop' is the namespace,
+	// 'search_form_handler' the widget name
+	$.widget( 'itop.search_form_handler',
+	{
+		// default options
+		options:
+		{
+			"criterion_outer_selector": null,
+			"result_list_outer_selector": null,
+			"submit_button_selector": null,
+			"hide_initial_criterion": false, // What is that?
+			"endpoint": null,
+			"search": {
+				"base_oql": "",
+				"criterion": [
+					// Structure
+					// {
+					// 	"or": [
+					// 		{
+					// 			"and": [
+					// 				{
+					// 					"ref": "alias.code",
+					// 					"operator": "contains",
+					// 					"values": [
+					// 						{
+					// 							"value": "foo",
+					// 							"label": "bar",
+					// 						}
+					// 					],
+					// 					"is_removable": true,
+					// 					"oql": "",
+					// 				},
+					// 			]
+					// 		},
+					// 	]
+					// },
+				],
+				"fields": [
+					// Structure
+					// 	"alias.code": {
+					// 		"class_alias": "",
+					// 		"class": "",
+					// 		"code": "",
+					// 		"label": "",
+					// 		"type": "",
+					// 		"allowed_values": {...},
+					// 	},
+				],
+			},
+		},
+
+		// jQuery elements
+		elements:
+		{
+			criterion_area: null,
+		},
+
+		// the constructor
+		_create: function()
+		{
+			var me = this;
+			
+			this.element
+			.addClass('search_form_handler');
+
+			// Binding events
+			// this.element.bind('update_fields', function(oEvent, oData){
+			// 	me._onUpdateFields(oEvent, oData);
+			// });
+
+			// Binding buttons
+			if(this.options.submit_button_selector !== null)
+			{
+				this.options.submit_button_selector.off('click').on('click', function(oEvent){ me._onSubmitClick(oEvent); });
+			}
+			// if(this.options.cancel_btn_selector !== null)
+			// {
+			// 	this.options.cancel_btn_selector.off('click').on('click', function(oEvent){ me._onCancelClick(oEvent); });
+			// }
+
+			// Prepare criterion area
+			this._prepareCriterionArea();
+		},
+   
+		// called when created, and later when changing options
+		_refresh: function()
+		{
+			
+		},
+		// events bound via _bind are removed automatically
+		// revert other modifications here
+		_destroy: function()
+		{
+			this.element
+			.removeClass('search_form_handler');
+		},
+		// _setOptions is called with a hash of all options that are changing
+		// always refresh when changing options
+		_setOptions: function()
+		{
+			this._superApply(arguments);
+		},
+		// _setOption is called for each individual option that is changing
+		_setOption: function( key, value )
+		{
+			this._super( key, value );
+		},
+
+
+		getCurrentValues: function()
+		{
+			// TODO
+			// return this.options.field_set.triggerHandler('get_current_values');
+		},
+
+		// - Prepare criterion area
+		_prepareCriterionArea: function()
+		{
+			// Build area element
+			if(this.options.criterion_outer_selector !== null && $(this.options.criterion_outer_selector).length > 0)
+			{
+				this.elements.criterion_area = $(this.options.criterion_outer_selector);
+			}
+			else
+			{
+				var oCriterionAreaElem = $('<div></div>').appendTo(this.element);
+				this.elements.criterion_area = oCriterionAreaElem;
+			}
+			this.elements.criterion_area.addClass('sf_criterion_area');
+
+			// Clean area
+			this.elements.criterion_area.html('');
+
+			// Fill area with existing criterion
+			for(var i in this.options.search.criterion)
+			{
+				console.log(i, this.options.search.criterion[i]);
+			}
+		},
+
+
+		// Criteria handlers
+		// - Add a criteria to the form
+		_addCriteria: function(oData)
+		{
+			var sRef = oData.ref
+			var sType = this._getCriteriaTypeFromFieldRef(sRef);
+
+			if(sType !== null)
+			{
+				var sWidgetClass = 'search_form_criteria' + ((sType === 'raw') ? '' : '_' + sType);
+				oCriteriaElem = $('<div></div>')
+					.addClass('sf_criteria')
+					.appendTo(this.elements.criterion_area)
+					.search_form_criteria(oData);
+			}
+			else
+			{
+				this._trace('Could not add criteria as we could not retrieve type for ref "' + sRef + '".');
+			}
+		},
+		// - Find a criteria's type from a field's ref (usually <CLASS_ALIAS>.<ATT_CODE>)
+		_getCriteriaTypeFromFieldRef: function(sRef)
+		{
+			var sType = null;
+
+			if(this.options.search.fields[sRef] !== undefined)
+			{
+				sType = this.options.search.fields[sRef].type;
+			}
+
+			return sType;
+		},
+
+
+		// Button handlers
+		_onSubmitClick: function(oEvent)
+		{
+			// TODO
+		},
+		_onCancelClick: function(oEvent)
+		{
+			// TODO
+		},
+
+
+		// Update handlers
+		// - Called on form update successes
+		_onUpdateSuccess: function(oData, sFormPath)
+		{
+			// TODO
+			// if(oData.form.updated_fields !== undefined)
+			// {
+			// 	this.element.find('[data-form-path="' + sFormPath + '"]').trigger('update_form', {updated_fields: oData.form.updated_fields});
+			// }
+		},
+		// - Called on form update failures
+		_onUpdateFailure: function(oData, sFormPath)
+		{
+			// TODO
+		},
+		// - Called after form updates
+		_onUpdateAlways: function(oData, sFormPath)
+		{
+			// TODO
+			// // Check all touched AFTER ajax is complete, otherwise the renderer will redraw the field in the mean time.
+			// this.element.find('[data-form-path="' + sFormPath + '"]').trigger('validate');
+			// this._enableFormAfterLoading();
+		},
+
+
+		// Helpers
+		// - Show loader
+		_disableFormBeforeLoading: function()
+		{
+			// TODO
+		},
+		// - Remove loader
+		_enableFormAfterLoading: function()
+		{
+			// TODO
+		},
+
+
+		// Debug helpers
+		// - Show a trace in the javascript console
+		_trace: function(sMessage, oData)
+		{
+			if(window.console)
+			{
+				if(oData !== undefined)
+				{
+					console.log('Search form handler: ' + sMessage, oData);
+				}
+				else
+				{
+					console.log('Search form handler: ' + sMessage);
+				}
+			}
+		},
+		// - Show current options
+		showOptions: function()
+		{
+			this._trace('Options', this.options, this.toto);
+		}
+	});
+});

From e9bcd170c094803c7b74f14610eea4d995905fd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Wed, 7 Mar 2018 17:07:40 +0000
Subject: [PATCH 006/202] Advanced Search

SVN:b1162[5391]
---
 application/nicewebpage.class.inc.php               |  4 +++-
 sources/application/search/searchform.class.inc.php | 13 ++++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/application/nicewebpage.class.inc.php b/application/nicewebpage.class.inc.php
index bfae9321d..a533c044a 100644
--- a/application/nicewebpage.class.inc.php
+++ b/application/nicewebpage.class.inc.php
@@ -50,7 +50,9 @@ class NiceWebPage extends WebPage
 		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/datatable.js');
 		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.positionBy.js');
 		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.popupmenu.js');
-		$this->add_ready_script(
+	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_handler.js');
+	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria.js');
+	    $this->add_ready_script(
 <<< EOF
 	//add new widget called TruncatedList to properly display truncated lists when they are sorted
 	$.tablesorter.addWidget({ 
diff --git a/sources/application/search/searchform.class.inc.php b/sources/application/search/searchform.class.inc.php
index 76eeebf69..ea7b72601 100644
--- a/sources/application/search/searchform.class.inc.php
+++ b/sources/application/search/searchform.class.inc.php
@@ -38,6 +38,15 @@ use WebPage;
 
 class SearchForm
 {
+	/**
+	 * @param \WebPage $oPage
+	 * @param \CMDBObjectSet $oSet
+	 * @param array $aExtraParams
+	 *
+	 * @return string
+	 * @throws \CoreException
+	 * @throws \DictExceptionMissingString
+	 */
 	public static function GetSearchForm(WebPage $oPage, CMDBObjectSet $oSet, $aExtraParams = array())
 	{
 		$sHtml = '';
@@ -110,8 +119,6 @@ class SearchForm
 			),
 		);
 
-		$oPage->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_handler.js');
-		$oPage->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria.js');
 		$oPage->add_ready_script('$("#fs_'.$sSearchFormId.'").search_form_handler('.json_encode($aSearchParams).');');
 
 		return $sHtml;
@@ -137,10 +144,10 @@ class SearchForm
 				$aField['code'] = $sFilterCode;
 				$aField['class'] = $sClassName;
 				$aField['class_alias'] = $sClassAlias;
-				$aField['label'] = Dict::S('Class:'.$sClassName.'/Attribute:'.$sFilterCode);
 				if (array_key_exists($sFilterCode, $aAttrDefs))
 				{
 					$oAttrDef = $aAttrDefs[$sFilterCode];
+					$aField['label'] = $oAttrDef->GetLabel();
 					$aField['widget'] = $oAttrDef->GetSearchType();
 					$aField['allowed_values'] = self::GetFieldAllowedValues($oAttrDef);
 				}

From fa60322ff156d5e4e6cb919000ca666dda31dbff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Thu, 8 Mar 2018 13:49:00 +0000
Subject: [PATCH 007/202] Advanced Search

SVN:b1162[5392]
---
 core/oql/expression.class.inc.php             |  30 ++++-
 pages/ajax.searchform.php                     |  81 +++++++++++++
 .../search/ajaxsearchexception.class.inc.php  |  35 ++++++
 .../search/criterionconversion.class.inc.php  |  35 ++++++
 .../search/criterionparser.class.inc.php      | 114 ++++++++++++++++++
 .../search/searchform.class.inc.php           |   1 +
 .../search/CriterionParserTest.php            |  86 +++++++++++++
 test/application/search/SearchFormTest.php    |   4 +-
 8 files changed, 384 insertions(+), 2 deletions(-)
 create mode 100644 pages/ajax.searchform.php
 create mode 100644 sources/application/search/ajaxsearchexception.class.inc.php
 create mode 100644 sources/application/search/criterionconversion.class.inc.php
 create mode 100644 sources/application/search/criterionparser.class.inc.php
 create mode 100644 test/application/search/CriterionParserTest.php

diff --git a/core/oql/expression.class.inc.php b/core/oql/expression.class.inc.php
index 65ba8ea7b..e017bd1b0 100644
--- a/core/oql/expression.class.inc.php
+++ b/core/oql/expression.class.inc.php
@@ -448,6 +448,7 @@ class BinaryExpression extends Expression
 
 	public function GetCriterion($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
 	{
+		$bReverseOperator = false;
 		$oLeftExpr = $this->GetLeftExpr();
 		$oRightExpr = $this->GetRightExpr();
 		if ($oLeftExpr instanceof FieldExpression && $oRightExpr instanceof FieldExpression)
@@ -462,6 +463,7 @@ class BinaryExpression extends Expression
 		if ($oRightExpr instanceof FieldExpression)
 		{
 			$oAttDef = $oRightExpr->GetAttDef($oSearch->GetJoinedClasses());
+			$bReverseOperator = true;
 		}
 
 		if (is_null($oAttDef))
@@ -474,7 +476,33 @@ class BinaryExpression extends Expression
 
 		$aCriteria = array_merge($aCriteriaLeft, $aCriteriaRight);
 
-		$aCriteria['operator'] = $this->GetOperator();
+		if ($bReverseOperator)
+		{
+			// switch left and right expressions so reverse the operator
+			// Note that the operation is the same so < becomes > and not >=
+			switch ($this->GetOperator())
+			{
+				case '>':
+					$aCriteria['operator'] = '<';
+					break;
+				case '<':
+					$aCriteria['operator'] = '>';
+					break;
+				case '>=':
+					$aCriteria['operator'] = '<=';
+					break;
+				case '<=':
+					$aCriteria['operator'] = '>=';
+					break;
+				default:
+					$aCriteria['operator'] = $this->GetOperator();
+					break;
+			}
+		}
+		else
+		{
+			$aCriteria['operator'] = $this->GetOperator();
+		}
 		$aCriteria['oql'] = $this->Render($aArgs, $bRetrofitParams);
 
 		return $aCriteria;
diff --git a/pages/ajax.searchform.php b/pages/ajax.searchform.php
new file mode 100644
index 000000000..04c08643f
--- /dev/null
+++ b/pages/ajax.searchform.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Copyright (C) 2010-2018 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ *  iTop is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with iTop. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+use Combodo\iTop\Application\Search\AjaxSearchException;
+use Combodo\iTop\Application\Search\CriterionParser;
+
+require_once('../approot.inc.php');
+require_once(APPROOT.'/application/application.inc.php');
+require_once(APPROOT.'/application/webpage.class.inc.php');
+require_once(APPROOT.'/application/ajaxwebpage.class.inc.php');
+require_once(APPROOT.'/application/startup.inc.php');
+require_once(APPROOT.'/application/user.preferences.class.inc.php');
+require_once(APPROOT.'/application/loginwebpage.class.inc.php');
+require_once(APPROOT.'/sources/application/search/ajaxsearchexception.class.inc.php');
+require_once(APPROOT.'/sources/application/search/criterionparser.class.inc.php');
+
+try
+{
+	if (LoginWebPage::EXIT_CODE_OK != LoginWebPage::DoLoginEx(null /* any portal */, false, LoginWebPage::EXIT_RETURN))
+	{
+		throw new SecurityException('You must be logged in');
+	}
+
+	$sParams = stripslashes(utils::ReadParam('params', '', false, 'raw_data'));
+	if (!$sParams)
+	{
+		throw new AjaxSearchException("Invalid query (empty filter)", 400);
+	}
+
+	$oPage = new ajax_page("");
+	$oPage->no_cache();
+	$oPage->SetContentType('text/html');
+
+	$aParams = json_decode($sParams, true);
+	$sOQL = CriterionParser::Parse($aParams['base_oql'], $aParams['criterion']);
+	$oFilter = DBSearch::FromOQL($sOQL);
+	$oDisplayBlock = new DisplayBlock($oFilter, 'list', false);
+
+	$aExtraParams['display_limit'] = true;
+	$aExtraParams['truncated'] = true;
+	$oDisplayBlock->RenderContent($oPage, $aExtraParams);
+
+	$oPage->output();
+
+} catch (AjaxSearchException $e)
+{
+	http_response_code($e->getCode());
+	// note: transform to cope with XSS attacks
+	echo htmlentities($e->GetMessage(), ENT_QUOTES, 'utf-8');
+	IssueLog::Error($e->getMessage()."\nDebug trace:\n".$e->getTraceAsString());
+} catch (SecurityException $e)
+{
+	http_response_code(403);
+	// note: transform to cope with XSS attacks
+	echo htmlentities($e->GetMessage(), ENT_QUOTES, 'utf-8');
+	IssueLog::Error($e->getMessage()."\nDebug trace:\n".$e->getTraceAsString());
+} catch (Exception $e)
+{
+	http_response_code(500);
+	// note: transform to cope with XSS attacks
+	echo htmlentities($e->GetMessage(), ENT_QUOTES, 'utf-8');
+	IssueLog::Error($e->getMessage()."\nDebug trace:\n".$e->getTraceAsString());
+}
\ No newline at end of file
diff --git a/sources/application/search/ajaxsearchexception.class.inc.php b/sources/application/search/ajaxsearchexception.class.inc.php
new file mode 100644
index 000000000..a3d259674
--- /dev/null
+++ b/sources/application/search/ajaxsearchexception.class.inc.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright (C) 2010-2018 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ *  iTop is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with iTop. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+/**
+ * Created by PhpStorm.
+ * User: Eric
+ * Date: 08/03/2018
+ * Time: 11:18
+ */
+
+namespace Combodo\iTop\Application\Search;
+
+
+class AjaxSearchException extends \Exception
+{
+
+}
\ No newline at end of file
diff --git a/sources/application/search/criterionconversion.class.inc.php b/sources/application/search/criterionconversion.class.inc.php
new file mode 100644
index 000000000..ce98967aa
--- /dev/null
+++ b/sources/application/search/criterionconversion.class.inc.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright (C) 2010-2018 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ *  iTop is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with iTop. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+/**
+ * Created by PhpStorm.
+ * User: Eric
+ * Date: 08/03/2018
+ * Time: 14:47
+ */
+
+namespace Combodo\iTop\Application\Search;
+
+
+class CriterionConversion
+{
+
+}
\ No newline at end of file
diff --git a/sources/application/search/criterionparser.class.inc.php b/sources/application/search/criterionparser.class.inc.php
new file mode 100644
index 000000000..98532bd1b
--- /dev/null
+++ b/sources/application/search/criterionparser.class.inc.php
@@ -0,0 +1,114 @@
+<?php
+/**
+ * Copyright (C) 2010-2018 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ *  iTop is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with iTop. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+/**
+ * Created by PhpStorm.
+ * User: Eric
+ * Date: 08/03/2018
+ * Time: 11:25
+ */
+
+namespace Combodo\iTop\Application\Search;
+
+
+use DBObjectSearch;
+use IssueLog;
+use OQLException;
+
+class CriterionParser
+{
+
+	/**
+	 * @param $sBaseOql
+	 * @param $aCriterion
+	 *
+	 * @return string
+	 */
+	public static function Parse($sBaseOql, $aCriterion)
+	{
+		$aExpression = array();
+		$aOr = $aCriterion['or'];
+		foreach($aOr as $aAndList)
+		{
+
+			$sExpression = self::ParseAndList($aAndList['and']);
+			if (!empty($sExpression))
+			{
+				$aExpression[] = $sExpression;
+			}
+		}
+
+		if (empty($aExpression))
+		{
+			return $sBaseOql;
+		}
+
+		// Sanitize the base OQL
+		if (strpos($sBaseOql, ' WHERE '))
+		{
+			try
+			{
+				$oSearch = DBObjectSearch::FromOQL($sBaseOql);
+				$oSearch->ResetCondition();
+				$sBaseOql = $oSearch->ToOQL();
+			} catch (OQLException $e)
+			{
+				IssueLog::Error($e->getMessage());
+			}
+		}
+
+		return $sBaseOql.' WHERE '.implode(" OR ", $aExpression).'';
+	}
+
+	private static function ParseAndList($aAnd)
+	{
+		$aExpression = array();
+		foreach($aAnd as $aCriteria)
+		{
+			$aExpression[] = self::ParseCriteria($aCriteria);
+		}
+
+		if (empty($aExpression))
+		{
+			return '';
+		}
+
+		return '('.implode(" AND ", $aExpression).')';
+	}
+
+	private static function ParseCriteria($aCriteria)
+	{
+
+		if (!empty($aCriteria['oql']))
+		{
+			return $aCriteria['oql'];
+		}
+
+		// TODO Manage more complicated case
+		$aRef = explode('.', $aCriteria['ref']);
+		$sRef = '`'.$aRef[0].'`.`'.$aRef[1].'`';
+
+		$sOperator = $aCriteria['operator'];
+		$sValue = $aCriteria['values'][0]['value'];
+
+		return "({$sRef} {$sOperator} '{$sValue}')";
+	}
+}
\ No newline at end of file
diff --git a/sources/application/search/searchform.class.inc.php b/sources/application/search/searchform.class.inc.php
index ea7b72601..d3c45e4b0 100644
--- a/sources/application/search/searchform.class.inc.php
+++ b/sources/application/search/searchform.class.inc.php
@@ -112,6 +112,7 @@ class SearchForm
 
 		$aSearchParams = array(
 			'criterion_outer_selector' => "#fs_{$sSearchFormId}_criterion_outer",
+			'endpoint' => utils::GetAbsoluteUrlAppRoot().'pages/ajax.searchform.php',
 			'search' => array(
 				'fields' => $aFields,
 				'criterion' => $aCriterion,
diff --git a/test/application/search/CriterionParserTest.php b/test/application/search/CriterionParserTest.php
new file mode 100644
index 000000000..f36068650
--- /dev/null
+++ b/test/application/search/CriterionParserTest.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * Copyright (C) 2010-2018 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ *  iTop is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with iTop. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+/**
+ * Created by PhpStorm.
+ * User: Eric
+ * Date: 08/03/2018
+ * Time: 11:28
+ */
+
+namespace Combodo\iTop\Test\UnitTest\Application\Search;
+
+use Combodo\iTop\Application\Search\CriterionParser;
+use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
+
+
+class CriterionParserTest extends ItopDataTestCase
+{
+	/**
+	 * @throws Exception
+	 */
+	protected function setUp()
+	{
+		parent::setUp();
+
+		require_once(APPROOT."sources/application/search/criterionparser.class.inc.php");
+	}
+
+	public function testParse()
+	{
+		$sBaseOql = 'SELECT UserRequest';
+		$aCriterion = json_decode('{
+    "or": [
+        {
+            "and": [
+                {
+                    "ref": "UserRequest.start_date",
+                    "values": [
+                        {
+                            "value": "2017-01-01",
+                            "label": "2017-01-01 00:00:00"
+                        }
+                    ],
+                    "operator": ">",
+                    "oql": ""
+                },
+                {
+                    "ref": "UserRequest.start_date",
+                    "values": [
+                        {
+                            "value": "2018-01-01",
+                            "label": "2018-01-01 00:00:00"
+                        }
+                    ],
+                    "operator": "<",
+                    "oql": "(`UserRequest`.`start_date` < \'2018-01-01\')"
+                }
+            ]
+        }
+    ]
+}
+', true);
+		$sOQL = CriterionParser::Parse($sBaseOql, $aCriterion);
+
+		$this->debug($sOQL);
+		$this->markTestIncomplete();
+	}
+}
diff --git a/test/application/search/SearchFormTest.php b/test/application/search/SearchFormTest.php
index 695b6d159..68c3fce7c 100644
--- a/test/application/search/SearchFormTest.php
+++ b/test/application/search/SearchFormTest.php
@@ -59,6 +59,8 @@ class SearchFormTest extends ItopDataTestCase
 	public function testGetCriterion($sOQL, $iOrCount)
 	{
 		$aCriterion = SearchForm::GetCriterion(\DBObjectSearch::FromOQL($sOQL));
+		$aRes = array('base_oql' => $sOQL, 'criterion' => $aCriterion);
+		$this->debug(json_encode($aRes));
 		$this->debug($sOQL);
 		$this->debug(json_encode($aCriterion, JSON_PRETTY_PRINT));
 		$this->assertCount($iOrCount, $aCriterion['or']);
@@ -75,7 +77,7 @@ class SearchFormTest extends ItopDataTestCase
 			array('OQL' => "SELECT Contact WHERE status IN ('active', 'inactive')", 1),
 			array('OQL' => "SELECT Contact WHERE status = 'active' OR name LIKE 'toto%'", 2),
 			array('OQL' => "SELECT UserRequest WHERE DATE_SUB(NOW(), INTERVAL 14 DAY) < start_date", 1),
-			array('OQL' => "SELECT UserRequest WHERE start_date > '2017-01-01' AND start_date < '2018-01-01'", 1),
+			array('OQL' => "SELECT UserRequest WHERE start_date > '2017-01-01' AND '2018-01-01' >= start_date", 1),
 		);
 	}
 }

From 8ce708dadebb2cf1fb1da1378d297781692482b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Thu, 8 Mar 2018 14:53:57 +0000
Subject: [PATCH 008/202] Advanced Search

generate id on div "result list outer" and use this id on search widget initialisation

SVN:b1162[5393]
---
 application/ui.extkeywidget.class.inc.php           | 3 ++-
 application/ui.linksdirectwidget.class.inc.php      | 3 ++-
 application/ui.linkswidget.class.inc.php            | 3 ++-
 application/webpage.class.inc.php                   | 2 +-
 pages/UI.php                                        | 8 ++++----
 pages/UniversalSearch.php                           | 1 +
 sources/application/search/searchform.class.inc.php | 6 ++++++
 synchro/replica.php                                 | 2 +-
 8 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/application/ui.extkeywidget.class.inc.php b/application/ui.extkeywidget.class.inc.php
index 8d412b04d..610367eb0 100644
--- a/application/ui.extkeywidget.class.inc.php
+++ b/application/ui.extkeywidget.class.inc.php
@@ -341,7 +341,8 @@ EOF
 		$bOpen = MetaModel::GetConfig()->Get('legacy_search_drawer_open');
 		$oFilter->SetModifierProperty('UserRightsGetSelectFilter', 'bSearchMode', $this->bSearchMode);
 		$oBlock = new DisplayBlock($oFilter, 'search', false, $aParams);
-		$sHTML .= $oBlock->GetDisplay($oPage, $this->iId, array('open' => $bOpen, 'currentId' => $this->iId));
+		$sHTML .= $oBlock->GetDisplay($oPage, $this->iId,
+			array('open' => $bOpen, 'currentId' => $this->iId, 'table_id' => "dr_{$this->iId}"));
 		$sHTML .= "<form id=\"fr_{$this->iId}\" OnSubmit=\"return oACWidget_{$this->iId}.DoOk();\">\n";
 		$sHTML .= "<div id=\"dr_{$this->iId}\" style=\"vertical-align:top;background: #fff;height:100%;overflow:auto;padding:0;border:0;\">\n";
 		$sHTML .= "<div style=\"background: #fff; border:0; text-align:center; vertical-align:middle;\"><p>".Dict::S('UI:Message:EmptyList:UseSearchForm')."</p></div>\n";
diff --git a/application/ui.linksdirectwidget.class.inc.php b/application/ui.linksdirectwidget.class.inc.php
index e62729f8b..ff2abafc5 100644
--- a/application/ui.linksdirectwidget.class.inc.php
+++ b/application/ui.linksdirectwidget.class.inc.php
@@ -304,7 +304,8 @@ class UILinksWidgetDirect
 		}
 		$bOpen = MetaModel::GetConfig()->Get('legacy_search_drawer_open');
 		$oBlock = new DisplayBlock($oFilter, 'search', false);
-		$sHtml .= $oBlock->GetDisplay($oPage, "SearchFormToAdd_{$this->sInputid}", array('open' => $bOpen));
+		$sHtml .= $oBlock->GetDisplay($oPage, "SearchFormToAdd_{$this->sInputid}",
+			array('open' => $bOpen, 'table_id' => "SearchResultsToAdd_{$this->sInputid}"));
 		$sHtml .= "<form id=\"ObjectsAddForm_{$this->sInputid}\">\n";
 		$sHtml .= "<div id=\"SearchResultsToAdd_{$this->sInputid}\" style=\"vertical-align:top;background: #fff;height:100%;overflow:auto;padding:0;border:0;\">\n";
 		$sHtml .= "<div style=\"background: #fff; border:0; text-align:center; vertical-align:middle;\"><p>".Dict::S('UI:Message:EmptyList:UseSearchForm')."</p></div>\n";
diff --git a/application/ui.linkswidget.class.inc.php b/application/ui.linkswidget.class.inc.php
index 60a746dc8..8b9718e71 100644
--- a/application/ui.linkswidget.class.inc.php
+++ b/application/ui.linkswidget.class.inc.php
@@ -394,7 +394,8 @@ EOF
 		$oFilter = new DBObjectSearch($this->m_sRemoteClass);
 		$this->SetSearchDefaultFromContext($oCurrentObj, $oFilter);
 		$oBlock = new DisplayBlock($oFilter, 'search', false);
-		$sHtml .= $oBlock->GetDisplay($oPage, "SearchFormToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}", array('open' => $bOpen));
+		$sHtml .= $oBlock->GetDisplay($oPage, "SearchFormToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}",
+			array('open' => $bOpen, 'table_id' => "SearchResultsToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}"));
 		$sHtml .= "<form id=\"ObjectsAddForm_{$this->m_sAttCode}{$this->m_sNameSuffix}\" OnSubmit=\"return oWidget{$this->m_iInputId}.DoAddObjects(this.id);\">\n";
 		$sHtml .= "<div id=\"SearchResultsToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}\" style=\"vertical-align:top;background: #fff;height:100%;overflow:auto;padding:0;border:0;\">\n";
 		$sHtml .= "<div style=\"background: #fff; border:0; text-align:center; vertical-align:middle;\"><p>".Dict::S('UI:Message:EmptyList:UseSearchForm')."</p></div>\n";
diff --git a/application/webpage.class.inc.php b/application/webpage.class.inc.php
index 9af9a8ce8..e0c01d997 100644
--- a/application/webpage.class.inc.php
+++ b/application/webpage.class.inc.php
@@ -347,7 +347,7 @@ class WebPage implements Page
 	 */
 	public function GetDetails($aFields)
 	{
-		$sHtml = "<div class=\"details\">\n";
+		$sHtml = "<div class=\"details\" id='search-widget-results-outer'>\n";
 		foreach($aFields as $aAttrib)
 		{
 			$sDataAttCode = isset($aAttrib['attcode']) ? "data-attcode=\"{$aAttrib['attcode']}\"" : '';
diff --git a/pages/UI.php b/pages/UI.php
index 1c4092aaf..2debf6183 100644
--- a/pages/UI.php
+++ b/pages/UI.php
@@ -130,7 +130,7 @@ function DisplayDetails($oP, $sClass, $oObj, $id)
 	$sClassLabel = MetaModel::GetName($sClass);
 	$oSearch = new DBObjectSearch($sClass);
 	$oBlock = new DisplayBlock($oSearch, 'search', false);
-	$oBlock->Display($oP, 0);
+	$oBlock->Display($oP, 0, array('table_id' => 'search-widget-results-outer'));
 
 	// The object could be listed, check if it is actually allowed to view it
 	$oSet = CMDBObjectSet::FromObject($oObj);
@@ -198,7 +198,7 @@ function DisplaySearchSet($oP, $oFilter, $bSearchForm = true, $sBaseClass = '',
 {
 	if ($bSearchForm)
 	{
-		$aParams = array('open' => $bSearchFormOpen);
+		$aParams = array('open' => $bSearchFormOpen, 'table_id' => '1');
 		if (!empty($sBaseClass))
 		{
 			$aParams['baseClass'] = $sBaseClass;
@@ -484,9 +484,9 @@ try
 				if ($bSearchForm)
 				{
 					$oBlock = new DisplayBlock($oFilter, 'search', false);
-					$oBlock->Display($oP, 0);
+					$oBlock->Display($oP, 0, array('table_id' => 'search-widget-result-outer'));
 				}
-				$oP->P('<b>'.Dict::Format('UI:Error:IncorrectOQLQuery_Message', $e->getHtmlDesc()).'</b>');
+				$oP->add('<div id="search-widget-result-outer"><p><b>'.Dict::Format('UI:Error:IncorrectOQLQuery_Message', $e->getHtmlDesc()).'</b></p></div>');
 			}
 			catch(Exception $e)
 			{
diff --git a/pages/UniversalSearch.php b/pages/UniversalSearch.php
index 8ca74edb6..169aa0fcf 100644
--- a/pages/UniversalSearch.php
+++ b/pages/UniversalSearch.php
@@ -110,6 +110,7 @@ if ($oFilter != null)
 	$aExtraParams['open'] = true;
 	$aExtraParams['baseClass'] = $sBaseClass;
 	$aExtraParams['action'] = utils::GetAbsoluteUrlAppRoot().'pages/UniversalSearch.php';
+	$aExtraParams['table_id'] = '1';
 	//$aExtraParams['class'] = $sClassName;
 	$oBlock->Display($oP, 0, $aExtraParams);
 
diff --git a/sources/application/search/searchform.class.inc.php b/sources/application/search/searchform.class.inc.php
index d3c45e4b0..9c05fff01 100644
--- a/sources/application/search/searchform.class.inc.php
+++ b/sources/application/search/searchform.class.inc.php
@@ -110,8 +110,14 @@ class SearchForm
 		$oBaseSearch = $oSearch->DeepClone();
 		$oBaseSearch->ResetCondition();
 
+		if (!isset($aExtraParams['table_id']))
+		{
+			$aExtraParams['table_id'] = "search_form_result_{$sSearchFormId}";
+			$sHtml .= "<div class=\"display_block\" id=\"search_form_result_{$sSearchFormId}\"></div>\n";
+		}
 		$aSearchParams = array(
 			'criterion_outer_selector' => "#fs_{$sSearchFormId}_criterion_outer",
+			'result_list_outer_selector' => "#{$aExtraParams['table_id']}",
 			'endpoint' => utils::GetAbsoluteUrlAppRoot().'pages/ajax.searchform.php',
 			'search' => array(
 				'fields' => $aFields,
diff --git a/synchro/replica.php b/synchro/replica.php
index c04f710a4..57d78c694 100644
--- a/synchro/replica.php
+++ b/synchro/replica.php
@@ -59,7 +59,7 @@ try
 			throw new ApplicationException(Dict::Format('UI:Error:1ParametersMissing', 'oql'));
 		}
 		$oFilter = DBObjectSearch::FromOQL($sOQL);
-		$oBlock1 = new DisplayBlock($oFilter, 'search', false, array('menu'=>false));
+			$oBlock1 = new DisplayBlock($oFilter, 'search', false, array('menu' => false, '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);

From 2033c171f0346addb13774bd982b388958e725f7 Mon Sep 17 00:00:00 2001
From: Guillaume Lajarige <guillaume.lajarige@combodo.com>
Date: Thu, 8 Mar 2018 16:50:10 +0000
Subject: [PATCH 009/202] Advanced search: Integration with endpoint POC & WIP.

SVN:b1162[5394]
---
 application/nicewebpage.class.inc.php |   1 +
 css/css-variables.scss                |  24 ++-
 css/light-grey.css                    |  88 ++++++--
 css/light-grey.scss                   |  75 +++++++
 js/search/search_form_criteria.js     | 124 ++++++------
 js/search/search_form_criteria_raw.js |  55 +++++
 js/search/search_form_handler.js      | 277 ++++++++++++++++++++------
 7 files changed, 498 insertions(+), 146 deletions(-)
 create mode 100644 js/search/search_form_criteria_raw.js

diff --git a/application/nicewebpage.class.inc.php b/application/nicewebpage.class.inc.php
index a533c044a..d1a4a65bd 100644
--- a/application/nicewebpage.class.inc.php
+++ b/application/nicewebpage.class.inc.php
@@ -52,6 +52,7 @@ class NiceWebPage extends WebPage
 		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.popupmenu.js');
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_handler.js');
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria.js');
+	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_raw.js');
 	    $this->add_ready_script(
 <<< EOF
 	//add new widget called TruncatedList to properly display truncated lists when they are sorted
diff --git a/css/css-variables.scss b/css/css-variables.scss
index 6e61874f8..e4e13bdcd 100644
--- a/css/css-variables.scss
+++ b/css/css-variables.scss
@@ -1,8 +1,28 @@
-$highlight-color: #E87C1E;
+// Base colors
+$gray-base:              #000 !default;
+$gray-darker:            lighten($gray-base, 13.5%) !default; // #222
+$gray-dark:              #444 !default;
+$gray:                   #777 !default;
+$gray-light:             #808080 !default;
+$gray-lighter:           #ddd !default;
+$gray-extra-light:       #F1F1F1 !default;
+
+$white:					#FFFFFF !default;
+
+$combodo-orange:		#EA7D1E !default;
+$combodo-dark-gray:		#585653 !default;
+
+$combodo-orange-dark:		darken($combodo-orange, 13.8%) !default;
+$combodo-orange-darker:		darken($combodo-orange, 18%) !default;
+$combodo-dark-gray-dark:	darken($combodo-dark-gray, 13.5%) !default;
+$combodo-dark-gray-darker:	darken($combodo-dark-gray, 18%) !default;
+
+// Vars
+$highlight-color: $combodo-orange;
 $grey-color: #555555;
 $complement-color: #1c94c4;
 $complement-light: #d6e8ef;
-$frame-background-color: #F1F1F1;
+$frame-background-color: $gray-extra-light;
 $text-color: #000;
 // Beware the version number MUST be enclosed with quotes otherwise v2.3.0 becomes v2 0.3 .0
 $version: "v2.4.0";
\ No newline at end of file
diff --git a/css/light-grey.css b/css/light-grey.css
index 1c3555356..f46ed2059 100644
--- a/css/light-grey.css
+++ b/css/light-grey.css
@@ -58,7 +58,7 @@ label {
   cursor: pointer;
 }
 .hilite, .hilite a, .hilite a:visited {
-  color: #e87c1e;
+  color: #ea7d1e;
   text-decoration: none;
 }
 table.datatable {
@@ -114,7 +114,7 @@ table.listResults td .view-image img {
   cursor: pointer;
   margin-bottom: 3px;
   padding: 2px;
-  background-color: #e87c1e;
+  background-color: #ea7d1e;
 }
 .edit-image .edit-buttons .button.disabled {
   cursor: default;
@@ -275,7 +275,7 @@ legend.transparent {
 }
 .ui-widget-content td a:hover, p a:hover, td a:hover {
   text-decoration: underline;
-  color: #e87c1e;
+  color: #ea7d1e;
 }
 .cke_reset_all *:hover {
   text-decoration: none;
@@ -283,8 +283,8 @@ legend.transparent {
 }
 table.cke_dialog_contents a.cke_dialog_ui_button_ok {
   color: #000;
-  border-color: #e87c1e;
-  background: #e87c1e;
+  border-color: #ea7d1e;
+  background: #ea7d1e;
 }
 .cke_notifications_area {
   display: none;
@@ -309,7 +309,7 @@ td a.mailto, td a.mailto:visited {
 }
 td a.mailto:hover {
   text-decoration: underline;
-  color: #e87c1e;
+  color: #ea7d1e;
   padding-left: 20px;
   background: url(../images/mail.png?v=v2.4.0) no-repeat left;
 }
@@ -329,7 +329,7 @@ a.small_action {
   padding-left: 5px;
   padding-top: 2px;
   padding-bottom: 2px;
-  background: #e87c1e url(../images/actions_left.png?v=v2.4.0) no-repeat left;
+  background: #ea7d1e url(../images/actions_left.png?v=v2.4.0) no-repeat left;
 }
 .actions_details span {
   background: url(../images/actions_right.png?v=v2.4.0) no-repeat right;
@@ -424,7 +424,7 @@ div.ui-accordion-content {
   text-decoration: none;
 }
 .ui-accordion-content a:hover {
-  color: #e87c1e;
+  color: #ea7d1e;
   text-decoration: none;
 }
 .ui-accordion-content ul {
@@ -455,7 +455,7 @@ a.CollapsibleLabel.open, td a.CollapsibleLabel.open {
   padding: 0px 0pt 0px 16px;
   font-size: 8pt;
   text-decoration: none;
-  color: #e87c1e;
+  color: #ea7d1e;
   background: url(../images/mini-arrow-orange-open.gif) no-repeat left;
 }
 .page_header {
@@ -506,7 +506,7 @@ div.actions_menu > ul {
   nowidth: 70px;
   padding-left: 5px;
   /* Nasty work-around for IE... en attendant mieux */
-  background: #e87c1e url(../images/actions_left.png?v=v2.4.0) no-repeat top left;
+  background: #ea7d1e url(../images/actions_left.png?v=v2.4.0) no-repeat top left;
   cursor: pointer;
   margin: 0;
 }
@@ -588,7 +588,7 @@ div.actions_menu > ul > li {
   text-align: left;
 }
 .itop_popup li ul li a:hover, #logOffBtn li ul li a:hover {
-  background: #e87c1e;
+  background: #ea7d1e;
   color: #fff;
   font-weight: bold;
 }
@@ -675,6 +675,7 @@ input.dp-applied {
   float: left;
 }
 /* For search forms */
+/* TODO: Remove when cleaning up old search */
 .SearchDrawer {
   border-top: 5px solid #1c94c4;
   border-left: 5px solid #1c94c4;
@@ -753,6 +754,57 @@ div.HRDrawer {
   nopadding-right: 1em;
   margin-top: 0;
 }
+/* Search forms v2 */
+/* TODO: Remove comment before final commit */
+.search_form_handler {
+  /* Sizing reset */
+  /* Hyperlink reset */
+}
+.search_form_handler * {
+  box-sizing: border-box;
+}
+.search_form_handler a {
+  color: inherit;
+  text-decoration: none;
+}
+.search_form_handler .sf_criterion_area {
+  /* Common style between criterion and more criterion */
+  /* Criteria tags */
+  /* More criterion */
+}
+.search_form_handler .sf_criterion_area .sf_active_criterion, .search_form_handler .sf_criterion_area .sf_more_criterion {
+  display: inline-block;
+}
+.search_form_handler .sf_criterion_area .sf_more_criterion, .search_form_handler .sf_criterion_area .search_form_criteria {
+  position: relative;
+  padding: 8px 10px;
+  background-color: #ea7d1e;
+  color: #fff;
+}
+.search_form_handler .sf_criterion_area .search_form_criteria {
+  display: inline-block;
+  margin-right: 3px;
+}
+.search_form_handler .sf_criterion_area .search_form_criteria.locked {
+  background-color: #f1f1f1;
+}
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group {
+  display: none;
+}
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened {
+  display: block;
+}
+.search_form_handler .sf_criterion_area .sf_more_criterion .sf_mc_list {
+  position: absolute;
+  margin: 0px;
+  top: 100%;
+  left: 0px;
+  background-color: #ea7d1e;
+}
+.search_form_handler .sf_criterion_area .sf_more_criterion .sf_mc_list .sf_mc_field {
+  cursor: pointer;
+  white-space: nowrap;
+}
 .mandatory {
   border: 1px solid #f00;
 }
@@ -892,7 +944,7 @@ div#logo div {
   margin-top: 2px;
   margin-right: 4px;
   padding: 6px 9px;
-  background-color: #e87c1e;
+  background-color: #ea7d1e;
   color: white;
   border-radius: 6px;
   text-align: left;
@@ -1499,7 +1551,7 @@ img.prev, img.first, img.next, img.last {
 }
 div.actions_button {
   float: right;
-  background: #e87c1e url("../images/actions_left.png?v=v2.4.0") no-repeat scroll left top;
+  background: #ea7d1e url("../images/actions_left.png?v=v2.4.0") no-repeat scroll left top;
   padding-left: 5px;
   margin-top: 0;
   margin-right: 10px;
@@ -1507,7 +1559,7 @@ div.actions_button {
   vertical-align: middle;
 }
 div.actions_button a, .actions_button a:hover, .actions_button a:visited {
-  background: #e87c1e url(../images/actions_bkg.png?v=v2.4.0) no-repeat scroll right top;
+  background: #ea7d1e url(../images/actions_bkg.png?v=v2.4.0) no-repeat scroll right top;
   color: #fff;
   padding-right: 8px;
   cursor: pointer;
@@ -1540,7 +1592,7 @@ select#org_id {
   position: relative;
 }
 .edit_mode .dashlet-selected {
-  background: #e87c1e !important;
+  background: #ea7d1e !important;
   padding: 5px;
   margin: 0;
 }
@@ -1706,7 +1758,7 @@ a.summary, a.summary:hover {
   z-index: 999;
 }
 #DashboardMenu li ul li a:hover {
-  background: #e87c1e;
+  background: #ea7d1e;
   color: #fff;
   font-weight: bold;
   list-style: none;
@@ -2063,7 +2115,7 @@ span.refresh-button {
 }
 #itop-breadcrumb .breadcrumb-item a:hover {
   text-decoration: none;
-  color: #e87c1e;
+  color: #ea7d1e;
 }
 #itop-breadcrumb .breadcrumb-item a::after {
   content: '';
@@ -2127,7 +2179,7 @@ span.refresh-button {
   margin-bottom: 1px;
 }
 .object-ref-icon.fa {
-  color: #e87c1e;
+  color: #ea7d1e;
   font-size: smaller;
   vertical-align: 1px;
   margin-right: 1px;
diff --git a/css/light-grey.scss b/css/light-grey.scss
index aaf3e6658..063cd959c 100644
--- a/css/light-grey.scss
+++ b/css/light-grey.scss
@@ -756,6 +756,7 @@ input.dp-applied {
 }
 
 /* For search forms */
+/* TODO: Remove when cleaning up old search */
 .SearchDrawer {
 	//background: $complement-color url(../images/search-top-left-corner.png?v=#{$version}) top left no-repeat;
 	border-top: 5px solid $complement-color;
@@ -839,6 +840,80 @@ div.HRDrawer {
 	nopadding-right: 1em;
 	margin-top: 0;
 }
+/* Search forms v2 */
+/* TODO: Remove comment before final commit */
+.search_form_handler{
+	/* Sizing reset */
+	*{
+		box-sizing: border-box;
+	}
+	/* Hyperlink reset */
+	a{
+		color: inherit;
+		text-decoration: none;
+	}
+
+	.sf_criterion_area{
+		/* Common style between criterion and more criterion */
+		.sf_active_criterion,
+		.sf_more_criterion{
+			display: inline-block;
+		}
+		.sf_more_criterion,
+		.search_form_criteria{
+			position: relative;
+			padding: 8px 10px;
+			background-color: $combodo-orange;
+			color: $white;
+		}
+
+		/* Criteria tags */
+		.search_form_criteria{
+			display: inline-block;
+			margin-right: 3px;
+
+			&.locked{
+				background-color: $gray-extra-light;
+			}
+
+			.sfc_close{
+
+			}
+			.sfc_toggle{
+				&.opened{
+
+				}
+			}
+			.sfc_title{
+
+			}
+			.sfc_form_group{
+				display: none;
+
+				&.opened{
+					display: block;
+				}
+			}
+		}
+
+		/* More criterion */
+		.sf_more_criterion{
+			.sf_mc_list{
+				position: absolute;
+				margin: 0px;
+				top: 100%;
+				left: 0px;
+				background-color: $combodo-orange;
+
+				.sf_mc_field{
+					cursor: pointer;
+					white-space: nowrap;
+				}
+			}
+		}
+	}
+}
+
 .mandatory {
 	border: 1px solid #f00;
 }
diff --git a/js/search/search_form_criteria.js b/js/search/search_form_criteria.js
index 27d5e0a87..0047f9a10 100644
--- a/js/search/search_form_criteria.js
+++ b/js/search/search_form_criteria.js
@@ -9,15 +9,15 @@ $(function()
 		// default options
 		options:
 		{
-			handled_classes: [],
-			get_current_value_callback: 'getCurrentValue',
-			set_current_value_callback: function(me, oEvent, oData){ console.log('Search form criteria: set_current_value_callback must be overloaded, this is the default callback.'); },
+			get_current_values_callback: 'getCurrentValues',
+			set_current_values_callback: function(me, oEvent, oData){ console.log('Search form criteria: set_current_values_callback must be overloaded, this is the default callback.'); },
 
-			ref: "",
-			operator: "=",
+			ref: '',
+			operator: '=',
 			values: [],
-			oql: "",
+			oql: '',
 			is_removable: true,
+			is_modified: false, // TODO: change this on value change and remove oql property value
 		},
    
 		// the constructor
@@ -25,12 +25,14 @@ $(function()
 		{
 			var me = this;
 			
-			this.element
-			.addClass('search_form_criteria');
+			this.element.addClass('search_form_criteria');
 
-			// Get/SetCurrentValue callbacks handler
-			this.element
-				.bind('get_current_value set_current_value', function(oEvent, oData){
+			// GetData
+			this.element.bind('itop.search.criteria.get_data', function(oEvent, oData){
+				return me._onGetData(oData);
+			});
+			// Get/SetCurrentValues callbacks handler
+			this.element.bind('itop.search.criteria.get_current_values itop.search.criteria.set_current_values', function(oEvent, oData){
 					oEvent.stopPropagation();
 
 					var callback = me.options[oEvent.type+'_callback'];
@@ -61,8 +63,7 @@ $(function()
 		// revert other modifications here
 		_destroy: function()
 		{
-			this.element
-			.removeClass('search_form_criteria');
+			this.element.removeClass('search_form_criteria');
 		},
 		// _setOptions is called with a hash of all options that are changing
 		// always refresh when changing options
@@ -77,52 +78,30 @@ $(function()
 		},
 
 
-		getCurrentValue: function()
+		// Public methods
+		getCurrentValues: function()
 		{
-			// TODO
-			// var value = null;
-			//
-			// this.element.find(':input').each(function(iIndex, oElem){
-			// 	if($(oElem).is(':hidden') || $(oElem).is(':text') || $(oElem).is(':password') || $(oElem).is('textarea'))
-			// 	{
-			// 		value = $(oElem).val();
-			// 	}
-			// 	else if($(oElem).is('select'))
-			// 	{
-			// 		if($(oElem).is('select[multiple]'))
-			// 		{
-			// 			value = [];
-			// 			$(oElem).find('option:selected').each(function(){
-			// 				value.push($(this).val());
-			// 			});
-			// 		}
-			// 		else
-			// 		{
-			// 			value = $(oElem).val();
-			// 		}
-			// 	}
-			// 	else if($(oElem).is(':checkbox') || $(oElem).is(':radio'))
-			// 	{
-			// 		if(value === null)
-			// 		{
-			// 			value = [];
-			// 		}
-			// 		if($(oElem).is(':checked'))
-			// 		{
-			// 			value.push($(oElem).val());
-			// 		}
-			// 	}
-			// 	else
-			// 	{
-			// 		console.log('Form field : Input type not handle yet.');
-			// 	}
-			// });
-			//
-			// return value;
+			var aValues = this.options.values;
+			return aValues;
 		},
 
 
-		// Prepare DOM element
+		// Event callbacks
+		_onGetData: function(oData)
+		{
+			var oData = {
+				'ref': this.options.ref,
+				'operator': this.options.operator,
+				'values': this.options.values,
+				'is_removable': this.options.is_removable,
+				'oql': this.options.oql,
+			};
+			return oData;
+		},
+
+
+		// DOM element helpers
+		// - Prepare element DOM structure
 		_prepareElement: function()
 		{
 			// Prepare base DOM structure
@@ -130,26 +109,51 @@ $(function()
 			this.element
 				.append('<div class="sfc_title"></div>')
 				.append('<div class="sfc_form_group"></div>')
-				.append('<div class="sfc_toggle"><span class="fa fa-caret-down"></span></div>');
+				.append('<div class="sfc_toggle"><a class="fa fa-caret-down" href="#"></a></div>');
 
 			// Removable / locked decoration
 			if(this.options.is_removable === true)
 			{
-				this.element.append('<div class="sfc_close"><span class="fa fa-times"></span></div>');
+				this.element.append('<div class="sfc_close"><a class="fa fa-times" href="#"></a></div>');
 			}
 			else
 			{
 				this.element.append('<div class="sfc_locked"><span class="fa fa-lock"></span></div>');
 			}
 
-			// Fill
+			// Fill criteria
+			this._setTitle();
+		},
+		_setTitle: function(sTitle)
+		{
+			if(sTitle === undefined)
+			{
+				// TODO: Make nice label
+			}
+			this.element.find('.sfc_title').text(sTitle);
 		},
 
 
-		// Debug helper
+		// Debug helpers
+		// - Show a trace in the javascript console
+		_trace: function(sMessage, oData)
+		{
+			if(window.console)
+			{
+				if(oData !== undefined)
+				{
+					console.log('Search form criteria: ' + sMessage, oData);
+				}
+				else
+				{
+					console.log('Search form criteria: ' + sMessage);
+				}
+			}
+		},
+		// - Show current options
 		showOptions: function()
 		{
-			return this.options;
+			this._trace('Options', this.options);
 		}
 	});
 });
diff --git a/js/search/search_form_criteria_raw.js b/js/search/search_form_criteria_raw.js
new file mode 100644
index 000000000..7b628316d
--- /dev/null
+++ b/js/search/search_form_criteria_raw.js
@@ -0,0 +1,55 @@
+//iTop Search form criteria raw
+;
+$(function()
+{
+	// the widget definition, where 'itop' is the namespace,
+	// 'search_form_criteria_raw' the widget name
+	$.widget( 'itop.search_form_criteria_raw', $.itop.search_form_criteria,
+	{
+		// default options
+		options:
+		{
+		},
+   
+		// the constructor
+		_create: function()
+		{
+			var me = this;
+
+			this._super();
+			this.element.addClass('search_form_criteria_raw');
+		},
+		// called when created, and later when changing options
+		_refresh: function()
+		{
+
+		},
+		// events bound via _bind are removed automatically
+		// revert other modifications here
+		_destroy: function()
+		{
+			this.element.removeClass('search_form_criteria_raw');
+			this._super();
+		},
+		// _setOptions is called with a hash of all options that are changing
+		// always refresh when changing options
+		_setOptions: function()
+		{
+			this._superApply(arguments);
+		},
+		// _setOption is called for each individual option that is changing
+		_setOption: function( key, value )
+		{
+			this._super( key, value );
+		},
+
+		_setTitle: function(sTitle)
+		{
+			if(sTitle === undefined)
+			{
+				sTitle = this.options.oql;
+			}
+			this._super(sTitle);
+		},
+	});
+});
diff --git a/js/search/search_form_handler.js b/js/search/search_form_handler.js
index d8e2c65aa..5ed8e3335 100644
--- a/js/search/search_form_handler.js
+++ b/js/search/search_form_handler.js
@@ -9,54 +9,57 @@ $(function()
 		// default options
 		options:
 		{
-			"criterion_outer_selector": null,
-			"result_list_outer_selector": null,
-			"submit_button_selector": null,
-			"hide_initial_criterion": false, // What is that?
-			"endpoint": null,
-			"search": {
-				"base_oql": "",
-				"criterion": [
+			'criterion_outer_selector': null,
+			'result_list_outer_selector': null,
+			'submit_button_selector': null,
+			'hide_initial_criterion': false, // TODO: What is that?
+			'endpoint': null,
+			'search': {
+				'base_oql': '',
+				'criterion': [
 					// Structure
 					// {
-					// 	"or": [
+					// 	'or': [
 					// 		{
-					// 			"and": [
+					// 			'and': [
 					// 				{
-					// 					"ref": "alias.code",
-					// 					"operator": "contains",
-					// 					"values": [
+					// 					'ref': 'alias.code',
+					// 					'operator': 'contains',
+					// 					'values': [
 					// 						{
-					// 							"value": "foo",
-					// 							"label": "bar",
+					// 							'value': 'foo',
+					// 							'label': 'bar',
 					// 						}
 					// 					],
-					// 					"is_removable": true,
-					// 					"oql": "",
+					// 					'is_removable': true,
+					// 					'oql': '',
 					// 				},
 					// 			]
 					// 		},
 					// 	]
 					// },
 				],
-				"fields": [
+				'fields': [
 					// Structure
-					// 	"alias.code": {
-					// 		"class_alias": "",
-					// 		"class": "",
-					// 		"code": "",
-					// 		"label": "",
-					// 		"type": "",
-					// 		"allowed_values": {...},
+					// 	'alias.code': {
+					// 		'class_alias': '',
+					// 		'class': '',
+					// 		'code': '',
+					// 		'label': '',
+					// 		'type': '',
+					// 		'allowed_values': {...},
 					// 	},
 				],
 			},
+			'supported_criterion_types': ['raw'],
+			'default_criteria_type': 'raw',
 		},
 
 		// jQuery elements
 		elements:
 		{
-			criterion_area: null,
+			active_criterion: null,
+			more_criterion: null,
 		},
 
 		// the constructor
@@ -64,26 +67,20 @@ $(function()
 		{
 			var me = this;
 			
-			this.element
-			.addClass('search_form_handler');
+			this.element.addClass('search_form_handler');
 
-			// Binding events
-			// this.element.bind('update_fields', function(oEvent, oData){
-			// 	me._onUpdateFields(oEvent, oData);
-			// });
+			// Prepare DOM elements
+			this._prepareCriterionArea();
+			this._prepareResultsArea();
 
 			// Binding buttons
 			if(this.options.submit_button_selector !== null)
 			{
-				this.options.submit_button_selector.off('click').on('click', function(oEvent){ me._onSubmitClick(oEvent); });
+				$(this.options.submit_button_selector).off('click').on('click', function(oEvent){ me._onSubmitClick(oEvent); });
 			}
-			// if(this.options.cancel_btn_selector !== null)
-			// {
-			// 	this.options.cancel_btn_selector.off('click').on('click', function(oEvent){ me._onCancelClick(oEvent); });
-			// }
 
-			// Prepare criterion area
-			this._prepareCriterionArea();
+			// Binding events (eg. from search_form_criteria widgets)
+			this._bindEvents();
 		},
    
 		// called when created, and later when changing options
@@ -111,39 +108,137 @@ $(function()
 		},
 
 
-		getCurrentValues: function()
+		//
+		_bindEvents: function()
 		{
-			// TODO
-			// return this.options.field_set.triggerHandler('get_current_values');
+			var me = this;
+
+			// Criteria events
+			this.element.bind('itop.search.criteria.value_changed', function(oEvent, oData){
+				me._onCriteriaValueChanged(oData);
+			});
+		},
+		// - Update search option of the widget
+		_updateSearch: function()
+		{
+			var me = this;
+
+			// Criterion
+			// - Note: As of today, only a "or" level with a "and" is supported, so the following part
+			//         will need some refactoring when introducing new stuff.
+			var oCriterion = {
+				'or': [{
+					'and': []
+				}]
+			};
+			// - Retrieve criterion
+			this.elements.active_criterion.find('.search_form_criteria').each(function(){
+				var oCriteriaData = $(this).triggerHandler('itop.search.criteria.get_data');
+				oCriterion['or'][0]['and'].push(oCriteriaData);
+			});
+			// - Update search
+			this.options.search.criterion = oCriterion;
+
+			// No need to update base OQL and fields
 		},
 
+		// DOM helpers
 		// - Prepare criterion area
 		_prepareCriterionArea: function()
 		{
+			var oCriterionAreaElem;
+
 			// Build area element
 			if(this.options.criterion_outer_selector !== null && $(this.options.criterion_outer_selector).length > 0)
 			{
-				this.elements.criterion_area = $(this.options.criterion_outer_selector);
+				oCriterionAreaElem = $(this.options.criterion_outer_selector);
 			}
 			else
 			{
-				var oCriterionAreaElem = $('<div></div>').appendTo(this.element);
-				this.elements.criterion_area = oCriterionAreaElem;
+				oCriterionAreaElem = $('<div></div>').appendTo(this.element);
 			}
-			this.elements.criterion_area.addClass('sf_criterion_area');
+			oCriterionAreaElem.addClass('sf_criterion_area');
 
 			// Clean area
-			this.elements.criterion_area.html('');
+			oCriterionAreaElem
+				.html('')
+				.append('<div class="sf_active_criterion"></div>')
+				.append('<div class="sf_more_criterion"><span class="sf_mc_toggler fa fa-plus"></span><ul class="sf_mc_list"></ul></div>');
+			this.elements.active_criterion = oCriterionAreaElem.find('.sf_active_criterion');
+			this.elements.more_criterion = oCriterionAreaElem.find('.sf_more_criterion');
 
-			// Fill area with existing criterion
-			for(var i in this.options.search.criterion)
+			// Prepare content
+			this._prepareExistingCriterion();
+			this._prepareMoreCriterionMenu();
+
+			// TODO: Delete this
+			oCriterionAreaElem.append( $('<button type="button" value="submit" class="sf_submit_btn">Go!</button>') );
+			this.options.submit_button_selector = '.sf_submit_btn';
+		},
+		// - Prepare existing criterion
+		_prepareExistingCriterion: function()
+		{
+			// - OR conditions
+			var aORs = (this.options.search.criterion['or'] !== undefined) ? this.options.search.criterion['or'] : [];
+			for(var iORIdx in aORs)
 			{
-				console.log(i, this.options.search.criterion[i]);
+				// Note: We might want to create a OR container here when handling several OR conditions.
+
+				var aANDs = (aORs[iORIdx]['and'] !== undefined) ? aORs[iORIdx]['and'] : [];
+				for(var iANDIdx in aANDs)
+				{
+					var oCriteriaData = aANDs[iANDIdx];
+					this._addCriteria(oCriteriaData);
+				}
 			}
 		},
+		// - Prepare "more" button
+		_prepareMoreCriterionMenu: function()
+		{
+			var me = this;
+
+			// Add fields
+			// TODO: Find a widget to handle dropdown menu
+			for(var sFieldRef in this.options.search.fields)
+			{
+				var oField = this.options.search.fields[sFieldRef];
+				var oFieldElem = $('<li></li>')
+					.addClass('sf_mc_field')
+					.attr('data-field-ref', sFieldRef)
+					.text(oField.label);
+				this.elements.more_criterion.find('> .sf_mc_list').append(oFieldElem);
+			}
+
+			// Bind event
+			this.elements.more_criterion.find('.sf_mc_field').on('click', function(){
+				// Prepare new criterion data
+				var oData = {
+					'ref': $(this).attr('data-field-ref'),
+				};
+
+				// Add criteria but don't submit form as the user has not specified the value yet.
+				me._addCriteria(oData);
+			});
+		},
+		// - Prepare results area
+		_prepareResultsArea: function()
+		{
+			var oResultAreaElem;
+
+			// Build area element
+			if(this.options.result_list_outer_selector !== null && $(this.options.result_list_outer_selector).length > 0)
+			{
+				oResultAreaElem = $(this.options.result_list_outer_selector);
+			}
+			else
+			{
+				oResultAreaElem = $('<div></div>').appendTo(this.element);
+			}
+			oResultAreaElem.addClass('sf_results_area');
+		},
 
 
-		// Criteria handlers
+		// Criteria helpers
 		// - Add a criteria to the form
 		_addCriteria: function(oData)
 		{
@@ -152,11 +247,11 @@ $(function()
 
 			if(sType !== null)
 			{
-				var sWidgetClass = 'search_form_criteria' + ((sType === 'raw') ? '' : '_' + sType);
+				var sWidgetClass = 'search_form_criteria' + '_' + sType;
 				oCriteriaElem = $('<div></div>')
 					.addClass('sf_criteria')
-					.appendTo(this.elements.criterion_area)
-					.search_form_criteria(oData);
+					.appendTo(this.elements.active_criterion);
+				$.itop[sWidgetClass](oData, oCriteriaElem);
 			}
 			else
 			{
@@ -170,17 +265,35 @@ $(function()
 
 			if(this.options.search.fields[sRef] !== undefined)
 			{
-				sType = this.options.search.fields[sRef].type;
+				sType = this.options.search.fields[sRef].widget.toLowerCase();
+
+				// Make sure the criteria type is supported, otherwise we might try to initialize a unknown widget.
+				if(this.options.supported_criterion_types.indexOf(sType) < 0)
+				{
+					sType = this.options.default_criteria_type;
+				}
+			}
+			// Fallback for unknown widget types or unknown field refs
+			else
+			{
+				sType = this.options.default_criteria_type;
 			}
 
 			return sType;
 		},
-
+		// Criteria handlers
+		// - Event value changed
+		_onCriteriaValueChanged: function(oData)
+		{
+			this._updateSearch();
+			this._submit();
+		},
 
 		// Button handlers
 		_onSubmitClick: function(oEvent)
 		{
-			// TODO
+			// Assertion: the search is already up to date
+			this._submit();
 		},
 		_onCancelClick: function(oEvent)
 		{
@@ -188,9 +301,29 @@ $(function()
 		},
 
 
-		// Update handlers
-		// - Called on form update successes
-		_onUpdateSuccess: function(oData, sFormPath)
+		// Submit handlers
+		_submit: function()
+		{
+			var oData = {
+				'params': JSON.stringify({
+					'base_oql': this.options.search.base_oql,
+					'criterion': this.options.search.criterion,
+				}),
+			};
+
+			$.post(
+				this.options.endpoint,
+				oData,
+				function(oResponse, sStatus, oXHR){
+					console.log('POST success', oResponse, sStatus, oXHR);
+				}
+			)
+				.done(function(a,b,c,d){ console.log('POST done', a,b,c,d);})
+				.fail(function(a,b,c,d){ console.log('POST fail', a,b,c,d);})
+				.always(function(a,b,c,d){ console.log('POST always', a,b,c,d);});
+		},
+		// - Called on form submit successes
+		_onSubmitSuccess: function(oData, sFormPath)
 		{
 			// TODO
 			// if(oData.form.updated_fields !== undefined)
@@ -198,13 +331,13 @@ $(function()
 			// 	this.element.find('[data-form-path="' + sFormPath + '"]').trigger('update_form', {updated_fields: oData.form.updated_fields});
 			// }
 		},
-		// - Called on form update failures
-		_onUpdateFailure: function(oData, sFormPath)
+		// - Called on form submit failures
+		_onSubmitFailure: function(oData, sFormPath)
 		{
 			// TODO
 		},
-		// - Called after form updates
-		_onUpdateAlways: function(oData, sFormPath)
+		// - Called after form submits
+		_onSubmitAlways: function(oData, sFormPath)
 		{
 			// TODO
 			// // Check all touched AFTER ajax is complete, otherwise the renderer will redraw the field in the mean time.
@@ -213,7 +346,7 @@ $(function()
 		},
 
 
-		// Helpers
+		// Global helpers
 		// - Show loader
 		_disableFormBeforeLoading: function()
 		{
@@ -227,6 +360,18 @@ $(function()
 
 
 		// Debug helpers
+		// - Converts a snake_case string to CamelCase
+		_toCamelCase: function(sString)
+		{
+			var aParts = sString.split('_');
+
+			for(var i in aParts)
+			{
+				aParts[i] = aParts[i].charAt(0).toUpperCase() + aParts[i].substr(1);
+			}
+
+			return aParts.join('');
+		},
 		// - Show a trace in the javascript console
 		_trace: function(sMessage, oData)
 		{
@@ -245,7 +390,7 @@ $(function()
 		// - Show current options
 		showOptions: function()
 		{
-			this._trace('Options', this.options, this.toto);
+			this._trace('Options', this.options);
 		}
 	});
 });

From c04f73e86b32420313d744609397b6ac3558e65a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Thu, 8 Mar 2018 17:01:17 +0000
Subject: [PATCH 010/202] Advanced Search Convert from raw OQL to search form
 widget operator

SVN:b1162[5395]
---
 application/cmdbabstract.class.inc.php        |   4 +
 core/oql/expression.class.inc.php             |  19 ++-
 .../criteriontooql.class.inc.php              |  98 ++++++++++++
 .../criteriontosearchform.class.inc.php       |  70 +++++++++
 ...criterionconversionabstract.class.inc.php} |  18 ++-
 .../search/criterionparser.class.inc.php      |  39 ++---
 .../search/searchform.class.inc.php           |   2 +
 .../search/CriterionConversionTest.php        | 148 ++++++++++++++++++
 .../search/CriterionParserTest.php            |   3 +-
 9 files changed, 362 insertions(+), 39 deletions(-)
 create mode 100644 sources/application/search/criterionconversion/criteriontooql.class.inc.php
 create mode 100644 sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
 rename sources/application/search/{criterionconversion.class.inc.php => criterionconversionabstract.class.inc.php} (78%)
 create mode 100644 test/application/search/CriterionConversionTest.php

diff --git a/application/cmdbabstract.class.inc.php b/application/cmdbabstract.class.inc.php
index 429cd435c..64b024094 100644
--- a/application/cmdbabstract.class.inc.php
+++ b/application/cmdbabstract.class.inc.php
@@ -46,6 +46,10 @@ require_once(APPROOT.'/application/ui.htmleditorwidget.class.inc.php');
 require_once(APPROOT.'/application/datatable.class.inc.php');
 require_once(APPROOT.'/sources/renderer/console/consoleformrenderer.class.inc.php');
 require_once(APPROOT.'/sources/application/search/searchform.class.inc.php');
+require_once(APPROOT.'/sources/application/search/criterionparser.class.inc.php');
+require_once(APPROOT.'/sources/application/search/criterionconversionabstract.class.inc.php');
+require_once(APPROOT.'/sources/application/search/criterionconversion/criteriontooql.class.inc.php');
+require_once(APPROOT.'/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php');
 
 abstract class cmdbAbstractObject extends CMDBObject implements iDisplay
 {
diff --git a/core/oql/expression.class.inc.php b/core/oql/expression.class.inc.php
index e017bd1b0..266942353 100644
--- a/core/oql/expression.class.inc.php
+++ b/core/oql/expression.class.inc.php
@@ -912,9 +912,26 @@ class FieldExpression extends UnaryExpression
 	}
 
 
+	/**
+	 * @param $oSearch
+	 * @param null $aArgs
+	 * @param bool $bRetrofitParams
+	 * @param AttributeDefinition $oAttDef
+	 *
+	 * @return array
+	 */
 	public function GetCriterion($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
 	{
-		return array('ref' => $this->GetParent().'.'.$this->GetName());
+		if (!is_null($oAttDef))
+		{
+			$sSearchType = $oAttDef->GetSearchType();
+		}
+		else
+		{
+			$sSearchType = AttributeDefinition::SEARCH_WIDGET_TYPE;
+		}
+
+		return array('ref' => $this->GetParent().'.'.$this->GetName(), 'widget' => $sSearchType);
 	}
 }
 
diff --git a/sources/application/search/criterionconversion/criteriontooql.class.inc.php b/sources/application/search/criterionconversion/criteriontooql.class.inc.php
new file mode 100644
index 000000000..bf6e39854
--- /dev/null
+++ b/sources/application/search/criterionconversion/criteriontooql.class.inc.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Copyright (C) 2010-2018 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ *  iTop is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with iTop. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+
+namespace Combodo\iTop\Application\Search\CriterionConversion;
+
+
+use Combodo\iTop\Application\Search\CriterionConversionAbstract;
+
+class CriterionToOQL extends CriterionConversionAbstract
+{
+
+	public static function Convert($aCriteria)
+	{
+		if (!empty($aCriteria['oql']))
+		{
+			return $aCriteria['oql'];
+		}
+
+		$aRef = explode('.', $aCriteria['ref']);
+		for($i = 0; $i < count($aRef); $i++)
+		{
+			$aRef[$i] = '`'.$aRef[$i].'`';
+		}
+		$sRef = implode('.', $aRef);
+
+		$sOperator = $aCriteria['operator'];
+
+		$aMappedOperators = array(
+			self::OP_CONTAINS => 'ContainsToOql',
+			self::OP_STARTS_WITH => 'StartsWithToOql',
+			self::OP_ENDS_WITH => 'EndsWithToOql',
+			self::OP_EMPTY => 'EmptyToOql',
+			self::OP_NOT_EMPTY => 'NotEmptyToOql',
+		);
+
+		if (array_key_exists($sOperator, $aMappedOperators))
+		{
+			$sFct = $aMappedOperators[$sOperator];
+
+			return self::$sFct($sRef, $sOperator, $aCriteria['values']);
+		}
+
+		$sValue = $aCriteria['values'][0]['value'];
+
+		return "({$sRef} {$sOperator} '{$sValue}')";
+	}
+
+	protected static function ContainsToOql($sRef, $sOperator, $aValues)
+	{
+		$sValue = $aValues[0]['value'];
+
+		return "({$sRef} LIKE '%{$sValue}%')";
+	}
+
+	protected static function StartsWithToOql($sRef, $sOperator, $aValues)
+	{
+		$sValue = $aValues[0]['value'];
+
+		return "({$sRef} LIKE '{$sValue}%')";
+	}
+
+	protected static function EndsWithToOql($sRef, $sOperator, $aValues)
+	{
+		$sValue = $aValues[0]['value'];
+
+		return "({$sRef} LIKE '%{$sValue}')";
+	}
+
+	protected static function EmptyToOql($sRef, $sOperator, $aValues)
+	{
+		return "({$sRef} = '')";
+	}
+
+	protected static function NotEmptyToOql($sRef, $sOperator, $aValues)
+	{
+		return "({$sRef} != '')";
+	}
+
+}
\ No newline at end of file
diff --git a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
new file mode 100644
index 000000000..8a63719b8
--- /dev/null
+++ b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Copyright (C) 2010-2018 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ *  iTop is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with iTop. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+
+namespace Combodo\iTop\Application\Search\CriterionConversion;
+
+
+use AttributeString;
+use Combodo\iTop\Application\Search\CriterionConversionAbstract;
+
+class CriterionToSearchForm extends CriterionConversionAbstract
+{
+
+	public static function Convert($aAndCriterionRaw)
+	{
+		$aAndCriterion = array();
+		$aMappingOperatorToFunction = array(
+			AttributeString::SEARCH_WIDGET_TYPE => 'TextToSearchForm',
+		);
+
+		foreach($aAndCriterionRaw as $aCriteria)
+		{
+			if (array_key_exists($aCriteria['widget'], $aMappingOperatorToFunction))
+			{
+				$sFct = $aMappingOperatorToFunction[$aCriteria['widget']];
+				$aAndCriterion[] = self::$sFct($aCriteria);
+			}
+		}
+
+		return $aAndCriterion;
+	}
+
+	protected static function TextToSearchForm($aCriteria)
+	{
+		$sRef = $aCriteria['ref'];
+		$sOperator = $aCriteria['operator'];
+		$aValues = $aCriteria['values'];
+
+
+		$value = $aValues[0]['value'];
+		if ('' == $value)
+		{
+			$aCriteria['operator'] = CriterionConversionAbstract::OP_EMPTY;
+
+			return $aCriteria;
+		}
+		$bStartWithPercent = $value{0} == '%' ? true : false;
+		$bEndWithPercent = $value{0} == '%' ? true : false;
+
+		return $aCriteria;
+	}
+}
\ No newline at end of file
diff --git a/sources/application/search/criterionconversion.class.inc.php b/sources/application/search/criterionconversionabstract.class.inc.php
similarity index 78%
rename from sources/application/search/criterionconversion.class.inc.php
rename to sources/application/search/criterionconversionabstract.class.inc.php
index ce98967aa..d8f901874 100644
--- a/sources/application/search/criterionconversion.class.inc.php
+++ b/sources/application/search/criterionconversionabstract.class.inc.php
@@ -19,17 +19,19 @@
  *
  */
 
-/**
- * Created by PhpStorm.
- * User: Eric
- * Date: 08/03/2018
- * Time: 14:47
- */
 
 namespace Combodo\iTop\Application\Search;
 
 
-class CriterionConversion
+abstract class CriterionConversionAbstract
 {
 
-}
\ No newline at end of file
+	const OP_CONTAINS = 'contains';
+	const OP_STARTS_WITH = 'starts_with';
+	const OP_ENDS_WITH = 'ends_with';
+	const OP_EMPTY = 'empty';
+	const OP_NOT_EMPTY = 'not_empty';
+
+
+}
+
diff --git a/sources/application/search/criterionparser.class.inc.php b/sources/application/search/criterionparser.class.inc.php
index 98532bd1b..3ae4748f2 100644
--- a/sources/application/search/criterionparser.class.inc.php
+++ b/sources/application/search/criterionparser.class.inc.php
@@ -29,6 +29,7 @@
 namespace Combodo\iTop\Application\Search;
 
 
+use Combodo\iTop\Application\Search\CriterionConversion\CriterionToOQL;
 use DBObjectSearch;
 use IssueLog;
 use OQLException;
@@ -62,19 +63,17 @@ class CriterionParser
 		}
 
 		// Sanitize the base OQL
-		if (strpos($sBaseOql, ' WHERE '))
+		try
 		{
-			try
-			{
-				$oSearch = DBObjectSearch::FromOQL($sBaseOql);
-				$oSearch->ResetCondition();
-				$sBaseOql = $oSearch->ToOQL();
-			} catch (OQLException $e)
-			{
-				IssueLog::Error($e->getMessage());
-			}
+			$oSearch = DBObjectSearch::FromOQL($sBaseOql);
+			$oSearch->ResetCondition();
+			$sBaseOql = str_replace(' WHERE 1', '', $oSearch->ToOQL());
+		} catch (OQLException $e)
+		{
+			IssueLog::Error($e->getMessage());
 		}
 
+
 		return $sBaseOql.' WHERE '.implode(" OR ", $aExpression).'';
 	}
 
@@ -83,7 +82,7 @@ class CriterionParser
 		$aExpression = array();
 		foreach($aAnd as $aCriteria)
 		{
-			$aExpression[] = self::ParseCriteria($aCriteria);
+			$aExpression[] = CriterionToOQL::Convert($aCriteria);
 		}
 
 		if (empty($aExpression))
@@ -93,22 +92,4 @@ class CriterionParser
 
 		return '('.implode(" AND ", $aExpression).')';
 	}
-
-	private static function ParseCriteria($aCriteria)
-	{
-
-		if (!empty($aCriteria['oql']))
-		{
-			return $aCriteria['oql'];
-		}
-
-		// TODO Manage more complicated case
-		$aRef = explode('.', $aCriteria['ref']);
-		$sRef = '`'.$aRef[0].'`.`'.$aRef[1].'`';
-
-		$sOperator = $aCriteria['operator'];
-		$sValue = $aCriteria['values'][0]['value'];
-
-		return "({$sRef} {$sOperator} '{$sValue}')";
-	}
 }
\ No newline at end of file
diff --git a/sources/application/search/searchform.class.inc.php b/sources/application/search/searchform.class.inc.php
index 9c05fff01..3efce253a 100644
--- a/sources/application/search/searchform.class.inc.php
+++ b/sources/application/search/searchform.class.inc.php
@@ -26,6 +26,7 @@ namespace Combodo\iTop\Application\Search;
 use ApplicationContext;
 use AttributeDefinition;
 use CMDBObjectSet;
+use Combodo\iTop\Application\Search\CriterionConversion\CriterionToSearchForm;
 use CoreException;
 use DBObjectSearch;
 use Dict;
@@ -212,6 +213,7 @@ class SearchForm
 				}
 				$aAndCriterion[] = $oAndSubExpr->GetCriterion($oSearch);
 			}
+			$aAndCriterion = CriterionToSearchForm::Convert($aAndCriterion);
 			$aOrCriterion[] = array('and' => $aAndCriterion);
 		}
 
diff --git a/test/application/search/CriterionConversionTest.php b/test/application/search/CriterionConversionTest.php
new file mode 100644
index 000000000..4f3e43ee0
--- /dev/null
+++ b/test/application/search/CriterionConversionTest.php
@@ -0,0 +1,148 @@
+<?php
+/**
+ * Copyright (C) 2010-2018 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ *  iTop is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with iTop. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+/**
+ * Created by PhpStorm.
+ * User: Eric
+ * Date: 08/03/2018
+ * Time: 16:46
+ */
+
+namespace Combodo\iTop\Test\UnitTest\Application\Search;
+
+use Combodo\iTop\Application\Search\CriterionConversion\CriterionToOQL;
+use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
+
+class CriterionConversionTest extends ItopDataTestCase
+{
+	/**
+	 * @throws Exception
+	 */
+	protected function setUp()
+	{
+		parent::setUp();
+
+		require_once(APPROOT."sources/application/search/criterionconversionabstract.class.inc.php");
+	}
+
+	/**
+	 * @dataProvider ToOqlProvider
+	 */
+	public function testToOql($sJSONCriterion, $sExpectedOQL)
+	{
+		$sOql = CriterionToOQL::Convert(
+			json_decode($sJSONCriterion, true)
+		);
+
+		$this->debug($sOql);
+		$this->assertEquals($sExpectedOQL, $sOql);
+	}
+
+	public function ToOqlProvider()
+	{
+		return array(
+			'>' => array(
+				'{
+                    "ref": "UserRequest.start_date",
+                    "values": [
+                        {
+                            "value": "2017-01-01",
+                            "label": "2017-01-01 00:00:00"
+                        }
+                    ],
+                    "operator": ">",
+                    "oql": ""
+                }',
+				"(`UserRequest`.`start_date` > '2017-01-01')"
+			),
+			'contains' => array(
+				'{
+                    "ref": "Contact.name",
+                    "values": [
+                        {
+                            "value": "toto",
+                            "label": "toto"
+                        }
+                    ],
+                    "operator": "contains",
+                    "oql": ""
+                }',
+				"(`Contact`.`name` LIKE '%toto%')"
+			),
+			'starts_with' => array(
+				'{
+                    "ref": "Contact.name",
+                    "values": [
+                        {
+                            "value": "toto",
+                            "label": "toto"
+                        }
+                    ],
+                    "operator": "starts_with",
+                    "oql": ""
+                }',
+				"(`Contact`.`name` LIKE 'toto%')"
+			),
+			'ends_with' => array(
+				'{
+                    "ref": "Contact.name",
+                    "values": [
+                        {
+                            "value": "toto",
+                            "label": "toto"
+                        }
+                    ],
+                    "operator": "ends_with",
+                    "oql": ""
+                }',
+				"(`Contact`.`name` LIKE '%toto')"
+			),
+			'empty' => array(
+				'{
+                    "ref": "Contact.name",
+                    "values": [
+                        {
+                            "value": "",
+                            "label": ""
+                        }
+                    ],
+                    "operator": "empty",
+                    "oql": ""
+                }',
+				"(`Contact`.`name` = '')"
+			),
+			'not_empty' => array(
+				'{
+                    "ref": "Contact.name",
+                    "values": [
+                        {
+                            "value": "",
+                            "label": ""
+                        }
+                    ],
+                    "operator": "not_empty",
+                    "oql": ""
+                }',
+				"(`Contact`.`name` != '')"
+			),
+		);
+	}
+}
diff --git a/test/application/search/CriterionParserTest.php b/test/application/search/CriterionParserTest.php
index f36068650..370c68d7f 100644
--- a/test/application/search/CriterionParserTest.php
+++ b/test/application/search/CriterionParserTest.php
@@ -81,6 +81,7 @@ class CriterionParserTest extends ItopDataTestCase
 		$sOQL = CriterionParser::Parse($sBaseOql, $aCriterion);
 
 		$this->debug($sOQL);
-		$this->markTestIncomplete();
+
+		$this->assertEquals("SELECT `UserRequest` FROM UserRequest AS `UserRequest` WHERE ((`UserRequest`.`start_date` > '2017-01-01') AND (`UserRequest`.`start_date` < '2018-01-01'))", $sOQL);
 	}
 }

From 213d591eb081b0a653251fa1c76df4a68edb3ba7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Fri, 9 Mar 2018 08:43:28 +0000
Subject: [PATCH 011/202] Advanced Search

SVN:b1162[5396]
---
 core/cmdbsource.class.inc.php                 |  3 +-
 .../criteriontosearchform.class.inc.php       | 42 ++++++++++++++-----
 .../search/searchform.class.inc.php           |  4 +-
 3 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/core/cmdbsource.class.inc.php b/core/cmdbsource.class.inc.php
index a37429c30..2f4d35aef 100644
--- a/core/cmdbsource.class.inc.php
+++ b/core/cmdbsource.class.inc.php
@@ -233,8 +233,7 @@ class CMDBSource
 		}
 		catch(mysqli_sql_exception $e)
 		{
-			throw new MySQLException('Could not connect to the DB server',
-				array('host' => $sServer, 'user' => $sUser), $e);
+			throw new MySQLException('Could not connect to the DB server', array('host' => $sServer, 'user' => $sUser), $e);
 		}
 
 		if ($bCheckTlsAfterConnection
diff --git a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
index 8a63719b8..3fde3b554 100644
--- a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
+++ b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
@@ -38,10 +38,17 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 
 		foreach($aAndCriterionRaw as $aCriteria)
 		{
-			if (array_key_exists($aCriteria['widget'], $aMappingOperatorToFunction))
+			if (array_key_exists('widget', $aCriteria))
 			{
-				$sFct = $aMappingOperatorToFunction[$aCriteria['widget']];
-				$aAndCriterion[] = self::$sFct($aCriteria);
+				if (array_key_exists($aCriteria['widget'], $aMappingOperatorToFunction))
+				{
+					$sFct = $aMappingOperatorToFunction[$aCriteria['widget']];
+					$aAndCriterion[] = self::$sFct($aCriteria);
+				}
+				else
+				{
+					$aAndCriterion[] = $aCriteria;
+				}
 			}
 		}
 
@@ -50,21 +57,36 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 
 	protected static function TextToSearchForm($aCriteria)
 	{
-		$sRef = $aCriteria['ref'];
 		$sOperator = $aCriteria['operator'];
 		$aValues = $aCriteria['values'];
 
-
 		$value = $aValues[0]['value'];
-		if ('' == $value)
-		{
-			$aCriteria['operator'] = CriterionConversionAbstract::OP_EMPTY;
 
-			return $aCriteria;
-		}
 		$bStartWithPercent = $value{0} == '%' ? true : false;
 		$bEndWithPercent = $value{0} == '%' ? true : false;
 
+		switch (true)
+		{
+			case ('' == $value and ($sOperator == '=' or $sOperator == 'LIKE')):
+				$aCriteria['operator'] = CriterionConversionAbstract::OP_EMPTY;
+				break;
+			case ('' == $value and $sOperator == '!='):
+				$aCriteria['operator'] = CriterionConversionAbstract::OP_NOT_EMPTY;
+				break;
+			case ($sOperator == 'LIKE' && $bStartWithPercent && $bEndWithPercent):
+				$aCriteria['operator'] = CriterionConversionAbstract::OP_CONTAINS;
+				$aValues[0]['value'] = substr($value, 1, strlen($value) - 2);
+				break;
+			case ($sOperator == 'LIKE' && $bStartWithPercent):
+				$aCriteria['operator'] = CriterionConversionAbstract::OP_ENDS_WITH;
+				$aValues[0]['value'] = substr($value, 1, strlen($value) - 1);
+				break;
+			case ($sOperator == 'LIKE' && $bEndWithPercent):
+				$aCriteria['operator'] = CriterionConversionAbstract::OP_STARTS_WITH;
+				$aValues[0]['value'] = substr($value, 0, strlen($value) - 1);
+				break;
+		}
+
 		return $aCriteria;
 	}
 }
\ No newline at end of file
diff --git a/sources/application/search/searchform.class.inc.php b/sources/application/search/searchform.class.inc.php
index 3efce253a..05d7a73ea 100644
--- a/sources/application/search/searchform.class.inc.php
+++ b/sources/application/search/searchform.class.inc.php
@@ -110,6 +110,8 @@ class SearchForm
 
 		$oBaseSearch = $oSearch->DeepClone();
 		$oBaseSearch->ResetCondition();
+		$sBaseOQL = $sBaseOql = str_replace(' WHERE 1', '', $oBaseSearch->ToOQL());
+
 
 		if (!isset($aExtraParams['table_id']))
 		{
@@ -123,7 +125,7 @@ class SearchForm
 			'search' => array(
 				'fields' => $aFields,
 				'criterion' => $aCriterion,
-				'base_oql' => $oBaseSearch->ToOQL(),
+				'base_oql' => $sBaseOQL,
 			),
 		);
 

From 88b7ef5345544535599ce5a92acd8a66aed65516 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Fri, 9 Mar 2018 09:16:00 +0000
Subject: [PATCH 012/202] Advanced Search Conversion to search form

SVN:b1162[5397]
---
 core/oql/expression.class.inc.php             |   5 +-
 .../criteriontosearchform.class.inc.php       |  24 ++--
 .../search/searchform.class.inc.php           |   2 +-
 .../search/CriterionConversionTest.php        | 136 ++++++++++++++++++
 4 files changed, 155 insertions(+), 12 deletions(-)

diff --git a/core/oql/expression.class.inc.php b/core/oql/expression.class.inc.php
index 266942353..cea3be642 100644
--- a/core/oql/expression.class.inc.php
+++ b/core/oql/expression.class.inc.php
@@ -931,7 +931,10 @@ class FieldExpression extends UnaryExpression
 			$sSearchType = AttributeDefinition::SEARCH_WIDGET_TYPE;
 		}
 
-		return array('ref' => $this->GetParent().'.'.$this->GetName(), 'widget' => $sSearchType);
+		return array(
+			'widget' => $sSearchType,
+			'ref' => $this->GetParent().'.'.$this->GetName(),
+		);
 	}
 }
 
diff --git a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
index 3fde3b554..f884d3739 100644
--- a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
+++ b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
@@ -58,32 +58,36 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 	protected static function TextToSearchForm($aCriteria)
 	{
 		$sOperator = $aCriteria['operator'];
-		$aValues = $aCriteria['values'];
+		$sValue = $aCriteria['values'][0]['value'];
 
-		$value = $aValues[0]['value'];
-
-		$bStartWithPercent = $value{0} == '%' ? true : false;
-		$bEndWithPercent = $value{0} == '%' ? true : false;
+		$bStartWithPercent = substr($sValue, 0, 1) == '%' ? true : false;
+		$bEndWithPercent = substr($sValue, -1) == '%' ? true : false;
 
 		switch (true)
 		{
-			case ('' == $value and ($sOperator == '=' or $sOperator == 'LIKE')):
+			case ('' == $sValue and ($sOperator == '=' or $sOperator == 'LIKE')):
 				$aCriteria['operator'] = CriterionConversionAbstract::OP_EMPTY;
 				break;
-			case ('' == $value and $sOperator == '!='):
+			case ('' == $sValue and $sOperator == '!='):
 				$aCriteria['operator'] = CriterionConversionAbstract::OP_NOT_EMPTY;
 				break;
 			case ($sOperator == 'LIKE' && $bStartWithPercent && $bEndWithPercent):
 				$aCriteria['operator'] = CriterionConversionAbstract::OP_CONTAINS;
-				$aValues[0]['value'] = substr($value, 1, strlen($value) - 2);
+				$sValue = substr($sValue, 1, -1);
+				$aCriteria['values'][0]['value'] = $sValue;
+				$aCriteria['values'][0]['label'] = $sValue;
 				break;
 			case ($sOperator == 'LIKE' && $bStartWithPercent):
 				$aCriteria['operator'] = CriterionConversionAbstract::OP_ENDS_WITH;
-				$aValues[0]['value'] = substr($value, 1, strlen($value) - 1);
+				$sValue = substr($sValue, 1);
+				$aCriteria['values'][0]['value'] = $sValue;
+				$aCriteria['values'][0]['label'] = $sValue;
 				break;
 			case ($sOperator == 'LIKE' && $bEndWithPercent):
 				$aCriteria['operator'] = CriterionConversionAbstract::OP_STARTS_WITH;
-				$aValues[0]['value'] = substr($value, 0, strlen($value) - 1);
+				$sValue = substr($sValue, 0, -1);
+				$aCriteria['values'][0]['value'] = $sValue;
+				$aCriteria['values'][0]['label'] = $sValue;
 				break;
 		}
 
diff --git a/sources/application/search/searchform.class.inc.php b/sources/application/search/searchform.class.inc.php
index 05d7a73ea..57c56b4ec 100644
--- a/sources/application/search/searchform.class.inc.php
+++ b/sources/application/search/searchform.class.inc.php
@@ -110,7 +110,7 @@ class SearchForm
 
 		$oBaseSearch = $oSearch->DeepClone();
 		$oBaseSearch->ResetCondition();
-		$sBaseOQL = $sBaseOql = str_replace(' WHERE 1', '', $oBaseSearch->ToOQL());
+		$sBaseOQL = str_replace(' WHERE 1', '', $oBaseSearch->ToOQL());
 
 
 		if (!isset($aExtraParams['table_id']))
diff --git a/test/application/search/CriterionConversionTest.php b/test/application/search/CriterionConversionTest.php
index 4f3e43ee0..b90098bed 100644
--- a/test/application/search/CriterionConversionTest.php
+++ b/test/application/search/CriterionConversionTest.php
@@ -29,6 +29,7 @@
 namespace Combodo\iTop\Test\UnitTest\Application\Search;
 
 use Combodo\iTop\Application\Search\CriterionConversion\CriterionToOQL;
+use Combodo\iTop\Application\Search\CriterionConversion\CriterionToSearchForm;
 use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
 
 class CriterionConversionTest extends ItopDataTestCase
@@ -145,4 +146,139 @@ class CriterionConversionTest extends ItopDataTestCase
 			),
 		);
 	}
+
+	/**
+	 * @dataProvider ToSearchFormProvider
+	 */
+	function testToSearchForm($aCriterion, $sExpectedOperator)
+	{
+		$aRes = CriterionToSearchForm::Convert($aCriterion);
+		$this->debug($aRes);
+		$this->assertEquals($sExpectedOperator, $aRes[0]['operator']);
+	}
+
+	function ToSearchFormProvider()
+	{
+		return array(
+			'=' => array(
+				json_decode('[
+                {
+                    "ref": "Contact.name",
+                    "widget": "string",
+                    "values": [
+                        {
+                            "value": "toto",
+                            "label": "toto"
+                        }
+                    ],
+                    "operator": "=",
+                    "oql": "(`Contact`.`name` = \'toto\')"
+                }
+            ]', true),
+				'='
+			),
+			'starts_with' => array(
+				json_decode('[
+                {
+                    "ref": "Contact.name",
+                    "widget": "string",
+                    "values": [
+                        {
+                            "value": "toto%",
+                            "label": "toto%"
+                        }
+                    ],
+                    "operator": "LIKE",
+                    "oql": "(`Contact`.`name` LIKE \'toto%\')"
+                }
+            ]', true),
+				'starts_with'
+			),
+			'ends_with' => array(
+				json_decode('[
+                {
+                    "ref": "Contact.name",
+                    "widget": "string",
+                    "values": [
+                        {
+                            "value": "%toto",
+                            "label": "%toto"
+                        }
+                    ],
+                    "operator": "LIKE",
+                    "oql": "(`Contact`.`name` LIKE \'%toto\')"
+                }
+            ]', true),
+				'ends_with'
+			),
+			'contains' => array(
+				json_decode('[
+                {
+                    "widget": "string",
+                    "ref": "Contact.name",
+                    "values": [
+                        {
+                            "value": "%toto%",
+                            "label": "%toto%"
+                        }
+                    ],
+                    "operator": "LIKE",
+                    "oql": "(`Contact`.`name` LIKE \'%toto%\')"
+                }
+            ]', true),
+				'contains'
+			),
+			'empty1' => array(
+				json_decode('[
+                {
+                    "widget": "string",
+                    "ref": "Contact.name",
+                    "values": [
+                        {
+                            "value": "",
+                            "label": ""
+                        }
+                    ],
+                    "operator": "LIKE",
+                    "oql": "(`Contact`.`name` LIKE \'\')"
+                }
+            ]', true),
+				'empty'
+			),
+			'empty2' => array(
+				json_decode('[
+                {
+                    "widget": "string",
+                    "ref": "Contact.name",
+                    "values": [
+                        {
+                            "value": "",
+                            "label": ""
+                        }
+                    ],
+                    "operator": "=",
+                    "oql": "(`Contact`.`name` = \'\')"
+                }
+            ]', true),
+				'empty'
+			),
+			'not_empty' => array(
+				json_decode('[
+                {
+                    "widget": "string",
+                    "ref": "Contact.name",
+                    "values": [
+                        {
+                            "value": "",
+                            "label": ""
+                        }
+                    ],
+                    "operator": "!=",
+                    "oql": "(`Contact`.`name` != \'\')"
+                }
+            ]', true),
+				'not_empty'
+			),
+		);
+	}
 }

From 5f7453d031a98544bbe64f6647ba36c1cfceff2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Fri, 9 Mar 2018 09:23:36 +0000
Subject: [PATCH 013/202] Advanced Search

SVN:b1162[5398]
---
 pages/ajax.searchform.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pages/ajax.searchform.php b/pages/ajax.searchform.php
index 04c08643f..a2a6d309e 100644
--- a/pages/ajax.searchform.php
+++ b/pages/ajax.searchform.php
@@ -56,6 +56,7 @@ try
 
 	$aExtraParams['display_limit'] = true;
 	$aExtraParams['truncated'] = true;
+	$aExtraParams['currentId'] = uniqid('ajax-search-form');
 	$oDisplayBlock->RenderContent($oPage, $aExtraParams);
 
 	$oPage->output();

From 37196b42edb01ec0753798741dbde5a7eae097ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Fri, 9 Mar 2018 09:36:58 +0000
Subject: [PATCH 014/202] Advanced Search

SVN:b1162[5399]
---
 core/attributedef.class.inc.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/core/attributedef.class.inc.php b/core/attributedef.class.inc.php
index 1f4d439e7..45b34a274 100644
--- a/core/attributedef.class.inc.php
+++ b/core/attributedef.class.inc.php
@@ -111,7 +111,11 @@ define('LINKSET_EDITMODE_ADDREMOVE', 4); // The "linked" objects can be added/re
  */
 abstract class AttributeDefinition
 {
-	const SEARCH_WIDGET_TYPE = 'raw';
+	const SEARCH_WIDGET_TYPE_RAW = 'raw';
+	const SEARCH_WIDGET_TYPE_STRING = 'string';
+	const SEARCH_WIDGET_TYPE_ENUM = 'enum';
+	const SEARCH_WIDGET_TYPE_EXTERNAL_KEY = 'external_key';
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
 
 	public function GetType()
 	{
@@ -2097,7 +2101,7 @@ class AttributeBoolean extends AttributeInteger
  */
 class AttributeString extends AttributeDBField
 {
-	const SEARCH_WIDGET_TYPE = 'string';
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_STRING;
 
 	static public function ListExpectedParams()
 	{
@@ -3447,7 +3451,7 @@ class AttributeTemplateHTML extends AttributeText
  */
 class AttributeEnum extends AttributeString
 {
-	const SEARCH_WIDGET_TYPE = 'enum';
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_ENUM;
 
 	static public function ListExpectedParams()
 	{
@@ -4542,7 +4546,7 @@ class AttributeDeadline extends AttributeDateTime
  */
 class AttributeExternalKey extends AttributeDBFieldVoid
 {
-	const SEARCH_WIDGET_TYPE = 'external_key';
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_EXTERNAL_KEY;
 
 	static public function ListExpectedParams()
 	{

From 0bf33ec7e9a1d1e8c370d523184887dd53bdc76e Mon Sep 17 00:00:00 2001
From: Guillaume Lajarige <guillaume.lajarige@combodo.com>
Date: Fri, 9 Mar 2018 11:10:03 +0000
Subject: [PATCH 015/202] Advanced search: WIP POC, integration with endpoint.

SVN:b1162[5400]
---
 application/nicewebpage.class.inc.php    |  1 +
 js/search/search_form_criteria.js        | 61 +++++++++++++---
 js/search/search_form_criteria_raw.js    | 17 ++++-
 js/search/search_form_criteria_string.js | 77 ++++++++++++++++++++
 js/search/search_form_handler.js         | 92 +++++++++++++-----------
 5 files changed, 198 insertions(+), 50 deletions(-)
 create mode 100644 js/search/search_form_criteria_string.js

diff --git a/application/nicewebpage.class.inc.php b/application/nicewebpage.class.inc.php
index d1a4a65bd..4a3338bd6 100644
--- a/application/nicewebpage.class.inc.php
+++ b/application/nicewebpage.class.inc.php
@@ -53,6 +53,7 @@ class NiceWebPage extends WebPage
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_handler.js');
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria.js');
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_raw.js');
+	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_string.js');
 	    $this->add_ready_script(
 <<< EOF
 	//add new widget called TruncatedList to properly display truncated lists when they are sorted
diff --git a/js/search/search_form_criteria.js b/js/search/search_form_criteria.js
index 0047f9a10..aca7fe7b0 100644
--- a/js/search/search_form_criteria.js
+++ b/js/search/search_form_criteria.js
@@ -9,16 +9,19 @@ $(function()
 		// default options
 		options:
 		{
-			get_current_values_callback: 'getCurrentValues',
-			set_current_values_callback: function(me, oEvent, oData){ console.log('Search form criteria: set_current_values_callback must be overloaded, this is the default callback.'); },
-
 			ref: '',
 			operator: '=',
 			values: [],
 			oql: '',
 			is_removable: true,
+
+			field: {
+				label: '',
+			},
 			is_modified: false, // TODO: change this on value change and remove oql property value
 		},
+
+		handler: null,
    
 		// the constructor
 		_create: function()
@@ -27,6 +30,9 @@ $(function()
 			
 			this.element.addClass('search_form_criteria');
 
+			// Link search form handler
+			this.handler = this.element.closest('.search_form_handler');
+
 			// GetData
 			this.element.bind('itop.search.criteria.get_data', function(oEvent, oData){
 				return me._onGetData(oData);
@@ -78,25 +84,25 @@ $(function()
 		},
 
 
-		// Public methods
-		getCurrentValues: function()
+		// Protected methods
+		_remove: function()
 		{
-			var aValues = this.options.values;
-			return aValues;
+			this.element.remove();
+			this.handler.triggerHandler('itop.search.criteria.removed');
 		},
 
 
 		// Event callbacks
 		_onGetData: function(oData)
 		{
-			var oData = {
+			var oCriteriaData = {
 				'ref': this.options.ref,
 				'operator': this.options.operator,
 				'values': this.options.values,
 				'is_removable': this.options.is_removable,
 				'oql': this.options.oql,
 			};
-			return oData;
+			return oCriteriaData;
 		},
 
 
@@ -104,6 +110,8 @@ $(function()
 		// - Prepare element DOM structure
 		_prepareElement: function()
 		{
+			var me = this;
+
 			// Prepare base DOM structure
 			//this.options.ref+' '+this.options.operator+' '+this.options.values
 			this.element
@@ -111,10 +119,19 @@ $(function()
 				.append('<div class="sfc_form_group"></div>')
 				.append('<div class="sfc_toggle"><a class="fa fa-caret-down" href="#"></a></div>');
 
+			// Bind events
+			// - Toggler
+			this.element.find('.sfc_toggle, .sfc_title').on('click', function(){
+				me.element.find('.sfc_form_group').toggle();
+			});
+
 			// Removable / locked decoration
 			if(this.options.is_removable === true)
 			{
 				this.element.append('<div class="sfc_close"><a class="fa fa-times" href="#"></a></div>');
+				this.element.find('.sfc_close').on('click', function(){
+					me._remove();
+				});
 			}
 			else
 			{
@@ -134,6 +151,32 @@ $(function()
 		},
 
 
+		// Values helpers
+		_getValuesAsText: function()
+		{
+			var aValues = [];
+			for(var iValueIdx in this.options.values)
+			{
+				aValues.push(this.options.values[iValueIdx].value);
+			}
+
+			return aValues.join(', ');
+		},
+		_makeOQLExpression: function()
+		{
+			var aValues = [];
+			var sOQL = '';
+
+			for(var iValueIdx in this.options.values)
+			{
+				aValues.push( '\'' + this.options.values[iValueIdx].value + '\'' );
+			}
+			sOQL += '(`' + this.options.ref + '`) ' + this.options.operator + ' ' + aValues.join(', ') + ')';
+
+			return sOQL;
+		},
+
+
 		// Debug helpers
 		// - Show a trace in the javascript console
 		_trace: function(sMessage, oData)
diff --git a/js/search/search_form_criteria_raw.js b/js/search/search_form_criteria_raw.js
index 7b628316d..0d0935904 100644
--- a/js/search/search_form_criteria_raw.js
+++ b/js/search/search_form_criteria_raw.js
@@ -43,11 +43,26 @@ $(function()
 			this._super( key, value );
 		},
 
+		// DOM element helpers
+		_prepareElement: function()
+		{
+			this._super();
+
+			// Remove toggler as it's a non sense here
+			this.element.find('.sfc_toggle').remove();
+		},
 		_setTitle: function(sTitle)
 		{
 			if(sTitle === undefined)
 			{
-				sTitle = this.options.oql;
+				if(this.options.oql !== '')
+				{
+					sTitle = this.options.oql;
+				}
+				else
+				{
+					sTitle = this._makeOQLExpression();
+				}
 			}
 			this._super(sTitle);
 		},
diff --git a/js/search/search_form_criteria_string.js b/js/search/search_form_criteria_string.js
new file mode 100644
index 000000000..5035772c6
--- /dev/null
+++ b/js/search/search_form_criteria_string.js
@@ -0,0 +1,77 @@
+//iTop Search form criteria string
+;
+$(function()
+{
+	// the widget definition, where 'itop' is the namespace,
+	// 'search_form_criteria_string' the widget name
+	$.widget( 'itop.search_form_criteria_string', $.itop.search_form_criteria,
+	{
+		// default options
+		options:
+		{
+		},
+   
+		// the constructor
+		_create: function()
+		{
+			var me = this;
+
+			this._super();
+			this.element.addClass('search_form_criteria_string');
+		},
+		// called when created, and later when changing options
+		_refresh: function()
+		{
+
+		},
+		// events bound via _bind are removed automatically
+		// revert other modifications here
+		_destroy: function()
+		{
+			this.element.removeClass('search_form_criteria_string');
+			this._super();
+		},
+		// _setOptions is called with a hash of all options that are changing
+		// always refresh when changing options
+		_setOptions: function()
+		{
+			this._superApply(arguments);
+		},
+		// _setOption is called for each individual option that is changing
+		_setOption: function( key, value )
+		{
+			this._super( key, value );
+		},
+
+		// DOM element helpers
+		_prepareElement: function()
+		{
+			var me = this;
+
+			this._super();
+
+			// TODO: Refactor this after UI mockups
+			var oInputElem = $('<input type="text" />');
+			oInputElem.on('change', function(){
+				var sValue = $(this).val();
+
+				me.options.values = [{
+					value: sValue,
+					label: sValue,
+				}];
+				me._setTitle();
+
+				me.handler.triggerHandler('itop.search.criteria.value_changed');
+			})
+				.appendTo(this.element.find('.sfc_form_group'));
+		},
+		_setTitle: function(sTitle)
+		{
+			if(sTitle === undefined)
+			{
+				sTitle = this.options.field.label + ': ' + this._getValuesAsText();
+			}
+			this._super(sTitle);
+		},
+	});
+});
diff --git a/js/search/search_form_handler.js b/js/search/search_form_handler.js
index 5ed8e3335..888867b8f 100644
--- a/js/search/search_form_handler.js
+++ b/js/search/search_form_handler.js
@@ -51,7 +51,7 @@ $(function()
 					// 	},
 				],
 			},
-			'supported_criterion_types': ['raw'],
+			'supported_criterion_types': ['raw', 'string'],
 			'default_criteria_type': 'raw',
 		},
 
@@ -60,6 +60,7 @@ $(function()
 		{
 			active_criterion: null,
 			more_criterion: null,
+			results_area: null,
 		},
 
 		// the constructor
@@ -113,16 +114,23 @@ $(function()
 		{
 			var me = this;
 
+			// Form events
+			// - Prevent regular form submission (eg. hitting "Enter" in inputs)
+			this.element.on('submit', function(oEvent){
+				oEvent.preventDefault();
+			});
+
 			// Criteria events
 			this.element.bind('itop.search.criteria.value_changed', function(oEvent, oData){
 				me._onCriteriaValueChanged(oData);
 			});
+			this.element.bind('itop.search.criteria.removed', function(oEvent, oData){
+				me._onCriteriaRemoved(oData);
+			});
 		},
 		// - Update search option of the widget
 		_updateSearch: function()
 		{
-			var me = this;
-
 			// Criterion
 			// - Note: As of today, only a "or" level with a "and" is supported, so the following part
 			//         will need some refactoring when introducing new stuff.
@@ -170,10 +178,6 @@ $(function()
 			// Prepare content
 			this._prepareExistingCriterion();
 			this._prepareMoreCriterionMenu();
-
-			// TODO: Delete this
-			oCriterionAreaElem.append( $('<button type="button" value="submit" class="sf_submit_btn">Go!</button>') );
-			this.options.submit_button_selector = '.sf_submit_btn';
 		},
 		// - Prepare existing criterion
 		_prepareExistingCriterion: function()
@@ -209,7 +213,7 @@ $(function()
 				this.elements.more_criterion.find('> .sf_mc_list').append(oFieldElem);
 			}
 
-			// Bind event
+			// Bind events
 			this.elements.more_criterion.find('.sf_mc_field').on('click', function(){
 				// Prepare new criterion data
 				var oData = {
@@ -235,6 +239,8 @@ $(function()
 				oResultAreaElem = $('<div></div>').appendTo(this.element);
 			}
 			oResultAreaElem.addClass('sf_results_area');
+
+			this.elements.results_area = oResultAreaElem;
 		},
 
 
@@ -242,15 +248,24 @@ $(function()
 		// - Add a criteria to the form
 		_addCriteria: function(oData)
 		{
-			var sRef = oData.ref
+			var sRef = oData.ref;
 			var sType = this._getCriteriaTypeFromFieldRef(sRef);
 
 			if(sType !== null)
 			{
 				var sWidgetClass = 'search_form_criteria' + '_' + sType;
-				oCriteriaElem = $('<div></div>')
+
+				// Add some informations from the field
+				oData.field = {
+					label: this.options.search.fields[sRef].label,
+				};
+
+				// Create DOM element
+				var oCriteriaElem = $('<div></div>')
 					.addClass('sf_criteria')
 					.appendTo(this.elements.active_criterion);
+
+				// Instanciate widget
 				$.itop[sWidgetClass](oData, oCriteriaElem);
 			}
 			else
@@ -282,12 +297,16 @@ $(function()
 			return sType;
 		},
 		// Criteria handlers
-		// - Event value changed
 		_onCriteriaValueChanged: function(oData)
 		{
 			this._updateSearch();
 			this._submit();
 		},
+		_onCriteriaRemoved: function(oData)
+		{
+			this._updateSearch();
+			this._submit();
+		},
 
 		// Button handlers
 		_onSubmitClick: function(oEvent)
@@ -295,15 +314,12 @@ $(function()
 			// Assertion: the search is already up to date
 			this._submit();
 		},
-		_onCancelClick: function(oEvent)
-		{
-			// TODO
-		},
 
 
 		// Submit handlers
 		_submit: function()
 		{
+			var me = this;
 			var oData = {
 				'params': JSON.stringify({
 					'base_oql': this.options.search.base_oql,
@@ -311,51 +327,47 @@ $(function()
 				}),
 			};
 
+			// Show loader
+			this._showLoader();
+
+			// Do submit
 			$.post(
 				this.options.endpoint,
-				oData,
-				function(oResponse, sStatus, oXHR){
-					console.log('POST success', oResponse, sStatus, oXHR);
-				}
+				oData
 			)
-				.done(function(a,b,c,d){ console.log('POST done', a,b,c,d);})
-				.fail(function(a,b,c,d){ console.log('POST fail', a,b,c,d);})
-				.always(function(a,b,c,d){ console.log('POST always', a,b,c,d);});
+				.done(function(oResponse, sStatus, oXHR){ me._onSubmitSuccess(oResponse); })
+				.fail(function(oResponse, sStatus, oXHR){ me._onSubmitFailure(oResponse); })
+				.always(function(oResponse, sStatus, oXHR){ me._onSubmitAlways(oResponse); });
 		},
 		// - Called on form submit successes
-		_onSubmitSuccess: function(oData, sFormPath)
+		_onSubmitSuccess: function(oData)
 		{
-			// TODO
-			// if(oData.form.updated_fields !== undefined)
-			// {
-			// 	this.element.find('[data-form-path="' + sFormPath + '"]').trigger('update_form', {updated_fields: oData.form.updated_fields});
-			// }
+			this.elements.results_area.html(oData);
 		},
 		// - Called on form submit failures
-		_onSubmitFailure: function(oData, sFormPath)
+		_onSubmitFailure: function(oData)
 		{
-			// TODO
+			// TODO: onSubmitFailure callback
 		},
 		// - Called after form submits
-		_onSubmitAlways: function(oData, sFormPath)
+		_onSubmitAlways: function(oData)
 		{
-			// TODO
-			// // Check all touched AFTER ajax is complete, otherwise the renderer will redraw the field in the mean time.
-			// this.element.find('[data-form-path="' + sFormPath + '"]').trigger('validate');
-			// this._enableFormAfterLoading();
+			this._hideLoader();
 		},
 
 
 		// Global helpers
 		// - Show loader
-		_disableFormBeforeLoading: function()
+		_showLoader: function()
 		{
-			// TODO
+			// TODO: Show loader
+			this._trace('Show loader');
 		},
-		// - Remove loader
-		_enableFormAfterLoading: function()
+		// - Hide loader
+		_hideLoader: function()
 		{
-			// TODO
+			// TODO: Hide loader
+			this._trace('Hide loader');
 		},
 
 

From 1d96cbeb07ae57f8014e1fb0521755a49a0cff41 Mon Sep 17 00:00:00 2001
From: Guillaume Lajarige <guillaume.lajarige@combodo.com>
Date: Fri, 9 Mar 2018 13:18:56 +0000
Subject: [PATCH 016/202] Advanced search: WIP POC, client widgets.

SVN:b1162[5401]
---
 js/search/search_form_criteria.js |  4 ++--
 js/search/search_form_handler.js  | 15 ++++++++++++---
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/js/search/search_form_criteria.js b/js/search/search_form_criteria.js
index aca7fe7b0..443257d58 100644
--- a/js/search/search_form_criteria.js
+++ b/js/search/search_form_criteria.js
@@ -117,7 +117,7 @@ $(function()
 			this.element
 				.append('<div class="sfc_title"></div>')
 				.append('<div class="sfc_form_group"></div>')
-				.append('<div class="sfc_toggle"><a class="fa fa-caret-down" href="#"></a></div>');
+				.append('<span class="sfc_toggle"><a class="fa fa-caret-down" href="#"></a></span>');
 
 			// Bind events
 			// - Toggler
@@ -128,7 +128,7 @@ $(function()
 			// Removable / locked decoration
 			if(this.options.is_removable === true)
 			{
-				this.element.append('<div class="sfc_close"><a class="fa fa-times" href="#"></a></div>');
+				this.element.append('<span class="sfc_close"><a class="fa fa-times" href="#"></a></span>');
 				this.element.find('.sfc_close').on('click', function(){
 					me._remove();
 				});
diff --git a/js/search/search_form_handler.js b/js/search/search_form_handler.js
index 888867b8f..5a226edab 100644
--- a/js/search/search_form_handler.js
+++ b/js/search/search_form_handler.js
@@ -256,9 +256,12 @@ $(function()
 				var sWidgetClass = 'search_form_criteria' + '_' + sType;
 
 				// Add some informations from the field
-				oData.field = {
-					label: this.options.search.fields[sRef].label,
-				};
+				if(this._hasFieldDefinition(sRef))
+				{
+					oData.field = {
+						label: this.options.search.fields[sRef].label,
+					};
+				}
 
 				// Create DOM element
 				var oCriteriaElem = $('<div></div>')
@@ -308,6 +311,12 @@ $(function()
 			this._submit();
 		},
 
+		// Field helpers
+		_hasFieldDefinition: function(sRef)
+		{
+			return (this.options.search.fields[sRef] !== undefined);
+		},
+
 		// Button handlers
 		_onSubmitClick: function(oEvent)
 		{

From 767507d19577556b5e7e770fd5a89592ddffa762 Mon Sep 17 00:00:00 2001
From: Guillaume Lajarige <guillaume.lajarige@combodo.com>
Date: Fri, 9 Mar 2018 13:34:04 +0000
Subject: [PATCH 017/202] Advanced search: WIP POC, integration with endpoint.

SVN:b1162[5402]
---
 css/light-grey.css                       |  7 +++++++
 css/light-grey.scss                      |  9 ++++++++-
 js/search/search_form_criteria.js        |  6 +++++-
 js/search/search_form_criteria_raw.js    |  4 ++++
 js/search/search_form_criteria_string.js | 13 +++++--------
 js/search/search_form_handler.js         |  2 ++
 6 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/css/light-grey.css b/css/light-grey.css
index f46ed2059..389c48217 100644
--- a/css/light-grey.css
+++ b/css/light-grey.css
@@ -784,16 +784,23 @@ div.HRDrawer {
 .search_form_handler .sf_criterion_area .search_form_criteria {
   display: inline-block;
   margin-right: 3px;
+  /* Special criterion processing */
 }
 .search_form_handler .sf_criterion_area .search_form_criteria.locked {
   background-color: #f1f1f1;
 }
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_title {
+  cursor: pointer;
+}
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group {
   display: none;
 }
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened {
   display: block;
 }
+.search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_raw .sfc_title {
+  cursor: initial;
+}
 .search_form_handler .sf_criterion_area .sf_more_criterion .sf_mc_list {
   position: absolute;
   margin: 0px;
diff --git a/css/light-grey.scss b/css/light-grey.scss
index 063cd959c..ef223d102 100644
--- a/css/light-grey.scss
+++ b/css/light-grey.scss
@@ -885,7 +885,7 @@ div.HRDrawer {
 				}
 			}
 			.sfc_title{
-
+				cursor: pointer;
 			}
 			.sfc_form_group{
 				display: none;
@@ -894,6 +894,13 @@ div.HRDrawer {
 					display: block;
 				}
 			}
+
+			/* Special criterion processing */
+			&.search_form_criteria_raw{
+				.sfc_title{
+					cursor: initial;
+				}
+			}
 		}
 
 		/* More criterion */
diff --git a/js/search/search_form_criteria.js b/js/search/search_form_criteria.js
index 443257d58..4244f716c 100644
--- a/js/search/search_form_criteria.js
+++ b/js/search/search_form_criteria.js
@@ -141,27 +141,31 @@ $(function()
 			// Fill criteria
 			this._setTitle();
 		},
+		// - Set the title element
 		_setTitle: function(sTitle)
 		{
 			if(sTitle === undefined)
 			{
 				// TODO: Make nice label
+				sTitle = this.options.field.label + ': ' + this._getValuesAsText();
 			}
 			this.element.find('.sfc_title').text(sTitle);
 		},
 
 
 		// Values helpers
+		// - Convert values to a standard string
 		_getValuesAsText: function()
 		{
 			var aValues = [];
 			for(var iValueIdx in this.options.values)
 			{
-				aValues.push(this.options.values[iValueIdx].value);
+				aValues.push(this.options.values[iValueIdx].label);
 			}
 
 			return aValues.join(', ');
 		},
+		// - Make an OQL expression from the criteria values and operator
 		_makeOQLExpression: function()
 		{
 			var aValues = [];
diff --git a/js/search/search_form_criteria_raw.js b/js/search/search_form_criteria_raw.js
index 0d0935904..3e91bf6e4 100644
--- a/js/search/search_form_criteria_raw.js
+++ b/js/search/search_form_criteria_raw.js
@@ -43,6 +43,10 @@ $(function()
 			this._super( key, value );
 		},
 
+		//------------------
+		// Inherited methods
+		//------------------
+
 		// DOM element helpers
 		_prepareElement: function()
 		{
diff --git a/js/search/search_form_criteria_string.js b/js/search/search_form_criteria_string.js
index 5035772c6..883b2c73a 100644
--- a/js/search/search_form_criteria_string.js
+++ b/js/search/search_form_criteria_string.js
@@ -9,6 +9,7 @@ $(function()
 		// default options
 		options:
 		{
+			operator: 'contains',
 		},
    
 		// the constructor
@@ -43,6 +44,10 @@ $(function()
 			this._super( key, value );
 		},
 
+		//------------------
+		// Inherited methods
+		//------------------
+
 		// DOM element helpers
 		_prepareElement: function()
 		{
@@ -65,13 +70,5 @@ $(function()
 			})
 				.appendTo(this.element.find('.sfc_form_group'));
 		},
-		_setTitle: function(sTitle)
-		{
-			if(sTitle === undefined)
-			{
-				sTitle = this.options.field.label + ': ' + this._getValuesAsText();
-			}
-			this._super(sTitle);
-		},
 	});
 });
diff --git a/js/search/search_form_handler.js b/js/search/search_form_handler.js
index 5a226edab..520dd3167 100644
--- a/js/search/search_form_handler.js
+++ b/js/search/search_form_handler.js
@@ -339,6 +339,8 @@ $(function()
 			// Show loader
 			this._showLoader();
 
+			// TODO: Make a throttle mecanism or cancel previous call when a newer is made.
+
 			// Do submit
 			$.post(
 				this.options.endpoint,

From 7d95c02b5716ff176a92f13aed21607de1af982f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Fri, 9 Mar 2018 13:42:19 +0000
Subject: [PATCH 018/202] Advanced Search

SVN:b1162[5403]
---
 pages/ajax.searchform.php                     |  3 +-
 .../criteriontooql.class.inc.php              | 38 ++++++++++++++++---
 .../criterionconversionabstract.class.inc.php |  2 +-
 .../search/criterionparser.class.inc.php      | 22 +++++------
 .../search/searchform.class.inc.php           |  2 -
 test/PHPunit.xml                              |  3 ++
 .../search/CriterionParserTest.php            |  6 +--
 7 files changed, 52 insertions(+), 24 deletions(-)

diff --git a/pages/ajax.searchform.php b/pages/ajax.searchform.php
index a2a6d309e..343a54e21 100644
--- a/pages/ajax.searchform.php
+++ b/pages/ajax.searchform.php
@@ -50,8 +50,7 @@ try
 	$oPage->SetContentType('text/html');
 
 	$aParams = json_decode($sParams, true);
-	$sOQL = CriterionParser::Parse($aParams['base_oql'], $aParams['criterion']);
-	$oFilter = DBSearch::FromOQL($sOQL);
+	$oFilter = CriterionParser::Parse($aParams['base_oql'], $aParams['criterion']);
 	$oDisplayBlock = new DisplayBlock($oFilter, 'list', false);
 
 	$aExtraParams['display_limit'] = true;
diff --git a/sources/application/search/criterionconversion/criteriontooql.class.inc.php b/sources/application/search/criterionconversion/criteriontooql.class.inc.php
index bf6e39854..036124f2f 100644
--- a/sources/application/search/criterionconversion/criteriontooql.class.inc.php
+++ b/sources/application/search/criterionconversion/criteriontooql.class.inc.php
@@ -50,37 +50,60 @@ class CriterionToOQL extends CriterionConversionAbstract
 			self::OP_ENDS_WITH => 'EndsWithToOql',
 			self::OP_EMPTY => 'EmptyToOql',
 			self::OP_NOT_EMPTY => 'NotEmptyToOql',
+			self::OP_ALL => 'AllToOql',
 		);
 
 		if (array_key_exists($sOperator, $aMappedOperators))
 		{
 			$sFct = $aMappedOperators[$sOperator];
 
-			return self::$sFct($sRef, $sOperator, $aCriteria['values']);
+			return self::$sFct($sRef, $sOperator, self::GetValues($aCriteria));
 		}
 
-		$sValue = $aCriteria['values'][0]['value'];
+		$sValue = self::GetValue(self::GetValues($aCriteria), 0);
 
 		return "({$sRef} {$sOperator} '{$sValue}')";
 	}
 
+	private static function GetValues($aCriteria)
+	{
+		if (!array_key_exists('values', $aCriteria))
+		{
+			return array();
+		}
+		return $aCriteria['values'];
+	}
+
+	private static function GetValue($aValues, $iIndex)
+	{
+		if (!array_key_exists($iIndex, $aValues))
+		{
+			return null;
+		}
+		if (!array_key_exists('value', $aValues[$iIndex]))
+		{
+			return null;
+		}
+		return $aValues[$iIndex]['value'];
+	}
+
 	protected static function ContainsToOql($sRef, $sOperator, $aValues)
 	{
-		$sValue = $aValues[0]['value'];
+		$sValue = self::GetValue($aValues, 0);
 
 		return "({$sRef} LIKE '%{$sValue}%')";
 	}
 
 	protected static function StartsWithToOql($sRef, $sOperator, $aValues)
 	{
-		$sValue = $aValues[0]['value'];
+		$sValue = self::GetValue($aValues, 0);
 
 		return "({$sRef} LIKE '{$sValue}%')";
 	}
 
 	protected static function EndsWithToOql($sRef, $sOperator, $aValues)
 	{
-		$sValue = $aValues[0]['value'];
+		$sValue = self::GetValue($aValues, 0);
 
 		return "({$sRef} LIKE '%{$sValue}')";
 	}
@@ -95,4 +118,9 @@ class CriterionToOQL extends CriterionConversionAbstract
 		return "({$sRef} != '')";
 	}
 
+	protected static function AllToOql($sRef, $sOperator, $aValues)
+	{
+		return "1";
+	}
+
 }
\ No newline at end of file
diff --git a/sources/application/search/criterionconversionabstract.class.inc.php b/sources/application/search/criterionconversionabstract.class.inc.php
index d8f901874..04ede456b 100644
--- a/sources/application/search/criterionconversionabstract.class.inc.php
+++ b/sources/application/search/criterionconversionabstract.class.inc.php
@@ -31,7 +31,7 @@ abstract class CriterionConversionAbstract
 	const OP_ENDS_WITH = 'ends_with';
 	const OP_EMPTY = 'empty';
 	const OP_NOT_EMPTY = 'not_empty';
-
+	const OP_ALL = 'all';
 
 }
 
diff --git a/sources/application/search/criterionparser.class.inc.php b/sources/application/search/criterionparser.class.inc.php
index 3ae4748f2..4aaa58b86 100644
--- a/sources/application/search/criterionparser.class.inc.php
+++ b/sources/application/search/criterionparser.class.inc.php
@@ -41,7 +41,7 @@ class CriterionParser
 	 * @param $sBaseOql
 	 * @param $aCriterion
 	 *
-	 * @return string
+	 * @return \DBSearch
 	 */
 	public static function Parse($sBaseOql, $aCriterion)
 	{
@@ -57,24 +57,24 @@ class CriterionParser
 			}
 		}
 
-		if (empty($aExpression))
-		{
-			return $sBaseOql;
-		}
-
-		// Sanitize the base OQL
 		try
 		{
 			$oSearch = DBObjectSearch::FromOQL($sBaseOql);
+			if (empty($aExpression))
+			{
+				return $oSearch;
+			}
+
 			$oSearch->ResetCondition();
-			$sBaseOql = str_replace(' WHERE 1', '', $oSearch->ToOQL());
+			$oExpression = \Expression::FromOQL(implode(" OR ", $aExpression));
+			$oSearch->AddConditionExpression($oExpression);
+			
+			return $oSearch;
 		} catch (OQLException $e)
 		{
 			IssueLog::Error($e->getMessage());
 		}
-
-
-		return $sBaseOql.' WHERE '.implode(" OR ", $aExpression).'';
+		return null;
 	}
 
 	private static function ParseAndList($aAnd)
diff --git a/sources/application/search/searchform.class.inc.php b/sources/application/search/searchform.class.inc.php
index 57c56b4ec..701c0a875 100644
--- a/sources/application/search/searchform.class.inc.php
+++ b/sources/application/search/searchform.class.inc.php
@@ -99,11 +99,9 @@ class SearchForm
 		$sHtml .= "<div id=\"fs_{$sSearchFormId}_criterion_outer\">\n";
 		$sHtml .= "</div>\n";
 
-
 		$sPrimaryClassName = $oSet->GetClass();
 		$sPrimaryClassAlias = $oSet->GetClassAlias();
 
-
 		$aFields = self::GetFields($sPrimaryClassName, $sPrimaryClassAlias);
 		$oSearch = $oSet->GetFilter();
 		$aCriterion = self::GetCriterion($oSearch);
diff --git a/test/PHPunit.xml b/test/PHPunit.xml
index 7dce7bb0e..ca32289e3 100644
--- a/test/PHPunit.xml
+++ b/test/PHPunit.xml
@@ -47,6 +47,9 @@
         <testsuite name="Tickets">
             <directory>itop-tickets</directory>
         </testsuite>
+        <testsuite name="Application">
+            <directory>application</directory>
+        </testsuite>
     </testsuites>
 
     <!-- Code coverage white list -->
diff --git a/test/application/search/CriterionParserTest.php b/test/application/search/CriterionParserTest.php
index 370c68d7f..cc4b4de0c 100644
--- a/test/application/search/CriterionParserTest.php
+++ b/test/application/search/CriterionParserTest.php
@@ -78,10 +78,10 @@ class CriterionParserTest extends ItopDataTestCase
     ]
 }
 ', true);
-		$sOQL = CriterionParser::Parse($sBaseOql, $aCriterion);
+		$oSearch = CriterionParser::Parse($sBaseOql, $aCriterion);
 
-		$this->debug($sOQL);
+		//$this->debug($oSearch);
 
-		$this->assertEquals("SELECT `UserRequest` FROM UserRequest AS `UserRequest` WHERE ((`UserRequest`.`start_date` > '2017-01-01') AND (`UserRequest`.`start_date` < '2018-01-01'))", $sOQL);
+		$this->assertEquals("SELECT `UserRequest` FROM UserRequest AS `UserRequest` WHERE ((`UserRequest`.`start_date` > '2017-01-01') AND (`UserRequest`.`start_date` < '2018-01-01'))", $oSearch->ToOQL());
 	}
 }

From b8aed0f0045712ad28f766b667d54e64f2e5c099 Mon Sep 17 00:00:00 2001
From: Guillaume Lajarige <guillaume.lajarige@combodo.com>
Date: Fri, 9 Mar 2018 16:28:46 +0000
Subject: [PATCH 019/202] Advanced search: WIP POC, integration with endpoint,
 add "list_params" parameter.

SVN:b1162[5405]
---
 js/search/search_form_handler.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/js/search/search_form_handler.js b/js/search/search_form_handler.js
index 520dd3167..2580d8da1 100644
--- a/js/search/search_form_handler.js
+++ b/js/search/search_form_handler.js
@@ -51,6 +51,7 @@ $(function()
 					// 	},
 				],
 			},
+			'list_params': {},	// Passed through to the endpoint so it can render the list correctly regarding the context.
 			'supported_criterion_types': ['raw', 'string'],
 			'default_criteria_type': 'raw',
 		},
@@ -334,6 +335,7 @@ $(function()
 					'base_oql': this.options.search.base_oql,
 					'criterion': this.options.search.criterion,
 				}),
+				'list_params': this.options.list_params,
 			};
 
 			// Show loader
@@ -358,7 +360,7 @@ $(function()
 		// - Called on form submit failures
 		_onSubmitFailure: function(oData)
 		{
-			// TODO: onSubmitFailure callback
+			// TODO: onSubmitFailure callback. Show oData in a debug or error div.
 		},
 		// - Called after form submits
 		_onSubmitAlways: function(oData)

From 8cf4bc58a76cadb9fb05d03d3fa51d1bcb9c36fd Mon Sep 17 00:00:00 2001
From: Guillaume Lajarige <guillaume.lajarige@combodo.com>
Date: Fri, 9 Mar 2018 16:38:30 +0000
Subject: [PATCH 020/202] Advanced search: WIP POC, better criteria widget
 instanciation.

SVN:b1162[5406]
---
 js/search/search_form_handler.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/js/search/search_form_handler.js b/js/search/search_form_handler.js
index 2580d8da1..33db6cdb6 100644
--- a/js/search/search_form_handler.js
+++ b/js/search/search_form_handler.js
@@ -254,7 +254,8 @@ $(function()
 
 			if(sType !== null)
 			{
-				var sWidgetClass = 'search_form_criteria' + '_' + sType;
+				// Retrieve widget class
+				var sWidgetName = this._getCriteriaWidgetNameFromType(sType);
 
 				// Add some informations from the field
 				if(this._hasFieldDefinition(sRef))
@@ -270,7 +271,7 @@ $(function()
 					.appendTo(this.elements.active_criterion);
 
 				// Instanciate widget
-				$.itop[sWidgetClass](oData, oCriteriaElem);
+				$.itop[sWidgetName](oData, oCriteriaElem);
 			}
 			else
 			{
@@ -300,6 +301,11 @@ $(function()
 
 			return sType;
 		},
+		// - Find a criteria's widget name from a criteria's type
+		_getCriteriaWidgetNameFromType: function(sType)
+		{
+			return 'search_form_criteria' + '_' + (($.itop['search_form_criteria_'+sType] !== undefined) ? sType : 'raw');
+		},
 		// Criteria handlers
 		_onCriteriaValueChanged: function(oData)
 		{
@@ -335,7 +341,7 @@ $(function()
 					'base_oql': this.options.search.base_oql,
 					'criterion': this.options.search.criterion,
 				}),
-				'list_params': this.options.list_params,
+				'list_params': JSON.stringify(this.options.list_params),
 			};
 
 			// Show loader

From d02fb69ca7452570e276afff411c99e7cdd1e49f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Fri, 9 Mar 2018 17:07:15 +0000
Subject: [PATCH 021/202] Advanced Search

SVN:b1162[5407]
---
 application/ui.extkeywidget.class.inc.php           |  2 +-
 application/ui.linkswidget.class.inc.php            |  2 +-
 pages/ajax.searchform.php                           | 12 ++++++++++++
 sources/application/search/searchform.class.inc.php | 11 +++++++++++
 4 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/application/ui.extkeywidget.class.inc.php b/application/ui.extkeywidget.class.inc.php
index 610367eb0..6a430e599 100644
--- a/application/ui.extkeywidget.class.inc.php
+++ b/application/ui.extkeywidget.class.inc.php
@@ -342,7 +342,7 @@ EOF
 		$oFilter->SetModifierProperty('UserRightsGetSelectFilter', 'bSearchMode', $this->bSearchMode);
 		$oBlock = new DisplayBlock($oFilter, 'search', false, $aParams);
 		$sHTML .= $oBlock->GetDisplay($oPage, $this->iId,
-			array('open' => $bOpen, 'currentId' => $this->iId, 'table_id' => "dr_{$this->iId}"));
+			array('open' => $bOpen, 'currentId' => $this->iId, 'table_id' => "dr_{$this->iId}", 'selection_mode' => true, 'selection_type' => 'single'));
 		$sHTML .= "<form id=\"fr_{$this->iId}\" OnSubmit=\"return oACWidget_{$this->iId}.DoOk();\">\n";
 		$sHTML .= "<div id=\"dr_{$this->iId}\" style=\"vertical-align:top;background: #fff;height:100%;overflow:auto;padding:0;border:0;\">\n";
 		$sHTML .= "<div style=\"background: #fff; border:0; text-align:center; vertical-align:middle;\"><p>".Dict::S('UI:Message:EmptyList:UseSearchForm')."</p></div>\n";
diff --git a/application/ui.linkswidget.class.inc.php b/application/ui.linkswidget.class.inc.php
index 8b9718e71..9295c919b 100644
--- a/application/ui.linkswidget.class.inc.php
+++ b/application/ui.linkswidget.class.inc.php
@@ -395,7 +395,7 @@ EOF
 		$this->SetSearchDefaultFromContext($oCurrentObj, $oFilter);
 		$oBlock = new DisplayBlock($oFilter, 'search', false);
 		$sHtml .= $oBlock->GetDisplay($oPage, "SearchFormToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}",
-			array('open' => $bOpen, 'table_id' => "SearchResultsToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}"));
+			array('open' => $bOpen, 'table_id' => "SearchResultsToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}", 'selection_mode' => true));
 		$sHtml .= "<form id=\"ObjectsAddForm_{$this->m_sAttCode}{$this->m_sNameSuffix}\" OnSubmit=\"return oWidget{$this->m_iInputId}.DoAddObjects(this.id);\">\n";
 		$sHtml .= "<div id=\"SearchResultsToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}\" style=\"vertical-align:top;background: #fff;height:100%;overflow:auto;padding:0;border:0;\">\n";
 		$sHtml .= "<div style=\"background: #fff; border:0; text-align:center; vertical-align:middle;\"><p>".Dict::S('UI:Message:EmptyList:UseSearchForm')."</p></div>\n";
diff --git a/pages/ajax.searchform.php b/pages/ajax.searchform.php
index 343a54e21..96253c3a1 100644
--- a/pages/ajax.searchform.php
+++ b/pages/ajax.searchform.php
@@ -53,6 +53,18 @@ try
 	$oFilter = CriterionParser::Parse($aParams['base_oql'], $aParams['criterion']);
 	$oDisplayBlock = new DisplayBlock($oFilter, 'list', false);
 
+	$sListParams = stripslashes(utils::ReadParam('list_params', '{}', false, 'raw_data'));
+	$aListParams = json_decode($sListParams, true);
+
+	if (array_key_exists('selection_mode', $aListParams))
+	{
+		$aExtraParams['selection_mode'] = $aListParams['selection_mode'];
+	}
+	if (array_key_exists('selection_type', $aListParams))
+	{
+		$aExtraParams['selection_type'] = $aListParams['selection_type'];
+	}
+
 	$aExtraParams['display_limit'] = true;
 	$aExtraParams['truncated'] = true;
 	$aExtraParams['currentId'] = uniqid('ajax-search-form');
diff --git a/sources/application/search/searchform.class.inc.php b/sources/application/search/searchform.class.inc.php
index 701c0a875..689e2d449 100644
--- a/sources/application/search/searchform.class.inc.php
+++ b/sources/application/search/searchform.class.inc.php
@@ -74,6 +74,16 @@ class SearchForm
 		{
 			$sRootClass = $sClassName;
 		}
+		$aListParams = array();
+		if (array_key_exists('selection_mode', $aExtraParams))
+		{
+			$aListParams['selection_mode'] = $aExtraParams['selection_mode'];
+		}
+		if (array_key_exists('selection_type', $aExtraParams))
+		{
+			$aListParams['selection_type'] = $aExtraParams['selection_type'];
+		}
+
 		$aSubClasses = MetaModel::GetSubclasses($sRootClass);
 		if (count($aSubClasses) > 0)
 		{
@@ -120,6 +130,7 @@ class SearchForm
 			'criterion_outer_selector' => "#fs_{$sSearchFormId}_criterion_outer",
 			'result_list_outer_selector' => "#{$aExtraParams['table_id']}",
 			'endpoint' => utils::GetAbsoluteUrlAppRoot().'pages/ajax.searchform.php',
+			'list_params' => $aListParams,
 			'search' => array(
 				'fields' => $aFields,
 				'criterion' => $aCriterion,

From b3d625b9fc10142c853eea561595d7e34092a965 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Tue, 13 Mar 2018 08:11:01 +0000
Subject: [PATCH 022/202] Advanced Search

SVN:b1162[5408]
---
 application/datatable.class.inc.php           | 27 ----------------
 application/ui.extkeywidget.class.inc.php     |  2 +-
 application/ui.linkswidget.class.inc.php      | 16 ++++++++--
 pages/ajax.render.php                         |  2 +-
 pages/ajax.searchform.php                     | 32 +++++++++++++++++--
 .../search/searchform.class.inc.php           | 21 +++++++++++-
 6 files changed, 66 insertions(+), 34 deletions(-)

diff --git a/application/datatable.class.inc.php b/application/datatable.class.inc.php
index 672cc40b2..86f13aada 100644
--- a/application/datatable.class.inc.php
+++ b/application/datatable.class.inc.php
@@ -571,33 +571,6 @@ EOF
 		{
 			$oPage->add_ready_script("oTable.trigger(\"fakesorton\", [$sFakeSortList]);");
 		}
-		//if ($iNbPages == 1)
-		if (false)
-		{
-			if (isset($aExtraParams['cssCount']))
-			{
-				$sCssCount = $aExtraParams['cssCount'];
-				if ($sSelectMode == 'single')
-				{
-					$sSelectSelector = ":radio[name^=selectObj]";
-				}
-				else if ($sSelectMode == 'multiple')
-				{
-					$sSelectSelector = ":checkbox[name^=selectObj]";
-				}
-				$oPage->add_ready_script(
-<<<EOF
-	$('#{$this->iListId} table.listResults $sSelectSelector').change(function() {
-		var c = $('{$sCssCount}');							
-		var v = $('#{$this->iListId} table.listResults $sSelectSelector:checked').length;
-		c.val(v);
-		$('#{$this->iListId} .selectedCount').text(v);
-		c.trigger('change');	
-	});
-EOF
-				);
-			}
-		}
 		return $sHtml;
 	}
 	
diff --git a/application/ui.extkeywidget.class.inc.php b/application/ui.extkeywidget.class.inc.php
index 6a430e599..f260b7cd4 100644
--- a/application/ui.extkeywidget.class.inc.php
+++ b/application/ui.extkeywidget.class.inc.php
@@ -342,7 +342,7 @@ EOF
 		$oFilter->SetModifierProperty('UserRightsGetSelectFilter', 'bSearchMode', $this->bSearchMode);
 		$oBlock = new DisplayBlock($oFilter, 'search', false, $aParams);
 		$sHTML .= $oBlock->GetDisplay($oPage, $this->iId,
-			array('open' => $bOpen, 'currentId' => $this->iId, 'table_id' => "dr_{$this->iId}", 'selection_mode' => true, 'selection_type' => 'single'));
+			array('open' => $bOpen, 'currentId' => $this->iId, 'table_id' => "dr_{$this->iId}", 'table_inner_id' => "{$this->iId}_results", 'selection_mode' => true, 'selection_type' => 'single', 'cssCount' => '#count_'.$this->iId));
 		$sHTML .= "<form id=\"fr_{$this->iId}\" OnSubmit=\"return oACWidget_{$this->iId}.DoOk();\">\n";
 		$sHTML .= "<div id=\"dr_{$this->iId}\" style=\"vertical-align:top;background: #fff;height:100%;overflow:auto;padding:0;border:0;\">\n";
 		$sHTML .= "<div style=\"background: #fff; border:0; text-align:center; vertical-align:middle;\"><p>".Dict::S('UI:Message:EmptyList:UseSearchForm')."</p></div>\n";
diff --git a/application/ui.linkswidget.class.inc.php b/application/ui.linkswidget.class.inc.php
index 9295c919b..acdf2c4b2 100644
--- a/application/ui.linkswidget.class.inc.php
+++ b/application/ui.linkswidget.class.inc.php
@@ -386,8 +386,13 @@ EOF
 	/**
 	 * @param WebPage $oPage
 	 * @param DBObject $oCurrentObj
+	 * @param $sJson
+	 *
+	 * @throws \CoreException
+	 * @throws \DictExceptionMissingString
+	 * @throws \Exception
 	 */
-	public function GetObjectPickerDialog($oPage, $oCurrentObj)
+	public function GetObjectPickerDialog($oPage, $oCurrentObj, $sJson)
 	{
 		$bOpen = MetaModel::GetConfig()->Get('legacy_search_drawer_open');
 		$sHtml = "<div class=\"wizContainer\" style=\"vertical-align:top;\">\n";
@@ -395,7 +400,14 @@ EOF
 		$this->SetSearchDefaultFromContext($oCurrentObj, $oFilter);
 		$oBlock = new DisplayBlock($oFilter, 'search', false);
 		$sHtml .= $oBlock->GetDisplay($oPage, "SearchFormToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}",
-			array('open' => $bOpen, 'table_id' => "SearchResultsToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}", 'selection_mode' => true));
+			array(
+				'open' => $bOpen,
+				'table_id' => "SearchResultsToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}",
+				'table_inner_id' => "ResultsToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}",
+				'selection_mode' => true,
+				'json' => $sJson,
+				'cssCount' => '#count_'.$this->m_sAttCode.$this->m_sNameSuffix
+			));
 		$sHtml .= "<form id=\"ObjectsAddForm_{$this->m_sAttCode}{$this->m_sNameSuffix}\" OnSubmit=\"return oWidget{$this->m_iInputId}.DoAddObjects(this.id);\">\n";
 		$sHtml .= "<div id=\"SearchResultsToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}\" style=\"vertical-align:top;background: #fff;height:100%;overflow:auto;padding:0;border:0;\">\n";
 		$sHtml .= "<div style=\"background: #fff; border:0; text-align:center; vertical-align:middle;\"><p>".Dict::S('UI:Message:EmptyList:UseSearchForm')."</p></div>\n";
diff --git a/pages/ajax.render.php b/pages/ajax.render.php
index 663f7bd39..d27d54949 100644
--- a/pages/ajax.render.php
+++ b/pages/ajax.render.php
@@ -269,7 +269,7 @@ try
 			$oObj = null;
 		}
 		$oWidget = new UILinksWidget($sClass, $sAttCode, $iInputId, $sSuffix, $bDuplicates);
-		$oWidget->GetObjectPickerDialog($oPage, $oObj);	
+			$oWidget->GetObjectPickerDialog($oPage, $oObj, $sJson);
 		break;
 		
 		// ui.linkswidget
diff --git a/pages/ajax.searchform.php b/pages/ajax.searchform.php
index 96253c3a1..d7624e40c 100644
--- a/pages/ajax.searchform.php
+++ b/pages/ajax.searchform.php
@@ -31,6 +31,7 @@ require_once(APPROOT.'/application/user.preferences.class.inc.php');
 require_once(APPROOT.'/application/loginwebpage.class.inc.php');
 require_once(APPROOT.'/sources/application/search/ajaxsearchexception.class.inc.php');
 require_once(APPROOT.'/sources/application/search/criterionparser.class.inc.php');
+require_once(APPROOT.'/application/wizardhelper.class.inc.php');
 
 try
 {
@@ -56,6 +57,10 @@ try
 	$sListParams = stripslashes(utils::ReadParam('list_params', '{}', false, 'raw_data'));
 	$aListParams = json_decode($sListParams, true);
 
+	if (array_key_exists('currentId', $aListParams))
+	{
+		$aExtraParams['currentId'] = $aListParams['currentId'];
+	}
 	if (array_key_exists('selection_mode', $aListParams))
 	{
 		$aExtraParams['selection_mode'] = $aListParams['selection_mode'];
@@ -63,12 +68,35 @@ try
 	if (array_key_exists('selection_type', $aListParams))
 	{
 		$aExtraParams['selection_type'] = $aListParams['selection_type'];
+		// In case of single selection, the root of the HTML identifiers used is suffixed with "_results" (at least in the external keys)
+	}
+	if (array_key_exists('json', $aListParams))
+	{
+		$aJson = $aListParams['json'];
+		$sJson = json_encode($aJson);
+		$oWizardHelper = WizardHelper::FromJSON($sJson);
+		$oObj = $oWizardHelper->GetTargetObject();
+		$aExtraParams['query_params'] = array('this' => $oObj);
+	}
+	if (array_key_exists('cssCount', $aListParams))
+	{
+		$aExtraParams['cssCount'] = $aListParams['cssCount'];
+	}
+	if (array_key_exists('table_inner_id', $aListParams))
+	{
+		$sListId = $aListParams['table_inner_id'];
 	}
 
 	$aExtraParams['display_limit'] = true;
 	$aExtraParams['truncated'] = true;
-	$aExtraParams['currentId'] = uniqid('ajax-search-form');
-	$oDisplayBlock->RenderContent($oPage, $aExtraParams);
+	if (isset($sListId))
+	{
+		$oDisplayBlock->Display($oPage, $sListId, $aExtraParams);
+	}
+	else
+	{
+		$oDisplayBlock->RenderContent($oPage, $aExtraParams);
+	}
 
 	$oPage->output();
 
diff --git a/sources/application/search/searchform.class.inc.php b/sources/application/search/searchform.class.inc.php
index 689e2d449..0c9ed9776 100644
--- a/sources/application/search/searchform.class.inc.php
+++ b/sources/application/search/searchform.class.inc.php
@@ -53,17 +53,20 @@ class SearchForm
 		$sHtml = '';
 		$oAppContext = new ApplicationContext();
 		$sClassName = $oSet->GetFilter()->GetClass();
+		$aListParams = array();
 
 		// Simple search form
 		if (isset($aExtraParams['currentId']))
 		{
 			$sSearchFormId = $aExtraParams['currentId'];
+			$aListParams['currentId'] = $aExtraParams['currentId'];
 		}
 		else
 		{
 			$iSearchFormId = $oPage->GetUniqueId();
 			$sSearchFormId = 'SimpleSearchForm'.$iSearchFormId;
 			$sHtml .= "<div id=\"ds_$sSearchFormId\" class=\"mini_tab{$iSearchFormId}\">\n";
+			$aListParams['currentId'] = "$iSearchFormId";
 		}
 		// Check if the current class has some sub-classes
 		if (isset($aExtraParams['baseClass']))
@@ -74,7 +77,6 @@ class SearchForm
 		{
 			$sRootClass = $sClassName;
 		}
-		$aListParams = array();
 		if (array_key_exists('selection_mode', $aExtraParams))
 		{
 			$aListParams['selection_mode'] = $aExtraParams['selection_mode'];
@@ -84,6 +86,18 @@ class SearchForm
 			$aListParams['selection_type'] = $aExtraParams['selection_type'];
 		}
 
+		$sJson = stripslashes(utils::ReadParam('json', '', false, 'raw_data'));
+		if (!empty($sJson))
+		{
+			$aListParams['json'] = json_decode($sJson, true);
+		}
+
+
+		if (array_key_exists('cssCount', $aExtraParams))
+		{
+			$aListParams['cssCount'] = $aExtraParams['cssCount'];
+		}
+
 		$aSubClasses = MetaModel::GetSubclasses($sRootClass);
 		if (count($aSubClasses) > 0)
 		{
@@ -126,6 +140,11 @@ class SearchForm
 			$aExtraParams['table_id'] = "search_form_result_{$sSearchFormId}";
 			$sHtml .= "<div class=\"display_block\" id=\"search_form_result_{$sSearchFormId}\"></div>\n";
 		}
+		$aListParams['table_id'] = $aExtraParams['table_id'];
+		if (array_key_exists('table_inner_id', $aExtraParams))
+		{
+			$aListParams['table_inner_id'] = $aExtraParams['table_inner_id'];
+		}
 		$aSearchParams = array(
 			'criterion_outer_selector' => "#fs_{$sSearchFormId}_criterion_outer",
 			'result_list_outer_selector' => "#{$aExtraParams['table_id']}",

From 3e7edea7be88a9677d3e92ddc0949ab37abedac2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Tue, 13 Mar 2018 09:56:34 +0000
Subject: [PATCH 023/202] SVN:b1162[5409]

---
 core/attributedef.class.inc.php               | 15727 ++++++++--------
 .../search/searchform.class.inc.php           |    76 +-
 2 files changed, 7963 insertions(+), 7840 deletions(-)

diff --git a/core/attributedef.class.inc.php b/core/attributedef.class.inc.php
index 45b34a274..7cb0421aa 100644
--- a/core/attributedef.class.inc.php
+++ b/core/attributedef.class.inc.php
@@ -1,7829 +1,7898 @@
-<?php
-// Copyright (C) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Typology for the attributes
- *
- * @copyright   Copyright (C) 2010-2017 Combodo SARL
- * @license	 http://opensource.org/licenses/AGPL-3.0
- */
-
-
-require_once('MyHelpers.class.inc.php');
-require_once('ormdocument.class.inc.php');
-require_once('ormstopwatch.class.inc.php');
-require_once('ormpassword.class.inc.php');
-require_once('ormcaselog.class.inc.php');
-require_once('ormlinkset.class.inc.php');
-require_once('htmlsanitizer.class.inc.php');
-require_once(APPROOT.'sources/autoload.php');
-require_once('customfieldshandler.class.inc.php');
-require_once('ormcustomfieldsvalue.class.inc.php');
-require_once('datetimeformat.class.inc.php');
-// This should be changed to a use when we go full-namespace
-require_once(APPROOT . 'sources/form/validator/validator.class.inc.php');
-require_once(APPROOT . 'sources/form/validator/notemptyextkeyvalidator.class.inc.php');
-
-/**
- * MissingColumnException - sent if an attribute is being created but the column is missing in the row 
- *
- * @package	 iTopORM
- */
-class MissingColumnException extends Exception
-{}
-
-/**
- * add some description here... 
- *
- * @package	 iTopORM
- */
-define('EXTKEY_RELATIVE', 1);
-
-/**
- * add some description here... 
- *
- * @package	 iTopORM
- */
-define('EXTKEY_ABSOLUTE', 2);
-
-/**
- * Propagation of the deletion through an external key - ask the user to delete the referencing object 
- *
- * @package	 iTopORM
- */
-define('DEL_MANUAL', 1);
-
-/**
- * Propagation of the deletion through an external key - ask the user to delete the referencing object 
- *
- * @package	 iTopORM
- */
-define('DEL_AUTO', 2);
-/**
- * Fully silent delete... not yet implemented
- */
-define('DEL_SILENT', 2);
-/**
- * For HierarchicalKeys only: move all the children up one level automatically
- */
-define('DEL_MOVEUP', 3);
-
-
-/**
- * For Link sets: tracking_level
- *
- * @package	 iTopORM
- */
-define('ATTRIBUTE_TRACKING_NONE', 0); // Do not track changes of the attribute
-define('ATTRIBUTE_TRACKING_ALL', 3); // Do track all changes of the attribute
-define('LINKSET_TRACKING_NONE', 0); // Do not track changes in the link set
-define('LINKSET_TRACKING_LIST', 1); // Do track added/removed items
-define('LINKSET_TRACKING_DETAILS', 2); // Do track modified items
-define('LINKSET_TRACKING_ALL', 3); // Do track added/removed/modified items
-
-define('LINKSET_EDITMODE_NONE', 0); // The linkset cannot be edited at all from inside this object
-define('LINKSET_EDITMODE_ADDONLY', 1); // The only possible action is to open a new window to create a new object
-define('LINKSET_EDITMODE_ACTIONS', 2); // Show the usual 'Actions' popup menu
-define('LINKSET_EDITMODE_INPLACE', 3); // The "linked" objects can be created/modified/deleted in place
-define('LINKSET_EDITMODE_ADDREMOVE', 4); // The "linked" objects can be added/removed in place
-
-
-/**
- * Attribute definition API, implemented in and many flavours (Int, String, Enum, etc.) 
- *
- * @package	 iTopORM
- */
-abstract class AttributeDefinition
-{
-	const SEARCH_WIDGET_TYPE_RAW = 'raw';
-	const SEARCH_WIDGET_TYPE_STRING = 'string';
-	const SEARCH_WIDGET_TYPE_ENUM = 'enum';
-	const SEARCH_WIDGET_TYPE_EXTERNAL_KEY = 'external_key';
-	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
-
-	public function GetType()
-	{
-		return Dict::S('Core:'.get_class($this));
-	}
-	public function GetTypeDesc()
-	{
-		return Dict::S('Core:'.get_class($this).'+');
-	}
-
-	abstract public function GetEditClass();
-
-	/**
-	 * Return the search widget type corresponding to this attribute
-	 *
-	 * @return string
-	 */
-	public function GetSearchType()
-	{
-		return static::SEARCH_WIDGET_TYPE;
-	}
-
-	protected $m_sCode;
-	private $m_aParams = array();
-	protected $m_sHostClass = '!undefined!';
-	public function Get($sParamName) {return $this->m_aParams[$sParamName];}
-	protected function IsParam($sParamName) {return (array_key_exists($sParamName, $this->m_aParams));}
-
-	protected function GetOptional($sParamName, $default)
-	{
-		if (array_key_exists($sParamName, $this->m_aParams))
-		{
-			return $this->m_aParams[$sParamName];
-		}
-		else
-		{
-			return $default;
-		}
-	}
-	
-	public function __construct($sCode, $aParams)
-	{
-		$this->m_sCode = $sCode;
-		$this->m_aParams = $aParams;
-		$this->ConsistencyCheck();
-	}
-
-	public function GetParams()
-	{
-		return $this->m_aParams;
-	}
-
-	public function HasParam($sParam)
-	{
-		return array_key_exists($sParam, $this->m_aParams);
-	}
-
-	public function SetHostClass($sHostClass)
-	{
-		$this->m_sHostClass = $sHostClass;
-	}
-	public function GetHostClass()
-	{
-		return $this->m_sHostClass;
-	}
-
-	public function ListSubItems()
-	{
-		$aSubItems = array();
-		foreach(MetaModel::ListAttributeDefs($this->m_sHostClass) as $sAttCode => $oAttDef)
-		{
-			if ($oAttDef instanceof AttributeSubItem)
-			{
-				if ($oAttDef->Get('target_attcode') == $this->m_sCode)
-				{
-					$aSubItems[$sAttCode] = $oAttDef;
-				}
-			}
-		}
-		return $aSubItems;
-	}
-
-	// Note: I could factorize this code with the parameter management made for the AttributeDef class
-	// to be overloaded
-	static public function ListExpectedParams()
-	{
-		return array();
-	}
-
-	private function ConsistencyCheck()
-	{
-		// Check that any mandatory param has been specified
-		//
-		$aExpectedParams = $this->ListExpectedParams();
-		foreach($aExpectedParams as $sParamName)
-		{
-			if (!array_key_exists($sParamName, $this->m_aParams))
-			{
-				$aBacktrace = debug_backtrace();
-				$sTargetClass = $aBacktrace[2]["class"];
-				$sCodeInfo = $aBacktrace[1]["file"]." - ".$aBacktrace[1]["line"];
-				throw new Exception("ERROR missing parameter '$sParamName' in ".get_class($this)." declaration for class $sTargetClass ($sCodeInfo)");
-			}
-		}
-	}
-
-	/**
-	 * Check the validity of the given value
-	 * @param DBObject $oHostObject
-	 * @param string An error if any, null otherwise
-	 */
-	public function CheckValue(DBObject $oHostObject, $value)
-	{
-		// todo: factorize here the cases implemented into DBObject
-		return true;
-	}
-
-	// table, key field, name field
-	public function ListDBJoins()
-	{
-		return "";
-		// e.g: return array("Site", "infrid", "name");
-	} 
-	public function GetFinalAttDef()
-	{
-		return $this;
-	}
-
-	/**
-	 * Deprecated - use IsBasedOnDBColumns instead
-	 * @return bool
-	 */
-	public function IsDirectField() {return static::IsBasedOnDBColumns();}
-
-	/**
-	 * Returns true if the attribute value is built after DB columns
-	 * @return bool
-	 */
-	static public function IsBasedOnDBColumns() {return false;}
-	/**
-	 * Returns true if the attribute value is built after other attributes by the mean of an expression (obtained via GetOQLExpression)
-	 * @return bool
-	 */
-	static public function IsBasedOnOQLExpression() {return false;}
-	/**
-	 * Returns true if the attribute value can be shown as a string
-	 * @return bool
-	 */
-	static public function IsScalar() {return false;}
-	/**
-	 * Returns true if the attribute value is a set of related objects (1-N or N-N)
-	 * @return bool
-	 */
-	static public function IsLinkSet() {return false;}
-	/**
-	 * Returns true if the attribute is an external key, either directly (RELATIVE to the host class), or indirectly (ABSOLUTELY)
-	 * @return bool
-	 */
-	public function IsExternalKey($iType = EXTKEY_RELATIVE) {return false;}
-	/**
-	 * Returns true if the attribute value is an external key, pointing to the host class
-	 * @return bool
-	 */
-	static public function IsHierarchicalKey() {return false;}
-	/**
-	 * Returns true if the attribute value is stored on an object pointed to be an external key
-	 * @return bool
-	 */
-	static public function IsExternalField() {return false;}
-	/**
-	 * Returns true if the attribute can be written (by essence : metamodel field option)
-	 *
-	 * @return bool
-	 * @see \DBObject::IsAttributeReadOnlyForCurrentState() for a specific object instance (depending on its workflow)
-	 */
-	public function IsWritable() {return false;}
-	/**
-	 * Returns true if the attribute has been added automatically by the framework
-	 * @return bool
-	 */
-	public function IsMagic() {return $this->GetOptional('magic', false);}
-	/**
-	 * Returns true if the attribute value is kept in the loaded object (in memory)
-	 * @return bool
-	 */
-	static public function LoadInObject() {return true;}
-	/**
-	 * Returns true if the attribute value comes from the database in one way or another
-	 * @return bool
-	 */
-	static public function LoadFromDB() {return true;}
-	/**
-	 * Returns true if the attribute should be loaded anytime (in addition to the column selected by the user)
-	 * @return bool
-	 */
-	public function AlwaysLoadInTables() {return $this->GetOptional('always_load_in_tables', false);}
-	/**
-	 * Must return the value if LoadInObject returns false
-	 * @return mixed
-	 */
-	public function GetValue($oHostObject){return null;}
-	/**
-	 * Returns true if the attribute must not be stored if its current value is "null" (Cf. IsNull())
-	 * @return bool
-	 */
-	public function IsNullAllowed() {return true;}
-	/**
-	 * Returns the attribute code (identifies the attribute in the host class)
-	 * @return string
-	 */
-	public function GetCode() {return $this->m_sCode;}
-
-	/**
-	 * Find the corresponding "link" attribute on the target class, if any
-	 * @return null | AttributeDefinition
-	 */
-	public function GetMirrorLinkAttribute() {return null;}
-
-	/**
-	 * Helper to browse the hierarchy of classes, searching for a label
-	 */	 	
-	protected function SearchLabel($sDictEntrySuffix, $sDefault, $bUserLanguageOnly)
-	{
-		$sLabel = Dict::S('Class:'.$this->m_sHostClass.$sDictEntrySuffix, '', $bUserLanguageOnly);
-		if (strlen($sLabel) == 0)
-		{
-			// Nothing found: go higher in the hierarchy (if possible)
-			//
-			$sLabel = $sDefault;
-			$sParentClass = MetaModel::GetParentClass($this->m_sHostClass);
-			if ($sParentClass)
-			{
-				if (MetaModel::IsValidAttCode($sParentClass, $this->m_sCode))
-				{
-					$oAttDef = MetaModel::GetAttributeDef($sParentClass, $this->m_sCode);
-					$sLabel = $oAttDef->SearchLabel($sDictEntrySuffix, $sDefault, $bUserLanguageOnly);
-				}
-			}
-		}
-		return $sLabel;
-	}
-
-	public function GetLabel($sDefault = null)
-	{
-		$sLabel = $this->SearchLabel('/Attribute:'.$this->m_sCode, null, true /*user lang*/);
-		if (is_null($sLabel))
-		{
-			// If no default value is specified, let's define the most relevant one for developping purposes
-			if (is_null($sDefault))
-			{
-				$sDefault = str_replace('_', ' ', $this->m_sCode);
-			}
-			// Browse the hierarchy again, accepting default (english) translations
-			$sLabel = $this->SearchLabel('/Attribute:'.$this->m_sCode, $sDefault, false);
-		}
-		return $sLabel;
-	}
-
-	/**
-	 * Get the label corresponding to the given value (in plain text)
-	 * To be overloaded for localized enums
-	 */
-	public function GetValueLabel($sValue)
-	{
-		return $sValue;
-	}
-
-	/**
-	 * Get the value from a given string (plain text, CSV import)
-	 * Return null if no match could be found	 
-	 */
-	public function MakeValueFromString($sProposedValue, $bLocalizedValue = false, $sSepItem = null, $sSepAttribute = null, $sSepValue = null, $sAttributeQualifier = null)
-	{
-		return $this->MakeRealValue($sProposedValue, null);
-	}
-
-	/**
-	 * Parses a search string coming from user input
-	 * @param string $sSearchString
-	 * @return string
-	 */
-	public function ParseSearchString($sSearchString)
-	{
-		return $sSearchString;
-	}
-	public function GetLabel_Obsolete()
-	{
-		// Written for compatibility with a data model written prior to version 0.9.1
-		if (array_key_exists('label', $this->m_aParams))
-		{
-			return $this->m_aParams['label'];
-		}
-		else
-		{
-			return $this->GetLabel();
-		}
-	}
-
-	public function GetDescription($sDefault = null)
-	{
-		$sLabel = $this->SearchLabel('/Attribute:'.$this->m_sCode.'+', null, true /*user lang*/);
-		if (is_null($sLabel))
-		{
-			// If no default value is specified, let's define the most relevant one for developping purposes
-			if (is_null($sDefault))
-			{
-				$sDefault = '';
-			}
-			// Browse the hierarchy again, accepting default (english) translations
-			$sLabel = $this->SearchLabel('/Attribute:'.$this->m_sCode.'+', $sDefault, false);
-		}
-		return $sLabel;
-	}
-
-	public function GetHelpOnEdition($sDefault = null)
-	{
-		$sLabel = $this->SearchLabel('/Attribute:'.$this->m_sCode.'?', null, true /*user lang*/);
-		if (is_null($sLabel))
-		{
-			// If no default value is specified, let's define the most relevant one for developping purposes
-			if (is_null($sDefault))
-			{
-				$sDefault = '';
-			}
-			// Browse the hierarchy again, accepting default (english) translations
-			$sLabel = $this->SearchLabel('/Attribute:'.$this->m_sCode.'?', $sDefault, false);
-		}
-		return $sLabel;
-	} 
-
-	public function GetHelpOnSmartSearch()
-	{
-		$aParents = array_merge(array(get_class($this) => get_class($this)), class_parents($this));
-		foreach ($aParents as $sClass)
-		{
-			$sHelp = Dict::S("Core:$sClass?SmartSearch", '-missing-');
-			if ($sHelp != '-missing-')
-			{
-				return $sHelp;
-			}
-		} 
-		return '';
-	} 
-
-	public function GetDescription_Obsolete()
-	{
-		// Written for compatibility with a data model written prior to version 0.9.1
-		if (array_key_exists('description', $this->m_aParams))
-		{
-			return $this->m_aParams['description'];
-		}
-		else
-		{
-			return $this->GetDescription();
-		}
-	}
-
-	public function GetTrackingLevel()
-	{
-		return $this->GetOptional('tracking_level', ATTRIBUTE_TRACKING_ALL);
-	}
-
-	public function GetValuesDef() {return null;} 
-	public function GetPrerequisiteAttributes($sClass = null) {return array();}
-
-	public function GetNullValue() {return null;} 
-	public function IsNull($proposedValue) {return is_null($proposedValue);} 
-
-	public function MakeRealValue($proposedValue, $oHostObj) {return $proposedValue;} // force an allowed value (type conversion and possibly forces a value as mySQL would do upon writing!)
-	public function Equals($val1, $val2) {return ($val1 == $val2);}
-
-	public function GetSQLExpressions($sPrefix = '') {return array();} // returns suffix/expression pairs (1 in most of the cases), for READING (Select)
-	public function FromSQLToValue($aCols, $sPrefix = '') {return null;} // returns a value out of suffix/value pairs, for SELECT result interpretation
-	public function GetSQLColumns($bFullSpec = false) {return array();} // returns column/spec pairs (1 in most of the cases), for STRUCTURING (DB creation)
-	public function GetSQLValues($value) {return array();} // returns column/value pairs (1 in most of the cases), for WRITING (Insert, Update)
-	public function RequiresIndex() {return false;}
-	public function CopyOnAllTables() {return false;}
-
-	public function GetOrderBySQLExpressions($sClassAlias)
-	{
-		// Note: This is the responsibility of this function to place backticks around column aliases
-		return array('`'.$sClassAlias.$this->GetCode().'`');
-	}
-	
-	public function GetOrderByHint()
-	{
-		return '';
-	}
-
-   // Import - differs slightly from SQL input, but identical in most cases
-   //
-	public function GetImportColumns() {return $this->GetSQLColumns();}
-	public function FromImportToValue($aCols, $sPrefix = '')
-	{
-		$aValues = array();
-		foreach ($this->GetSQLExpressions($sPrefix) as $sAlias => $sExpr)
-		{
-			// This is working, based on the assumption that importable fields
-			// are not computed fields => the expression is the name of a column
-			$aValues[$sPrefix.$sAlias] = $aCols[$sExpr];
-		}
-		return $this->FromSQLToValue($aValues, $sPrefix);
-	}
-
-	public function GetValidationPattern()
-	{
-		return '';
-	}
-	
-	public function CheckFormat($value)
-	{
-		return true;
-	}
-	 
-	public function GetMaxSize()
-	{
-		return null;
-	}
-	 
-	public function MakeValue()
-	{
-		$sComputeFunc = $this->Get("compute_func");
-		if (empty($sComputeFunc)) return null;
-
-		return call_user_func($sComputeFunc);
-	}
-	
-	abstract public function GetDefaultValue(DBObject $oHostObject = null);
-
-	//
-	// To be overloaded in subclasses
-	//
-	
-	abstract public function GetBasicFilterOperators(); // returns an array of "opCode"=>"description"
-	abstract public function GetBasicFilterLooseOperator(); // returns an "opCode"
-	//abstract protected GetBasicFilterHTMLInput();
-	abstract public function GetBasicFilterSQLExpr($sOpCode, $value); 
-
-	public function GetFilterDefinitions()
-	{
-		return array();
-	}
-
-	public function GetEditValue($sValue, $oHostObj = null)
-	{
-		return (string)$sValue;
-	}
-	
-	/**
-	 * For fields containing a potential markup, return the value without this markup
-	 * @return string
-	 */
-	public function GetAsPlainText($sValue, $oHostObj = null)
-	{
-		return (string) $this->GetEditValue($sValue, $oHostObj);
-	}
-
-	/**
-	 * Helper to get a value that will be JSON encoded
-	 * The operation is the opposite to FromJSONToValue	 
-	 */	 	
-	public function GetForJSON($value)
-	{
-		// In most of the cases, that will be the expected behavior...
-		return $this->GetEditValue($value);
-	}
-
-	/**
-	 * Helper to form a value, given JSON decoded data
-	 * The operation is the opposite to GetForJSON	 
-	 */	 	
-	public function FromJSONToValue($json)
-	{
-		// Passthrough in most of the cases
-		return $json;
-	}
-
-	/**
-	 * Override to display the value in the GUI
-	 */	
-	public function GetAsHTML($sValue, $oHostObject = null, $bLocalize = true)
-	{
-		return Str::pure2html((string)$sValue);
-	}
-
-	/**
-	 * Override to export the value in XML	
-	 */	
-	public function GetAsXML($sValue, $oHostObject = null, $bLocalize = true)
-	{
-		return Str::pure2xml((string)$sValue);
-	}
-
-	/**
-	 * Override to escape the value when read by DBObject::GetAsCSV()	
-	 */	
-	public function GetAsCSV($sValue, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
-	{
-		return (string)$sValue;
-	}
-
-	/**
-	 * Override to differentiate a value displayed in the UI or in the history
-	 */	
-	public function GetAsHTMLForHistory($sValue, $oHostObject = null, $bLocalize = true)
-	{
-		return $this->GetAsHTML($sValue, $oHostObject, $bLocalize);
-	}
-
-	static public function GetFormFieldClass()
-	{
-		return '\\Combodo\\iTop\\Form\\Field\\StringField';
-	}
-
-	/**
-	 * Override to specify Field class
-	 *
-	 * When called first, $oFormField is null and will be created (eg. Make). Then when the ::parent is called and the $oFormField is passed, MakeFormField behave more like a Prepare.
-	 */
-	public function MakeFormField(DBObject $oObject, $oFormField = null)
-	{
-		// This is a fallback in case the AttributeDefinition subclass has no overloading of this function.
-		if ($oFormField === null)
-		{
-			$sFormFieldClass = static::GetFormFieldClass();
-			$oFormField = new $sFormFieldClass($this->GetCode());
-			//$oFormField->SetReadOnly(true);
-		}
-
-		$oFormField->SetLabel($this->GetLabel());
-
-		// Attributes flags
-		// - Retrieving flags for the current object
-		if ($oObject->IsNew())
-		{
-			$iFlags = $oObject->GetInitialStateAttributeFlags($this->GetCode());
-		}
-		else
-		{
-			$iFlags = $oObject->GetAttributeFlags($this->GetCode());
-		}
-
-		// - Comparing flags
-		if ($this->IsWritable() && (!$this->IsNullAllowed() || (($iFlags & OPT_ATT_MANDATORY) === OPT_ATT_MANDATORY)))
-		{
-			$oFormField->SetMandatory(true);
-		}
-		if ((!$oObject->IsNew() || !$oFormField->GetMandatory()) && (($iFlags & OPT_ATT_READONLY) === OPT_ATT_READONLY))
-		{
-			$oFormField->SetReadOnly(true);
-		}
-		
-		// CurrentValue
-		$oFormField->SetCurrentValue($oObject->Get($this->GetCode()));
-
-		// Validation pattern
-		if ($this->GetValidationPattern() !== '')
-		{
-			$oFormField->AddValidator(new \Combodo\iTop\Form\Validator\Validator($this->GetValidationPattern()));
-		}
-
-		return $oFormField;
-	}
-
-	/**
-	 * List the available verbs for 'GetForTemplate'
-	 */	 
-	public function EnumTemplateVerbs()
-	{
-		return array(
-			'' => 'Plain text (unlocalized) representation',
-			'html' => 'HTML representation',
-			'label' => 'Localized representation',
-			'text' => 'Plain text representation (without any markup)',
-		);
-	}
-
-	/**
-	 * Get various representations of the value, for insertion into a template (e.g. in Notifications)
-	 * @param $value mixed The current value of the field
-	 * @param $sVerb string The verb specifying the representation of the value
-	 * @param $oHostObject DBObject The object
-	 * @param $bLocalize bool Whether or not to localize the value
-	 */
-	public function GetForTemplate($value, $sVerb, $oHostObject = null, $bLocalize = true)
-	{
-		if ($this->IsScalar())
-		{
-			switch ($sVerb)
-			{
-				case '':
-				return $value;
-				
-				case 'html':
-				return $this->GetAsHtml($value, $oHostObject, $bLocalize);
-				
-				case 'label':
-				return $this->GetEditValue($value);
-				
-				case 'text':
-				return $this->GetAsPlainText($value);
-				break;
-				
-				default:
-				throw new Exception("Unknown verb '$sVerb' for attribute ".$this->GetCode().' in class '.get_class($oHostObject));
-			}
-		}
-		return null;
-	}
-
-	public function GetAllowedValues($aArgs = array(), $sContains = '')
-	{
-		$oValSetDef = $this->GetValuesDef();
-		if (!$oValSetDef) return null;
-		return $oValSetDef->GetValues($aArgs, $sContains);
-	}
-
-	/**
-	 * Explain the change of the attribute (history)
-	 */	
-	public function DescribeChangeAsHTML($sOldValue, $sNewValue, $sLabel = null)
-	{
-		if (is_null($sLabel))
-		{
-			$sLabel = $this->GetLabel();
-		}
-
-		$sNewValueHtml = $this->GetAsHTMLForHistory($sNewValue);
-		$sOldValueHtml = $this->GetAsHTMLForHistory($sOldValue);
-
-		if($this->IsExternalKey())
-		{
-			$sTargetClass = $this->GetTargetClass();
-			$sOldValueHtml = (int)$sOldValue ? MetaModel::GetHyperLink($sTargetClass, (int)$sOldValue) : null;
-			$sNewValueHtml = (int)$sNewValue ? MetaModel::GetHyperLink($sTargetClass, (int)$sNewValue) : null;
-		}
-		if ( (($this->GetType() == 'String') || ($this->GetType() == 'Text')) &&
-			 (strlen($sNewValue) > strlen($sOldValue)) )
-		{
-			// Check if some text was not appended to the field
-			if (substr($sNewValue,0, strlen($sOldValue)) == $sOldValue) // Text added at the end
-			{
-				$sDelta = $this->GetAsHTML(substr($sNewValue, strlen($sOldValue)));
-				$sResult = Dict::Format('Change:Text_AppendedTo_AttName', $sDelta, $sLabel);
-			}
-			else if (substr($sNewValue, -strlen($sOldValue)) == $sOldValue)   // Text added at the beginning
-			{
-				$sDelta = $this->GetAsHTML(substr($sNewValue, 0, strlen($sNewValue) - strlen($sOldValue)));
-				$sResult = Dict::Format('Change:Text_AppendedTo_AttName', $sDelta, $sLabel);
-			}
-			else
-			{
-				if (strlen($sOldValue) == 0)
-				{
-					$sResult = Dict::Format('Change:AttName_SetTo', $sLabel, $sNewValueHtml);
-				}
-				else
-				{
-					if (is_null($sNewValue))
-					{
-						$sNewValueHtml = Dict::S('UI:UndefinedObject');
-					}
-					$sResult = Dict::Format('Change:AttName_SetTo_NewValue_PreviousValue_OldValue', $sLabel, $sNewValueHtml, $sOldValueHtml);
-				}
-			}
-		}
-		else
-		{
-			if (strlen($sOldValue) == 0)
-			{
-				$sResult = Dict::Format('Change:AttName_SetTo', $sLabel, $sNewValueHtml);
-			}
-			else
-			{
-				if (is_null($sNewValue))
-				{
-					$sNewValueHtml = Dict::S('UI:UndefinedObject');
-				}
-				$sResult = Dict::Format('Change:AttName_SetTo_NewValue_PreviousValue_OldValue', $sLabel, $sNewValueHtml, $sOldValueHtml);
-			}
-		}
-		return $sResult;
-	}
-
-
-	/**
-	 * Parses a string to find some smart search patterns and build the corresponding search/OQL condition
-	 * Each derived class is reponsible for defining and processing their own smart patterns, the base class
-	 * does nothing special, and just calls the default (loose) operator
-	 * @param string $sSearchText The search string to analyze for smart patterns
-	 * @param FieldExpression The FieldExpression representing the atttribute code in this OQL query
-	 * @param Hash $aParams Values of the query parameters
-	 * @return Expression The search condition to be added (AND) to the current search
-	 */
-	public function GetSmartConditionExpression($sSearchText, FieldExpression $oField, &$aParams)
-	{
-		$sParamName = $oField->GetParent().'_'.$oField->GetName();
-		$oRightExpr = new VariableExpression($sParamName);
-		$sOperator = $this->GetBasicFilterLooseOperator();
-		switch ($sOperator)
-		{
-			case 'Contains':
-			$aParams[$sParamName] = "%$sSearchText%";
-			$sSQLOperator = 'LIKE';
-			break;
-			
-			default:
-			$sSQLOperator = $sOperator;
-			$aParams[$sParamName] = $sSearchText;
-		}
-		$oNewCondition = new BinaryExpression($oField, $sSQLOperator, $oRightExpr);
-		return $oNewCondition;
-	}
-	
-	/**
-	 * Tells if an attribute is part of the unique fingerprint of the object (used for comparing two objects)
-	 * All attributes which value is not based on a value from the object itself (like ExternalFields or LinkedSet)
-	 * must be excluded from the object's signature
-	 * @return boolean
-	 */
-	public function IsPartOfFingerprint()
-	{
-		return true;
-	}
-	
-	/**
-	 * The part of the current attribute in the object's signature, for the supplied value
-	 * @param unknown $value The value of this attribute for the object
-	 * @return string The "signature" for this field/attribute
-	 */
-	public function Fingerprint($value)
-	{
-		return (string)$value;
-	}
-}
-
-/**
- * Set of objects directly linked to an object, and being part of its definition  
- *
- * @package	 iTopORM
- */
-class AttributeLinkedSet extends AttributeDefinition
-{
-	static public function ListExpectedParams()
-	{
-		return array_merge(parent::ListExpectedParams(), array("allowed_values", "depends_on", "linked_class", "ext_key_to_me", "count_min", "count_max"));
-	}
-
-	public function GetEditClass() {return "LinkedSet";}
-
-	public function IsWritable() {return true;}
-	static public function IsLinkSet() {return true;}
-	public function IsIndirect() {return false;} 
-
-	public function GetValuesDef() {return $this->Get("allowed_values");} 
-	public function GetPrerequisiteAttributes($sClass = null) {return $this->Get("depends_on");}
-	public function GetDefaultValue(DBObject $oHostObject = null)
-	{
-		$sLinkClass = $this->GetLinkedClass();
-		$sExtKeyToMe = $this->GetExtKeyToMe();
-
-		// The class to target is not the current class, because if this is a derived class,
-		// it may differ from the target class, then things start to become confusing
-		$oRemoteExtKeyAtt = MetaModel::GetAttributeDef($sLinkClass, $sExtKeyToMe);
-		$sMyClass = $oRemoteExtKeyAtt->GetTargetClass();
-
-		$oMyselfSearch = new DBObjectSearch($sMyClass);
-		if ($oHostObject !== null)
-		{
-			$oMyselfSearch->AddCondition('id', $oHostObject->GetKey(), '=');
-		}
-
-		$oLinkSearch = new DBObjectSearch($sLinkClass);
-		$oLinkSearch->AddCondition_PointingTo($oMyselfSearch, $sExtKeyToMe);
-		if ($this->IsIndirect())
-		{
-			// Join the remote class so that the archive flag will be taken into account
-			$sExtKeyToRemote = $this->GetExtKeyToRemote();
-			$oExtKeyToRemote = MetaModel::GetAttributeDef($sLinkClass, $sExtKeyToRemote);
-			$sRemoteClass = $oExtKeyToRemote->GetTargetClass();
-			if (MetaModel::IsArchivable($sRemoteClass))
-			{
-				$oRemoteSearch = new DBObjectSearch($sRemoteClass);
-				$oLinkSearch->AddCondition_PointingTo($oRemoteSearch, $this->GetExtKeyToRemote());
-			}
-		}
-		$oLinks = new DBObjectSet($oLinkSearch);
-		$oLinkSet = new ormLinkSet($this->GetHostClass(), $this->GetCode(), $oLinks);
-		return $oLinkSet;
-	}
-
-	public function GetTrackingLevel()
-	{
-		return $this->GetOptional('tracking_level', MetaModel::GetConfig()->Get('tracking_level_linked_set_default'));
-	}
-
-	public function GetEditMode()
-	{
-		return $this->GetOptional('edit_mode', LINKSET_EDITMODE_ACTIONS);
-	}
-	
-	public function GetLinkedClass() {return $this->Get('linked_class');}
-	public function GetExtKeyToMe() {return $this->Get('ext_key_to_me');}
-
-	public function GetBasicFilterOperators() {return array();}
-	public function GetBasicFilterLooseOperator() {return '';}
-	public function GetBasicFilterSQLExpr($sOpCode, $value) {return '';}
-
-	public function GetAsHTML($sValue, $oHostObject = null, $bLocalize = true)
-	{
-		if (is_object($sValue) && ($sValue instanceof ormLinkSet))
-		{
-			$sValue->Rewind();
-			$aItems = array();
-			while ($oObj = $sValue->Fetch())
-			{
-				// Show only relevant information (hide the external key to the current object)
-				$aAttributes = array();
-				foreach(MetaModel::ListAttributeDefs($this->GetLinkedClass()) as $sAttCode => $oAttDef)
-				{
-					if ($sAttCode == $this->GetExtKeyToMe()) continue;
-					if ($oAttDef->IsExternalField()) continue;
-					$sAttValue = $oObj->GetAsHTML($sAttCode);
-					if (strlen($sAttValue) > 0)
-					{
-						$aAttributes[] = $sAttValue;
-					}
-				}
-				$sAttributes = implode(', ', $aAttributes);
-				$aItems[] = $sAttributes;
-			}
-			return implode('<br/>', $aItems);
-		}
-		return null;
-	}
-
-	public function GetAsXML($sValue, $oHostObject = null, $bLocalize = true)
-	{
-		if (is_object($sValue) && ($sValue instanceof ormLinkSet))
-		{
-			$sValue->Rewind();
-			$sRes = "<Set>\n";
-			while ($oObj = $sValue->Fetch())
-			{
-				$sObjClass = get_class($oObj);
-				$sRes .= "<$sObjClass id=\"".$oObj->GetKey()."\">\n";
-				// Show only relevant information (hide the external key to the current object)
-				$aAttributes = array();
-				foreach(MetaModel::ListAttributeDefs($sObjClass) as $sAttCode => $oAttDef)
-				{
-					if ($sAttCode == 'finalclass')
-					{
-						if ($sObjClass == $this->GetLinkedClass())
-						{
-							// Simplify the output if the exact class could be determined implicitely
-							continue;
-						}
-					}
-					if ($sAttCode == $this->GetExtKeyToMe()) continue;
-					if ($oAttDef->IsExternalField())
-					{
-						if ($oAttDef->GetKeyAttCode() == $this->GetExtKeyToMe()) continue;
-						if ($oAttDef->IsFriendlyName()) continue;
-					}
-					if ($oAttDef instanceof AttributeFriendlyName) continue;
-					if (!$oAttDef->IsScalar()) continue;
-					$sAttValue = $oObj->GetAsXML($sAttCode, $bLocalize);
-					$sRes .= "<$sAttCode>$sAttValue</$sAttCode>\n";
-				}
-				$sRes .= "</$sObjClass>\n";
-			}
-			$sRes .= "</Set>\n";
-		}
-		else
-		{
-			$sRes = '';
-		}
-		return $sRes;
-	}
-
-	public function GetAsCSV($sValue, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
-	{
-		$sSepItem = MetaModel::GetConfig()->Get('link_set_item_separator');
-		$sSepAttribute = MetaModel::GetConfig()->Get('link_set_attribute_separator');
-		$sSepValue = MetaModel::GetConfig()->Get('link_set_value_separator');
-		$sAttributeQualifier = MetaModel::GetConfig()->Get('link_set_attribute_qualifier');
-
-		if (is_object($sValue) && ($sValue instanceof ormLinkSet))
-		{
-			$sValue->Rewind();
-			$aItems = array();
-			while ($oObj = $sValue->Fetch())
-			{
-				$sObjClass = get_class($oObj);
-				// Show only relevant information (hide the external key to the current object)
-				$aAttributes = array();
-				foreach(MetaModel::ListAttributeDefs($sObjClass) as $sAttCode => $oAttDef)
-				{
-					if ($sAttCode == 'finalclass')
-					{
-						if ($sObjClass == $this->GetLinkedClass())
-						{
-							// Simplify the output if the exact class could be determined implicitely 
-							continue;
-						}
-					}
-					if ($sAttCode == $this->GetExtKeyToMe()) continue;
-					if ($oAttDef->IsExternalField()) continue;
-					if (!$oAttDef->IsBasedOnDBColumns()) continue;
-					if (!$oAttDef->IsScalar()) continue;
-					$sAttValue = $oObj->GetAsCSV($sAttCode, $sSepValue, '', $bLocalize);
-					if (strlen($sAttValue) > 0)
-					{
-						$sAttributeData = str_replace($sAttributeQualifier, $sAttributeQualifier.$sAttributeQualifier, $sAttCode.$sSepValue.$sAttValue);
-						$aAttributes[] = $sAttributeQualifier.$sAttributeData.$sAttributeQualifier;
-					}
-				}
-				$sAttributes = implode($sSepAttribute, $aAttributes);
-				$aItems[] = $sAttributes;
-			}
-			$sRes = implode($sSepItem, $aItems);
-		}
-		else
-		{
-			$sRes = '';
-		}
-		$sRes = str_replace($sTextQualifier, $sTextQualifier.$sTextQualifier, $sRes);
-		$sRes = $sTextQualifier.$sRes.$sTextQualifier;
-		return $sRes;
-	}
-
-	/**
-	 * List the available verbs for 'GetForTemplate'
-	 */	 
-	public function EnumTemplateVerbs()
-	{
-		return array(
-			'' => 'Plain text (unlocalized) representation',
-			'html' => 'HTML representation (unordered list)',
-		);
-	}
-
-	/**
-	 * Get various representations of the value, for insertion into a template (e.g. in Notifications)
-	 * @param $value mixed The current value of the field
-	 * @param $sVerb string The verb specifying the representation of the value
-	 * @param $oHostObject DBObject The object
-	 * @param $bLocalize bool Whether or not to localize the value
-	 */
-	public function GetForTemplate($value, $sVerb, $oHostObject = null, $bLocalize = true)
-	{
-		$sRemoteName = $this->IsIndirect() ? $this->GetExtKeyToRemote().'_friendlyname' : 'friendlyname';
-		
-		$oLinkSet = clone $value; // Workaround/Safety net for Trac #887
-		$iLimit = MetaModel::GetConfig()->Get('max_linkset_output');
-		$iCount = 0;
-		$aNames = array();
-		foreach($oLinkSet as $oItem)
-		{
-			if (($iLimit > 0) && ($iCount == $iLimit))
-			{
-				$iTotal = $oLinkSet->Count();
-				$aNames[] = '... '.Dict::Format('UI:TruncatedResults', $iCount, $iTotal);
-				break;
-			}
-			$aNames[] = $oItem->Get($sRemoteName);
-			$iCount++;
-		}
-
-		switch($sVerb)
-		{
-			case '':
-			return implode("\n", $aNames);
-					
-			case 'html':
-			return '<ul><li>'.implode("</li><li>", $aNames).'</li></ul>';
-			
-			default:
-			throw new Exception("Unknown verb '$sVerb' for attribute ".$this->GetCode().' in class '.get_class($oHostObject));
-		}
-	}
-
-	public function DuplicatesAllowed() {return false;} // No duplicates for 1:n links, never
-
-	public function GetImportColumns()
-	{
-		$aColumns = array();
-		$aColumns[$this->GetCode()] = 'TEXT';
-		return $aColumns;
-	}
-
-	public function MakeValueFromString($sProposedValue, $bLocalizedValue = false, $sSepItem = null, $sSepAttribute = null, $sSepValue = null, $sAttributeQualifier = null)
-	{
-		if (is_null($sSepItem) || empty($sSepItem))
-		{
-			$sSepItem = MetaModel::GetConfig()->Get('link_set_item_separator');
-		}
-		if (is_null($sSepAttribute) || empty($sSepAttribute))
-		{
-			$sSepAttribute = MetaModel::GetConfig()->Get('link_set_attribute_separator');
-		}
-		if (is_null($sSepValue) || empty($sSepValue))
-		{
-			$sSepValue = MetaModel::GetConfig()->Get('link_set_value_separator');
-		}
-		if (is_null($sAttributeQualifier) || empty($sAttributeQualifier))
-		{
-			$sAttributeQualifier = MetaModel::GetConfig()->Get('link_set_attribute_qualifier');
-		}
-
-		$sTargetClass = $this->Get('linked_class');
-
-		$sInput = str_replace($sSepItem, "\n", $sProposedValue);
-		$oCSVParser = new CSVParser($sInput, $sSepAttribute, $sAttributeQualifier);
-
-		$aInput = $oCSVParser->ToArray(0 /* do not skip lines */);
-
-		$aLinks = array();
-		foreach($aInput as $aRow)
-		{
-			// 1st - get the values, split the extkey->searchkey specs, and eventually get the finalclass value
-			$aExtKeys = array();
-			$aValues = array();
-			foreach($aRow as $sCell)
-			{
-				$iSepPos = strpos($sCell, $sSepValue);
-				if ($iSepPos === false)
-				{
-					// Houston...
-					throw new CoreException('Wrong format for link attribute specification', array('value' => $sCell));
-				}
-
-				$sAttCode = trim(substr($sCell, 0, $iSepPos));
-				$sValue = substr($sCell, $iSepPos + strlen($sSepValue));
-
-				if (preg_match('/^(.+)->(.+)$/', $sAttCode, $aMatches))
-				{
-					$sKeyAttCode = $aMatches[1];
-					$sRemoteAttCode = $aMatches[2];
-					$aExtKeys[$sKeyAttCode][$sRemoteAttCode] = $sValue;
-					if (!MetaModel::IsValidAttCode($sTargetClass, $sKeyAttCode))
-					{
-						throw new CoreException('Wrong attribute code for link attribute specification', array('class' => $sTargetClass, 'attcode' => $sKeyAttCode));
-					}
-					$oKeyAttDef = MetaModel::GetAttributeDef($sTargetClass, $sKeyAttCode);
-					$sRemoteClass = $oKeyAttDef->GetTargetClass();
-					if (!MetaModel::IsValidAttCode($sRemoteClass, $sRemoteAttCode))
-					{
-						throw new CoreException('Wrong attribute code for link attribute specification', array('class' => $sRemoteClass, 'attcode' => $sRemoteAttCode));
-					}
-				}
-				else
-				{
-					if(!MetaModel::IsValidAttCode($sTargetClass, $sAttCode))
-					{
-						throw new CoreException('Wrong attribute code for link attribute specification', array('class' => $sTargetClass, 'attcode' => $sAttCode));
-					}
-					$oAttDef = MetaModel::GetAttributeDef($sTargetClass, $sAttCode);
-					$aValues[$sAttCode] = $oAttDef->MakeValueFromString($sValue, $bLocalizedValue, $sSepItem, $sSepAttribute, $sSepValue, $sAttributeQualifier);
-				}
-			}
-
-			// 2nd - Instanciate the object and set the value
-			if (isset($aValues['finalclass']))
-			{
-				$sLinkClass = $aValues['finalclass'];
-				if (!is_subclass_of($sLinkClass, $sTargetClass))
-				{
-					throw new CoreException('Wrong class for link attribute specification', array('requested_class' => $sLinkClass, 'expected_class' => $sTargetClass));
-				}
-			}
-			elseif (MetaModel::IsAbstract($sTargetClass))
-			{
-					throw new CoreException('Missing finalclass for link attribute specification');
-			}
-			else
-			{
-				$sLinkClass = $sTargetClass;
-			}
-
-			$oLink = MetaModel::NewObject($sLinkClass);
-			foreach ($aValues as $sAttCode => $sValue)
-			{
-				$oLink->Set($sAttCode, $sValue);
-			}
-
-			// 3rd - Set external keys from search conditions
-			foreach ($aExtKeys as $sKeyAttCode => $aReconciliation)
-			{
-				$oKeyAttDef = MetaModel::GetAttributeDef($sTargetClass, $sKeyAttCode);
-				$sKeyClass = $oKeyAttDef->GetTargetClass();
-				$oExtKeyFilter = new DBObjectSearch($sKeyClass);
-				$aReconciliationDesc = array();
-				foreach($aReconciliation as $sRemoteAttCode => $sValue)
-				{
-					$oExtKeyFilter->AddCondition($sRemoteAttCode, $sValue, '=');
-					$aReconciliationDesc[] = "$sRemoteAttCode=$sValue";
-				}
-				$oExtKeySet = new DBObjectSet($oExtKeyFilter);
-				switch($oExtKeySet->Count())
-				{
-				case 0:
-					$sReconciliationDesc = implode(', ', $aReconciliationDesc);
-					throw new CoreException("Found no match", array('ext_key' => $sKeyAttCode, 'reconciliation' => $sReconciliationDesc));
-					break;
-				case 1:
-					$oRemoteObj = $oExtKeySet->Fetch();
-					$oLink->Set($sKeyAttCode, $oRemoteObj->GetKey());
-					break;
-				default:
-					$sReconciliationDesc = implode(', ', $aReconciliationDesc);
-					throw new CoreException("Found several matches", array('ext_key' => $sKeyAttCode, 'reconciliation' => $sReconciliationDesc));
-					// Found several matches, ambiguous
-				}
-			}
-
-			// Check (roughly) if such a link is valid
-			$aErrors = array();
-			foreach(MetaModel::ListAttributeDefs($sTargetClass) as $sAttCode => $oAttDef)
-			{
-				if ($oAttDef->IsExternalKey())
-				{
-					if (($oAttDef->GetTargetClass() == $this->GetHostClass()) || (is_subclass_of($this->GetHostClass(), $oAttDef->GetTargetClass())))
-					{
-						continue; // Don't check the key to self
-					}
-				}
-				
-				if ($oAttDef->IsWritable() && $oAttDef->IsNull($oLink->Get($sAttCode)) && !$oAttDef->IsNullAllowed())
-				{
-					$aErrors[] = $sAttCode;
-				}
-			}
-			if (count($aErrors) > 0)
-			{
-				throw new CoreException("Missing value for mandatory attribute(s): ".implode(', ', $aErrors));
-			}
-
-			$aLinks[] = $oLink;
-		}
-		$oSet = DBObjectSet::FromArray($sTargetClass, $aLinks);
-		return $oSet;
-	}
-
-	/**
-	 * Helper to get a value that will be JSON encoded
-	 * The operation is the opposite to FromJSONToValue	 
-	 */	 	
-	public function GetForJSON($value)
-	{
-		$aRet = array();
-		if (is_object($value) && ($value instanceof ormLinkSet))
-		{
-			$value->Rewind();
-			while ($oObj = $value->Fetch())
-			{
-				$sObjClass = get_class($oObj);
-				// Show only relevant information (hide the external key to the current object)
-				$aAttributes = array();
-				foreach(MetaModel::ListAttributeDefs($sObjClass) as $sAttCode => $oAttDef)
-				{
-					if ($sAttCode == 'finalclass')
-					{
-						if ($sObjClass == $this->GetLinkedClass())
-						{
-							// Simplify the output if the exact class could be determined implicitely 
-							continue;
-						}
-					}
-					if ($sAttCode == $this->GetExtKeyToMe()) continue;
-					if ($oAttDef->IsExternalField()) continue;
-					if (!$oAttDef->IsBasedOnDBColumns()) continue;
-					if (!$oAttDef->IsScalar()) continue;
-					$attValue = $oObj->Get($sAttCode);
-					$aAttributes[$sAttCode] = $oAttDef->GetForJSON($attValue);
-				}
-				$aRet[] = $aAttributes;
-			}
-		}
-		return $aRet;
-	}
-
-	/**
-	 * Helper to form a value, given JSON decoded data
-	 * The operation is the opposite to GetForJSON	 
-	 */	 	
-	public function FromJSONToValue($json)
-	{
-		$sTargetClass = $this->Get('linked_class');
-
-		$aLinks = array();
-		foreach($json as $aValues)
-		{
-			if (isset($aValues['finalclass']))
-			{
-				$sLinkClass = $aValues['finalclass'];
-				if (!is_subclass_of($sLinkClass, $sTargetClass))
-				{
-					throw new CoreException('Wrong class for link attribute specification', array('requested_class' => $sLinkClass, 'expected_class' => $sTargetClass));
-				}
-			}
-			elseif (MetaModel::IsAbstract($sTargetClass))
-			{
-					throw new CoreException('Missing finalclass for link attribute specification');
-			}
-			else
-			{
-				$sLinkClass = $sTargetClass;
-			}
-
-			$oLink = MetaModel::NewObject($sLinkClass);
-			foreach ($aValues as $sAttCode => $sValue)
-			{
-				$oLink->Set($sAttCode, $sValue);
-			}
-
-			// Check (roughly) if such a link is valid
-			$aErrors = array();
-			foreach(MetaModel::ListAttributeDefs($sTargetClass) as $sAttCode => $oAttDef)
-			{
-				if ($oAttDef->IsExternalKey())
-				{
-					if (($oAttDef->GetTargetClass() == $this->GetHostClass()) || (is_subclass_of($this->GetHostClass(), $oAttDef->GetTargetClass())))
-					{
-						continue; // Don't check the key to self
-					}
-				}
-				
-				if ($oAttDef->IsWritable() && $oAttDef->IsNull($oLink->Get($sAttCode)) && !$oAttDef->IsNullAllowed())
-				{
-					$aErrors[] = $sAttCode;
-				}
-			}
-			if (count($aErrors) > 0)
-			{
-				throw new CoreException("Missing value for mandatory attribute(s): ".implode(', ', $aErrors));
-			}
-
-			$aLinks[] = $oLink;
-		}
-		$oSet = DBObjectSet::FromArray($sTargetClass, $aLinks);
-		return $oSet;
-	}
-
-	/**
-	 * @param ormLinkSet $val1
-	 * @param ormLinkSet $val2
-	 * @return bool
-	 */
-	public function Equals($val1, $val2)
-	{
-		if ($val1 === $val2)
-		{
-			$bAreEquivalent = true;
-		}
-		else
-		{
-            $bAreEquivalent = ($val2->HasDelta() === false);
-		}
-		return $bAreEquivalent;
-	}
-
-	/**
-	 * Find the corresponding "link" attribute on the target class, if any
-	 * @return null | AttributeDefinition
-	 */
-	public function GetMirrorLinkAttribute()
-	{
-		$oRemoteAtt = MetaModel::GetAttributeDef($this->GetLinkedClass(), $this->GetExtKeyToMe());
-		return $oRemoteAtt;
-	}
-
-	static public function GetFormFieldClass()
-	{
-		return '\\Combodo\\iTop\\Form\\Field\\LinkedSetField';
-	}
-
-	public function MakeFormField(DBObject $oObject, $oFormField = null)
-	{
-		if ($oFormField === null)
-		{
-			$sFormFieldClass = static::GetFormFieldClass();
-			$oFormField = new $sFormFieldClass($this->GetCode());
-		}
-		
-		// Setting target class
-		if (!$this->IsIndirect())
-		{
-			$sTargetClass = $this->GetLinkedClass();
-		}
-		else
-		{
-			$oRemoteAttDef = MetaModel::GetAttributeDef($this->GetLinkedClass(), $this->GetExtKeyToRemote());
-			$sTargetClass = $oRemoteAttDef->GetTargetClass();
-
-			$oFormField->SetExtKeyToRemote($this->GetExtKeyToRemote());
-		}
-		$oFormField->SetTargetClass($sTargetClass);
-		$oFormField->SetIndirect($this->IsIndirect());
-		// Setting attcodes to display
-		$aAttCodesToDisplay = MetaModel::FlattenZList(MetaModel::GetZListItems($sTargetClass, 'list'));
-		// - Adding friendlyname attribute to the list is not already in it
-		$sTitleAttCode = MetaModel::GetFriendlyNameAttributeCode($sTargetClass);
-		if (($sTitleAttCode !== null) && !in_array($sTitleAttCode, $aAttCodesToDisplay))
-		{
-			$aAttCodesToDisplay = array_merge(array($sTitleAttCode), $aAttCodesToDisplay);
-		}
-		// - Adding attribute labels
-		$aAttributesToDisplay = array();
-		foreach ($aAttCodesToDisplay as $sAttCodeToDisplay)
-		{
-			$oAttDefToDisplay = MetaModel::GetAttributeDef($sTargetClass, $sAttCodeToDisplay);
-			$aAttributesToDisplay[$sAttCodeToDisplay] = $oAttDefToDisplay->GetLabel();
-		}
-		$oFormField->SetAttributesToDisplay($aAttributesToDisplay);
-		
-		parent::MakeFormField($oObject, $oFormField);
-		
-		return $oFormField;
-	}
-
-	public function IsPartOfFingerprint() { return false; }
-}
-
-/**
- * Set of objects linked to an object (n-n), and being part of its definition  
- *
- * @package	 iTopORM
- */
-class AttributeLinkedSetIndirect extends AttributeLinkedSet
-{
-	static public function ListExpectedParams()
-	{
-		return array_merge(parent::ListExpectedParams(), array("ext_key_to_remote"));
-	}
-	public function IsIndirect() {return true;} 
-	public function GetExtKeyToRemote() { return $this->Get('ext_key_to_remote'); }
-	public function GetEditClass() {return "LinkedSet";}
-	public function DuplicatesAllowed() {return $this->GetOptional("duplicates", false);} // The same object may be linked several times... or not...
-
-	public function GetTrackingLevel()
-	{
-		return $this->GetOptional('tracking_level', MetaModel::GetConfig()->Get('tracking_level_linked_set_indirect_default'));
-	}
-
-	/**
-	 * Find the corresponding "link" attribute on the target class, if any
-	 * @return null | AttributeDefinition
-	 */
-	public function GetMirrorLinkAttribute()
-	{
-		$oRet = null;
-		$oExtKeyToRemote = MetaModel::GetAttributeDef($this->GetLinkedClass(), $this->GetExtKeyToRemote());
-		$sRemoteClass = $oExtKeyToRemote->GetTargetClass();
-		foreach (MetaModel::ListAttributeDefs($sRemoteClass) as $sRemoteAttCode => $oRemoteAttDef)
-		{
-			if (!$oRemoteAttDef instanceof AttributeLinkedSetIndirect) continue;
-			if ($oRemoteAttDef->GetLinkedClass() != $this->GetLinkedClass()) continue;
-			if ($oRemoteAttDef->GetExtKeyToMe() != $this->GetExtKeyToRemote()) continue;
-			if ($oRemoteAttDef->GetExtKeyToRemote() != $this->GetExtKeyToMe()) continue;
-			$oRet = $oRemoteAttDef;
-			break;
-		}
-		return $oRet;
-	}
-}
-
-/**
- * Abstract class implementing default filters for a DB column  
- *
- * @package	 iTopORM
- */
-class AttributeDBFieldVoid extends AttributeDefinition
-{	
-	static public function ListExpectedParams()
-	{
-		return array_merge(parent::ListExpectedParams(), array("allowed_values", "depends_on", "sql"));
-	}
-
-	// To be overriden, used in GetSQLColumns
-	protected function GetSQLCol($bFullSpec = false)
-	{
-		return "VARCHAR(255)".($bFullSpec ? $this->GetSQLColSpec() : '');
-	}
-	protected function GetSQLColSpec()
-	{
-		$default = $this->ScalarToSQL($this->GetDefaultValue());
-		if (is_null($default))
-		{
-			$sRet = '';
-		}
-		else
-		{
-			if (is_numeric($default))
-			{
-				// Though it is a string in PHP, it will be considered as a numeric value in MySQL
-				// Then it must not be quoted here, to preserve the compatibility with the value returned by CMDBSource::GetFieldSpec
-				$sRet = " DEFAULT $default";
-			}
-			else
-			{
-				$sRet = " DEFAULT ".CMDBSource::Quote($default);
-			}
-		}
-		return $sRet;
-	}
-
-	public function GetEditClass() {return "String";}
-	
-	public function GetValuesDef() {return $this->Get("allowed_values");} 
-	public function GetPrerequisiteAttributes($sClass = null) {return $this->Get("depends_on");}
-
-	static public function IsBasedOnDBColumns() {return true;}
-	static public function IsScalar() {return true;}
-	public function IsWritable() {return !$this->IsMagic();}
-	public function GetSQLExpr()
-	{
-		return $this->Get("sql");
-	}
-
-	public function GetDefaultValue(DBObject $oHostObject = null) {return $this->MakeRealValue("", $oHostObject);}
-	public function IsNullAllowed() {return false;}
-
-	// 
-	protected function ScalarToSQL($value) {return $value;} // format value as a valuable SQL literal (quoted outside)
-
-	public function GetSQLExpressions($sPrefix = '')
-	{
-		$aColumns = array();
-		// Note: to optimize things, the existence of the attribute is determined by the existence of one column with an empty suffix
-		$aColumns[''] = $this->Get("sql");
-		return $aColumns;
-	}
-
-	public function FromSQLToValue($aCols, $sPrefix = '')
-	{
-		$value = $this->MakeRealValue($aCols[$sPrefix.''], null);
-		return $value;
-	}
-	public function GetSQLValues($value)
-	{
-		$aValues = array();
-		$aValues[$this->Get("sql")] = $this->ScalarToSQL($value);
-		return $aValues;
-	}
-
-	public function GetSQLColumns($bFullSpec = false)
-	{
-		$aColumns = array();
-		$aColumns[$this->Get("sql")] = $this->GetSQLCol($bFullSpec);
-		return $aColumns;
-	}
-
-	public function GetFilterDefinitions()
-	{
-		return array($this->GetCode() => new FilterFromAttribute($this));
-	}
-
-	public function GetBasicFilterOperators()
-	{
-		return array("="=>"equals", "!="=>"differs from");
-	}
-	public function GetBasicFilterLooseOperator()
-	{
-		return "=";
-	}
-
-	public function GetBasicFilterSQLExpr($sOpCode, $value)
-	{
-		$sQValue = CMDBSource::Quote($value);
-		switch ($sOpCode)
-		{
-		case '!=':
-			return $this->GetSQLExpr()." != $sQValue";
-			break;
-		case '=':
-		default:
-			return $this->GetSQLExpr()." = $sQValue";
-		}
-	} 
-}
-
-/**
- * Base class for all kind of DB attributes, with the exception of external keys 
- *
- * @package	 iTopORM
- */
-class AttributeDBField extends AttributeDBFieldVoid
-{	
-	static public function ListExpectedParams()
-	{
-		return array_merge(parent::ListExpectedParams(), array("default_value", "is_null_allowed"));
-	}
-	public function GetDefaultValue(DBObject $oHostObject = null) {return $this->MakeRealValue($this->Get("default_value"), $oHostObject);}
-	public function IsNullAllowed() {return $this->Get("is_null_allowed");}
-}
-
-/**
- * Map an integer column to an attribute 
- *
- * @package	 iTopORM
- */
-class AttributeInteger extends AttributeDBField
-{
-	static public function ListExpectedParams()
-	{
-		return parent::ListExpectedParams();
-		//return array_merge(parent::ListExpectedParams(), array());
-	}
-
-	public function GetEditClass() {return "String";}
-	protected function GetSQLCol($bFullSpec = false) {return "INT(11)".($bFullSpec ? $this->GetSQLColSpec() : '');}
-	
-	public function GetValidationPattern()
-	{
-		return "^[0-9]+$";
-	}
-
-	public function GetBasicFilterOperators()
-	{
-		return array(
-			"!="=>"differs from",
-			"="=>"equals",
-			">"=>"greater (strict) than",
-			">="=>"greater than",
-			"<"=>"less (strict) than",
-			"<="=>"less than",
-			"in"=>"in"
-		);
-	}
-	public function GetBasicFilterLooseOperator()
-	{
-		// Unless we implement an "equals approximately..." or "same order of magnitude"
-		return "=";
-	}
-
-	public function GetBasicFilterSQLExpr($sOpCode, $value)
-	{
-		$sQValue = CMDBSource::Quote($value);
-		switch ($sOpCode)
-		{
-		case '!=':
-			return $this->GetSQLExpr()." != $sQValue";
-			break;
-		case '>':
-			return $this->GetSQLExpr()." > $sQValue";
-			break;
-		case '>=':
-			return $this->GetSQLExpr()." >= $sQValue";
-			break;
-		case '<':
-			return $this->GetSQLExpr()." < $sQValue";
-			break;
-		case '<=':
-			return $this->GetSQLExpr()." <= $sQValue";
-			break;
-		case 'in':
-			if (!is_array($value)) throw new CoreException("Expected an array for argument value (sOpCode='$sOpCode')");
-			return $this->GetSQLExpr()." IN ('".implode("', '", $value)."')"; 
-			break;
-
-		case '=':
-		default:
-			return $this->GetSQLExpr()." = \"$value\"";
-		}
-	} 
-
-	public function GetNullValue()
-	{
-		return null;
-	} 
-	public function IsNull($proposedValue)
-	{
-		return is_null($proposedValue);
-	} 
-
-	public function MakeRealValue($proposedValue, $oHostObj)
-	{
-		if (is_null($proposedValue)) return null;
-		if ($proposedValue === '') return null; // 0 is transformed into '' !
-		return (int)$proposedValue;
-	}
-
-	public function ScalarToSQL($value)
-	{
-		assert(is_numeric($value) || is_null($value));
-		return $value; // supposed to be an int
-	}
-}
-
-/**
- * An external key for which the class is defined as the value of another attribute 
- *
- * @package	 iTopORM
- */
-class AttributeObjectKey extends AttributeDBFieldVoid
-{
-	static public function ListExpectedParams()
-	{
-		return array_merge(parent::ListExpectedParams(), array('class_attcode', 'is_null_allowed'));
-	}
-
-	public function GetEditClass() {return "String";}
-	protected function GetSQLCol($bFullSpec = false) {return "INT(11)".($bFullSpec ? " DEFAULT 0" : "");}
-
-	public function GetDefaultValue(DBObject $oHostObject = null) {return 0;}
-	public function IsNullAllowed()
-	{
-		return $this->Get("is_null_allowed");
-	}
-
-
-	public function GetBasicFilterOperators()
-	{
-		return parent::GetBasicFilterOperators();
-	}
-	public function GetBasicFilterLooseOperator()
-	{
-		return parent::GetBasicFilterLooseOperator();
-	}
-
-	public function GetBasicFilterSQLExpr($sOpCode, $value)
-	{
-		return parent::GetBasicFilterSQLExpr($sOpCode, $value);
-	} 
-
-	public function GetNullValue()
-	{
-		return 0;
-	} 
-
-	public function IsNull($proposedValue)
-	{
-		return ($proposedValue == 0);
-	} 
-
-	public function MakeRealValue($proposedValue, $oHostObj)
-	{
-		if (is_null($proposedValue)) return 0;
-		if ($proposedValue === '') return 0;
-		if (MetaModel::IsValidObject($proposedValue)) return $proposedValue->GetKey();
-		return (int)$proposedValue;
-	}
-}
-
-/**
- * Display an integer between 0 and 100 as a percentage / horizontal bar graph 
- *
- * @package	 iTopORM
- */
-class AttributePercentage extends AttributeInteger
-{
-	public function GetAsHTML($sValue, $oHostObject = null, $bLocalize = true)
-	{
-		$iWidth = 5; // Total width of the percentage bar graph, in em...
-		$iValue = (int)$sValue;
-		if ($iValue > 100)
-		{
-			$iValue = 100;
-		}
-		else if ($iValue < 0)
-		{
-			$iValue = 0;
-		}
-		if ($iValue > 90)
-		{
-			$sColor = "#cc3300";
-		}
-		else if ($iValue > 50)
-		{
-			$sColor = "#cccc00";
-		}
-		else
-		{
-			$sColor = "#33cc00";
-		}
-		$iPercentWidth = ($iWidth * $iValue) / 100;
-		return "<div style=\"width:{$iWidth}em;-moz-border-radius: 3px;-webkit-border-radius: 3px;border-radius: 3px;display:inline-block;border: 1px #ccc solid;\"><div style=\"width:{$iPercentWidth}em; display:inline-block;background-color:$sColor;\">&nbsp;</div></div>&nbsp;$sValue %";
-	}
-}
-
-/**
- * Map a decimal value column (suitable for financial computations) to an attribute
- * internally in PHP such numbers are represented as string. Should you want to perform
- * a calculation on them, it is recommended to use the BC Math functions in order to
- * retain the precision
- *
- * @package	 iTopORM
- */
-class AttributeDecimal extends AttributeDBField
-{
-	static public function ListExpectedParams()
-	{
-		return array_merge(parent::ListExpectedParams(), array('digits', 'decimals' /* including precision */));
-	}
-
-	public function GetEditClass() {return "String";}
-	protected function GetSQLCol($bFullSpec = false)
-	{
-		return "DECIMAL(".$this->Get('digits').",".$this->Get('decimals').")".($bFullSpec ? $this->GetSQLColSpec() : '');
-	}
-	
-	public function GetValidationPattern()
-	{
-		$iNbDigits = $this->Get('digits');
-		$iPrecision = $this->Get('decimals');
-		$iNbIntegerDigits = $iNbDigits - $iPrecision - 1; // -1 because the first digit is treated separately in the pattern below
-		return "^[-+]?[0-9]\d{0,$iNbIntegerDigits}(\.\d{0,$iPrecision})?$";
-	}
-
-	public function GetBasicFilterOperators()
-	{
-		return array(
-			"!="=>"differs from",
-			"="=>"equals",
-			">"=>"greater (strict) than",
-			">="=>"greater than",
-			"<"=>"less (strict) than",
-			"<="=>"less than",
-			"in"=>"in"
-		);
-	}
-	public function GetBasicFilterLooseOperator()
-	{
-		// Unless we implement an "equals approximately..." or "same order of magnitude"
-		return "=";
-	}
-
-	public function GetBasicFilterSQLExpr($sOpCode, $value)
-	{
-		$sQValue = CMDBSource::Quote($value);
-		switch ($sOpCode)
-		{
-		case '!=':
-			return $this->GetSQLExpr()." != $sQValue";
-			break;
-		case '>':
-			return $this->GetSQLExpr()." > $sQValue";
-			break;
-		case '>=':
-			return $this->GetSQLExpr()." >= $sQValue";
-			break;
-		case '<':
-			return $this->GetSQLExpr()." < $sQValue";
-			break;
-		case '<=':
-			return $this->GetSQLExpr()." <= $sQValue";
-			break;
-		case 'in':
-			if (!is_array($value)) throw new CoreException("Expected an array for argument value (sOpCode='$sOpCode')");
-			return $this->GetSQLExpr()." IN ('".implode("', '", $value)."')"; 
-			break;
-
-		case '=':
-		default:
-			return $this->GetSQLExpr()." = \"$value\"";
-		}
-	} 
-
-	public function GetNullValue()
-	{
-		return null;
-	} 
-	public function IsNull($proposedValue)
-	{
-		return is_null($proposedValue);
-	} 
-
-	public function MakeRealValue($proposedValue, $oHostObj)
-	{
-		if (is_null($proposedValue)) return null;
-		if ($proposedValue === '') return null;
-		return (string)$proposedValue;
-	}
-
-	public function ScalarToSQL($value)
-	{
-		assert(is_null($value) || preg_match('/'.$this->GetValidationPattern().'/', $value));
-		return $value; // null or string
-	}
-}
-
-/**
- * Map a boolean column to an attribute 
- *
- * @package	 iTopORM
- */
-class AttributeBoolean extends AttributeInteger
-{
-	static public function ListExpectedParams()
-	{
-		return parent::ListExpectedParams();
-		//return array_merge(parent::ListExpectedParams(), array());
-	}
-
-	public function GetEditClass() {return "Integer";}
-	protected function GetSQLCol($bFullSpec = false) {return "TINYINT(1)".($bFullSpec ? $this->GetSQLColSpec() : '');}
-
-	public function MakeRealValue($proposedValue, $oHostObj)
-	{
-		if (is_null($proposedValue)) return null;
-		if ($proposedValue === '') return null;
-		if ((int)$proposedValue) return true;
-		return false;
-	}
-
-	public function ScalarToSQL($value)
-	{
-		if ($value) return 1;
-		return 0;
-	}
-
-	public function GetValueLabel($bValue)
-	{
-		if (is_null($bValue))
-		{
-			$sLabel = Dict::S('Core:'.get_class($this).'/Value:null');
-		}
-		else
-		{
-			$sValue = $bValue ? 'yes' : 'no';
-			$sDefault = Dict::S('Core:'.get_class($this).'/Value:'.$sValue);
-			$sLabel = $this->SearchLabel('/Attribute:'.$this->m_sCode.'/Value:'.$sValue, $sDefault, true /*user lang*/);
-		}
-		return $sLabel;
-	}
-
-	public function GetValueDescription($bValue)
-	{
-		if (is_null($bValue))
-		{
-			$sDescription = Dict::S('Core:'.get_class($this).'/Value:null+');
-		}
-		else
-		{
-			$sValue = $bValue ? 'yes' : 'no';
-			$sDefault = Dict::S('Core:'.get_class($this).'/Value:'.$sValue.'+');
-			$sDescription = $this->SearchLabel('/Attribute:'.$this->m_sCode.'/Value:'.$sValue.'+', $sDefault, true /*user lang*/);
-		}
-		return $sDescription;
-	}
-
-	public function GetAsHTML($bValue, $oHostObject = null, $bLocalize = true)
-	{
-		if (is_null($bValue))
-		{
-			$sRes = '';
-		}
-		elseif ($bLocalize)
-		{
-			$sLabel = $this->GetValueLabel($bValue);
-			$sDescription = $this->GetValueDescription($bValue);
-			// later, we could imagine a detailed description in the title
-			$sRes = "<span title=\"$sDescription\">".parent::GetAsHtml($sLabel)."</span>";
-		}
-		else
-		{
-			$sRes = $bValue ? 'yes' : 'no';
-		}
-		return $sRes;
-	}
-
-	public function GetAsXML($bValue, $oHostObject = null, $bLocalize = true)
-	{
-		if (is_null($bValue))
-		{
-			$sFinalValue = '';
-		}
-		elseif ($bLocalize)
-		{
-			$sFinalValue = $this->GetValueLabel($bValue);
-		}
-		else
-		{
-			$sFinalValue = $bValue ? 'yes' : 'no';
-		}
-		$sRes = parent::GetAsXML($sFinalValue, $oHostObject, $bLocalize);
-		return $sRes;
-	}
-
-	public function GetAsCSV($bValue, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
-	{
-		if (is_null($bValue))
-		{
-			$sFinalValue = '';
-		}
-		elseif ($bLocalize)
-		{
-			$sFinalValue = $this->GetValueLabel($bValue);
-		}
-		else
-		{
-			$sFinalValue = $bValue ? 'yes' : 'no';
-		}
-		$sRes = parent::GetAsCSV($sFinalValue, $sSeparator, $sTextQualifier, $oHostObject, $bLocalize);
-		return $sRes;
-	}
-
-	static public function GetFormFieldClass()
-	{
-		return '\\Combodo\\iTop\\Form\\Field\\SelectField';
-	}
-
-	public function MakeFormField(DBObject $oObject, $oFormField = null)
-	{
-		if ($oFormField === null)
-		{
-			$sFormFieldClass = static::GetFormFieldClass();
-			$oFormField = new $sFormFieldClass($this->GetCode());
-		}
-
-		$oFormField->SetChoices(array('yes' => $this->GetValueLabel(true), 'no' => $this->GetValueLabel(false)));
-		parent::MakeFormField($oObject, $oFormField);
-
-		return $oFormField;
-	}
-
-	public function GetEditValue($value, $oHostObj = null)
-	{
-		if (is_null($value))
-		{
-			return '';
-		}
-		else
-		{
-			return $this->GetValueLabel($value);
-		}
-	}
-
-	/**
-	 * Helper to get a value that will be JSON encoded
-	 * The operation is the opposite to FromJSONToValue
-	 */
-	public function GetForJSON($value)
-	{
-		return (bool)$value;
-	}
-
-	public function MakeValueFromString($sProposedValue, $bLocalizedValue = false, $sSepItem = null, $sSepAttribute = null, $sSepValue = null, $sAttributeQualifier = null)
-	{
-		$sInput = strtolower(trim($sProposedValue));
-		if ($bLocalizedValue)
-		{
-			switch ($sInput)
-			{
-				case '1': // backward compatibility
-				case $this->GetValueLabel(true):
-					$value = true;
-					break;
-				case '0': // backward compatibility
-				case 'no':
-				case $this->GetValueLabel(false):
-					$value = false;
-					break;
-				default:
-					$value = null;
-			}
-		}
-		else
-		{
-			switch ($sInput)
-			{
-				case '1': // backward compatibility
-				case 'yes':
-					$value = true;
-					break;
-				case '0': // backward compatibility
-				case 'no':
-					$value = false;
-					break;
-				default:
-					$value = null;
-			}
-		}
-		return $value;
-	}
-}
-
-/**
- * Map a varchar column (size < ?) to an attribute 
- *
- * @package	 iTopORM
- */
-class AttributeString extends AttributeDBField
-{
-	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_STRING;
-
-	static public function ListExpectedParams()
-	{
-		return parent::ListExpectedParams();
-		//return array_merge(parent::ListExpectedParams(), array());
-	}
-
-	public function GetEditClass() {return "String";}
-	protected function GetSQLCol($bFullSpec = false) {return "VARCHAR(255)".($bFullSpec ? $this->GetSQLColSpec() : '');}
-
-	public function GetValidationPattern()
-	{
-		$sPattern = $this->GetOptional('validation_pattern', '');
-		if (empty($sPattern))
-		{
-			return parent::GetValidationPattern();
-		}
-		else
-		{
-			return $sPattern;
-		}
-	}
-
-	public function CheckFormat($value)
-	{
-		$sRegExp = $this->GetValidationPattern();
-		if (empty($sRegExp))
-		{
-			return true;
-		}
-		else
-		{
-			$sRegExp = str_replace('/', '\\/', $sRegExp);
-			return preg_match("/$sRegExp/", $value);
-		}
-	}
-
-	public function GetMaxSize()
-	{
-		return 255;
-	}
-
-	public function GetBasicFilterOperators()
-	{
-		return array(
-			"="=>"equals",
-			"!="=>"differs from",
-			"Like"=>"equals (no case)",
-			"NotLike"=>"differs from (no case)",
-			"Contains"=>"contains",
-			"Begins with"=>"begins with",
-			"Finishes with"=>"finishes with"
-		);
-	}
-	public function GetBasicFilterLooseOperator()
-	{
-		return "Contains";
-	}
-
-	public function GetBasicFilterSQLExpr($sOpCode, $value)
-	{
-		$sQValue = CMDBSource::Quote($value);
-		switch ($sOpCode)
-		{
-		case '=':
-		case '!=':
-			return $this->GetSQLExpr()." $sOpCode $sQValue";
-		case 'Begins with':
-			return $this->GetSQLExpr()." LIKE ".CMDBSource::Quote("$value%");
-		case 'Finishes with':
-			return $this->GetSQLExpr()." LIKE ".CMDBSource::Quote("%$value");
-		case 'Contains':
-			return $this->GetSQLExpr()." LIKE ".CMDBSource::Quote("%$value%");
-		case 'NotLike':
-			return $this->GetSQLExpr()." NOT LIKE $sQValue";
-		case 'Like':
-		default:
-			return $this->GetSQLExpr()." LIKE $sQValue";
-		}
-	} 
-
-	public function GetNullValue()
-	{
-		return '';
-	} 
-
-	public function IsNull($proposedValue)
-	{
-		return ($proposedValue == '');
-	} 
-
-	public function MakeRealValue($proposedValue, $oHostObj)
-	{
-		if (is_null($proposedValue)) return '';
-		return (string)$proposedValue;
-	}
-
-	public function ScalarToSQL($value)
-	{
-		if (!is_string($value) && !is_null($value))
-		{
-			throw new CoreWarning('Expected the attribute value to be a string', array('found_type' => gettype($value), 'value' => $value, 'class' => $this->GetHostClass(), 'attribute' => $this->GetCode()));
-		}
-		return $value;
-	}
-
-	public function GetAsCSV($sValue, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
-	{
-		$sFrom = array("\r\n", $sTextQualifier);
-		$sTo = array("\n", $sTextQualifier.$sTextQualifier);
-		$sEscaped = str_replace($sFrom, $sTo, (string)$sValue);
-		return $sTextQualifier.$sEscaped.$sTextQualifier;
-	}
-
-	public function GetDisplayStyle()
-	{
-		return $this->GetOptional('display_style', 'select');
-	}
-
-	static public function GetFormFieldClass()
-	{
-		return '\\Combodo\\iTop\\Form\\Field\\StringField';
-	}
-
-	public function MakeFormField(DBObject $oObject, $oFormField = null)
-	{
-		if ($oFormField === null)
-		{
-			$sFormFieldClass = static::GetFormFieldClass();
-			$oFormField = new $sFormFieldClass($this->GetCode());
-		}
-		parent::MakeFormField($oObject, $oFormField);
-
-		return $oFormField;
-	}
-
-}
-
-/**
- * An attibute that matches an object class 
- *
- * @package	 iTopORM
- */
-class AttributeClass extends AttributeString
-{
-	static public function ListExpectedParams()
-	{
-		return array_merge(parent::ListExpectedParams(), array("class_category", "more_values"));
-	}
-
-	public function __construct($sCode, $aParams)
-	{
-		$this->m_sCode = $sCode;
-		$aParams["allowed_values"] = new ValueSetEnumClasses($aParams['class_category'], $aParams['more_values']);
-		parent::__construct($sCode, $aParams);
-	}
-
-	public function GetDefaultValue(DBObject $oHostObject = null)
-	{
-		$sDefault = parent::GetDefaultValue($oHostObject);
-		if (!$this->IsNullAllowed() && $this->IsNull($sDefault))
-		{
-			// For this kind of attribute specifying null as default value
-			// is authorized even if null is not allowed
-			
-			// Pick the first one...
-			$aClasses = $this->GetAllowedValues();
-			$sDefault = key($aClasses);
-		}
-		return $sDefault;
-	}
-
-	public function GetAsHTML($sValue, $oHostObject = null, $bLocalize = true)
-	{
-		if (empty($sValue)) return '';
-		return MetaModel::GetName($sValue);
-	}
-
-	public function RequiresIndex()
-	{
-		return true;
-	}
-	
-	public function GetBasicFilterLooseOperator()
-	{
-		return '=';
-	}
-	
-}
-
-/**
- * An attibute that matches one of the language codes availables in the dictionnary 
- *
- * @package	 iTopORM
- */
-class AttributeApplicationLanguage extends AttributeString
-{
-	static public function ListExpectedParams()
-	{
-		return parent::ListExpectedParams();
-	}
-
-	public function __construct($sCode, $aParams)
-	{
-		$this->m_sCode = $sCode;
-		$aAvailableLanguages = Dict::GetLanguages();
-		$aLanguageCodes = array();
-		foreach($aAvailableLanguages as $sLangCode => $aInfo)
-		{
-			$aLanguageCodes[$sLangCode] = $aInfo['description'].' ('.$aInfo['localized_description'].')';
-		}
-		$aParams["allowed_values"] = new ValueSetEnum($aLanguageCodes);
-		parent::__construct($sCode, $aParams);
-	}
-
-	public function RequiresIndex()
-	{
-		return true;
-	}
-	
-	public function GetBasicFilterLooseOperator()
-	{
-		return '=';
-	}
-}
-
-/**
- * The attribute dedicated to the finalclass automatic attribute 
- *
- * @package	 iTopORM
- */
-class AttributeFinalClass extends AttributeString
-{
-	public function __construct($sCode, $aParams)
-	{
-		$this->m_sCode = $sCode;
-		$aParams["allowed_values"] = null;
-		parent::__construct($sCode, $aParams);
-
-		$this->m_sValue = $this->Get("default_value");
-	}
-
-	public function IsWritable()
-	{
-		return false;
-	}
-	public function IsMagic()
-	{
-		return true;
-	}
-
-	public function RequiresIndex()
-	{
-		return true;
-	}
-
-	public function SetFixedValue($sValue)
-	{
-		$this->m_sValue = $sValue;
-	}
-	public function GetDefaultValue(DBObject $oHostObject = null)
-	{
-		return $this->m_sValue;
-	}
-
-	public function GetAsHTML($sValue, $oHostObject = null, $bLocalize = true)
-	{
-		if (empty($sValue)) return '';
-		if ($bLocalize)
-		{
-			return MetaModel::GetName($sValue);
-		}
-		else
-		{
-			return $sValue;
-		}
-	}
-
-	/**
-	 * An enum can be localized
-	 */
-	public function MakeValueFromString($sProposedValue, $bLocalizedValue = false, $sSepItem = null, $sSepAttribute = null, $sSepValue = null, $sAttributeQualifier = null)
-	{
-		if ($bLocalizedValue)
-		{
-			// Lookup for the value matching the input
-			//
-			$sFoundValue = null;
-			$aRawValues = self::GetAllowedValues();
-			if (!is_null($aRawValues))
-			{
-				foreach ($aRawValues as $sKey => $sValue)
-				{
-					if ($sProposedValue == $sValue)
-					{
-						$sFoundValue = $sKey;
-						break;
-					}
-				}
-			}
-			if (is_null($sFoundValue))
-			{
-				return null;
-			}
-			return $this->MakeRealValue($sFoundValue, null);
-		}
-		else
-		{
-			return parent::MakeValueFromString($sProposedValue, $bLocalizedValue, $sSepItem, $sSepAttribute, $sSepValue, $sAttributeQualifier);
-		}
-	}
-
-
-	// Because this is sometimes used to get a localized/string version of an attribute...
-	public function GetEditValue($sValue, $oHostObj = null)
-	{
-		if (empty($sValue)) return '';
-		return MetaModel::GetName($sValue);
-	}
-	/**
-	 * Helper to get a value that will be JSON encoded
-	 * The operation is the opposite to FromJSONToValue
-	 */
-	public function GetForJSON($value)
-	{
-		// JSON values are NOT localized
-		return $value;
-	}
-	
- 	public function GetAsCSV($value, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
-	{
-		if ($bLocalize && $value != '')
-		{
-			$sRawValue = MetaModel::GetName($value);
-		}
-		else
-		{
-			$sRawValue = $value;
-		}
-		return parent::GetAsCSV($sRawValue, $sSeparator, $sTextQualifier, null, false, $bConvertToPlainText);
-	}
-
-	public function GetAsXML($value, $oHostObject = null, $bLocalize = true)
-	{
-		if (empty($value)) return '';
-		if ($bLocalize)
-		{
-			$sRawValue = MetaModel::GetName($value);
-		}
-		else
-		{
-			$sRawValue = $value;
-		}
-		return Str::pure2xml($sRawValue);
-	}
-
-	public function GetBasicFilterLooseOperator()
-	{
-		return '=';
-	}
-	
-	public function GetValueLabel($sValue)
-	{
-		if (empty($sValue)) return '';
-		return MetaModel::GetName($sValue);
-	}
-
-	public function GetAllowedValues($aArgs = array(), $sContains = '')
-	{
-		$aRawValues = MetaModel::EnumChildClasses($this->GetHostClass(), ENUM_CHILD_CLASSES_ALL);
-		$aLocalizedValues = array();
-		foreach ($aRawValues as $sClass)
-		{
-			$aLocalizedValues[$sClass] = MetaModel::GetName($sClass);
-		}
-  		return $aLocalizedValues;
-  	}
-}
-
-
-/**
- * Map a varchar column (size < ?) to an attribute that must never be shown to the user 
- *
- * @package	 iTopORM
- */
-class AttributePassword extends AttributeString
-{
-	static public function ListExpectedParams()
-	{
-		return parent::ListExpectedParams();
-		//return array_merge(parent::ListExpectedParams(), array());
-	}
-
-	public function GetEditClass() {return "Password";}
-	protected function GetSQLCol($bFullSpec = false) {return "VARCHAR(64)".($bFullSpec ? $this->GetSQLColSpec() : '');}
-
-	public function GetMaxSize()
-	{
-		return 64;
-	}
-
-	public function GetFilterDefinitions()
-	{
-	// Note: due to this, you will get an error if a password is being declared as a search criteria (see ZLists)
-		// not allowed to search on passwords!
-		return array();
-	}
-
-	public function GetAsHTML($sValue, $oHostObject = null, $bLocalize = true)
-	{
-		if (strlen($sValue) == 0)
-		{
-			return '';
-		}
-		else
-		{
-			return '******';
-		}
-	}
-	
-	public function IsPartOfFingerprint() { return false; } // Cannot reliably compare two encrypted passwords since the same password will be encrypted in diffferent manners depending on the random 'salt'
-}
-
-/**
- * Map a text column (size < 255) to an attribute that is encrypted in the database
- * The encryption is based on a key set per iTop instance. Thus if you export your
- * database (in SQL) to someone else without providing the key at the same time
- * the encrypted fields will remain encrypted
- *
- * @package	 iTopORM
- */
-class AttributeEncryptedString extends AttributeString
-{
-	static $sKey = null; // Encryption key used for all encrypted fields
-
-	public function __construct($sCode, $aParams)
-	{
-		parent::__construct($sCode, $aParams);
-		if (self::$sKey == null)
-		{
-			self::$sKey = MetaModel::GetConfig()->GetEncryptionKey();
-		}
-	}
-	/**
-	 * When the attribute definitions are stored in APC cache:
-	 * 1) The static class variable $sKey is NOT serialized
-	 * 2) The object's constructor is NOT called upon wakeup
-	 * 3) mcrypt may crash the server if passed an empty key !!
-	 * 
-	 * So let's restore the key (if needed) when waking up
-	 **/
-	public function __wakeup()
-	{
-		if (self::$sKey == null)
-		{
-			self::$sKey = MetaModel::GetConfig()->GetEncryptionKey();
-		}
-	}
-	
-
-	protected function GetSQLCol($bFullSpec = false) {return "TINYBLOB";}	
-
-	public function GetMaxSize()
-	{
-		return 255;
-	}
-
-	public function GetFilterDefinitions()
-	{
-		// Note: due to this, you will get an error if a an encrypted field is declared as a search criteria (see ZLists)
-		// not allowed to search on encrypted fields !
-		return array();
-	}
-
-	public function MakeRealValue($proposedValue, $oHostObj)
-	{
-		if (is_null($proposedValue)) return null;
-		return (string)$proposedValue;
-	}
-
-	/**
-	 * Decrypt the value when reading from the database
-	 */
-	public function FromSQLToValue($aCols, $sPrefix = '')
-	{
- 		$oSimpleCrypt = new SimpleCrypt();
- 		$sValue = $oSimpleCrypt->Decrypt(self::$sKey, $aCols[$sPrefix]);
-		return $sValue;
-	}
-
-	/**
-	 * Encrypt the value before storing it in the database
-	 */
-	public function GetSQLValues($value)
-	{
- 		$oSimpleCrypt = new SimpleCrypt();
- 		$encryptedValue = $oSimpleCrypt->Encrypt(self::$sKey, $value);
-
-		$aValues = array();
-		$aValues[$this->Get("sql")] = $encryptedValue;
-		return $aValues;
-	}
-}
-
-
-// Wiki formatting - experimental
-//
-// [[<objClass>:<objName>]]
-// Example: [[Server:db1.tnut.com]]
-define('WIKI_OBJECT_REGEXP', '/\[\[(.+):(.+)\]\]/U');
-
-
-/**
- * Map a text column (size > ?) to an attribute 
- *
- * @package	 iTopORM
- */
-class AttributeText extends AttributeString
-{
-	public function GetEditClass() {return ($this->GetFormat() == 'text') ? 'Text' : "HTML";}
-	
-	protected function GetSQLCol($bFullSpec = false) {return "TEXT";}
-
-	public function GetSQLColumns($bFullSpec = false)
-	{
-		$aColumns = array();
-		$aColumns[$this->Get('sql')] = $this->GetSQLCol($bFullSpec);
-		if ($this->GetOptional('format', null) != null )
-		{
-			// Add the extra column only if the property 'format' is specified for the attribute
-			$aColumns[$this->Get('sql').'_format'] = "ENUM('text','html')";
-			if ($bFullSpec)
-			{
-				$aColumns[$this->Get('sql').'_format'].= " DEFAULT 'text'"; // default 'text' is for migrating old records
-			}
-		}
-		return $aColumns;
-	}
-
-	public function GetSQLExpressions($sPrefix = '')
-	{
-		if ($sPrefix == '')
-		{
-			$sPrefix = $this->Get('sql');
-		}
-		$aColumns = array();
-		// Note: to optimize things, the existence of the attribute is determined by the existence of one column with an empty suffix
-		$aColumns[''] = $sPrefix;
-		if ($this->GetOptional('format', null) != null )
-		{
-			// Add the extra column only if the property 'format' is specified for the attribute
-			$aColumns['_format'] = $sPrefix.'_format';
-		}
-		return $aColumns;
-	}
-	
-	public function GetMaxSize()
-	{
-		// Is there a way to know the current limitation for mysql?
-		// See mysql_field_len()
-		return 65535;
-	}
-
-	static public function RenderWikiHtml($sText, $bWikiOnly = false)
-	{
-		if (!$bWikiOnly)
-		{
-			$sPattern = '/'.str_replace('/', '\/', utils::GetConfig()->Get('url_validation_pattern')).'/i';
-			if (preg_match_all($sPattern, $sText, $aAllMatches, PREG_SET_ORDER /* important !*/ |PREG_OFFSET_CAPTURE /* important ! */))
-			{
-				$aUrls = array();
-				$i = count($aAllMatches);
-				// Replace the URLs by an actual hyperlink <a href="...">...</a>
-				// Let's do it backwards so that the initial positions are not modified by the replacement
-				// This works if the matches are captured: in the order they occur in the string  AND
-				// with their offset (i.e. position) inside the string
-				while($i > 0)
-				{
-					$i--;
-					$sUrl = $aAllMatches[$i][0][0]; // String corresponding to the main pattern
-					$iPos = $aAllMatches[$i][0][1]; // Position of the main pattern
-					$sText = substr_replace($sText, "<a href=\"$sUrl\">$sUrl</a>", $iPos, strlen($sUrl));
-					
-				}
-			}
-		}
-		if (preg_match_all(WIKI_OBJECT_REGEXP, $sText, $aAllMatches, PREG_SET_ORDER))
-		{
-			foreach($aAllMatches as $iPos => $aMatches)
-			{
-				$sClass = trim($aMatches[1]);
-				$sName = trim($aMatches[2]);
-				
-				if (MetaModel::IsValidClass($sClass))
-				{
-					$oObj = MetaModel::GetObjectByName($sClass, $sName, false /* MustBeFound */);
-					if (is_object($oObj))
-					{
-						// Propose a std link to the object
-						$sText = str_replace($aMatches[0], $oObj->GetHyperlink(), $sText);
-					}
-					else
-					{
-						// Propose a std link to the object
-						$sClassLabel = MetaModel::GetName($sClass);
-						$sText = str_replace($aMatches[0], "<span class=\"wiki_broken_link\">$sClassLabel:$sName</span>", $sText);
-						// Later: propose a link to create a new object
-						// Anyhow... there is no easy way to suggest default values based on the given FRIENDLY name
-						//$sText = preg_replace('/\[\[(.+):(.+)\]\]/', '<a href="'.utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=new&class='.$sClass.'&default[att1]=xxx&default[att2]=yyy">'.$sName.'</a>', $sText);
-					}
-				}
-			}
-		}
-		return $sText;
-	}
-
-	public function GetAsHTML($sValue, $oHostObject = null, $bLocalize = true)
-	{
-		$aStyles = array();
-		if ($this->GetWidth() != '')
-		{
-			$aStyles[] = 'width:'.$this->GetWidth();
-		}
-		if ($this->GetHeight() != '')
-		{
-			$aStyles[] = 'height:'.$this->GetHeight();
-		}
-		$sStyle = '';
-		if (count($aStyles) > 0)
-		{
-			$aStyles[] = 'overflow:auto';
-			$sStyle = 'style="'.implode(';', $aStyles).'"';
-		}
-		
-		if ($this->GetFormat() == 'text')
-		{
-			$sValue = parent::GetAsHTML($sValue, $oHostObject, $bLocalize);
-			$sValue = self::RenderWikiHtml($sValue);
-			return "<div $sStyle>".str_replace("\n", "<br>\n", $sValue).'</div>';			
-		}
-		else
-		{
-			$sValue = self::RenderWikiHtml($sValue, true /* wiki only */);
-			return "<div class=\"HTML\" $sStyle>".InlineImage::FixUrls($sValue).'</div>';
-		}
-		
-	}
-
-	public function GetEditValue($sValue, $oHostObj = null)
-	{
-		if ($this->GetFormat() == 'text')
-		{
-			if (preg_match_all(WIKI_OBJECT_REGEXP, $sValue, $aAllMatches, PREG_SET_ORDER))
-			{
-				foreach($aAllMatches as $iPos => $aMatches)
-				{
-					$sClass = $aMatches[1];
-					$sName = $aMatches[2];
-
-					if (MetaModel::IsValidClass($sClass))
-					{
-						$sClassLabel = MetaModel::GetName($sClass);
-						$sValue = str_replace($aMatches[0], "[[$sClassLabel:$sName]]", $sValue);
-					}
-				}
-			}
-		}
-		else
-		{
-			$sValue = str_replace('&', '&amp;', $sValue);
-		}
-		return $sValue;
-	}
-
-	/**
-	 * For fields containing a potential markup, return the value without this markup
-	 * @return string
-	 */
-	public function GetAsPlainText($sValue, $oHostObj = null)
-	{
-		if ($this->GetFormat() == 'html')
-		{
-			return (string) utils::HtmlToText($this->GetEditValue($sValue, $oHostObj));
-		}
-		else
-		{
-			return parent::GetAsPlainText($sValue, $oHostObj);
-		}
-	}
-	
-	public function MakeRealValue($proposedValue, $oHostObj)
-	{
-		$sValue = $proposedValue;
-		switch ($this->GetFormat())
-		{
-			case 'html':
-			if (($sValue !== null) && ($sValue !== ''))
-			{
-				$sValue = HTMLSanitizer::Sanitize($sValue);
-			}
-			break;
-			
-			case 'text':
-			default:
-			if (preg_match_all(WIKI_OBJECT_REGEXP, $sValue, $aAllMatches, PREG_SET_ORDER))
-			{
-				foreach($aAllMatches as $iPos => $aMatches)
-				{
-					$sClassLabel = $aMatches[1];
-					$sName = $aMatches[2];
-
-					if (!MetaModel::IsValidClass($sClassLabel))
-					{
-						$sClass = MetaModel::GetClassFromLabel($sClassLabel);
-						if ($sClass)
-						{
-							$sValue = str_replace($aMatches[0], "[[$sClass:$sName]]", $sValue);
-						}
-					}
-				}
-			}
-		}
-		return $sValue;
-	}
-
-	public function GetAsXML($value, $oHostObject = null, $bLocalize = true)
-	{
-		return Str::pure2xml($value);
-	}
-	
-	public function GetWidth()
-	{
-		return $this->GetOptional('width', '');		
-	}
-	
-	public function GetHeight()
-	{
-		return $this->GetOptional('height', '');		
-	}
-
-	static public function GetFormFieldClass()
-	{
-		return '\\Combodo\\iTop\\Form\\Field\\TextAreaField';
-	}
-
-	public function MakeFormField(DBObject $oObject, $oFormField = null)
-	{
-		if ($oFormField === null)
-		{
-			$sFormFieldClass = static::GetFormFieldClass();
-			$oFormField = new $sFormFieldClass($this->GetCode(), null, $oObject);
-			$oFormField->SetFormat($this->GetFormat());
-		}
-		parent::MakeFormField($oObject, $oFormField);
-
-		return $oFormField;
-	}
-
-	/**
-	 * The actual formatting of the field: either text (=plain text) or html (= text with HTML markup)
-	 * @return string
-	 */
-	public function GetFormat()
-	{
-		return $this->GetOptional('format', 'text');
-	}
-	
-	/**
-	 * Read the value from the row returned by the SQL query and transorms it to the appropriate
-	 * internal format (either text or html)
-	 * @see AttributeDBFieldVoid::FromSQLToValue()
-	 */
-	public function FromSQLToValue($aCols, $sPrefix = '')
-	{
-		$value = $aCols[$sPrefix.''];
-		if ($this->GetOptional('format', null) != null )
-		{
-			// Read from the extra column only if the property 'format' is specified for the attribute
-			$sFormat = $aCols[$sPrefix.'_format'];
-		}
-		else
-		{
-			$sFormat = $this->GetFormat();
-		}
-		
-		switch($sFormat)
-		{
-			case 'text':
-			if ($this->GetFormat() == 'html')
-			{
-				$value = utils::TextToHtml($value);
-			}
-			break;
-			
-			case 'html':
-			if ($this->GetFormat() == 'text')
-			{
-				$value = utils::HtmlToText($value);
-			}
-			else
-			{
-				$value = InlineImage::FixUrls((string)$value);
-			}
-			break;
-			
-			default:
-			// unknown format ??
-		}
-		return $value;
-	}
-	
-	public function GetSQLValues($value)
-	{
-		$aValues = array();
-		$aValues[$this->Get("sql")] = $this->ScalarToSQL($value);
-		if ($this->GetOptional('format', null) != null )
-		{
-			// Add the extra column only if the property 'format' is specified for the attribute
-			$aValues[$this->Get("sql").'_format'] = $this->GetFormat();
-		}
-		return $aValues;
-	}	
-	
-	public function GetAsCSV($sValue, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
-	{
-		switch($this->GetFormat())
-		{
-			case 'html':
-			if ($bConvertToPlainText)
-			{
-				$sValue = utils::HtmlToText((string)$sValue);
-			}
-			$sFrom = array("\r\n", $sTextQualifier);
-			$sTo = array("\n", $sTextQualifier.$sTextQualifier);
-			$sEscaped = str_replace($sFrom, $sTo, (string)$sValue);
-			return $sTextQualifier.$sEscaped.$sTextQualifier;
-			break;
-			
-			case 'text':
-			default:
-			return parent::GetAsCSV($sValue, $sSeparator, $sTextQualifier, $oHostObject, $bLocalize, $bConvertToPlainText);
-		}
-	}
-}
-
-/**
- * Map a log to an attribute 
- *
- * @package	 iTopORM
- */
-class AttributeLongText extends AttributeText
-{
-	protected function GetSQLCol($bFullSpec = false) {return "LONGTEXT";}
-
-	public function GetMaxSize()
-	{
-		// Is there a way to know the current limitation for mysql?
-		// See mysql_field_len()
-		return 65535*1024; // Limited... still 64 Mb!
-	}
-}
-
-/**
- * An attibute that stores a case log (i.e journal) 
- *
- * @package	 iTopORM
- */
-class AttributeCaseLog extends AttributeLongText
-{
-	public function GetNullValue()
-	{
-		return '';
-	} 
-
-	public function IsNull($proposedValue)
-	{
-		if (!($proposedValue instanceof ormCaseLog))
-		{
-			return ($proposedValue == '');
-		}
-		return ($proposedValue->GetText() == '');
-	} 
-
-	public function ScalarToSQL($value)
-	{
-		if (!is_string($value) && !is_null($value))
-		{
-			throw new CoreWarning('Expected the attribute value to be a string', array('found_type' => gettype($value), 'value' => $value, 'class' => $this->GetCode(), 'attribute' => $this->GetHostClass()));
-		}
-		return $value;
-	}
-	public function GetEditClass() {return "CaseLog";}
-
-	public function GetEditValue($sValue, $oHostObj = null)
-	{
-		if (!($sValue instanceOf ormCaseLog))
-		{
-			return '';
-		}
-		return $sValue->GetModifiedEntry();
-	}
-
-	/**
-	 * For fields containing a potential markup, return the value without this markup
-	 * @return string
-	 */
-	public function GetAsPlainText($value, $oHostObj = null)
-	{
-		if ($value instanceOf ormCaseLog)
-		{
-
-			return $value->GetAsPlainText();
-		}
-		else
-		{
-			return (string) $value;
-		}
-	}
-	
-	public function GetDefaultValue(DBObject $oHostObject = null) {return new ormCaseLog();}
-	public function Equals($val1, $val2) {return ($val1->GetText() == $val2->GetText());}
-	
-
-	// Facilitate things: allow the user to Set the value from a string
-	public function MakeRealValue($proposedValue, $oHostObj)
-	{
-		if ($proposedValue instanceof ormCaseLog)
-		{
-			// Passthrough
-			$ret = clone $proposedValue;
-		}
-		else
-		{
-			// Append the new value if an instance of the object is supplied
-			//
-			$oPreviousLog = null;
-			if ($oHostObj != null)
-			{
-				$oPreviousLog = $oHostObj->Get($this->GetCode());
-				if (!is_object($oPreviousLog))
-				{
-					$oPreviousLog = $oHostObj->GetOriginal($this->GetCode());;
-				}
-				
-			}
-			if (is_object($oPreviousLog))
-			{
-				$oCaseLog = clone($oPreviousLog);
-			}
-			else
-			{
-				$oCaseLog = new ormCaseLog();
-			}
-
-			if ($proposedValue instanceof stdClass)
-			{
-				$oCaseLog->AddLogEntryFromJSON($proposedValue);
-			}
-			else
-			{
-				if (strlen($proposedValue) > 0)
-				{
-					$oCaseLog->AddLogEntry($proposedValue);
-				}
-			}
-			$ret = $oCaseLog;
-		}
-		return $ret;
-	}
-
-	public function GetSQLExpressions($sPrefix = '')
-	{
-		if ($sPrefix == '')
-		{
-			$sPrefix = $this->Get('sql');
-		}
-		$aColumns = array();
-		// Note: to optimize things, the existence of the attribute is determined by the existence of one column with an empty suffix
-		$aColumns[''] = $sPrefix;
-		$aColumns['_index'] = $sPrefix.'_index';
-		return $aColumns;
-	}
-
-	public function FromSQLToValue($aCols, $sPrefix = '')
-	{
-		if (!array_key_exists($sPrefix, $aCols))
-		{
-			$sAvailable = implode(', ', array_keys($aCols));
-			throw new MissingColumnException("Missing column '$sPrefix' from {$sAvailable}");
-		} 
-		$sLog = $aCols[$sPrefix];
-
-		if (isset($aCols[$sPrefix.'_index'])) 
-		{
-			$sIndex = $aCols[$sPrefix.'_index'];
-		}
-		else
-		{
-			// For backward compatibility, allow the current state to be: 1 log, no index
-			$sIndex = '';
-		}
-
-		if (strlen($sIndex) > 0)
-		{ 
-			$aIndex = unserialize($sIndex);
-			$value = new ormCaseLog($sLog, $aIndex);
-		}
-		else
-		{
-			$value = new ormCaseLog($sLog);
-		}
-		return $value;
-	}
-
-	public function GetSQLValues($value)
-	{
-		if (!($value instanceOf ormCaseLog))
-		{
-			$value = new ormCaseLog('');
-		}
-		$aValues = array();
-		$aValues[$this->GetCode()] = $value->GetText();
-		$aValues[$this->GetCode().'_index'] = serialize($value->GetIndex());
-
-		return $aValues;
-	}
-
-	public function GetSQLColumns($bFullSpec = false)
-	{
-		$aColumns = array();
-		$aColumns[$this->GetCode()] = 'LONGTEXT'; // 2^32 (4 Gb)
-		$aColumns[$this->GetCode().'_index'] = 'BLOB';
-		return $aColumns;
-	}
-
-	public function GetAsHTML($value, $oHostObject = null, $bLocalize = true)
-	{
-		if ($value instanceOf ormCaseLog)
-		{
-			$sContent = $value->GetAsHTML(null, false, array(__class__, 'RenderWikiHtml'));
-		}
-		else
-		{
-			$sContent = '';
-		}
-		$aStyles = array();
-		if ($this->GetWidth() != '')
-		{
-			$aStyles[] = 'width:'.$this->GetWidth();
-		}
-		if ($this->GetHeight() != '')
-		{
-			$aStyles[] = 'height:'.$this->GetHeight();
-		}
-		$sStyle = '';
-		if (count($aStyles) > 0)
-		{
-			$sStyle = 'style="'.implode(';', $aStyles).'"';
-		}
-		return "<div class=\"caselog\" $sStyle>".$sContent.'</div>';	}
-
-
-	public function GetAsCSV($value, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
-	{
-		if ($value instanceOf ormCaseLog)
-		{
-			return parent::GetAsCSV($value->GetText($bConvertToPlainText), $sSeparator, $sTextQualifier, $oHostObject, $bLocalize, $bConvertToPlainText);
-		}
-		else
-		{
-			return '';
-		}
-	}
-	
-	public function GetAsXML($value, $oHostObject = null, $bLocalize = true)
-	{
-		if ($value instanceOf ormCaseLog)
-		{
-			return parent::GetAsXML($value->GetText(), $oHostObject, $bLocalize);
-		}
-		else
-		{
-			return '';
-		}
-	}
-
-	/**
-	 * List the available verbs for 'GetForTemplate'
-	 */	 
-	public function EnumTemplateVerbs()
-	{
-		return array(
-			'' => 'Plain text representation of all the log entries',
-			'head' => 'Plain text representation of the latest entry',
-			'head_html' => 'HTML representation of the latest entry',
-			'html' => 'HTML representation of all the log entries',
-		);
-	}
-
-	/**
-	 * Get various representations of the value, for insertion into a template (e.g. in Notifications)
-	 * @param $value mixed The current value of the field
-	 * @param $sVerb string The verb specifying the representation of the value
-	 * @param $oHostObject DBObject The object
-	 * @param $bLocalize bool Whether or not to localize the value
-	 */
-	public function GetForTemplate($value, $sVerb, $oHostObject = null, $bLocalize = true)
-	{
-		switch($sVerb)
-		{
-			case '':
-			return $value->GetText(true);
-			
-			case 'head':
-			return $value->GetLatestEntry('text');
-
-			case 'head_html':
-			return $value->GetLatestEntry('html');
-			
-			case 'html':
-			return $value->GetAsEmailHtml();
-	
-			default:
-			throw new Exception("Unknown verb '$sVerb' for attribute ".$this->GetCode().' in class '.get_class($oHostObject));
-		}
-	}
-	
-	/**
-	 * Helper to get a value that will be JSON encoded
-	 * The operation is the opposite to FromJSONToValue	 
-	 */	 	
-	public function GetForJSON($value)
-	{
-		return $value->GetForJSON();
-	}
-
-	/**
-	 * Helper to form a value, given JSON decoded data
-	 * The operation is the opposite to GetForJSON	 
-	 */	 	
-	public function FromJSONToValue($json)
-	{
-		if (is_string($json))
-		{
-			// Will be correctly handled in MakeRealValue
-			$ret = $json;
-		}
-		else
-		{
-			if (isset($json->add_item))
-			{
-				// Will be correctly handled in MakeRealValue
-				$ret = $json->add_item;
-				if (!isset($ret->message))
-				{
-					throw new Exception("Missing mandatory entry: 'message'");
-				}
-			}
-			else
-			{
-				$ret = ormCaseLog::FromJSON($json);
-			}
-		}
-		return $ret;
-	}
-	
-	public function Fingerprint($value)
-	{
-		$sFingerprint = '';
-		if ($value instanceOf ormCaseLog)
-		{
-			$sFingerprint = $value->GetText();
-		}
-		return $sFingerprint;
-	}
-	
-	/**
-	 * The actual formatting of the text: either text (=plain text) or html (= text with HTML markup)
-	 * @return string
-	 */
-	public function GetFormat()
-	{
-		return $this->GetOptional('format', 'html'); // default format for case logs is now HTML
-	}
-
-	static public function GetFormFieldClass()
-	{
-		return '\\Combodo\\iTop\\Form\\Field\\CaseLogField';
-	}
-
-	public function MakeFormField(DBObject $oObject, $oFormField = null)
-	{
-		// First we call the parent so the field is build
-		$oFormField = parent::MakeFormField($oObject, $oFormField);
-		// Then only we set the value
-		$oFormField->SetCurrentValue($this->GetEditValue($oObject->Get($this->GetCode())));
-		// And we set the entries
-		$oFormField->SetEntries($oObject->Get($this->GetCode())->GetAsArray());
-
-		return $oFormField;
-	}
-}
-
-/**
- * Map a text column (size > ?), containing HTML code, to an attribute 
- *
- * @package	 iTopORM
- */
-class AttributeHTML extends AttributeLongText
-{
-	public function GetSQLColumns($bFullSpec = false)
-	{
-		$aColumns = array();
-		$aColumns[$this->Get('sql')] = $this->GetSQLCol();
-		if ($this->GetOptional('format', null) != null )
-		{
-			// Add the extra column only if the property 'format' is specified for the attribute
-			$aColumns[$this->Get('sql').'_format'] = "ENUM('text','html')";
-			if ($bFullSpec)
-			{
-				$aColumns[$this->Get('sql').'_format'].= " DEFAULT 'html'"; // default 'html' is for migrating old records
-			}
-		}
-		return $aColumns;
-	}
-
-	/**
-	 * The actual formatting of the text: either text (=plain text) or html (= text with HTML markup)
-	 * @return string
-	 */
-	public function GetFormat()
-	{
-		return $this->GetOptional('format', 'html'); // Defaults to HTML
-	}
-}
-
-/**
- * Specialization of a string: email 
- *
- * @package	 iTopORM
- */
-class AttributeEmailAddress extends AttributeString
-{
-	public function GetValidationPattern()
-	{
-		return $this->GetOptional('validation_pattern', '^'.utils::GetConfig()->Get('email_validation_pattern').'$');
-	}
-
-    static public function GetFormFieldClass()
-    {
-        return '\\Combodo\\iTop\\Form\\Field\\EmailField';
-    }
-
-	public function GetAsHTML($sValue, $oHostObject = null, $bLocalize = true)
-	{
-		if (empty($sValue)) return '';
-		return '<a class="mailto" href="mailto:'.$sValue.'">'.parent::GetAsHTML($sValue).'</a>';
-	}
-}
-
-/**
- * Specialization of a string: IP address 
- *
- * @package	 iTopORM
- */
-class AttributeIPAddress extends AttributeString
-{
-	public function GetValidationPattern()
-	{
-		$sNum = '(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])';
-		return "^($sNum\\.$sNum\\.$sNum\\.$sNum)$";
-	}
-
-	public function GetOrderBySQLExpressions($sClassAlias)
-	{
-		// Note: This is the responsibility of this function to place backticks around column aliases
-		return array('INET_ATON(`'.$sClassAlias.$this->GetCode().'`)');
-	}
-}
-
-/**
- * Specialization of a string: OQL expression 
- *
- * @package	 iTopORM
- */
-class AttributeOQL extends AttributeText
-{
-	public function GetEditClass() {return "OQLExpression";}
-}
-
-/**
- * Specialization of a string: template (contains iTop placeholders like $current_contact_id$ or $this->name$) 
- *
- * @package	 iTopORM
- */
-class AttributeTemplateString extends AttributeString
-{
-}
-
-/**
- * Specialization of a text: template (contains iTop placeholders like $current_contact_id$ or $this->name$)
- *
- * @package	 iTopORM
- */
-class AttributeTemplateText extends AttributeText
-{
-}
-
-/**
- * Specialization of a HTML: template (contains iTop placeholders like $current_contact_id$ or $this->name$)
- *
- * @package	 iTopORM
- */
-class AttributeTemplateHTML extends AttributeText
-{
-	public function GetSQLColumns($bFullSpec = false)
-	{
-		$aColumns = array();
-		$aColumns[$this->Get('sql')] = $this->GetSQLCol();
-		if ($this->GetOptional('format', null) != null )
-		{
-			// Add the extra column only if the property 'format' is specified for the attribute
-			$aColumns[$this->Get('sql').'_format'] = "ENUM('text','html')";
-			if ($bFullSpec)
-			{
-				$aColumns[$this->Get('sql').'_format'].= " DEFAULT 'html'"; // default 'html' is for migrating old records
-			}
-		}
-		return $aColumns;
-	}
-
-	/**
-	 * The actual formatting of the text: either text (=plain text) or html (= text with HTML markup)
-	 * @return string
-	 */
-	public function GetFormat()
-	{
-		return $this->GetOptional('format', 'html'); // Defaults to HTML
-	}
-}
-
-
-/**
- * Map a enum column to an attribute 
- *
- * @package	 iTopORM
- */
-class AttributeEnum extends AttributeString
-{
-	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_ENUM;
-
-	static public function ListExpectedParams()
-	{
-		return parent::ListExpectedParams();
-		//return array_merge(parent::ListExpectedParams(), array());
-	}
-
-	public function GetEditClass() {return "String";}
-	protected function GetSQLCol($bFullSpec = false)
-	{
-		$oValDef = $this->GetValuesDef();
-		if ($oValDef)
-		{
-			$aValues = CMDBSource::Quote(array_keys($oValDef->GetValues(array(), "")), true);
-		}
-		else
-		{
-			$aValues = array();
-		}
-		if (count($aValues) > 0)
-		{
-			// The syntax used here do matters
-			// In particular, I had to remove unnecessary spaces to
-			// make sure that this string will match the field type returned by the DB
-			// (used to perform a comparison between the current DB format and the data model)
-			return "ENUM(".implode(",", $aValues).")".($bFullSpec ? $this->GetSQLColSpec() : '');
-		}
-		else
-		{
-			return "VARCHAR(255)".($bFullSpec ? " DEFAULT ''" : ""); // ENUM() is not an allowed syntax!
-		}
-	}
-	
-	protected function GetSQLColSpec()
-	{
-		$default = $this->ScalarToSQL($this->GetDefaultValue());
-		if (is_null($default))
-		{
-			$sRet = '';
-		}
-		else
-		{
-			// ENUMs values are strings so the default value must be a string as well,
-			// otherwise MySQL interprets the number as the zero-based index of the value in the list (i.e. the nth value in the list)
-			$sRet = " DEFAULT ".CMDBSource::Quote($default);
-		}
-		return $sRet;
-	}
-
-	public function ScalarToSQL($value)
-	{
-		// Note: for strings, the null value is an empty string and it is recorded as such in the DB
-		//	   but that wasn't working for enums, because '' is NOT one of the allowed values
-		//	   that's why a null value must be forced to a real null
-		$value = parent::ScalarToSQL($value);
-		if ($this->IsNull($value))
-		{
-			return null;
-		}
-		else
-		{
-			return $value;
-		}
-	}
-
-	public function RequiresIndex()
-	{
-		return false;
-	}
-
-	public function GetBasicFilterOperators()
-	{
-		return parent::GetBasicFilterOperators();
-	}
-	public function GetBasicFilterLooseOperator()
-	{
-		return '=';
-	}
-
-	public function GetBasicFilterSQLExpr($sOpCode, $value)
-	{
-		return parent::GetBasicFilterSQLExpr($sOpCode, $value);
-	} 
-
-	public function GetValueLabel($sValue)
-	{
-		if (is_null($sValue))
-		{
-			// Unless a specific label is defined for the null value of this enum, use a generic "undefined" label		
-			$sLabel = Dict::S('Class:'.$this->GetHostClass().'/Attribute:'.$this->GetCode().'/Value:'.$sValue, Dict::S('Enum:Undefined'));
-		}
-		else
-		{
-			$sLabel = $this->SearchLabel('/Attribute:'.$this->m_sCode.'/Value:'.$sValue, null, true /*user lang*/);
-			if (is_null($sLabel))
-			{
-				$sDefault = str_replace('_', ' ', $sValue);
-				// Browse the hierarchy again, accepting default (english) translations
-				$sLabel = $this->SearchLabel('/Attribute:'.$this->m_sCode.'/Value:'.$sValue, $sDefault, false);
-			}
-		}
-		return $sLabel;
-	}
-
-	public function GetValueDescription($sValue)
-	{
-		if (is_null($sValue))
-		{
-			// Unless a specific label is defined for the null value of this enum, use a generic "undefined" label		
-			$sDescription = Dict::S('Class:'.$this->GetHostClass().'/Attribute:'.$this->GetCode().'/Value:'.$sValue.'+', Dict::S('Enum:Undefined'));
-		}
-		else
-		{
-			$sDescription = Dict::S('Class:'.$this->GetHostClass().'/Attribute:'.$this->GetCode().'/Value:'.$sValue.'+', '', true /* user language only */);
-			if (strlen($sDescription) == 0)
-			{
-				$sParentClass = MetaModel::GetParentClass($this->m_sHostClass);
-				if ($sParentClass)
-				{
-					if (MetaModel::IsValidAttCode($sParentClass, $this->m_sCode))
-					{
-						$oAttDef = MetaModel::GetAttributeDef($sParentClass, $this->m_sCode);
-						$sDescription = $oAttDef->GetValueDescription($sValue);
-					}
-				}
-			}
-		}
-		return $sDescription;
-	}
-
-	public function GetAsHTML($sValue, $oHostObject = null, $bLocalize = true)
-	{
-		if ($bLocalize)
-		{
-			$sLabel = $this->GetValueLabel($sValue);
-			$sDescription = $this->GetValueDescription($sValue);
-			// later, we could imagine a detailed description in the title
-			$sRes = "<span title=\"$sDescription\">".parent::GetAsHtml($sLabel)."</span>";
-		}
-		else
-		{
-			$sRes = parent::GetAsHtml($sValue, $oHostObject, $bLocalize);
-		}
-		return $sRes;
-	}
-
-	public function GetAsXML($value, $oHostObject = null, $bLocalize = true)
-	{
-		if (is_null($value))
-		{
-			$sFinalValue = '';
-		}
-		elseif ($bLocalize)
-		{
-			$sFinalValue = $this->GetValueLabel($value);
-		}
-		else
-		{
-			$sFinalValue = $value;
-		}
-		$sRes = parent::GetAsXML($sFinalValue, $oHostObject, $bLocalize);
-		return $sRes;
-	}
-
-	public function GetAsCSV($sValue, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
-	{
-		if (is_null($sValue))
-		{
-			$sFinalValue = '';
-		}
-		elseif ($bLocalize)
-		{
-			$sFinalValue = $this->GetValueLabel($sValue);
-		}
-		else
-		{
-			$sFinalValue = $sValue;
-		}
-		$sRes = parent::GetAsCSV($sFinalValue, $sSeparator, $sTextQualifier, $oHostObject, $bLocalize);
-		return $sRes;
-	}
-
-	static public function GetFormFieldClass()
-	{
-		return '\\Combodo\\iTop\\Form\\Field\\SelectField';
-	}
-
-	public function MakeFormField(DBObject $oObject, $oFormField = null)
-	{
-		if ($oFormField === null)
-		{
-			// TODO : We should check $this->Get('display_style') and create a Radio / Select / ... regarding its value
-			$sFormFieldClass = static::GetFormFieldClass();
-			$oFormField = new $sFormFieldClass($this->GetCode());
-		}
-
-		$oFormField->SetChoices($this->GetAllowedValues($oObject->ToArgsForQuery()));
-		parent::MakeFormField($oObject, $oFormField);
-
-		return $oFormField;
-	}
-
-	public function GetEditValue($sValue, $oHostObj = null)
-	{
-		if (is_null($sValue))
-		{
-			return '';
-		}
-		else
-		{
-			return $this->GetValueLabel($sValue);
-		}
-	}
-
-	/**
-	 * Helper to get a value that will be JSON encoded
-	 * The operation is the opposite to FromJSONToValue	 
-	 */	 	
-	public function GetForJSON($value)
-	{
-		return $value;
-	}
-
-	public function GetAllowedValues($aArgs = array(), $sContains = '')
-	{
-		$aRawValues = parent::GetAllowedValues($aArgs, $sContains);
-		if (is_null($aRawValues)) return null;
-		$aLocalizedValues = array();
-		foreach ($aRawValues as $sKey => $sValue)
-		{
-			$aLocalizedValues[$sKey] = Str::pure2html($this->GetValueLabel($sKey));
-		}
-  		return $aLocalizedValues;
-  	}
-  	
-	/**
-	 * An enum can be localized
-	 */	 	
-	public function MakeValueFromString($sProposedValue, $bLocalizedValue = false, $sSepItem = null, $sSepAttribute = null, $sSepValue = null, $sAttributeQualifier = null)
-	{
-		if ($bLocalizedValue)
-		{
-			// Lookup for the value matching the input
-			//
-			$sFoundValue = null;
-			$aRawValues = parent::GetAllowedValues();
-			if (!is_null($aRawValues))
-			{
-				foreach ($aRawValues as $sKey => $sValue)
-				{
-					$sRefValue = $this->GetValueLabel($sKey);
-					if ($sProposedValue == $sRefValue)
-					{
-						$sFoundValue = $sKey;
-						break;
-					}
-				}
-			}
-			if (is_null($sFoundValue))
-			{
-				return null;
-			}
-	  		return $this->MakeRealValue($sFoundValue, null);
-		}
-		else
-		{
-			return parent::MakeValueFromString($sProposedValue, $bLocalizedValue, $sSepItem, $sSepAttribute, $sSepValue, $sAttributeQualifier);
-		}
-	}
-
-  	/**
-  	 * Processes the input value to align it with the values supported
-  	 * by this type of attribute. In this case: turns empty strings into nulls
-  	 * @param mixed $proposedValue The value to be set for the attribute
-  	 * @return mixed The actual value that will be set
-  	 */
-	public function MakeRealValue($proposedValue, $oHostObj)
-	{
-		if ($proposedValue == '') return null;
-		return parent::MakeRealValue($proposedValue, $oHostObj);
-	}
-	
-	public function GetOrderByHint()
-	{
-		$aValues = $this->GetAllowedValues();
-	
-		return Dict::Format('UI:OrderByHint_Values', implode(', ', $aValues));
-	}
-}
-
-/**
- * A meta enum is an aggregation of enum from subclasses into an enum of a base class
- * It has been designed is to cope with the fact that statuses must be defined in leaf classes, while it makes sense to
- * have a superstatus available on the root classe(s)
- *
- * @package	 iTopORM
- */
-class AttributeMetaEnum extends AttributeEnum
-{
-	static public function ListExpectedParams()
-	{
-		return array('allowed_values', 'sql', 'default_value', 'mapping');
-	}
-
-	public function IsNullAllowed()
-	{
-		return false; // Well... this actually depends on the mapping
-	}
-
-	public function IsWritable()
-	{
-		return false;
-	}
-
-	public function RequiresIndex()
-	{
-		return true;
-	}
-
-	public function GetPrerequisiteAttributes($sClass = null)
-	{
-		if (is_null($sClass))
-		{
-			$sClass = $this->GetHostClass();
-		}
-		$aMappingData = $this->GetMapRule($sClass);
-		if ($aMappingData == null)
-		{
-			$aRet = array();
-		}
-		else
-		{
-			$aRet = array($aMappingData['attcode']);
-		}
-		return $aRet;
-	}
-
-	/**
-	 * Overload the standard so as to leave the data unsorted
-	 *
-	 * @param array $aArgs
-	 * @param string $sContains
-	 * @return array|null
-	 */
-	public function GetAllowedValues($aArgs = array(), $sContains = '')
-	{
-		$oValSetDef = $this->GetValuesDef();
-		if (!$oValSetDef) return null;
-		$aRawValues = $oValSetDef->GetValueList();
-
-		if (is_null($aRawValues)) return null;
-		$aLocalizedValues = array();
-		foreach ($aRawValues as $sKey => $sValue)
-		{
-			$aLocalizedValues[$sKey] = Str::pure2html($this->GetValueLabel($sKey));
-		}
-		return $aLocalizedValues;
-	}
-
-	/**
-	 * Returns the meta value for the given object.
-	 * See also MetaModel::RebuildMetaEnums() that must be maintained when MapValue changes
-	 *
-	 * @param $oObject
-	 * @return mixed
-	 * @throws Exception
-	 */
-	public function MapValue($oObject)
-	{
-		$aMappingData = $this->GetMapRule(get_class($oObject));
-		if ($aMappingData == null)
-		{
-			$sRet = $this->GetDefaultValue();
-		}
-		else
-		{
-			$sAttCode = $aMappingData['attcode'];
-			$value = $oObject->Get($sAttCode);
-			if (array_key_exists($value, $aMappingData['values']))
-			{
-				$sRet = $aMappingData['values'][$value];
-			}
-			elseif ($this->GetDefaultValue() != '')
-			{
-				$sRet = $this->GetDefaultValue();
-			}
-			else
-			{
-				throw new Exception('AttributeMetaEnum::MapValue(): mapping not found for value "'.$value.'" in '.get_class($oObject).', on attribute '.MetaModel::GetAttributeOrigin($this->GetHostClass(), $this->GetCode()).'::'.$this->GetCode());
-			}
-		}
-		return $sRet;
-	}
-
-	public function GetMapRule($sClass)
-	{
-		$aMappings = $this->Get('mapping');
-		if (array_key_exists($sClass, $aMappings))
-		{
-			$aMappingData = $aMappings[$sClass];
-		}
-		else
-		{
-			$sParent = MetaModel::GetParentClass($sClass);
-			if (is_null($sParent))
-			{
-				$aMappingData = null;
-			}
-			else
-			{
-				$aMappingData = $this->GetMapRule($sParent);
-			}
-		}
-
-		return $aMappingData;
-	}
-}
-/**
- * Map a date+time column to an attribute 
- *
- * @package	 iTopORM
- */
-class AttributeDateTime extends AttributeDBField
-{
-	static $oFormat = null;
-	
-	static public function GetFormat()
-	{
-		if (self::$oFormat == null)
-		{
-			static::LoadFormatFromConfig();		
-		}
-		return self::$oFormat;
-	}	
-	
-	/**
-	 * Load the 3 settings: date format, time format and data_time format from the configuration
-	 */
-	protected static function LoadFormatFromConfig()
-	{
-		$aFormats = MetaModel::GetConfig()->Get('date_and_time_format');
-		$sLang = Dict::GetUserLanguage();
-		$sDateFormat = isset($aFormats[$sLang]['date']) ? $aFormats[$sLang]['date'] : (isset($aFormats['default']['date']) ? $aFormats['default']['date'] : 'Y-m-d');
-		$sTimeFormat = isset($aFormats[$sLang]['time']) ? $aFormats[$sLang]['time'] : (isset($aFormats['default']['time']) ? $aFormats['default']['time'] : 'H:i:s');
-		$sDateAndTimeFormat = isset($aFormats[$sLang]['date_time']) ? $aFormats[$sLang]['date_time'] : (isset($aFormats['default']['date_time']) ? $aFormats['default']['date_time'] : '$date $time');
-		
-		$sFullFormat = str_replace(array('$date', '$time'), array($sDateFormat, $sTimeFormat), $sDateAndTimeFormat);
-		
-		self::SetFormat(new DateTimeFormat($sFullFormat));
-		AttributeDate::SetFormat(new DateTimeFormat($sDateFormat));		
-	}
-	
-	/**
-	 * Returns the format string used for the date & time stored in memory
-	 * @return string
-	 */
-	static public function GetInternalFormat()
-	{
-		return 'Y-m-d H:i:s';
-	}
-
-	/**
-	 * Returns the format string used for the date & time written to MySQL
-	 * @return string
-	 */
-	static public function GetSQLFormat()
-	{
-		return 'Y-m-d H:i:s';
-	}
-	
-	static public function SetFormat(DateTimeFormat $oDateTimeFormat)
-	{
-		self::$oFormat = $oDateTimeFormat;
-	}
-	
-	static public function GetSQLTimeFormat()
-	{
-		return 'H:i:s';
-	}
-	
-	/**
-	 * Parses a search string coming from user input
-	 * @param string $sSearchString
-	 * @return string
-	 */
-	public function ParseSearchString($sSearchString)
-	{
-		try
-		{
-			$oDateTime = $this->GetFormat()->Parse($sSearchString);
-			$sSearchString = $oDateTime->format($this->GetInternalFormat());
-		}
-		catch(Exception $e)
-		{
-			$sFormatString = '!'.(string)AttributeDate::GetFormat(); // BEWARE: ! is needed to set non-parsed fields to zero !!!
-			$oDateTime = DateTime::createFromFormat($sFormatString, $sSearchString); 
-			if ($oDateTime !== false)
-			{
-				$sSearchString = $oDateTime->format($this->GetInternalFormat());
-			}
-		}
-		return $sSearchString;
-	}
-	
-	static public function GetFormFieldClass()
-	{
-		return '\\Combodo\\iTop\\Form\\Field\\DateTimeField';
-	}
-	
-	/**
-	 * Override to specify Field class
-	 *
-	 * When called first, $oFormField is null and will be created (eg. Make). Then when the ::parent is called and the $oFormField is passed, MakeFormField behave more like a Prepare.
-	 */
-	public function MakeFormField(DBObject $oObject, $oFormField = null)
-	{
-		if ($oFormField === null)
-		{
-			$sFormFieldClass = static::GetFormFieldClass();
-			$oFormField = new $sFormFieldClass($this->GetCode());
-		}
-		$oFormField->SetPHPDateTimeFormat((string) $this->GetFormat());
-		$oFormField->SetJSDateTimeFormat($this->GetFormat()->ToMomentJS());
-
-		$oFormField = parent::MakeFormField($oObject, $oFormField);
-
-		// After call to the parent as it sets the current value
-		$oFormField->SetCurrentValue($this->GetFormat()->Format($oObject->Get($this->GetCode())));
-
-		return $oFormField;
-	}
-
-    /**
-     * @inheritdoc
-     */
-    public function EnumTemplateVerbs()
-    {
-        return array(
-            '' => 'Formatted representation',
-            'raw' => 'Not formatted representation',
-        );
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function GetForTemplate($value, $sVerb, $oHostObject = null, $bLocalize = true)
-    {
-        switch ($sVerb)
-        {
-            case '':
-            case 'text':
-                return static::GetFormat()->format($value);
-                break;
-            case 'html':
-                // Note: Not passing formatted value as the method will format it.
-                return $this->GetAsHTML($value);
-                break;
-            case 'raw':
-                return $value;
-                break;
-            default:
-                return parent::GetForTemplate($value, $sVerb, $oHostObject, $bLocalize);
-                break;
-        }
-        return null;
-    }
-
-	static public function ListExpectedParams()
-	{
-		return parent::ListExpectedParams();
-		//return array_merge(parent::ListExpectedParams(), array());
-	}
-
-	public function GetEditClass() {return "DateTime";}
-
-
-	public function GetEditValue($sValue, $oHostObj = null)
-	{
-		return (string)static::GetFormat()->format($sValue);
-	}	
-	public function GetValueLabel($sValue, $oHostObj = null)
-	{
-		return (string)static::GetFormat()->format($sValue);
-	}	
-	
-	protected function GetSQLCol($bFullSpec = false) {return "DATETIME";}
-
-	public function GetImportColumns()
-	{
-		// Allow an empty string to be a valid value (synonym for "reset")
-		$aColumns = array();
-		$aColumns[$this->GetCode()] = 'VARCHAR(19)';
-		return $aColumns;
-	}
-
-	public static function GetAsUnixSeconds($value)
-	{
-		$oDeadlineDateTime = new DateTime($value);
-		$iUnixSeconds = $oDeadlineDateTime->format('U');
-		return $iUnixSeconds;
-	}
-
-	public function GetDefaultValue(DBObject $oHostObject = null)
-	{
-		// null value will be replaced by the current date, if not already set, in DoComputeValues
-		return $this->GetNullValue();
-	}
-
-	public function GetValidationPattern()
-	{
-		return static::GetFormat()->ToRegExpr();
-	}
-
-	public function GetBasicFilterOperators()
-	{
-		return array(
-			"="=>"equals",
-			"!="=>"differs from",
-			"<"=>"before",
-			"<="=>"before",
-			">"=>"after (strictly)",
-			">="=>"after",
-			"SameDay"=>"same day (strip time)",
-			"SameMonth"=>"same year/month",
-			"SameYear"=>"same year",
-			"Today"=>"today",
-			">|"=>"after today + N days",
-			"<|"=>"before today + N days",
-			"=|"=>"equals today + N days",
-		);
-	}
-	public function GetBasicFilterLooseOperator()
-	{
-		// Unless we implement a "same xxx, depending on given precision" !
-		return "=";
-	}
-
-	public function GetBasicFilterSQLExpr($sOpCode, $value)
-	{
-		$sQValue = CMDBSource::Quote($value);
-
-		switch ($sOpCode)
-		{
-		case '=':
-		case '!=':
-		case '<':
-		case '<=':
-		case '>':
-		case '>=':
-			return $this->GetSQLExpr()." $sOpCode $sQValue";
-		case 'SameDay':
-			return "DATE(".$this->GetSQLExpr().") = DATE($sQValue)";
-		case 'SameMonth':
-			return "DATE_FORMAT(".$this->GetSQLExpr().", '%Y-%m') = DATE_FORMAT($sQValue, '%Y-%m')";
-		case 'SameYear':
-			return "MONTH(".$this->GetSQLExpr().") = MONTH($sQValue)";
-		case 'Today':
-			return "DATE(".$this->GetSQLExpr().") = CURRENT_DATE()";
-		case '>|':
-			return "DATE(".$this->GetSQLExpr().") > DATE_ADD(CURRENT_DATE(), INTERVAL $sQValue DAY)";
-		case '<|':
-			return "DATE(".$this->GetSQLExpr().") < DATE_ADD(CURRENT_DATE(), INTERVAL $sQValue DAY)";
-		case '=|':
-			return "DATE(".$this->GetSQLExpr().") = DATE_ADD(CURRENT_DATE(), INTERVAL $sQValue DAY)";
-		default:
-			return $this->GetSQLExpr()." = $sQValue";
-		}
-	}
-	
-	public function MakeRealValue($proposedValue, $oHostObj)
-	{
-		if (is_null($proposedValue))
-		{
-			return null;
-		}
-		if (is_string($proposedValue) && ($proposedValue == "") && $this->IsNullAllowed())
-		{
-			return null;
-		}
-		if (!is_numeric($proposedValue))
-		{
-			// Check the format
-			try
-			{
-				$oFormat = new DateTimeFormat($this->GetInternalFormat());
-				$oTrash = $oFormat->Parse($proposedValue);
-			}
-			catch (Exception $e)
-			{
-				throw new Exception('Wrong format for date attribute '.$this->GetCode().', expecting "'.$this->GetInternalFormat().'" and got "'.$proposedValue.'"');
-			}
-
-			return $proposedValue;
-		}
-
-		return date(static::GetInternalFormat(), $proposedValue);
-	}
-
-	public function ScalarToSQL($value)
-	{
-		if (is_null($value))
-		{	
-			return null;
-		}
-		elseif (empty($value))
-		{
-			// Make a valid date for MySQL. TO DO: support NULL as a literal value for fields that can be null.
-			// todo: this is NOT valid in strict mode (default setting for MySQL 5.7)
-			// todo: if to be kept, this should be overloaded for AttributeDate (0000-00-00)
-			return '0000-00-00 00:00:00';
-		}
-		return $value;
-	}
-
-	public function GetAsHTML($value, $oHostObject = null, $bLocalize = true)
-	{
-		return Str::pure2html(static::GetFormat()->format($value));
-	}
-
-	public function GetAsXML($value, $oHostObject = null, $bLocalize = true)
-	{
-		return Str::pure2xml($value);
-	}
-
-	public function GetAsCSV($sValue, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
-	{
-		if (empty($sValue) || ($sValue === '0000-00-00 00:00:00') || ($sValue === '0000-00-00'))
-		{
-			return '';
-		}
-		else if ((string)static::GetFormat() !== static::GetInternalFormat())
-		{
-			// Format conversion
-			$oDate = new DateTime($sValue);
-			if ($oDate !== false)
-			{
-				$sValue = static::GetFormat()->format($oDate);
-			}
-		}
-		$sFrom = array("\r\n", $sTextQualifier);
-		$sTo = array("\n", $sTextQualifier.$sTextQualifier);
-		$sEscaped = str_replace($sFrom, $sTo, (string)$sValue);
-		return $sTextQualifier.$sEscaped.$sTextQualifier;
-	}
-	
-	/**
-	 * Parses a string to find some smart search patterns and build the corresponding search/OQL condition
-	 * Each derived class is reponsible for defining and processing their own smart patterns, the base class
-	 * does nothing special, and just calls the default (loose) operator
-	 * @param string $sSearchText The search string to analyze for smart patterns
-	 * @param FieldExpression The FieldExpression representing the atttribute code in this OQL query
-	 * @param Hash $aParams Values of the query parameters
-	 * @return Expression The search condition to be added (AND) to the current search
-	 */
-	public function GetSmartConditionExpression($sSearchText, FieldExpression $oField, &$aParams, $bParseSearchString = false)
-	{
-		// Possible smart patterns
-		$aPatterns = array(
-			'between' => array('pattern' => '/^\[(.*),(.*)\]$/', 'operator' => 'n/a'),
-			'greater than or equal' => array('pattern' => '/^>=(.*)$/', 'operator' => '>='),
-			'greater than' => array('pattern' => '/^>(.*)$/', 'operator' => '>'),
-			'less than or equal' => array('pattern' => '/^<=(.*)$/', 'operator' => '<='),
-			'less than' =>  array('pattern' => '/^<(.*)$/', 'operator' => '<'),
-		);
-		
-		$sPatternFound = '';
-		$aMatches = array();
-		foreach($aPatterns as $sPatName => $sPattern)
-		{
-			if (preg_match($sPattern['pattern'], $sSearchText, $aMatches))
-			{
-				$sPatternFound = $sPatName;
-				break;
-			}			
-		}
-		
-		switch($sPatternFound)
-		{
-			case 'between':
-			
-			$sParamName1 = $oField->GetParent().'_'.$oField->GetName().'_1';
-			$oRightExpr = new VariableExpression($sParamName1);
-			if ($bParseSearchString)
-			{
-				$aParams[$sParamName1] = $this->ParseSearchString($aMatches[1]);
-			}
-			else
-			{
-			$aParams[$sParamName1] = $aMatches[1];
-			}
-			$oCondition1 = new BinaryExpression($oField, '>=', $oRightExpr);
-
-			$sParamName2 = $oField->GetParent().'_'.$oField->GetName().'_2';
-			$oRightExpr = new VariableExpression($sParamName2);
-			$sOperator = $this->GetBasicFilterLooseOperator();
-			if ($bParseSearchString)
-			{
-				$aParams[$sParamName2] = $this->ParseSearchString($aMatches[2]);
-			}
-			else
-			{
-			$aParams[$sParamName2] = $aMatches[2];
-			}
-			$oCondition2 = new BinaryExpression($oField, '<=', $oRightExpr);
-			
-			$oNewCondition = new BinaryExpression($oCondition1, 'AND', $oCondition2);
-			break;
-			
-			case 'greater than':
-			case 'greater than or equal':
-			case 'less than':
-			case 'less than or equal':
-			$sSQLOperator = $aPatterns[$sPatternFound]['operator'];
-			$sParamName = $oField->GetParent().'_'.$oField->GetName();
-			$oRightExpr = new VariableExpression($sParamName);
-			if ($bParseSearchString)
-			{
-				$aParams[$sParamName] = $this->ParseSearchString($aMatches[1]);
-			}
-			else
-			{
-			$aParams[$sParamName] = $aMatches[1];
-			}
-			$oNewCondition = new BinaryExpression($oField, $sSQLOperator, $oRightExpr);
-			
-			break;
-						
-			default:
-			$oNewCondition = parent::GetSmartConditionExpression($sSearchText, $oField, $aParams, $bParseSearchString);
-
-		}
-
-		return $oNewCondition;
-	}
-
-
-	public function GetHelpOnSmartSearch()
-	{
-		$sDict = parent::GetHelpOnSmartSearch();
-		
-		$oFormat = static::GetFormat();
-		$sExample = $oFormat->Format(new DateTime('2015-07-19 18:40:00'));
-		return vsprintf($sDict, array($oFormat->ToPlaceholder(), $sExample));
-	}	
-}
-
-/**
- * Store a duration as a number of seconds 
- *
- * @package	 iTopORM
- */
-class AttributeDuration extends AttributeInteger
-{
-	public function GetEditClass() {return "Duration";}
-	protected function GetSQLCol($bFullSpec = false) {return "INT(11) UNSIGNED";}
-
-	public function GetNullValue() {return '0';}
-
-	public function MakeRealValue($proposedValue, $oHostObj)
-	{
-		if (is_null($proposedValue)) return null;
-		if (!is_numeric($proposedValue)) return null;
-		if ( ((int)$proposedValue) < 0) return null;
-
-		return (int)$proposedValue;
-	}
-
-	public function ScalarToSQL($value)
-	{
-		if (is_null($value))
-		{	
-			return null;
-		}
-		return $value;
-	}
-
-	public function GetAsHTML($value, $oHostObject = null, $bLocalize = true)
-	{
-		return Str::pure2html(self::FormatDuration($value));
-	}
-
-	public static function FormatDuration($duration)
-	{
-		$aDuration = self::SplitDuration($duration);
-		$sResult = '';
-		
-		if ($duration < 60)
-		{
-			// Less than 1 min
-			$sResult = Dict::Format('Core:Duration_Seconds', $aDuration['seconds']);			
-		}
-		else if ($duration < 3600)
-		{
-			// less than 1 hour, display it in minutes/seconds
-			$sResult = Dict::Format('Core:Duration_Minutes_Seconds', $aDuration['minutes'], $aDuration['seconds']);			
-		}
-		else if ($duration < 86400)
-		{
-			// Less than 1 day, display it in hours/minutes/seconds	
-			$sResult = Dict::Format('Core:Duration_Hours_Minutes_Seconds', $aDuration['hours'], $aDuration['minutes'], $aDuration['seconds']);			
-		}
-		else
-		{
-			// more than 1 day, display it in days/hours/minutes/seconds
-			$sResult = Dict::Format('Core:Duration_Days_Hours_Minutes_Seconds', $aDuration['days'], $aDuration['hours'], $aDuration['minutes'], $aDuration['seconds']);			
-		}
-		return $sResult;
-	}
-	
-	static function SplitDuration($duration)
-	{
-		$duration = (int) $duration;
-		$days = floor($duration / 86400);
-		$hours = floor(($duration - (86400*$days)) / 3600);
-		$minutes = floor(($duration - (86400*$days + 3600*$hours)) / 60);
-		$seconds = ($duration % 60); // modulo
-		return array( 'days' => $days, 'hours' => $hours, 'minutes' => $minutes, 'seconds' => $seconds );		
-	}
-
-	static public function GetFormFieldClass()
-	{
-		return '\\Combodo\\iTop\\Form\\Field\\DurationField';
-	}
-
-	public function MakeFormField(DBObject $oObject, $oFormField = null)
-	{
-		if ($oFormField === null)
-		{
-			$sFormFieldClass = static::GetFormFieldClass();
-			$oFormField = new $sFormFieldClass($this->GetCode());
-		}
-		parent::MakeFormField($oObject, $oFormField);
-
-		// Note : As of today, this attribute is -by nature- only supported in readonly mode, not edition
-		$sAttCode = $this->GetCode();
-		$oFormField->SetCurrentValue($oObject->Get($sAttCode));
-		$oFormField->SetReadOnly(true);
-
-		return $oFormField;
-	}
-
-}
-/**
- * Map a date+time column to an attribute 
- *
- * @package	 iTopORM
- */
-class AttributeDate extends AttributeDateTime
-{
-	static $oDateFormat = null;
-	
-	static public function GetFormat()
-	{
-		if (self::$oDateFormat == null)
-		{			
-			AttributeDateTime::LoadFormatFromConfig();		
-		}
-		return self::$oDateFormat;
-	}
-
-	static public function SetFormat(DateTimeFormat $oDateFormat)
-	{
-		self::$oDateFormat = $oDateFormat;
-	}
-
-	/**
-	 * Returns the format string used for the date & time stored in memory
-	 * @return string
-	 */
-	static public function GetInternalFormat()
-	{
-		return 'Y-m-d';
-	}
-
-	/**
-	 * Returns the format string used for the date & time written to MySQL
-	 * @return string
-	 */
-	static public function GetSQLFormat()
-	{
-		return 'Y-m-d';
-	}
-	
-	static public function ListExpectedParams()
-	{
-		return parent::ListExpectedParams();
-		//return array_merge(parent::ListExpectedParams(), array());
-	}
-
-	public function GetEditClass() {return "Date";}
-	protected function GetSQLCol($bFullSpec = false) {return "DATE";}
-	public function GetImportColumns()
-	{
-		// Allow an empty string to be a valid value (synonym for "reset")
-		$aColumns = array();
-		$aColumns[$this->GetCode()] = 'VARCHAR(10)';
-		return $aColumns;
-	}
-
-
-	/**
-	 * Override to specify Field class
-	 *
-	 * When called first, $oFormField is null and will be created (eg. Make). Then when the ::parent is called and the $oFormField is passed, MakeFormField behave more like a Prepare.
-	 */
-	public function MakeFormField(DBObject $oObject, $oFormField = null)
-	{
-		$oFormField = parent::MakeFormField($oObject, $oFormField);
-		$oFormField->SetDateOnly(true);
-		
-		return $oFormField;
-	}
-	
-}
-
-/**
- * A dead line stored as a date & time
- * The only difference with the DateTime attribute is the display:
- * relative to the current time
- */
-class AttributeDeadline extends AttributeDateTime
-{
-	public function GetAsHTML($value, $oHostObject = null, $bLocalize = true)
-	{
-		$sResult = self::FormatDeadline($value);
-		return $sResult;
-	}
-
-	public static function FormatDeadline($value)
-	{
-		$sResult = '';
-		if ($value !== null)
-		{
-			$iValue = AttributeDateTime::GetAsUnixSeconds($value);
-			$sDate = AttributeDateTime::GetFormat()->Format($value);
-			$difference = $iValue - time();
-	
-			if ($difference >= 0)
-			{
-				$sDifference = self::FormatDuration($difference);
-			}
-			else
-			{
-				$sDifference = Dict::Format('UI:DeadlineMissedBy_duration', self::FormatDuration(-$difference));
-			}
-			$sFormat = MetaModel::GetConfig()->Get('deadline_format', '$difference$');
-			$sResult = str_replace(array('$date$', '$difference$'), array($sDate, $sDifference), $sFormat);
-		}
-
-		return $sResult;
-	}
-
-	static function FormatDuration($duration)
-	{
-		$days = floor($duration / 86400);
-		$hours = floor(($duration - (86400*$days)) / 3600);
-		$minutes = floor(($duration - (86400*$days + 3600*$hours)) / 60);
-		$sResult = '';
-		
-		if ($duration < 60)
-		{
-			// Less than 1 min
-			$sResult =Dict::S('UI:Deadline_LessThan1Min');			
-		}
-		else if ($duration < 3600)
-		{
-			// less than 1 hour, display it in minutes
-			$sResult =Dict::Format('UI:Deadline_Minutes', $minutes);			
-		}
-		else if ($duration < 86400)
-		{
-			// Less that 1 day, display it in hours/minutes	
-			$sResult =Dict::Format('UI:Deadline_Hours_Minutes', $hours, $minutes);			
-		}
-		else
-		{
-			// Less that 1 day, display it in hours/minutes	
-			$sResult =Dict::Format('UI:Deadline_Days_Hours_Minutes', $days, $hours, $minutes);			
-		}
-		return $sResult;
-	}
-}
-
-/**
- * Map a foreign key to an attribute 
- *  AttributeExternalKey and AttributeExternalField may be an external key
- *  the difference is that AttributeExternalKey corresponds to a column into the defined table
- *  where an AttributeExternalField corresponds to a column into another table (class)
- *
- * @package	 iTopORM
- */
-class AttributeExternalKey extends AttributeDBFieldVoid
-{
-	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_EXTERNAL_KEY;
-
-	static public function ListExpectedParams()
-	{
-		return array_merge(parent::ListExpectedParams(), array("targetclass", "is_null_allowed", "on_target_delete"));
-	}
-
-	public function GetEditClass() {return "ExtKey";}
-	protected function GetSQLCol($bFullSpec = false) {return "INT(11)".($bFullSpec ? " DEFAULT 0" : "");}
-	public function RequiresIndex()
-	{
-		return true;
-	}
-
-	public function IsExternalKey($iType = EXTKEY_RELATIVE) {return true;}
-	public function GetTargetClass($iType = EXTKEY_RELATIVE) {return $this->Get("targetclass");}
-	public function GetKeyAttDef($iType = EXTKEY_RELATIVE){return $this;}
-	public function GetKeyAttCode() {return $this->GetCode();} 
-	public function GetDisplayStyle() { return $this->GetOptional('display_style', 'select'); }
-	
-
-	public function GetDefaultValue(DBObject $oHostObject = null) {return 0;}
-	public function IsNullAllowed()
-	{
-		if (MetaModel::GetConfig()->Get('disable_mandatory_ext_keys'))
-		{
-			return true;
-		}
-		return $this->Get("is_null_allowed");
-	}
-
-
-	public function GetBasicFilterOperators()
-	{
-		return parent::GetBasicFilterOperators();
-	}
-	public function GetBasicFilterLooseOperator()
-	{
-		return parent::GetBasicFilterLooseOperator();
-	}
-
-	public function GetBasicFilterSQLExpr($sOpCode, $value)
-	{
-		return parent::GetBasicFilterSQLExpr($sOpCode, $value);
-	} 
-
-	// overloaded here so that an ext key always have the answer to
-	// "what are your possible values?"
-	public function GetValuesDef()
-	{
-		$oValSetDef = $this->Get("allowed_values");
-		if (!$oValSetDef)
-		{
-			// Let's propose every existing value
-			$oValSetDef = new ValueSetObjects('SELECT '.$this->GetTargetClass());
-		}
-		return $oValSetDef;
-	}
-
-	public function GetAllowedValues($aArgs = array(), $sContains = '')
-	{
-		//throw new Exception("GetAllowedValues on ext key has been deprecated");
-		try
-		{
-			return parent::GetAllowedValues($aArgs, $sContains);
-		}
-		catch (MissingQueryArgument $e)
-		{
-			// Some required arguments could not be found, enlarge to any existing value
-			$oValSetDef = new ValueSetObjects('SELECT '.$this->GetTargetClass());
-			return $oValSetDef->GetValues($aArgs, $sContains);
-		}
-	}
-
-	public function GetAllowedValuesAsObjectSet($aArgs = array(), $sContains = '', $iAdditionalValue = null)
-	{
-		$oValSetDef = $this->GetValuesDef();
-		$oSet = $oValSetDef->ToObjectSet($aArgs, $sContains, $iAdditionalValue);
-		return $oSet;
-	}
-
-	public function GetAllowedValuesAsFilter($aArgs = array(), $sContains = '', $iAdditionalValue = null)
-	{
-		return DBObjectSearch::FromOQL($this->GetValuesDef()->GetFilterExpression());
-	}
-
-	public function GetDeletionPropagationOption()
-	{
-		return $this->Get("on_target_delete");
-	}
-
-	public function GetNullValue()
-	{
-		return 0;
-	} 
-
-	public function IsNull($proposedValue)
-	{
-		return ($proposedValue == 0);
-	} 
-
-	public function MakeRealValue($proposedValue, $oHostObj)
-	{
-		if (is_null($proposedValue)) return 0;
-		if ($proposedValue === '') return 0;
-		if (MetaModel::IsValidObject($proposedValue)) return $proposedValue->GetKey();
-		return (int)$proposedValue;
-	}
-	
-	public function GetMaximumComboLength()
-	{
-		return $this->GetOptional('max_combo_length', MetaModel::GetConfig()->Get('max_combo_length'));
-	}
-	
-	public function GetMinAutoCompleteChars()
-	{
-		return $this->GetOptional('min_autocomplete_chars', MetaModel::GetConfig()->Get('min_autocomplete_chars'));
-	}
-	
-	public function AllowTargetCreation()
-	{
-		return $this->GetOptional('allow_target_creation', MetaModel::GetConfig()->Get('allow_target_creation'));
-	}
-
-	/**
-	 * Find the corresponding "link" attribute on the target class, if any
-	 * @return null | AttributeDefinition
-	 */
-	public function GetMirrorLinkAttribute()
-	{
-		$oRet = null;
-		$sRemoteClass = $this->GetTargetClass();
-		foreach (MetaModel::ListAttributeDefs($sRemoteClass) as $sRemoteAttCode => $oRemoteAttDef)
-		{
-			if (!$oRemoteAttDef->IsLinkSet()) continue;
-			if (!is_subclass_of($this->GetHostClass(), $oRemoteAttDef->GetLinkedClass()) && $oRemoteAttDef->GetLinkedClass() != $this->GetHostClass()) continue;
-			if ($oRemoteAttDef->GetExtKeyToMe() != $this->GetCode()) continue;
-			$oRet = $oRemoteAttDef;
-			break;
-		}
-		return $oRet;
-	}
-
-	static public function GetFormFieldClass()
-	{
-		return '\\Combodo\\iTop\\Form\\Field\\SelectObjectField';
-	}
-
-	public function MakeFormField(DBObject $oObject, $oFormField = null)
-	{
-		if ($oFormField === null)
-		{
-			// TODO : We should check $this->Get('display_style') and create a Radio / Select / ... regarding its value
-			$sFormFieldClass = static::GetFormFieldClass();
-			$oFormField = new $sFormFieldClass($this->GetCode());
-		}
-		
-		// Setting params
-		$oFormField->SetMaximumComboLength($this->GetMaximumComboLength());
-		$oFormField->SetMinAutoCompleteChars($this->GetMinAutoCompleteChars());
-		$oFormField->SetHierarchical(MetaModel::IsHierarchicalClass($this->GetTargetClass()));
-		// Setting choices regarding the field dependencies
-		$aFieldDependencies = $this->GetPrerequisiteAttributes();
-		if (!empty($aFieldDependencies))
-		{
-			$oTmpAttDef = $this;
-			$oTmpField = $oFormField;
-			$oFormField->SetOnFinalizeCallback(function() use ($oTmpField, $oTmpAttDef, $oObject)
-			{
-			    /** @var $oTmpField \Combodo\iTop\Form\Field\Field */
-			    /** @var $oTmpAttDef \AttributeDefinition */
-			    /** @var $oObject \DBObject */
-
-				// We set search object only if it has not already been set (overrided)
-				if ($oTmpField->GetSearch() === null)
-				{
-					$oSearch = DBSearch::FromOQL($oTmpAttDef->GetValuesDef()->GetFilterExpression());
-					$oSearch->SetInternalParams(array('this' => $oObject));
-					$oTmpField->SetSearch($oSearch);
-				}
-			});
-		}
-		else
-		{
-			$oSearch = DBSearch::FromOQL($this->GetValuesDef()->GetFilterExpression());
-			$oSearch->SetInternalParams(array('this' => $oObject));
-			$oFormField->SetSearch($oSearch);
-		}
-
-		// If ExtKey is mandatory, we add a validator to ensure that the value 0 is not selected
-		if ($oObject->GetAttributeFlags($this->GetCode()) & OPT_ATT_MANDATORY)
-		{
-			$oFormField->AddValidator(new \Combodo\iTop\Form\Validator\NotEmptyExtKeyValidator());
-		}
-
-		parent::MakeFormField($oObject, $oFormField);
-
-		return $oFormField;
-	}
-
-}
-
-/**
- * Special kind of External Key to manage a hierarchy of objects
- */
-class AttributeHierarchicalKey extends AttributeExternalKey
-{
-	protected $m_sTargetClass;
-
-	static public function ListExpectedParams()
-	{
-		$aParams = parent::ListExpectedParams();
-		$idx = array_search('targetclass', $aParams);
-		unset($aParams[$idx]);
-		$idx = array_search('jointype', $aParams);
-		unset($aParams[$idx]);
-		return $aParams; // TODO: mettre les bons parametres ici !!
-	}
-
-	public function GetEditClass() {return "ExtKey";}
-	public function RequiresIndex()
-	{
-		return true;
-	}
-
-	/*
-	*  The target class is the class for which the attribute has been defined first
-	*/	
-	public function SetHostClass($sHostClass)
-	{
-		if (!isset($this->m_sTargetClass))
-		{
-			$this->m_sTargetClass = $sHostClass;
-		}
-		parent::SetHostClass($sHostClass);
-	}
-
-	static public function IsHierarchicalKey() {return true;}
-	public function GetTargetClass($iType = EXTKEY_RELATIVE) {return $this->m_sTargetClass;}
-	public function GetKeyAttDef($iType = EXTKEY_RELATIVE){return $this;}
-	public function GetKeyAttCode() {return $this->GetCode();}
-
-	public function GetBasicFilterOperators()
-	{
-		return parent::GetBasicFilterOperators();
-	}
-	public function GetBasicFilterLooseOperator()
-	{
-		return parent::GetBasicFilterLooseOperator();
-	}
-
-	public function GetSQLColumns($bFullSpec = false)
-	{
-		$aColumns = array();
-		$aColumns[$this->GetCode()] = 'INT(11)'.($bFullSpec ? ' DEFAULT 0' : '');
-		$aColumns[$this->GetSQLLeft()] = 'INT(11)'.($bFullSpec ? ' DEFAULT 0' : '');
-		$aColumns[$this->GetSQLRight()] = 'INT(11)'.($bFullSpec ? ' DEFAULT 0' : '');
-		return $aColumns;
-	}
-	public function GetSQLRight()
-	{
-		return $this->GetCode().'_right';
-	}
-	public function GetSQLLeft()
-	{
-		return $this->GetCode().'_left';
-	}
-
-	public function GetSQLValues($value)
-	{
-		if (!is_array($value))
-		{
-			$aValues[$this->GetCode()] = $value;
-		}
-		else
-		{
-			$aValues = array();
-			$aValues[$this->GetCode()] = $value[$this->GetCode()];
-			$aValues[$this->GetSQLRight()] = $value[$this->GetSQLRight()];
-			$aValues[$this->GetSQLLeft()] = $value[$this->GetSQLLeft()];
-		}
-		return $aValues;
-	}
-
-	public function GetAllowedValues($aArgs = array(), $sContains = '')
-	{
-		$oFilter = $this->GetHierachicalFilter($aArgs, $sContains);
-		if ($oFilter)
-		{
-			$oValSetDef = $this->GetValuesDef();
-			$oValSetDef->AddCondition($oFilter);
-			return $oValSetDef->GetValues($aArgs, $sContains);
-		}
-		else
-		{
-			return parent::GetAllowedValues($aArgs, $sContains);
-		}
-	}
-
-	public function GetAllowedValuesAsObjectSet($aArgs = array(), $sContains = '', $iAdditionalValue = null)
-	{
-		$oValSetDef = $this->GetValuesDef();
-		$oFilter = $this->GetHierachicalFilter($aArgs, $sContains, $iAdditionalValue);
-		if ($oFilter)
-		{
-			$oValSetDef->AddCondition($oFilter);
-		}
-		$oSet = $oValSetDef->ToObjectSet($aArgs, $sContains, $iAdditionalValue);
-		return $oSet;
-	}
-
-	public function GetAllowedValuesAsFilter($aArgs = array(), $sContains = '', $iAdditionalValue = null)
-	{
-		$oFilter = $this->GetHierachicalFilter($aArgs, $sContains, $iAdditionalValue);
-		if ($oFilter)
-		{
-			return $oFilter;
-		}
-		return parent::GetAllowedValuesAsFilter($aArgs, $sContains, $iAdditionalValue);
-	}
-
-	private function GetHierachicalFilter($aArgs = array(), $sContains = '', $iAdditionalValue = null)
-	{
-		if (array_key_exists('this', $aArgs))
-		{
-			// Hierarchical keys have one more constraint: the "parent value" cannot be
-			// "under" themselves
-			$iRootId = $aArgs['this']->GetKey();
-			if ($iRootId > 0) // ignore objects that do no exist in the database...
-			{
-				$sClass = $this->m_sTargetClass;
-				return DBObjectSearch::FromOQL("SELECT $sClass AS node JOIN $sClass AS root ON node.".$this->GetCode()." NOT BELOW root.id WHERE root.id = $iRootId");
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Find the corresponding "link" attribute on the target class, if any
-	 * @return null | AttributeDefinition
-	 */
-	public function GetMirrorLinkAttribute()
-	{
-		return null;
-	}
-}
-
-/**
- * An attribute which corresponds to an external key (direct or indirect) 
- *
- * @package	 iTopORM
- */
-class AttributeExternalField extends AttributeDefinition
-{
-	static public function ListExpectedParams()
-	{
-		return array_merge(parent::ListExpectedParams(), array("extkey_attcode", "target_attcode"));
-	}
-
-	public function GetEditClass() {return "ExtField";}
-
-	public function GetFinalAttDef()
-	{
-		$oExtAttDef = $this->GetExtAttDef();
-		return $oExtAttDef->GetFinalAttDef(); 
-	}
-
-	protected function GetSQLCol($bFullSpec = false)
-	{
-		// throw new CoreException("external attribute: does it make any sense to request its type ?");  
-		$oExtAttDef = $this->GetExtAttDef();
-		return $oExtAttDef->GetSQLCol($bFullSpec); 
-	}
-
-	public function GetSQLExpressions($sPrefix = '')
-	{
-		if ($sPrefix == '')
-		{
-			return array('' => $this->GetCode()); // Warning: Use GetCode() since AttributeExternalField does not have any 'sql' property
-		}
-		else
-		{
-			return $sPrefix;
-		} 
-	}
-
-	public function GetLabel($sDefault = null)
-	{
-		if ($this->IsFriendlyName())
-		{
-			$sKeyAttCode = $this->Get("extkey_attcode");
-			$oExtKeyAttDef = MetaModel::GetAttributeDef($this->GetHostClass(), $sKeyAttCode);
-			$sLabel = $oExtKeyAttDef->GetLabel($this->m_sCode);
-		}
-		else
-		{
-			$sLabel = parent::GetLabel('');
-			if (strlen($sLabel) == 0)
-			{
-				$oRemoteAtt = $this->GetExtAttDef();
-				$sLabel = $oRemoteAtt->GetLabel($this->m_sCode);
-			}
-		}
-		return $sLabel;
-	}
-	public function GetDescription($sDefault = null)
-	{
-		$sLabel = parent::GetDescription('');
-		if (strlen($sLabel) == 0)
-		{
-			$oRemoteAtt = $this->GetExtAttDef();
-			$sLabel = $oRemoteAtt->GetDescription('');
-		}
-		return $sLabel;
-	} 
-	public function GetHelpOnEdition($sDefault = null)
-	{
-		$sLabel = parent::GetHelpOnEdition('');
-		if (strlen($sLabel) == 0)
-		{
-			$oRemoteAtt = $this->GetExtAttDef();
-			$sLabel = $oRemoteAtt->GetHelpOnEdition('');
-		}
-		return $sLabel;
-	} 
-
-	public function IsExternalKey($iType = EXTKEY_RELATIVE)
-	{
-		switch($iType)
-		{
-		case EXTKEY_ABSOLUTE:
-			// see further
-			$oRemoteAtt = $this->GetExtAttDef();
-			return $oRemoteAtt->IsExternalKey($iType);
-
-		case EXTKEY_RELATIVE:
-			return false;
-
-		default:
-			throw new CoreException("Unexpected value for argument iType: '$iType'");
-		}
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function IsFriendlyName()
-	{
-		$oRemoteAtt = $this->GetExtAttDef();
-		if ($oRemoteAtt instanceof AttributeExternalField)
-		{
-			$bRet = $oRemoteAtt->IsFriendlyName();
-		}
-		elseif ($oRemoteAtt instanceof  AttributeFriendlyName)
-		{
-			$bRet = true;
-		}
-		else
-		{
-			$bRet = false;
-		}
-		return $bRet;
-	}
-
-	public function GetTargetClass($iType = EXTKEY_RELATIVE)
-	{
-		return $this->GetKeyAttDef($iType)->GetTargetClass();
-	}
-
-	static public function IsExternalField() {return true;}
-	public function GetKeyAttCode() {return $this->Get("extkey_attcode");} 
-	public function GetExtAttCode() {return $this->Get("target_attcode");} 
-
-	public function GetKeyAttDef($iType = EXTKEY_RELATIVE)
-	{
-		switch($iType)
-		{
-		case EXTKEY_ABSOLUTE:
-			// see further
-			$oRemoteAtt = $this->GetExtAttDef();
-			if ($oRemoteAtt->IsExternalField())
-			{
-				return $oRemoteAtt->GetKeyAttDef(EXTKEY_ABSOLUTE);
-			}
-			else if ($oRemoteAtt->IsExternalKey())
-			{
-				return $oRemoteAtt;
-			}
-			return $this->GetKeyAttDef(EXTKEY_RELATIVE); // which corresponds to the code hereafter !
-
-		case EXTKEY_RELATIVE:
-			return MetaModel::GetAttributeDef($this->GetHostClass(), $this->Get("extkey_attcode"));
-
-		default:
-			throw new CoreException("Unexpected value for argument iType: '$iType'");
-		}
-	}
-	
-	public function GetPrerequisiteAttributes($sClass = null)
-	{
-		return array($this->Get("extkey_attcode"));
-	} 
-	
-
-	public function GetExtAttDef()
-	{
-		$oKeyAttDef = $this->GetKeyAttDef();
-		$oExtAttDef = MetaModel::GetAttributeDef($oKeyAttDef->GetTargetClass(), $this->Get("target_attcode"));
-		if (!is_object($oExtAttDef)) throw new CoreException("Invalid external field ".$this->GetCode()." in class ".$this->GetHostClass().". The class ".$oKeyAttDef->GetTargetClass()." has no attribute ".$this->Get("target_attcode"));
-		return $oExtAttDef;
-	}
-
-	public function GetSQLExpr()
-	{
-		$oExtAttDef = $this->GetExtAttDef();
-		return $oExtAttDef->GetSQLExpr(); 
-	} 
-
-	public function GetDefaultValue(DBObject $oHostObject = null)
-	{
-		$oExtAttDef = $this->GetExtAttDef();
-		return $oExtAttDef->GetDefaultValue();
-	}
-	public function IsNullAllowed()
-	{
-		$oExtAttDef = $this->GetExtAttDef();
-		return $oExtAttDef->IsNullAllowed(); 
-	}
-
-	static public function IsScalar()
-	{
-		return true;
-	}
-
-	public function GetFilterDefinitions()
-	{
-		return array($this->GetCode() => new FilterFromAttribute($this));
-	}
-
-	public function GetBasicFilterOperators()
-	{
-		$oExtAttDef = $this->GetExtAttDef();
-		return $oExtAttDef->GetBasicFilterOperators(); 
-	}
-	public function GetBasicFilterLooseOperator()
-	{
-		$oExtAttDef = $this->GetExtAttDef();
-		return $oExtAttDef->GetBasicFilterLooseOperator(); 
-	}
-
-	public function GetBasicFilterSQLExpr($sOpCode, $value)
-	{
-		$oExtAttDef = $this->GetExtAttDef();
-		return $oExtAttDef->GetBasicFilterSQLExpr($sOpCode, $value);
-	} 
-
-	public function GetNullValue()
-	{
-		$oExtAttDef = $this->GetExtAttDef();
-		return $oExtAttDef->GetNullValue();
-	} 
-
-	public function IsNull($proposedValue)
-	{
-		$oExtAttDef = $this->GetExtAttDef();
-		return $oExtAttDef->IsNull($proposedValue);
-	} 
-
-	public function MakeRealValue($proposedValue, $oHostObj)
-	{
-		$oExtAttDef = $this->GetExtAttDef();
-		return $oExtAttDef->MakeRealValue($proposedValue, $oHostObj);
-	}
-
-	public function ScalarToSQL($value)
-	{
-		// This one could be used in case of filtering only
-		$oExtAttDef = $this->GetExtAttDef();
-		return $oExtAttDef->ScalarToSQL($value);
-	}
-
-
-	// Do not overload GetSQLExpression here because this is handled in the joins
-	//public function GetSQLExpressions($sPrefix = '') {return array();}
-
-	// Here, we get the data...
-	public function FromSQLToValue($aCols, $sPrefix = '')
-	{
-		$oExtAttDef = $this->GetExtAttDef();
-		return $oExtAttDef->FromSQLToValue($aCols, $sPrefix);
-	}
-
-	public function GetAsHTML($value, $oHostObject = null, $bLocalize = true)
-	{
-		$oExtAttDef = $this->GetExtAttDef();
-		return $oExtAttDef->GetAsHTML($value, null, $bLocalize);
-	}
-	public function GetAsXML($value, $oHostObject = null, $bLocalize = true)
-	{
-		$oExtAttDef = $this->GetExtAttDef();
-		return $oExtAttDef->GetAsXML($value, null, $bLocalize);
-	}
-	public function GetAsCSV($value, $sSeparator = ',', $sTestQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
-	{
-		$oExtAttDef = $this->GetExtAttDef();
-		return $oExtAttDef->GetAsCSV($value, $sSeparator, $sTestQualifier, null, $bLocalize, $bConvertToPlainText);
-	}
-
-	static public function GetFormFieldClass()
-	{
-		return '\\Combodo\\iTop\\Form\\Field\\LabelField';
-	}
-
-	public function MakeFormField(DBObject $oObject, $oFormField = null)
-	{
-	    // Retrieving AttDef from the remote attribute
-        $oRemoteAttDef = $this->GetExtAttDef();
-
-        if ($oFormField === null)
-		{
-		    // ExternalField's FormField are actually based on the FormField from the target attribute.
-            // Except for the AttributeExternalKey because we have no OQL and stuff
-            if($oRemoteAttDef instanceof AttributeExternalKey)
-            {
-                $sFormFieldClass = static::GetFormFieldClass();
-            }
-            else
-            {
-                $sFormFieldClass = $oRemoteAttDef::GetFormFieldClass();
-            }
-			$oFormField = new $sFormFieldClass($this->GetCode());
-		}
-		parent::MakeFormField($oObject, $oFormField);
-
-        // Manually setting for remote ExternalKey, otherwise, the id would be displayed.
-		if($oRemoteAttDef instanceof AttributeExternalKey)
-        {
-            $oFormField->SetCurrentValue($oObject->Get($this->GetCode().'_friendlyname'));
-        }
-
-		// Readonly field because we can't update external fields
-		$oFormField->SetReadOnly(true);
-
-		return $oFormField;
-	}
-
-	public function IsPartOfFingerprint()
-	{
-		return false;
-	}
-
-}
-
-/**
- * Map a varchar column to an URL (formats the ouput in HMTL) 
- *
- * @package	 iTopORM
- */
-class AttributeURL extends AttributeString
-{
-	static public function ListExpectedParams()
-	{
-		//return parent::ListExpectedParams();
-		return array_merge(parent::ListExpectedParams(), array("target"));
-	}
-
-	protected function GetSQLCol($bFullSpec = false) {return "VARCHAR(2048)".($bFullSpec ? $this->GetSQLColSpec() : '');}
-
-	public function GetMaxSize()
-	{
-		return 2048;
-	}
-	
-	public function GetEditClass() {return "String";}
-
-	public function GetAsHTML($sValue, $oHostObject = null, $bLocalize = true)
-	{
-		$sTarget = $this->Get("target");
-		if (empty($sTarget)) $sTarget = "_blank";
-		$sLabel = Str::pure2html($sValue);
-		if (strlen($sLabel) > 128)
-		{
-			// Truncate the length to 128 characters, by removing the middle
-			$sLabel = substr($sLabel, 0, 100).'.....'.substr($sLabel, -20);
-		}
-		return "<a target=\"$sTarget\" href=\"$sValue\">$sLabel</a>";
-	}
-
-	public function GetValidationPattern()
-	{
-		return $this->GetOptional('validation_pattern', '^'.utils::GetConfig()->Get('url_validation_pattern').'$');
-	}
-
-    static public function GetFormFieldClass()
-    {
-        return '\\Combodo\\iTop\\Form\\Field\\UrlField';
-    }
-
-    public function MakeFormField(DBObject $oObject, $oFormField = null)
-    {
-        if ($oFormField === null)
-        {
-            $sFormFieldClass = static::GetFormFieldClass();
-            $oFormField = new $sFormFieldClass($this->GetCode());
-        }
-        parent::MakeFormField($oObject, $oFormField);
-
-        $oFormField->SetTarget($this->Get('target'));
-
-        return $oFormField;
-    }
-}
-
-/**
- * A blob is an ormDocument, it is stored as several columns in the database  
- *
- * @package	 iTopORM
- */
-class AttributeBlob extends AttributeDefinition
-{
-	static public function ListExpectedParams()
-	{
-		return array_merge(parent::ListExpectedParams(), array("depends_on"));
-	}
-
-	public function GetEditClass() {return "Document";}
-
-	static public function IsBasedOnDBColumns() {return true;}
-	static public function IsScalar() {return true;}
-	public function IsWritable() {return true;}
-	public function GetDefaultValue(DBObject $oHostObject = null) {return "";}
-	public function IsNullAllowed(DBObject $oHostObject = null) {return $this->GetOptional("is_null_allowed", false);}
-
-	public function GetEditValue($sValue, $oHostObj = null)
-	{
-		return '';
-	}
-	
-	/**
-	 * Users can provide the document from an URL (including an URL on iTop itself)
-	 * for CSV import. Administrators can even provide the path to a local file
-	 * {@inheritDoc}
-	 * @see AttributeDefinition::MakeRealValue()
-	 */
-	public function MakeRealValue($proposedValue, $oHostObj)
-	{
-		if ($proposedValue === null) return null;
-		
-		if (is_object($proposedValue))
-		{
-			$proposedValue = clone $proposedValue;
-		}
-		else
-		{
-			try
-			{
-				// Read the file from iTop, an URL (or the local file system - for admins only)
-				$proposedValue = Utils::FileGetContentsAndMIMEType($proposedValue);
-			}
-			catch(Exception $e)
-			{
-				IssueLog::Warning(get_class($this)."::MakeRealValue - ".$e->getMessage());
-				// Not a real document !! store is as text !!! (This was the default behavior before)
-				$proposedValue = new ormDocument($e->getMessage()." \n".$proposedValue, 'text/plain');
-			}	
-		}
-		return $proposedValue;
-	}
-
-	public function GetSQLExpressions($sPrefix = '')
-	{
-		if ($sPrefix == '')
-		{
-			$sPrefix = $this->GetCode();
-		}
-		$aColumns = array();
-		// Note: to optimize things, the existence of the attribute is determined by the existence of one column with an empty suffix
-		$aColumns[''] = $sPrefix.'_mimetype';
-		$aColumns['_data'] = $sPrefix.'_data';
-		$aColumns['_filename'] = $sPrefix.'_filename';
-		return $aColumns;
-	}
-
-	public function FromSQLToValue($aCols, $sPrefix = '')
-	{
-		if (!array_key_exists($sPrefix, $aCols))
-		{
-			$sAvailable = implode(', ', array_keys($aCols));
-			throw new MissingColumnException("Missing column '$sPrefix' from {$sAvailable}");
-		} 
-		$sMimeType = isset($aCols[$sPrefix]) ? $aCols[$sPrefix] : '';
-
-		if (!array_key_exists($sPrefix.'_data', $aCols)) 
-		{
-			$sAvailable = implode(', ', array_keys($aCols));
-			throw new MissingColumnException("Missing column '".$sPrefix."_data' from {$sAvailable}");
-		} 
-		$data = isset($aCols[$sPrefix.'_data']) ? $aCols[$sPrefix.'_data'] : null;
-
-		if (!array_key_exists($sPrefix.'_filename', $aCols)) 
-		{
-			$sAvailable = implode(', ', array_keys($aCols));
-			throw new MissingColumnException("Missing column '".$sPrefix."_filename' from {$sAvailable}");
-		} 
-		$sFileName =  isset($aCols[$sPrefix.'_filename']) ? $aCols[$sPrefix.'_filename'] : '';
-
-		$value = new ormDocument($data, $sMimeType, $sFileName);
-		return $value;
-	}
-
-	public function GetSQLValues($value)
-	{
-		// #@# Optimization: do not load blobs anytime
-		//	 As per mySQL doc, selecting blob columns will prevent mySQL from
-		//	 using memory in case a temporary table has to be created
-		//	 (temporary tables created on disk)
-		//	 We will have to remove the blobs from the list of attributes when doing the select
-		//	 then the use of Get() should finalize the load
-		if ($value instanceOf ormDocument && !$value->IsEmpty())
-		{
-			$aValues = array();
-			$aValues[$this->GetCode().'_data'] = $value->GetData();
-			$aValues[$this->GetCode().'_mimetype'] = $value->GetMimeType();
-			$aValues[$this->GetCode().'_filename'] = $value->GetFileName();
-		}
-		else
-		{
-			$aValues = array();
-			$aValues[$this->GetCode().'_data'] = '';
-			$aValues[$this->GetCode().'_mimetype'] = '';
-			$aValues[$this->GetCode().'_filename'] = '';
-		}
-		return $aValues;
-	}
-
-	public function GetSQLColumns($bFullSpec = false)
-	{
-		$aColumns = array();
-		$aColumns[$this->GetCode().'_data'] = 'LONGBLOB'; // 2^32 (4 Gb)
-		$aColumns[$this->GetCode().'_mimetype'] = 'VARCHAR(255)';
-		$aColumns[$this->GetCode().'_filename'] = 'VARCHAR(255)';
-		return $aColumns;
-	}
-
-	public function GetFilterDefinitions()
-	{
-		return array();
-		// still not working... see later...
-		return array(
-			$this->GetCode().'->filename' => new FilterFromAttribute($this, '_filename'),
-			$this->GetCode().'_mimetype' => new FilterFromAttribute($this, '_mimetype'),
-			$this->GetCode().'_mimetype' => new FilterFromAttribute($this, '_mimetype')
-		);
-	}
-
-	public function GetBasicFilterOperators()
-	{
-		return array();
-	}
-	public function GetBasicFilterLooseOperator()
-	{
-		return '=';
-	}
-
-	public function GetBasicFilterSQLExpr($sOpCode, $value)
-	{
-		return 'true';
-	} 
-
-	public function GetAsHTML($value, $oHostObject = null, $bLocalize = true)
-	{
-		if (is_object($value))
-		{
-			return $value->GetAsHTML();
-		}
-	}
-
-	public function GetAsCSV($sValue, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
-	{
-		$sAttCode = $this->GetCode();
-		if ($sValue instanceof ormDocument && !$sValue->IsEmpty())
-		{
-			return $sValue->GetDownloadURL(get_class($oHostObject), $oHostObject->GetKey(), $sAttCode);
-		}
-		return ''; // Not exportable in CSV !
-	}
-	
-	public function GetAsXML($value, $oHostObject = null, $bLocalize = true)
-	{
-		$sRet = '';
-		if (is_object($value))
-		{
-			if (!$value->IsEmpty())
-			{
-				$sRet = '<mimetype>'.$value->GetMimeType().'</mimetype>';
-				$sRet .= '<filename>'.$value->GetFileName().'</filename>';
-				$sRet .= '<data>'.base64_encode($value->GetData()).'</data>';
-			}
-		}
-		return $sRet;
-	}
-
-	/**
-	 * Helper to get a value that will be JSON encoded
-	 * The operation is the opposite to FromJSONToValue	 
-	 */	 	
-	public function GetForJSON($value)
-	{
-		if ($value instanceOf ormDocument)
-		{
-			$aValues = array();
-			$aValues['data'] = base64_encode($value->GetData());
-			$aValues['mimetype'] = $value->GetMimeType();
-			$aValues['filename'] = $value->GetFileName();
-		}
-		else
-		{
-			$aValues = null;
-		}
-		return $aValues;
-	}
-
-	/**
-	 * Helper to form a value, given JSON decoded data
-	 * The operation is the opposite to GetForJSON	 
-	 */	 	
-	public function FromJSONToValue($json)
-	{
-		if (isset($json->data))
-		{
-			$data = base64_decode($json->data);
-			$value = new ormDocument($data, $json->mimetype, $json->filename);
-		}
-		else
-		{
-			$value = null;
-		}
-		return $value;
-	}
-	
-	public function Fingerprint($value)
-	{
-		$sFingerprint = '';
-		if ($value instanceOf ormDocument)
-		{
-			$sFingerprint = md5($value->GetData());
-		}
-		return $sFingerprint;		
-	}
-
-	static public function GetFormFieldClass()
-	{
-		return '\\Combodo\\iTop\\Form\\Field\\BlobField';
-	}
-
-	public function MakeFormField(DBObject $oObject, $oFormField = null)
-	{
-		if ($oFormField === null)
-		{
-			$sFormFieldClass = static::GetFormFieldClass();
-			$oFormField = new $sFormFieldClass($this->GetCode());
-		}
-
-		// Note: As of today we want this field to always be read-only
-		$oFormField->SetReadOnly(true);
-
-		// Generating urls
-		$value = $oObject->Get($this->GetCode());
-		$oFormField->SetDownloadUrl($value->GetDownloadURL(get_class($oObject), $oObject->GetKey(), $this->GetCode()));
-		$oFormField->SetDisplayUrl($value->GetDisplayURL(get_class($oObject), $oObject->GetKey(), $this->GetCode()));
-
-		parent::MakeFormField($oObject, $oFormField);
-
-		return $oFormField;
-	}
-
-}
-
-/**
- * An image is a specific type of document, it is stored as several columns in the database
- *
- * @package	 iTopORM
- */
-class AttributeImage extends AttributeBlob
-{
-	public function GetEditClass() {return "Image";}
-
-	/**
-	 * {@inheritDoc}
-	 * @see AttributeBlob::MakeRealValue()
-	 */
-	public function MakeRealValue($proposedValue, $oHostObj)
-	{
-		$oDoc = parent::MakeRealValue($proposedValue, $oHostObj);
-		// The validation of the MIME Type is done by CheckFormat below
-		return $oDoc;
-	}
-	
-	/**
-	 * Check that the supplied ormDocument actually contains an image
-	 * {@inheritDoc}
-	 * @see AttributeDefinition::CheckFormat()
-	 */
-	public function CheckFormat($value)
-	{
-		if ($value instanceof ormDocument && !$value->IsEmpty())
-		{
-			return ($value->GetMainMimeType() == 'image');
-		}
-		return true;
-	}
-	
-	public function GetAsHTML($value, $oHostObject = null, $bLocalize = true)
-	{
-		$iMaxWidthPx = $this->Get('display_max_width');
-		$iMaxHeightPx = $this->Get('display_max_height');
-		$sUrl = $this->Get('default_image');
-		$sRet = ($sUrl !== null) ? '<img src="'.$sUrl.'" style="max-width: '.$iMaxWidthPx.'px; max-height: '.$iMaxHeightPx.'px">' : '';
-		if (is_object($value) && !$value->IsEmpty())
-		{
-			if ($oHostObject->IsNew() || ($oHostObject->IsModified() && (array_key_exists($this->GetCode(), $oHostObject->ListChanges()))))
-			{
-				// If the object is modified (or not yet stored in the database) we must serve the content of the image directly inline
-				// otherwise (if we just give an URL) the browser will be given the wrong content... and may cache it
-				$sUrl = 'data:'.$value->GetMimeType().';base64,'.base64_encode($value->GetData());
-			}
-			else
-			{
-				$sUrl = $value->GetDownloadURL(get_class($oHostObject), $oHostObject->GetKey(), $this->GetCode());
-			}
-			$sRet = '<img src="'.$sUrl.'" style="max-width: '.$iMaxWidthPx.'px; max-height: '.$iMaxHeightPx.'px">';
-		}
-		return '<div class="view-image" style="width: '.$iMaxWidthPx.'px; height: '.$iMaxHeightPx.'px;"><span class="helper-middle"></span>'.$sRet.'</div>';
-	}
-
-    static public function GetFormFieldClass()
-    {
-        return '\\Combodo\\iTop\\Form\\Field\\ImageField';
-    }
-}
-/**
- * A stop watch is an ormStopWatch object, it is stored as several columns in the database  
- *
- * @package	 iTopORM
- */
-class AttributeStopWatch extends AttributeDefinition
-{
-	static public function ListExpectedParams()
-	{
-		// The list of thresholds must be an array of iPercent => array of 'option' => value
-		return array_merge(parent::ListExpectedParams(), array("states", "goal_computing", "working_time_computing", "thresholds"));
-	}
-
-	public function GetEditClass() {return "StopWatch";}
-
-	static public function IsBasedOnDBColumns() {return true;}
-	static public function IsScalar() {return true;}
-	public function IsWritable() {return true;}
-	public function GetDefaultValue(DBObject $oHostObject = null) {return $this->NewStopWatch();}
-
-	public function GetEditValue($value, $oHostObj = null)
-	{
-		return $value->GetTimeSpent();
-	}
-
-	public function GetStates()
-	{
-		return $this->Get('states');
-	}
-
-	public function AlwaysLoadInTables()
-	{
-		// Each and every stop watch is accessed for computing the highlight code (DBObject::GetHighlightCode())
-		return true;
-	}
-
-	/**
-	 * Construct a brand new (but configured) stop watch
-	 */	 	
-	public function NewStopWatch()
-	{
-		$oSW = new ormStopWatch();
-		foreach ($this->ListThresholds() as $iThreshold => $aFoo)
-		{
-			$oSW->DefineThreshold($iThreshold);
-		}
-		return $oSW;
-	}
-
-	// Facilitate things: allow the user to Set the value from a string
-	public function MakeRealValue($proposedValue, $oHostObj)
-	{
-		if (!$proposedValue instanceof ormStopWatch)
-		{
-			return $this->NewStopWatch();
-		}
-		return $proposedValue;
-	}
-
-	public function GetSQLExpressions($sPrefix = '')
-	{
-		if ($sPrefix == '')
-		{
-			$sPrefix = $this->GetCode(); // Warning: a stopwatch does not have any 'sql' property, so its SQL column is equal to its attribute code !!
-		}
-		$aColumns = array();
-		// Note: to optimize things, the existence of the attribute is determined by the existence of one column with an empty suffix
-		$aColumns[''] = $sPrefix.'_timespent';
-		$aColumns['_started'] = $sPrefix.'_started';
-		$aColumns['_laststart'] = $sPrefix.'_laststart';
-		$aColumns['_stopped'] = $sPrefix.'_stopped';
-		foreach ($this->ListThresholds() as $iThreshold => $aFoo)
-		{
-			$sThPrefix = '_'.$iThreshold;
-			$aColumns[$sThPrefix.'_deadline'] = $sPrefix.$sThPrefix.'_deadline';
-			$aColumns[$sThPrefix.'_passed'] = $sPrefix.$sThPrefix.'_passed';
-			$aColumns[$sThPrefix.'_triggered'] = $sPrefix.$sThPrefix.'_triggered';
-			$aColumns[$sThPrefix.'_overrun'] = $sPrefix.$sThPrefix.'_overrun';
-		}
-		return $aColumns;
-	}
-
-	public static function DateToSeconds($sDate)
-	{
-		if (is_null($sDate))
-		{
-			return null;
-		}
-		$oDateTime = new DateTime($sDate);
-		$iSeconds = $oDateTime->format('U');
-		return $iSeconds;
-	}
-
-	public static function SecondsToDate($iSeconds)
-	{
-		if (is_null($iSeconds))
-		{
-			return null;
-		}
-		return date("Y-m-d H:i:s", $iSeconds);
-	}
-
-	public function FromSQLToValue($aCols, $sPrefix = '')
-	{
-		$aExpectedCols = array($sPrefix, $sPrefix.'_started', $sPrefix.'_laststart', $sPrefix.'_stopped');
-		foreach ($this->ListThresholds() as $iThreshold => $aFoo)
-		{
-			$sThPrefix = '_'.$iThreshold;
-			$aExpectedCols[] = $sPrefix.$sThPrefix.'_deadline';
-			$aExpectedCols[] = $sPrefix.$sThPrefix.'_passed';
-			$aExpectedCols[] = $sPrefix.$sThPrefix.'_triggered';
-			$aExpectedCols[] = $sPrefix.$sThPrefix.'_overrun';
-		}
-		foreach ($aExpectedCols as $sExpectedCol)
-		{
-			if (!array_key_exists($sExpectedCol, $aCols))
-			{
-				$sAvailable = implode(', ', array_keys($aCols));
-				throw new MissingColumnException("Missing column '$sExpectedCol' from {$sAvailable}");
-			} 
-		}
-
-		$value = new ormStopWatch(
-			$aCols[$sPrefix],
-			self::DateToSeconds($aCols[$sPrefix.'_started']),
-			self::DateToSeconds($aCols[$sPrefix.'_laststart']),
-			self::DateToSeconds($aCols[$sPrefix.'_stopped'])
-		);
-
-		$aThresholds = array();
-		foreach ($this->ListThresholds() as $iThreshold => $aDefinition)
-		{
-			$sThPrefix = '_'.$iThreshold;
-			$value->DefineThreshold(
-				$iThreshold,
-				self::DateToSeconds($aCols[$sPrefix.$sThPrefix.'_deadline']),
-				(bool)($aCols[$sPrefix.$sThPrefix.'_passed'] == 1),
-				(bool)($aCols[$sPrefix.$sThPrefix.'_triggered'] == 1),
-				$aCols[$sPrefix.$sThPrefix.'_overrun'],
-				array_key_exists('highlight', $aDefinition) ? $aDefinition['highlight'] : null
-			);
-		}
-
-		return $value;
-	}
-
-	public function GetSQLValues($value)
-	{
-		if ($value instanceOf ormStopWatch)
-		{
-			$aValues = array();
-			$aValues[$this->GetCode().'_timespent'] = $value->GetTimeSpent();
-			$aValues[$this->GetCode().'_started'] = self::SecondsToDate($value->GetStartDate());
-			$aValues[$this->GetCode().'_laststart'] = self::SecondsToDate($value->GetLastStartDate());
-			$aValues[$this->GetCode().'_stopped'] = self::SecondsToDate($value->GetStopDate());
-
-			foreach ($this->ListThresholds() as $iThreshold => $aFoo)
-			{
-				$sPrefix = $this->GetCode().'_'.$iThreshold;
-				$aValues[$sPrefix.'_deadline'] = self::SecondsToDate($value->GetThresholdDate($iThreshold));
-				$aValues[$sPrefix.'_passed'] = $value->IsThresholdPassed($iThreshold) ? '1' : '0';
-				$aValues[$sPrefix.'_triggered'] = $value->IsThresholdTriggered($iThreshold) ? '1' : '0';
-				$aValues[$sPrefix.'_overrun'] = $value->GetOverrun($iThreshold);
-			}
-		}
-		else
-		{
-			$aValues = array();
-			$aValues[$this->GetCode().'_timespent'] = '';
-			$aValues[$this->GetCode().'_started'] = '';
-			$aValues[$this->GetCode().'_laststart'] = '';
-			$aValues[$this->GetCode().'_stopped'] = '';
-		}
-		return $aValues;
-	}
-
-	public function GetSQLColumns($bFullSpec = false)
-	{
-		$aColumns = array();
-		$aColumns[$this->GetCode().'_timespent'] = 'INT(11) UNSIGNED';
-		$aColumns[$this->GetCode().'_started'] = 'DATETIME';
-		$aColumns[$this->GetCode().'_laststart'] = 'DATETIME';
-		$aColumns[$this->GetCode().'_stopped'] = 'DATETIME';
-		foreach ($this->ListThresholds() as $iThreshold => $aFoo)
-		{
-			$sPrefix = $this->GetCode().'_'.$iThreshold;
-			$aColumns[$sPrefix.'_deadline'] = 'DATETIME';
-			$aColumns[$sPrefix.'_passed'] = 'TINYINT(1) UNSIGNED';
-			$aColumns[$sPrefix.'_triggered'] = 'TINYINT(1)';
-			$aColumns[$sPrefix.'_overrun'] = 'INT(11) UNSIGNED';
-		}
-		return $aColumns;
-	}
-
-	public function GetFilterDefinitions()
-	{
-		$aRes = array(
-			$this->GetCode() => new FilterFromAttribute($this),
-			$this->GetCode().'_started' => new FilterFromAttribute($this, '_started'),
-			$this->GetCode().'_laststart' => new FilterFromAttribute($this, '_laststart'),
-			$this->GetCode().'_stopped' => new FilterFromAttribute($this, '_stopped')
-		);
-		foreach ($this->ListThresholds() as $iThreshold => $aFoo)
-		{
-			$sPrefix = $this->GetCode().'_'.$iThreshold;
-			$aRes[$sPrefix.'_deadline'] = new FilterFromAttribute($this, '_deadline');
-			$aRes[$sPrefix.'_passed'] = new FilterFromAttribute($this, '_passed');
-			$aRes[$sPrefix.'_triggered'] = new FilterFromAttribute($this, '_triggered');
-			$aRes[$sPrefix.'_overrun'] = new FilterFromAttribute($this, '_overrun');
-		}
-		return $aRes;
-	}
-
-	public function GetBasicFilterOperators()
-	{
-		return array();
-	}
-	public function GetBasicFilterLooseOperator()
-	{
-		return '=';
-	}
-
-	public function GetBasicFilterSQLExpr($sOpCode, $value)
-	{
-		return 'true';
-	}
-
-	public function GetAsHTML($value, $oHostObject = null, $bLocalize = true)
-	{
-		if (is_object($value))
-		{
-			return $value->GetAsHTML($this, $oHostObject);
-		}
-	}
-
-	public function GetAsCSV($value, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
-	{
-		return $value->GetTimeSpent();
-	}
-	
-	public function GetAsXML($value, $oHostObject = null, $bLocalize = true)
-	{
-		return $value->GetTimeSpent();
-	}
-
-	public function ListThresholds()
-	{
-		return $this->Get('thresholds');
-	}
-	
-	public function Fingerprint($value)
-	{
-		$sFingerprint = '';
-		if (is_object($value))
-		{
-			$sFingerprint = $value->GetAsHTML($this);
-		}
-		return $sFingerprint;
-	}
-
-	/**
-	 * To expose internal values: Declare an attribute AttributeSubItem
-	 * and implement the GetSubItemXXXX verbs
-	 */	 	
-	public function GetSubItemSQLExpression($sItemCode)
-	{
-		$sPrefix = $this->GetCode();
-		switch($sItemCode)
-		{
-		case 'timespent':
-			return array('' => $sPrefix.'_timespent');
-		case 'started':
-			return array('' => $sPrefix.'_started');
-		case 'laststart':
-			return array('' => $sPrefix.'_laststart');
-		case 'stopped':
-			return array('' => $sPrefix.'_stopped');
-		}
-
-		foreach ($this->ListThresholds() as $iThreshold => $aFoo)
-		{
-			$sThPrefix = $iThreshold.'_';
-			if (substr($sItemCode, 0, strlen($sThPrefix)) == $sThPrefix)
-			{
-				// The current threshold is concerned
-				$sThresholdCode = substr($sItemCode, strlen($sThPrefix));
-				switch($sThresholdCode)
-				{
-				case 'deadline':
-					return array('' => $sPrefix.'_'.$iThreshold.'_deadline');
-				case 'passed':
-					return array('' => $sPrefix.'_'.$iThreshold.'_passed');
-				case 'triggered':
-					return array('' => $sPrefix.'_'.$iThreshold.'_triggered');
-				case 'overrun':
-					return array('' => $sPrefix.'_'.$iThreshold.'_overrun');
-				}
-			}
-		}
-		throw new CoreException("Unknown item code '$sItemCode' for attribute ".$this->GetHostClass().'::'.$this->GetCode());
-	}
-
-	public function GetSubItemValue($sItemCode, $value, $oHostObject = null)
-	{
-		$oStopWatch = $value;
-		switch($sItemCode)
-		{
-		case 'timespent':
-			return $oStopWatch->GetTimeSpent();
-		case 'started':
-			return $oStopWatch->GetStartDate();
-		case 'laststart':
-			return $oStopWatch->GetLastStartDate();
-		case 'stopped':
-			return $oStopWatch->GetStopDate();
-		}
-
-		foreach ($this->ListThresholds() as $iThreshold => $aFoo)
-		{
-			$sThPrefix = $iThreshold.'_';
-			if (substr($sItemCode, 0, strlen($sThPrefix)) == $sThPrefix)
-			{
-				// The current threshold is concerned
-				$sThresholdCode = substr($sItemCode, strlen($sThPrefix));
-				switch($sThresholdCode)
-				{
-				case 'deadline':
-					return $oStopWatch->GetThresholdDate($iThreshold);
-				case 'passed':
-					return $oStopWatch->IsThresholdPassed($iThreshold);
-				case 'triggered':
-					return $oStopWatch->IsThresholdTriggered($iThreshold);
-				case 'overrun':
-					return $oStopWatch->GetOverrun($iThreshold);
-				}
-			}
-		}
-
-		throw new CoreException("Unknown item code '$sItemCode' for attribute ".$this->GetHostClass().'::'.$this->GetCode());
-	}
-
-	protected function GetBooleanLabel($bValue)
-	{
-		$sDictKey = $bValue ? 'yes' : 'no';
-		return Dict::S('BooleanLabel:'.$sDictKey, 'def:'.$sDictKey);
-	}
-
-	public function GetSubItemAsHTMLForHistory($sItemCode, $sValue)
-	{
-		switch($sItemCode)
-		{
-		case 'timespent':
-			$sHtml = (int)$sValue ? Str::pure2html(AttributeDuration::FormatDuration($sValue)) : null;
-			break;
-		case 'started':
-		case 'laststart':
-		case 'stopped':
-			$sHtml = (int)$sValue ? date((string)AttributeDateTime::GetFormat(), (int)$sValue) : null;
-			break;
-
-		default:
-			foreach ($this->ListThresholds() as $iThreshold => $aFoo)
-			{
-				$sThPrefix = $iThreshold.'_';
-				if (substr($sItemCode, 0, strlen($sThPrefix)) == $sThPrefix)
-				{
-					// The current threshold is concerned
-					$sThresholdCode = substr($sItemCode, strlen($sThPrefix));
-					switch($sThresholdCode)
-					{
-					case 'deadline':
-						$sHtml = (int)$sValue ? date((string)AttributeDateTime::GetFormat(), (int)$sValue) : null;
-						break;
-					case 'passed':
-						$sHtml = $this->GetBooleanLabel((int)$sValue);
-						break;
-					case 'triggered':
-						$sHtml = $this->GetBooleanLabel((int)$sValue);
-						break;
-					case 'overrun':
-						$sHtml = (int)$sValue > 0 ? Str::pure2html(AttributeDuration::FormatDuration((int)$sValue)) : '';
-					}
-				}
-			}
-		}
-		return $sHtml;
-	}
-
-	public function GetSubItemAsPlainText($sItemCode, $value)
-	{
-		$sRet = $value;
-
-		switch ($sItemCode)
-		{
-			case 'timespent':
-				$sRet = AttributeDuration::FormatDuration($value);
-				break;
-			case 'started':
-			case 'laststart':
-			case 'stopped':
-				if (is_null($value))
-				{
-					$sRet = ''; // Undefined
-				}
-				else
-				{
-					$oDateTime = new DateTime();
-					$oDateTime->setTimestamp($value);
-					$oDateTimeFormat = AttributeDateTime::GetFormat();
-					$sRet = $oDateTimeFormat->Format($oDateTime);
-				}
-				break;
-
-			default:
-				foreach ($this->ListThresholds() as $iThreshold => $aFoo)
-				{
-					$sThPrefix = $iThreshold . '_';
-					if (substr($sItemCode, 0, strlen($sThPrefix)) == $sThPrefix)
-					{
-						// The current threshold is concerned
-						$sThresholdCode = substr($sItemCode, strlen($sThPrefix));
-						switch ($sThresholdCode)
-						{
-							case 'deadline':
-								if ($value)
-								{
-									$sDate = date(AttributeDateTime::GetInternalFormat(), $value);
-									$sRet = AttributeDeadline::FormatDeadline($sDate);
-								}
-								else
-								{
-									$sRet = '';
-								}
-								break;
-							case 'passed':
-							case 'triggered':
-								$sRet = $this->GetBooleanLabel($value);
-								break;
-							case 'overrun':
-								$sRet = AttributeDuration::FormatDuration($value);
-								break;
-						}
-					}
-				}
-		}
-		return $sRet;
-	}
-
-	public function GetSubItemAsHTML($sItemCode, $value)
-	{
-		$sHtml = $value;
-
-		switch ($sItemCode)
-		{
-			case 'timespent':
-				$sHtml = Str::pure2html(AttributeDuration::FormatDuration($value));
-				break;
-			case 'started':
-			case 'laststart':
-			case 'stopped':
-				if (is_null($value))
-				{
-					$sHtml = ''; // Undefined
-				}
-				else
-				{
-					$oDateTime = new DateTime();
-					$oDateTime->setTimestamp($value);
-					$oDateTimeFormat = AttributeDateTime::GetFormat();
-					$sHtml = Str::pure2html($oDateTimeFormat->Format($oDateTime));
-				}
-				break;
-
-			default:
-				foreach ($this->ListThresholds() as $iThreshold => $aFoo)
-				{
-					$sThPrefix = $iThreshold . '_';
-					if (substr($sItemCode, 0, strlen($sThPrefix)) == $sThPrefix)
-					{
-						// The current threshold is concerned
-						$sThresholdCode = substr($sItemCode, strlen($sThPrefix));
-						switch ($sThresholdCode)
-						{
-							case 'deadline':
-								if ($value)
-								{
-									$sDate = date(AttributeDateTime::GetInternalFormat(), $value);
-									$sHtml = Str::pure2html(AttributeDeadline::FormatDeadline($sDate));
-								}
-								else
-								{
-									$sHtml = '';
-								}
-								break;
-							case 'passed':
-							case 'triggered':
-								$sHtml = $this->GetBooleanLabel($value);
-								break;
-							case 'overrun':
-								$sHtml = Str::pure2html(AttributeDuration::FormatDuration($value));
-								break;
-						}
-					}
-				}
-		}
-		return $sHtml;
-	}
-
-	public function GetSubItemAsCSV($sItemCode, $value, $sSeparator = ',', $sTextQualifier = '"', $bConvertToPlainText = false)
-	{
-		$sFrom = array("\r\n", $sTextQualifier);
-		$sTo = array("\n", $sTextQualifier.$sTextQualifier);
-		$sEscaped = str_replace($sFrom, $sTo, (string)$value);
-		$sRet = $sTextQualifier.$sEscaped.$sTextQualifier;
-
-		switch($sItemCode)
-		{
-		case 'timespent':
-				$sRet = $sTextQualifier . AttributeDuration::FormatDuration($value) . $sTextQualifier;
-				break;
-		case 'started':
-		case 'laststart':
-		case 'stopped':
-				if ($value !== null)
-				{
-					$oDateTime = new DateTime();
-					$oDateTime->setTimestamp($value);
-					$oDateTimeFormat = AttributeDateTime::GetFormat();
-					$sRet = $sTextQualifier . $oDateTimeFormat->Format($oDateTime) . $sTextQualifier;
-				}
-				break;
-
-		default:
-			foreach ($this->ListThresholds() as $iThreshold => $aFoo)
-			{
-				$sThPrefix = $iThreshold.'_';
-				if (substr($sItemCode, 0, strlen($sThPrefix)) == $sThPrefix)
-				{
-					// The current threshold is concerned
-					$sThresholdCode = substr($sItemCode, strlen($sThPrefix));
-					switch($sThresholdCode)
-					{
-						case 'deadline':
-								if ($value != '')
-								{
-									$oDateTime = new DateTime();
-									$oDateTime->setTimestamp($value);
-									$oDateTimeFormat = AttributeDateTime::GetFormat();
-									$sRet = $sTextQualifier . $oDateTimeFormat->Format($oDateTime) . $sTextQualifier;
-								}
-								break;
-
-							case 'passed':
-							case 'triggered':
-								$sRet = $sTextQualifier . $this->GetBooleanLabel($value) . $sTextQualifier;
-								break;
-
-							case 'overrun':
-								$sRet = $sTextQualifier . AttributeDuration::FormatDuration($value) . $sTextQualifier;
-								break;
-						}
-				}
-			}
-		}
-		return $sRet;
-	}
-
-	public function GetSubItemAsXML($sItemCode, $value)
-	{
-		$sRet = Str::pure2xml((string)$value);
-
-		switch($sItemCode)
-		{
-		case 'timespent':
-		case 'started':
-		case 'laststart':
-		case 'stopped':
-				break;
-
-		default:
-			foreach ($this->ListThresholds() as $iThreshold => $aFoo)
-			{
-				$sThPrefix = $iThreshold.'_';
-				if (substr($sItemCode, 0, strlen($sThPrefix)) == $sThPrefix)
-				{
-					// The current threshold is concerned
-					$sThresholdCode = substr($sItemCode, strlen($sThPrefix));
-					switch($sThresholdCode)
-					{
-					case 'deadline':
-						break;
-
-					case 'passed':
-					case 'triggered':
-						$sRet = $this->GetBooleanLabel($value);
-						break;
-
-					case 'overrun':
-						break;
-					}
-				}
-			}
-		}
-		return $sRet;
-	}
-
-	/**
-	 * Implemented for the HTML spreadsheet format!	
-	 */	
-	public function GetSubItemAsEditValue($sItemCode, $value)
-	{
-		$sRet = $value;
-
-		switch($sItemCode)
-		{
-		case 'timespent':
-			break;
-
-		case 'started':
-		case 'laststart':
-		case 'stopped':
-			if (is_null($value))
-			{
-				$sRet = ''; // Undefined
-			}
-			else
-			{
-				$sRet = date((string)AttributeDateTime::GetFormat(), $value);
-			}
-			break;
-
-		default:
-			foreach ($this->ListThresholds() as $iThreshold => $aFoo)
-			{
-				$sThPrefix = $iThreshold.'_';
-				if (substr($sItemCode, 0, strlen($sThPrefix)) == $sThPrefix)
-				{
-					// The current threshold is concerned
-					$sThresholdCode = substr($sItemCode, strlen($sThPrefix));
-					switch($sThresholdCode)
-					{
-					case 'deadline':
-						if ($value)
-						{
-							$sRet = date((string)AttributeDateTime::GetFormat(), $value);
-						}
-						else
-						{
-							$sRet = '';
-						}
-						break;
-					case 'passed':
-					case 'triggered':
-						$sRet = $this->GetBooleanLabel($value);
-						break;
-					case 'overrun':
-						break;
-					}
-				}
-			}
-		}
-		return $sRet;
-	}
-}
-
-/**
- * View of a subvalue of another attribute
- * If an attribute implements the verbs GetSubItem.... then it can expose
- * internal values, each of them being an attribute and therefore they
- * can be displayed at different times in the object lifecycle, and used for
- * reporting (as a condition in OQL, or as an additional column in an export)  
- * Known usages: Stop Watches can expose threshold statuses
- */
-class AttributeSubItem extends AttributeDefinition
-{
-	static public function ListExpectedParams()
-	{
-		return array_merge(parent::ListExpectedParams(), array('target_attcode', 'item_code'));
-	}
-
-	public function GetParentAttCode() {return $this->Get("target_attcode");} 
-
-	/**
-	 * Helper : get the attribute definition to which the execution will be forwarded	
-	 */	
-	public function GetTargetAttDef()
-	{
-		$sClass = $this->GetHostClass();
-		$oParentAttDef = MetaModel::GetAttributeDef($sClass, $this->Get('target_attcode'));
-		return $oParentAttDef;
-	}
-
-	public function GetEditClass() {return "";}
-	
-	public function GetValuesDef() {return null;}
-
-	static public function IsBasedOnDBColumns() {return true;}
-	static public function IsScalar() {return true;}
-	public function IsWritable() {return false;}
-	public function GetDefaultValue(DBObject $oHostObject = null) {return null;}
-//	public function IsNullAllowed() {return false;}
-
-	static public function LoadInObject() {return false;} // if this verb returns false, then GetValue must be implemented
-
-	/**
-	 * Used by DBOBject::Get()
-	 */
-	public function GetValue($oHostObject)
-	{
-		$oParent = $this->GetTargetAttDef();
-		$parentValue = $oHostObject->GetStrict($oParent->GetCode());
-		$res = $oParent->GetSubItemValue($this->Get('item_code'), $parentValue, $oHostObject);
-		return $res;
-	}
-
-	// 
-//	protected function ScalarToSQL($value) {return $value;} // format value as a valuable SQL literal (quoted outside)
-
-	public function FromSQLToValue($aCols, $sPrefix = '')
-	{
-	}
-
-	public function GetSQLColumns($bFullSpec = false)
-	{
-		return array();
-	}
-
-	public function GetFilterDefinitions()
-	{
-		return array($this->GetCode() => new FilterFromAttribute($this));
-	}
-
-	public function GetBasicFilterOperators()
-	{
-		return array();
-	}
-	public function GetBasicFilterLooseOperator()
-	{
-		return "=";
-	}
-
-	public function GetBasicFilterSQLExpr($sOpCode, $value)
-	{
-		$sQValue = CMDBSource::Quote($value);
-		switch ($sOpCode)
-		{
-		case '!=':
-			return $this->GetSQLExpr()." != $sQValue";
-			break;
-		case '=':
-		default:
-			return $this->GetSQLExpr()." = $sQValue";
-		}
-	} 
-
-	public function GetSQLExpressions($sPrefix = '')
-	{
-		$oParent = $this->GetTargetAttDef();
-		$res = $oParent->GetSubItemSQLExpression($this->Get('item_code'));
-		return $res;
-	}
-
-	public function GetAsPlainText($value, $oHostObject = null, $bLocalize = true)
-	{
-		$oParent = $this->GetTargetAttDef();
-		$res = $oParent->GetSubItemAsPlainText($this->Get('item_code'), $value);
-		return $res;
-	}
-
-	public function GetAsHTML($value, $oHostObject = null, $bLocalize = true)
-	{
-		$oParent = $this->GetTargetAttDef();
-		$res = $oParent->GetSubItemAsHTML($this->Get('item_code'), $value);
-		return $res;
-	}
-
-	public function GetAsHTMLForHistory($value, $oHostObject = null, $bLocalize = true)
-	{
-		$oParent = $this->GetTargetAttDef();
-		$res = $oParent->GetSubItemAsHTMLForHistory($this->Get('item_code'), $value);
-		return $res;
-	}
-
-	public function GetAsCSV($value, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
-	{
-		$oParent = $this->GetTargetAttDef();
-		$res = $oParent->GetSubItemAsCSV($this->Get('item_code'), $value, $sSeparator, $sTextQualifier, $bConvertToPlainText);
-		return $res;
-	}
-	
-	public function GetAsXML($value, $oHostObject = null, $bLocalize = true)
-	{
-		$oParent = $this->GetTargetAttDef();
-		$res = $oParent->GetSubItemAsXML($this->Get('item_code'), $value);
-		return $res;
-	}
-
-	/**
-	 * As of now, this function must be implemented to have the value in spreadsheet format
-	 */	 	
-	public function GetEditValue($value, $oHostObj = null)
-	{
-		$oParent = $this->GetTargetAttDef();
-		$res = $oParent->GetSubItemAsEditValue($this->Get('item_code'), $value);
-		return $res;
-	}
-	
-	public function IsPartOfFingerprint()
-	{
-		return false;
-	}
-
-	static public function GetFormFieldClass()
-	{
-		return '\\Combodo\\iTop\\Form\\Field\\LabelField';
-	}
-
-	public function MakeFormField(DBObject $oObject, $oFormField = null)
-	{
-		if ($oFormField === null)
-		{
-			$sFormFieldClass = static::GetFormFieldClass();
-			$oFormField = new $sFormFieldClass($this->GetCode());
-		}
-		parent::MakeFormField($oObject, $oFormField);
-
-		// Note : As of today, this attribute is -by nature- only supported in readonly mode, not edition
-		$sAttCode = $this->GetCode();
-		$oFormField->SetCurrentValue(html_entity_decode($oObject->GetAsHTML($sAttCode), ENT_QUOTES, 'UTF-8'));
-		$oFormField->SetReadOnly(true);
-
-		return $oFormField;
-	}
-
-}
-
-/**
- * One way encrypted (hashed) password
- */
-class AttributeOneWayPassword extends AttributeDefinition
-{
-	static public function ListExpectedParams()
-	{
-		return array_merge(parent::ListExpectedParams(), array("depends_on"));
-	}
-
-	public function GetEditClass() {return "One Way Password";}
-
-	static public function IsBasedOnDBColumns() {return true;}
-	static public function IsScalar() {return true;}
-	public function IsWritable() {return true;}
-	public function GetDefaultValue(DBObject $oHostObject = null) {return "";}
-	public function IsNullAllowed() {return $this->GetOptional("is_null_allowed", false);}
-
-	// Facilitate things: allow the user to Set the value from a string or from an ormPassword (already encrypted)
-	public function MakeRealValue($proposedValue, $oHostObj)
-	{
-		$oPassword = $proposedValue;
-		if (is_object($oPassword))
-		{
-			$oPassword = clone $proposedValue;
-		}
-		else
-		{
-			$oPassword = new ormPassword('', '');
-			$oPassword->SetPassword($proposedValue);
-		}
-		return $oPassword;
-	}
-
-	public function GetSQLExpressions($sPrefix = '')
-	{
-		if ($sPrefix == '')
-		{
-			$sPrefix = $this->GetCode(); // Warning: AttributeOneWayPassword does not have any sql property so code = sql !
-		}
-		$aColumns = array();
-		// Note: to optimize things, the existence of the attribute is determined by the existence of one column with an empty suffix
-		$aColumns[''] = $sPrefix.'_hash';
-		$aColumns['_salt'] = $sPrefix.'_salt';
-		return $aColumns;
-	}
-
-	public function FromSQLToValue($aCols, $sPrefix = '')
-	{
-		if (!array_key_exists($sPrefix, $aCols))
-		{
-			$sAvailable = implode(', ', array_keys($aCols));
-			throw new MissingColumnException("Missing column '$sPrefix' from {$sAvailable}");
-		} 
-		$hashed = isset($aCols[$sPrefix]) ? $aCols[$sPrefix] : '';
-
-		if (!array_key_exists($sPrefix.'_salt', $aCols)) 
-		{
-			$sAvailable = implode(', ', array_keys($aCols));
-			throw new MissingColumnException("Missing column '".$sPrefix."_salt' from {$sAvailable}");
-		} 
-		$sSalt = isset($aCols[$sPrefix.'_salt']) ? $aCols[$sPrefix.'_salt'] : '';
-
-		$value = new ormPassword($hashed, $sSalt);
-		return $value;
-	}
-
-	public function GetSQLValues($value)
-	{
-		// #@# Optimization: do not load blobs anytime
-		//	 As per mySQL doc, selecting blob columns will prevent mySQL from
-		//	 using memory in case a temporary table has to be created
-		//	 (temporary tables created on disk)
-		//	 We will have to remove the blobs from the list of attributes when doing the select
-		//	 then the use of Get() should finalize the load
-		if ($value instanceOf ormPassword)
-		{
-			$aValues = array();
-			$aValues[$this->GetCode().'_hash'] = $value->GetHash();
-			$aValues[$this->GetCode().'_salt'] = $value->GetSalt();
-		}
-		else
-		{
-			$aValues = array();
-			$aValues[$this->GetCode().'_hash'] = '';
-			$aValues[$this->GetCode().'_salt'] = '';
-		}
-		return $aValues;
-	}
-
-	public function GetSQLColumns($bFullSpec = false)
-	{
-		$aColumns = array();
-		$aColumns[$this->GetCode().'_hash'] = 'TINYBLOB';
-		$aColumns[$this->GetCode().'_salt'] = 'TINYBLOB';
-		return $aColumns;
-	}
-
-	public function GetImportColumns()
-	{
-		$aColumns = array();
-		$aColumns[$this->GetCode()] = 'TINYTEXT';
-		return $aColumns;
-	}
-
-	public function FromImportToValue($aCols, $sPrefix = '')
-	{
-		if (!isset($aCols[$sPrefix]))
-		{
-			$sAvailable = implode(', ', array_keys($aCols));
-			throw new MissingColumnException("Missing column '$sPrefix' from {$sAvailable}");
-		} 
-		$sClearPwd = $aCols[$sPrefix];
-
-		$oPassword = new ormPassword('', '');
-		$oPassword->SetPassword($sClearPwd);
-		return $oPassword;
-	}
-
-	public function GetFilterDefinitions()
-	{
-		return array();
-		// still not working... see later...
-	}
-
-	public function GetBasicFilterOperators()
-	{
-		return array();
-	}
-	public function GetBasicFilterLooseOperator()
-	{
-		return '=';
-	}
-
-	public function GetBasicFilterSQLExpr($sOpCode, $value)
-	{
-		return 'true';
-	} 
-
-	public function GetAsHTML($value, $oHostObject = null, $bLocalize = true)
-	{
-		if (is_object($value))
-		{
-			return $value->GetAsHTML();
-		}
-	}
-
-	public function GetAsCSV($sValue, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
-	{
-		return ''; // Not exportable in CSV
-	}
-	
-	public function GetAsXML($value, $oHostObject = null, $bLocalize = true)
-	{
-		return ''; // Not exportable in XML
-	}
-	
-	public function GetValueLabel($sValue, $oHostObj = null)
-	{
-		// Don't display anything in "group by" reports
-		return '*****';
-	}
-	
-}
-
-// Indexed array having two dimensions
-class AttributeTable extends AttributeDBField
-{
-	public function GetEditClass() {return "Table";}
-	protected function GetSQLCol($bFullSpec = false) {return "LONGTEXT";}
-
-	public function GetMaxSize()
-	{
-		return null;
-	}
-
-	public function GetNullValue()
-	{
-		return array();
-	} 
-
-	public function IsNull($proposedValue)
-	{
-		return (count($proposedValue) == 0);
-	} 
-
-	public function GetEditValue($sValue, $oHostObj = null)
-	{
-		return '';
-	}
-
-	// Facilitate things: allow the user to Set the value from a string
-	public function MakeRealValue($proposedValue, $oHostObj)
-	{
-		if (is_null($proposedValue))
-		{
-			return array();
-		}
-		else if (!is_array($proposedValue))
-		{
-			return array(0 => array(0 => $proposedValue));
-		}
-		return $proposedValue;
-	}
-
-	public function FromSQLToValue($aCols, $sPrefix = '')
-	{
-		try
-		{
-			$value = @unserialize($aCols[$sPrefix.'']);
-			if ($value === false)
-			{
-				$value = $this->MakeRealValue($aCols[$sPrefix.''], null);
-			}
-		}
-		catch(Exception $e)
-		{
-			$value = $this->MakeRealValue($aCols[$sPrefix.''], null);
-		}
-
-		return $value;
-	}
-
-	public function GetSQLValues($value)
-	{
-		$aValues = array();
-		$aValues[$this->Get("sql")] = serialize($value);
-		return $aValues;
-	}
-
-	public function GetAsHTML($value, $oHostObject = null, $bLocalize = true)
-	{
-		if (!is_array($value))
-		{
-			throw new CoreException('Expecting an array', array('found' => get_class($value)));
-		}
-		if (count($value) == 0)
-		{
-			return "";
-		}
-
-		$sRes = "<TABLE class=\"listResults\">";
-		$sRes .= "<TBODY>";
-		foreach($value as $iRow => $aRawData)
-		{
-			$sRes .= "<TR>";
-			foreach ($aRawData as $iCol => $cell)
-			{
-				// Note: avoid the warning in case the cell is made of an array
-				$sCell = @Str::pure2html((string)$cell);
-				$sCell = str_replace("\n", "<br>\n", $sCell);
-				$sRes .= "<TD>$sCell</TD>";
-			}
-			$sRes .= "</TR>";
-		}
-		$sRes .= "</TBODY>";
-		$sRes .= "</TABLE>";
-		return $sRes;
-	}
-
-	public function GetAsCSV($sValue, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
-	{
-		// Not implemented
-		return '';
-	}
-
-	public function GetAsXML($value, $oHostObject = null, $bLocalize = true)
-	{
-		if (count($value) == 0)
-		{
-			return "";
-		}
-
-		$sRes = "";
-		foreach($value as $iRow => $aRawData)
-		{
-			$sRes .= "<row>";
-			foreach ($aRawData as $iCol => $cell)
-			{
-				$sCell = Str::pure2xml((string)$cell);
-				$sRes .= "<cell icol=\"$iCol\">$sCell</cell>";
-			}
-			$sRes .= "</row>";
-		}
-		return $sRes;
-	}
-}
-
-// The PHP value is a hash array, it is stored as a TEXT column
-class AttributePropertySet extends AttributeTable
-{
-	public function GetEditClass() {return "PropertySet";}
-
-	// Facilitate things: allow the user to Set the value from a string
-	public function MakeRealValue($proposedValue, $oHostObj)
-	{
-		if (!is_array($proposedValue))
-		{
-			return array('?' => (string)$proposedValue);
-		}
-		return $proposedValue;
-	}
-
-	public function GetAsHTML($value, $oHostObject = null, $bLocalize = true)
-	{
-		if (!is_array($value))
-		{
-			throw new CoreException('Expecting an array', array('found' => get_class($value)));
-		}
-		if (count($value) == 0)
-		{
-			return "";
-		}
-
-		$sRes = "<TABLE class=\"listResults\">";
-		$sRes .= "<TBODY>";
-		foreach($value as $sProperty => $sValue)
-		{
-			if ($sProperty == 'auth_pwd')
-			{
-				$sValue = '*****';
-			}
-			$sRes .= "<TR>";
-			$sCell = str_replace("\n", "<br>\n", Str::pure2html((string)$sValue));
-			$sRes .= "<TD class=\"label\">$sProperty</TD><TD>$sCell</TD>";
-			$sRes .= "</TR>";
-		}
-		$sRes .= "</TBODY>";
-		$sRes .= "</TABLE>";
-		return $sRes;
-	}
-
-	public function GetAsCSV($value, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
-	{
-		if (count($value) == 0)
-		{
-			return "";
-		}
-
-		$aRes = array();
-		foreach($value as $sProperty => $sValue)
-		{
-			if ($sProperty == 'auth_pwd')
-			{
-				$sValue = '*****';
-			}
-			$sFrom = array(',', '=');
-			$sTo = array('\,', '\=');
-			$aRes[] = $sProperty.'='.str_replace($sFrom, $sTo, (string)$sValue);
-		}
-		$sRaw = implode(',', $aRes);
-
-		$sFrom = array("\r\n", $sTextQualifier);
-		$sTo = array("\n", $sTextQualifier.$sTextQualifier);
-		$sEscaped = str_replace($sFrom, $sTo, $sRaw);
-		return $sTextQualifier.$sEscaped.$sTextQualifier;
-	}
-
-	public function GetAsXML($value, $oHostObject = null, $bLocalize = true)
-	{
-		if (count($value) == 0)
-		{
-			return "";
-		}
-
-		$sRes = "";
-		foreach($value as $sProperty => $sValue)
-		{
-			if ($sProperty == 'auth_pwd')
-			{
-				$sValue = '*****';
-			}
-			$sRes .= "<property id=\"$sProperty\">";
-			$sRes .= Str::pure2xml((string)$sValue);
-			$sRes .= "</property>";
-		}
-		return $sRes;
-	}
-}
-
-/**
- * The attribute dedicated to the friendly name automatic attribute (not written) 
- *
- * @package	 iTopORM
- */
-
-/**
- * The attribute dedicated to the friendly name automatic attribute (not written) 
- *
- * @package	 iTopORM
- */
-class AttributeFriendlyName extends AttributeDefinition
-{
-	public function __construct($sCode)
-	{
-		$this->m_sCode = $sCode;
-		$aParams = array();
-		$aParams["default_value"] = '';
-		parent::__construct($sCode, $aParams);
-
-		$this->m_sValue = $this->Get("default_value");
-	}
-
-
-	public function GetEditClass() {return "";}
-
-	public function GetValuesDef() {return null;}
-	public function GetPrerequisiteAttributes($sClass = null) {return $this->GetOptional("depends_on", array());}
-
-	static public function IsScalar() {return true;}
-	public function IsNullAllowed() {return false;}
-
-	public function GetSQLExpressions($sPrefix = '')
-	{
-		if ($sPrefix == '')
-		{
-			$sPrefix = $this->GetCode(); // Warning AttributeComputedFieldVoid does not have any sql property
-		}
-		return array('' => $sPrefix);
-	}
-
-	static public function IsBasedOnOQLExpression() {return true;}
-	public function GetOQLExpression()
-	{
-		return MetaModel::GetNameExpression($this->GetHostClass());
-	}
-
-	public function GetLabel($sDefault = null)
-	{
-		$sLabel = parent::GetLabel('');
-		if (strlen($sLabel) == 0)
-		{
-			$sLabel = Dict::S('Core:FriendlyName-Label');
-		}
-		return $sLabel;
-	}
-	public function GetDescription($sDefault = null)
-	{
-		$sLabel = parent::GetDescription('');
-		if (strlen($sLabel) == 0)
-		{
-			$sLabel = Dict::S('Core:FriendlyName-Description');
-		}
-		return $sLabel;
-	} 
-
-	public function FromSQLToValue($aCols, $sPrefix = '')
-	{
- 		$sValue = $aCols[$sPrefix];
-		return $sValue;
-	}
-
-	public function IsWritable()
-	{
-		return false;
-	}
-	public function IsMagic()
-	{
-		return true;
-	}
-
-	static public function IsBasedOnDBColumns()
-	{
-		return false;
-	}
-
-	public function SetFixedValue($sValue)
-	{
-		$this->m_sValue = $sValue;
-	}
-	public function GetDefaultValue(DBObject $oHostObject = null)
-	{
-		return $this->m_sValue;
-	}
-
-	public function GetAsHTML($sValue, $oHostObject = null, $bLocalize = true)
-	{
-		return Str::pure2html((string)$sValue);
-	}
-
-	public function GetAsCSV($sValue, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
-	{
-		$sFrom = array("\r\n", $sTextQualifier);
-		$sTo = array("\n", $sTextQualifier.$sTextQualifier);
-		$sEscaped = str_replace($sFrom, $sTo, (string)$sValue);
-		return $sTextQualifier.$sEscaped.$sTextQualifier;
-	}
-
-	static function GetFormFieldClass()
-	{
-		return '\\Combodo\\iTop\\Form\\Field\\StringField';
-	}
-
-	public function MakeFormField(DBObject $oObject, $oFormField = null)
-	{
-		if ($oFormField === null)
-		{
-			$sFormFieldClass = static::GetFormFieldClass();
-			$oFormField = new $sFormFieldClass($this->GetCode());
-		}
-		$oFormField->SetReadOnly(true);
-		parent::MakeFormField($oObject, $oFormField);
-
-		return $oFormField;
-	}
-
-	// Do not display friendly names in the history of change
-	public function DescribeChangeAsHTML($sOldValue, $sNewValue, $sLabel = null)
-	{
-		return '';
-	}
-
-	public function GetFilterDefinitions()
-	{
-		return array($this->GetCode() => new FilterFromAttribute($this));
-	}
-
-	public function GetBasicFilterOperators()
-	{
-		return array("="=>"equals", "!="=>"differs from");
-	}
-
-	public function GetBasicFilterLooseOperator()
-	{
-		return "Contains";
-	}
-
-	public function GetBasicFilterSQLExpr($sOpCode, $value)
-	{
-		$sQValue = CMDBSource::Quote($value);
-		switch ($sOpCode)
-		{
-		case '=':
-		case '!=':
-			return $this->GetSQLExpr()." $sOpCode $sQValue";
-		case 'Contains':
-			return $this->GetSQLExpr()." LIKE ".CMDBSource::Quote("%$value%");
-		case 'NotLike':
-			return $this->GetSQLExpr()." NOT LIKE $sQValue";
-		case 'Like':
-		default:
-			return $this->GetSQLExpr()." LIKE $sQValue";
-		}
-	}
-	
-	public function IsPartOfFingerprint() { return false; }
-}
-
-/**
- * Holds the setting for the redundancy on a specific relation
- * Its value is a string, containing either:
- * - 'disabled'
- * - 'n', where n is a positive integer value giving the minimum count of items upstream
- * - 'n%', where n is a positive integer value, giving the minimum as a percentage of the total count of items upstream
- *
- * @package	 iTopORM
- */
-class AttributeRedundancySettings extends AttributeDBField
-{
-	static public function ListExpectedParams()
-	{
-		return array('sql', 'relation_code', 'from_class', 'neighbour_id', 'enabled', 'enabled_mode', 'min_up', 'min_up_type', 'min_up_mode');
-	}
-
-	public function GetValuesDef() {return null;} 
-	public function GetPrerequisiteAttributes($sClass = null) {return array();}
-
-	public function GetEditClass() {return "RedundancySetting";}
-	protected function GetSQLCol($bFullSpec = false)
-	{
-		return "VARCHAR(20)".($bFullSpec ? $this->GetSQLColSpec() : '');
-	}
-
-
-	public function GetValidationPattern()
-	{
-		return "^[0-9]{1,3}|[0-9]{1,2}%|disabled$";
-	}
-
-	public function GetMaxSize()
-	{
-		return 20;
-	}
-
-	public function GetDefaultValue(DBObject $oHostObject = null)
-	{
-		$sRet = 'disabled';
-		if ($this->Get('enabled'))
-		{
-			if ($this->Get('min_up_type') == 'count')
-			{
-				$sRet = (string) $this->Get('min_up');
-			}
-			else // percent
-			{
-				$sRet = $this->Get('min_up').'%';
-			}
-		}
-		return $sRet;
-	}
-
-	public function IsNullAllowed()
-	{
-		return false;
-	} 
-
-	public function GetNullValue()
-	{
-		return '';
-	} 
-
-	public function IsNull($proposedValue)
-	{
-		return ($proposedValue == '');
-	} 
-
-	public function MakeRealValue($proposedValue, $oHostObj)
-	{
-		if (is_null($proposedValue)) return '';
-		return (string)$proposedValue;
-	}
-
-	public function ScalarToSQL($value)
-	{
-		if (!is_string($value))
-		{
-			throw new CoreException('Expected the attribute value to be a string', array('found_type' => gettype($value), 'value' => $value, 'class' => $this->GetHostClass(), 'attribute' => $this->GetCode()));
-		}
-		return $value;
-	}
-
-	public function GetRelationQueryData()
-	{
-		foreach (MetaModel::EnumRelationQueries($this->GetHostClass(), $this->Get('relation_code'), false) as $sDummy => $aQueryInfo)
-		{
-			if ($aQueryInfo['sFromClass'] == $this->Get('from_class'))
-			{
-				if ($aQueryInfo['sNeighbour'] == $this->Get('neighbour_id'))
-				{
-					return $aQueryInfo;
-				}
-			}
-		}
-	}
-
-	/**
-	 * Find the user option label
-	 * @param user option : disabled|cout|percent	 	
-	 */	
-	public function GetUserOptionFormat($sUserOption, $sDefault = null)
-	{
-		$sLabel = $this->SearchLabel('/Attribute:'.$this->m_sCode.'/'.$sUserOption, null, true /*user lang*/);
-		if (is_null($sLabel))
-		{
-			// If no default value is specified, let's define the most relevant one for developping purposes
-			if (is_null($sDefault))
-			{
-				$sDefault = str_replace('_', ' ', $this->m_sCode.':'.$sUserOption.'(%1$s)');
-			}
-			// Browse the hierarchy again, accepting default (english) translations
-			$sLabel = $this->SearchLabel('/Attribute:'.$this->m_sCode.'/'.$sUserOption, $sDefault, false);
-		}
-		return $sLabel;
-	}
-
-	/**
-	 * Override to display the value in the GUI
-	 */	
-	public function GetAsHTML($sValue, $oHostObject = null, $bLocalize = true)
-	{
-		$sCurrentOption = $this->GetCurrentOption($sValue);
-		$sClass = $oHostObject ? get_class($oHostObject) : $this->m_sHostClass;
-		return sprintf($this->GetUserOptionFormat($sCurrentOption), $this->GetMinUpValue($sValue), MetaModel::GetName($sClass));
-	}
-
-	public function GetAsCSV($sValue, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
-	{
-		$sFrom = array("\r\n", $sTextQualifier);
-		$sTo = array("\n", $sTextQualifier.$sTextQualifier);
-		$sEscaped = str_replace($sFrom, $sTo, (string)$sValue);
-		return $sTextQualifier.$sEscaped.$sTextQualifier;
-	}
-
-	/**
-	 * Helper to interpret the value, given the current settings and string representation of the attribute	
-	 */	
-	public function IsEnabled($sValue)
-	{
-		if ($this->get('enabled_mode') == 'fixed')
-		{
-			$bRet = $this->get('enabled');
-		}
-		else
-		{
-			$bRet = ($sValue != 'disabled');
-		}
-		return $bRet;
-	}
-
-	/**
-	 * Helper to interpret the value, given the current settings and string representation of the attribute	
-	 */	
-	public function GetMinUpType($sValue)
-	{
-		if ($this->get('min_up_mode') == 'fixed')
-		{
-			$sRet = $this->get('min_up_type');
-		}
-		else
-		{
-			$sRet = 'count';
-			if (substr(trim($sValue), -1, 1) == '%')
-			{
-				$sRet = 'percent';
-			}
-		}
-		return $sRet;
-	}
-
-	/**
-	 * Helper to interpret the value, given the current settings and string representation of the attribute	
-	 */	
-	public function GetMinUpValue($sValue)
-	{
-		if ($this->get('min_up_mode') == 'fixed')
-		{
-			$iRet = (int) $this->Get('min_up');
-		}
-		else
-		{
-			$sRefValue = $sValue;
-			if (substr(trim($sValue), -1, 1) == '%')
-			{
-				$sRefValue = substr(trim($sValue), 0, -1);
-			}
-			$iRet = (int) trim($sRefValue);
-		}
-		return $iRet;
-	}
-
-	/**
-	 * Helper to determine if the redundancy can be viewed/edited by the end-user
-	 */	
-	public function IsVisible()
-	{
-		$bRet = false;
-		if ($this->Get('enabled_mode') == 'fixed')
-		{
-			$bRet = $this->Get('enabled');
-		}
-		elseif ($this->Get('enabled_mode') == 'user')
-		{
-			$bRet = true;
-		}
-		return $bRet;
-	}
-
-	public function IsWritable()
-	{
-		if (($this->Get('enabled_mode') == 'fixed') && ($this->Get('min_up_mode') == 'fixed'))
-		{
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * Returns an HTML form that can be read by ReadValueFromPostedForm
-	 */	
-	public function GetDisplayForm($sCurrentValue, $oPage, $bEditMode = false, $sFormPrefix = '')
-	{
-		$sRet = '';
-		$aUserOptions = $this->GetUserOptions($sCurrentValue);
-		if (count($aUserOptions) < 2)
-		{
-			$bEditOption = false;
-		}
-		else
-		{
-			$bEditOption = $bEditMode;
-		}
-		$sCurrentOption = $this->GetCurrentOption($sCurrentValue);
-		foreach($aUserOptions as $sUserOption)
-		{
-			$bSelected = ($sUserOption == $sCurrentOption);
-			$sRet .= '<div>';
-			$sRet .= $this->GetDisplayOption($sCurrentValue, $oPage, $sFormPrefix, $bEditOption, $sUserOption, $bSelected);
-			$sRet .= '</div>';
-		}
-		return $sRet;
-	}
-
-	const USER_OPTION_DISABLED = 'disabled';
-	const USER_OPTION_ENABLED_COUNT = 'count';
-	const USER_OPTION_ENABLED_PERCENT = 'percent';
-
-	/**
-	 * Depending on the xxx_mode parameters, build the list of options that are allowed to the end-user
-	 */	 	
-	protected function GetUserOptions($sValue)
-	{
-		$aRet = array();
-		if ($this->Get('enabled_mode') == 'user')
-		{
-			$aRet[] = self::USER_OPTION_DISABLED;
-		}
-		
-		if ($this->Get('min_up_mode') == 'user')
-		{
-			$aRet[] = self::USER_OPTION_ENABLED_COUNT;
-			$aRet[] = self::USER_OPTION_ENABLED_PERCENT;
-		}
-		else
-		{
-			if ($this->GetMinUpType($sValue) == 'count')
-			{
-				$aRet[] = self::USER_OPTION_ENABLED_COUNT;
-			}
-			else
-			{
-				$aRet[] = self::USER_OPTION_ENABLED_PERCENT;
-			}
-		}
-		return $aRet;
-	}
-
-	/**
-	 * Convert the string representation into one of the existing options	
-	 */	
-	protected function GetCurrentOption($sValue)
-	{
-		$sRet = self::USER_OPTION_DISABLED;
-		if ($this->IsEnabled($sValue))
-		{
-			if ($this->GetMinUpType($sValue) == 'count')
-			{
-				$sRet = self::USER_OPTION_ENABLED_COUNT;
-			}
-			else
-			{
-				$sRet = self::USER_OPTION_ENABLED_PERCENT;
-			}
-		}
-		return $sRet;
-	}
-
-	/**
-	 * Display an option (form, or current value)
-	 */	 	
-	protected function GetDisplayOption($sCurrentValue, $oPage, $sFormPrefix, $bEditMode, $sUserOption, $bSelected = true)
-	{
-		$sRet = '';
-
-		$iCurrentValue = $this->GetMinUpValue($sCurrentValue);
-		if ($bEditMode)
-		{
-			$sHtmlNamesPrefix = 'rddcy_'.$this->Get('relation_code').'_'.$this->Get('from_class').'_'.$this->Get('neighbour_id');
-			switch ($sUserOption)
-			{
-			case self::USER_OPTION_DISABLED:
-				$sValue = ''; // Empty placeholder
-				break;
-	
-			case self::USER_OPTION_ENABLED_COUNT:
-				if ($bEditMode)
-				{
-					$sName = $sHtmlNamesPrefix.'_min_up_count';
-					$sEditValue = $bSelected ? $iCurrentValue : '';
-					$sValue = '<input class="redundancy-min-up-count" type="string" size="3" name="'.$sName.'" value="'.$sEditValue.'">';
-					// To fix an issue on Firefox: focus set to the option (because the input is within the label for the option)
-					$oPage->add_ready_script("\$('[name=\"$sName\"]').click(function(){var me=this; setTimeout(function(){\$(me).focus();}, 100);});");
-				}
-				else
-				{
-					$sValue = $iCurrentValue;
-				}
-				break;
-	
-			case self::USER_OPTION_ENABLED_PERCENT:
-				if ($bEditMode)
-				{
-					$sName = $sHtmlNamesPrefix.'_min_up_percent';
-					$sEditValue = $bSelected ? $iCurrentValue : '';
-					$sValue = '<input class="redundancy-min-up-percent" type="string" size="3" name="'.$sName.'" value="'.$sEditValue.'">';
-					// To fix an issue on Firefox: focus set to the option (because the input is within the label for the option)
-					$oPage->add_ready_script("\$('[name=\"$sName\"]').click(function(){var me=this; setTimeout(function(){\$(me).focus();}, 100);});");
-				}
-				else
-				{
-					$sValue = $iCurrentValue;
-				}
-				break;
-			}
-			$sLabel = sprintf($this->GetUserOptionFormat($sUserOption), $sValue, MetaModel::GetName($this->GetHostClass()));
-
-			$sOptionName = $sHtmlNamesPrefix.'_user_option';
-			$sOptionId = $sOptionName.'_'.$sUserOption;
-			$sChecked = $bSelected ? 'checked' : '';
-			$sRet = '<input type="radio" name="'.$sOptionName.'" id="'.$sOptionId.'" value="'.$sUserOption.'"'.$sChecked.'> <label for="'.$sOptionId.'">'.$sLabel.'</label>';
-		}
-		else
-		{
-			// Read-only: display only the currently selected option
-			if ($bSelected)
-			{
-				$sRet = sprintf($this->GetUserOptionFormat($sUserOption), $iCurrentValue, MetaModel::GetName($this->GetHostClass()));
-			}
-		}
-		return $sRet;
-	}
-
-	/**
-	 * Makes the string representation out of the values given by the form defined in GetDisplayForm	
-	 */	
-	public function ReadValueFromPostedForm($sFormPrefix)
-	{
-		$sHtmlNamesPrefix = 'rddcy_'.$this->Get('relation_code').'_'.$this->Get('from_class').'_'.$this->Get('neighbour_id');
-
-		$iMinUpCount = (int) utils::ReadPostedParam($sHtmlNamesPrefix.'_min_up_count', null, 'raw_data');
-		$iMinUpPercent = (int) utils::ReadPostedParam($sHtmlNamesPrefix.'_min_up_percent', null, 'raw_data');
-		$sSelectedOption = utils::ReadPostedParam($sHtmlNamesPrefix.'_user_option', null, 'raw_data');
-		switch ($sSelectedOption)
-		{
-		case self::USER_OPTION_ENABLED_COUNT:
-			$sRet = $iMinUpCount;
-			break;
-
-		case self::USER_OPTION_ENABLED_PERCENT:
-			$sRet = $iMinUpPercent.'%';
-			break;
-
-		case self::USER_OPTION_DISABLED:
-		default:
-			$sRet = 'disabled';
-			break;
-		}
-		return $sRet;
-	}
-}
-
-/**
- * Custom fields managed by an external implementation
- *
- * @package     iTopORM
- */
-class AttributeCustomFields extends AttributeDefinition
-{
-	static public function ListExpectedParams()
-	{
-		return array_merge(parent::ListExpectedParams(), array("handler_class"));
-	}
-
-	public function GetEditClass() {return "CustomFields";}
-	public function IsWritable() {return true;}
-	static public function LoadFromDB() {return false;} // See ReadValue...
-
-	public function GetDefaultValue(DBObject $oHostObject = null)
-	{
-		return new ormCustomFieldsValue($oHostObject, $this->GetCode());
-	}
-
-	public function GetBasicFilterOperators() {return array();}
-	public function GetBasicFilterLooseOperator() {return '';}
-	public function GetBasicFilterSQLExpr($sOpCode, $value) {return '';}
-
-	/**
-	 * @param DBObject $oHostObject
-	 * @param array|null $aValues
-	 * @return CustomFieldsHandler
-	 */
-	public function GetHandler($aValues = null)
-	{
-		$sHandlerClass = $this->Get('handler_class');
-		$oHandler = new $sHandlerClass($this->GetCode());
-		if (!is_null($aValues))
-		{
-			$oHandler->SetCurrentValues($aValues);
-		}
-		return $oHandler;
-	}
-
-	public function GetPrerequisiteAttributes($sClass = null)
-	{
-		$sHandlerClass = $this->Get('handler_class');
-		return $sHandlerClass::GetPrerequisiteAttributes($sClass);
-	}
-
-	public function GetEditValue($sValue, $oHostObj = null)
-	{
-		return $this->GetForTemplate($sValue, '', $oHostObj, true);
-	}
-
-	/**
-	 * Makes the string representation out of the values given by the form defined in GetDisplayForm
-	 */
-	public function ReadValueFromPostedForm($oHostObject, $sFormPrefix)
-	{
-		$aRawData = json_decode(utils::ReadPostedParam("attr_{$sFormPrefix}{$this->GetCode()}", '{}', 'raw_data'), true);
-		return new ormCustomFieldsValue($oHostObject, $this->GetCode(), $aRawData);
-	}
-
-	public function MakeRealValue($proposedValue, $oHostObject)
-	{
-		if (is_object($proposedValue) && ($proposedValue instanceof ormCustomFieldsValue))
-		{
-			return $proposedValue;
-		}
-		elseif (is_string($proposedValue))
-		{
-			$aValues = json_decode($proposedValue, true);
-			return new ormCustomFieldsValue($oHostObject, $this->GetCode(), $aValues);
-		}
-		elseif (is_array($proposedValue))
-		{
-			return new ormCustomFieldsValue($oHostObject, $this->GetCode(), $proposedValue);
-		}
-		elseif (is_null($proposedValue))
-		{
-			return new ormCustomFieldsValue($oHostObject, $this->GetCode());
-		}
-		throw new Exception('Unexpected type for the value of a custom fields attribute: '.gettype($proposedValue));
-	}
-
-	static public function GetFormFieldClass()
-	{
-		return '\\Combodo\\iTop\\Form\\Field\\SubFormField';
-	}
-
-	/**
-	 * Override to build the relevant form field
-	 *
-	 * When called first, $oFormField is null and will be created (eg. Make). Then when the ::parent is called and the $oFormField is passed, MakeFormField behaves more like a Prepare.
-	 */
-	public function MakeFormField(DBObject $oObject, $oFormField = null)
-	{
-		if ($oFormField === null)
-		{
-			$sFormFieldClass = static::GetFormFieldClass();
-			$oFormField = new $sFormFieldClass($this->GetCode());
-			$oFormField->SetForm($this->GetForm($oObject));
-		}
-		parent::MakeFormField($oObject, $oFormField);
-		
-		return $oFormField;
-	}
-
-	/**
-	 * @param DBObject $oHostObject
-	 * @return Combodo\iTop\Form\Form
-	 */
-	public function GetForm(DBObject $oHostObject, $sFormPrefix = null)
-	{
-		try
-		{
-			$oValue = $oHostObject->Get($this->GetCode());
-			$oHandler = $this->GetHandler($oValue->GetValues());
-			$sFormId = is_null($sFormPrefix) ? 'cf_'.$this->GetCode() : $sFormPrefix.'_cf_'.$this->GetCode();
-			$oHandler->BuildForm($oHostObject, $sFormId);
-			$oForm = $oHandler->GetForm();
-		}
-		catch (Exception $e)
-		{
-			$oForm = new \Combodo\iTop\Form\Form('');
-			$oField = new \Combodo\iTop\Form\Field\LabelField('');
-			$oField->SetLabel('Custom field error: '.$e->getMessage());
-			$oForm->AddField($oField);
-			$oForm->Finalize();
-		}
-		return $oForm;
-	}
-
-	/**
-	 * Read the data from where it has been stored. This verb must be implemented as soon as LoadFromDB returns false and LoadInObject returns true
-	 * @param $oHostObject
-	 * @return ormCustomFieldsValue
-	 */
-	public function ReadValue($oHostObject)
-	{
-		try
-		{
-			$oHandler = $this->GetHandler();
-			$aValues = $oHandler->ReadValues($oHostObject);
-			$oRet = new ormCustomFieldsValue($oHostObject, $this->GetCode(), $aValues);
-		}
-		catch (Exception $e)
-		{
-			$oRet = new ormCustomFieldsValue($oHostObject, $this->GetCode());
-		}
-		return $oRet;
-	}
-
-	/**
-	 * Record the data (currently in the processing of recording the host object)
-	 * It is assumed that the data has been checked prior to calling Write()
-	 * @param DBObject $oHostObject
-	 * @param ormCustomFieldsValue|null $oValue (null is the default value)
-	 */
-	public function WriteValue(DBObject $oHostObject, ormCustomFieldsValue $oValue = null)
-	{
-		if (is_null($oValue))
-		{
-			$oHandler = $this->GetHandler();
-			$aValues = array();
-		}
-		else
-		{
-			// Pass the values through the form to make sure that they are correct
-			$oHandler = $this->GetHandler($oValue->GetValues());
-			$oHandler->BuildForm($oHostObject, '');
-			$oForm = $oHandler->GetForm();
-			$aValues = $oForm->GetCurrentValues();
-		}
-		return $oHandler->WriteValues($oHostObject, $aValues);
-	}
-
-	/**
-	 * The part of the current attribute in the object's signature, for the supplied value
-	 * @param $value The value of this attribute for the object
-	 * @return string The "signature" for this field/attribute
-	 */
-	public function Fingerprint($value)
-	{
-		$oHandler = $this->GetHandler($value->GetValues());
-		return $oHandler->GetValueFingerprint();
-	}
-
-	/**
-	 * Check the validity of the data
-	 * @param DBObject $oHostObject
-	 * @param $value
-	 * @return bool|string true or error message
-	 */
-	public function CheckValue(DBObject $oHostObject, $value)
-	{
-		try
-		{
-			$oHandler = $this->GetHandler($value->GetValues());
-			$oHandler->BuildForm($oHostObject, '');
-			$oForm = $oHandler->GetForm();
-			$oForm->Validate();
-			if ($oForm->GetValid())
-			{
-				$ret = true;
-			}
-			else
-			{
-				$aMessages = array();
-				foreach ($oForm->GetErrorMessages() as $sFieldId => $aFieldMessages)
-				{
-					$aMessages[] = $sFieldId.': '.implode(', ', $aFieldMessages);
-				}
-				$ret = 'Invalid value: '.implode(', ', $aMessages);
-			}
-		}
-		catch (Exception $e)
-		{
-			$ret = $e->getMessage();
-		}
-		return $ret;
-	}
-
-	/**
-	 * Cleanup data upon object deletion (object id still available here)
-	 * @param DBObject $oHostObject
-	 */
-	public function DeleteValue(DBObject $oHostObject)
-	{
-		$oValue = $oHostObject->Get($this->GetCode());
-		$oHandler = $this->GetHandler($oValue->GetValues());
-		return $oHandler->DeleteValues($oHostObject);
-	}
-
-	public function GetAsHTML($value, $oHostObject = null, $bLocalize = true)
-	{
-		try
-		{
-			$sRet = $value->GetAsHTML($bLocalize);
-		}
-		catch (Exception $e)
-		{
-			$sRet = 'Custom field error: '.htmlentities($e->getMessage(), ENT_QUOTES, 'UTF-8');
-		}
-		return $sRet;
-	}
-
-	public function GetAsXML($value, $oHostObject = null, $bLocalize = true)
-	{
-		try
-		{
-			$sRet = $value->GetAsXML($bLocalize);
-		}
-		catch (Exception $e)
-		{
-			$sRet = Str::pure2xml('Custom field error: '.$e->getMessage());
-		}
-		return $sRet;
-	}
-
-	public function GetAsCSV($value, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
-	{
-		try
-		{
-			$sRet = $value->GetAsCSV($sSeparator, $sTextQualifier, $bLocalize, $bConvertToPlainText);
-		}
-		catch (Exception $e)
-		{
-			$sFrom = array("\r\n", $sTextQualifier);
-			$sTo = array("\n", $sTextQualifier.$sTextQualifier);
-			$sEscaped = str_replace($sFrom, $sTo, 'Custom field error: '.$e->getMessage());
-			$sRet = $sTextQualifier.$sEscaped.$sTextQualifier;
-		}
-		return $sRet;
-	}
-
-	/**
-	 * List the available verbs for 'GetForTemplate'
-	 */
-	public function EnumTemplateVerbs()
-	{
-		$sHandlerClass = $this->Get('handler_class');
-		return $sHandlerClass::EnumTemplateVerbs();
-	}
-
-	/**
-	 * Get various representations of the value, for insertion into a template (e.g. in Notifications)
-	 * @param $value mixed The current value of the field
-	 * @param $sVerb string The verb specifying the representation of the value
-	 * @param $oHostObject DBObject The object
-	 * @param $bLocalize bool Whether or not to localize the value
-	 */
-	public function GetForTemplate($value, $sVerb, $oHostObject = null, $bLocalize = true)
-	{
-		try
-		{
-			$sRet = $value->GetForTemplate($sVerb, $bLocalize);
-		}
-		catch (Exception $e)
-		{
-			$sRet = 'Custom field error: '.$e->getMessage();
-		}
-		return $sRet;
-	}
-
-	public function MakeValueFromString($sProposedValue, $bLocalizedValue = false, $sSepItem = null, $sSepAttribute = null, $sSepValue = null, $sAttributeQualifier = null)
-	{
-		return null;
-	}
-
-	/**
-	 * Helper to get a value that will be JSON encoded
-	 * The operation is the opposite to FromJSONToValue
-	 */
-	public function GetForJSON($value)
-	{
-		return null;
-	}
-
-	/**
-	 * Helper to form a value, given JSON decoded data
-	 * The operation is the opposite to GetForJSON
-	 */
-	public function FromJSONToValue($json)
-	{
-		return null;
-	}
-
-	public function Equals($val1, $val2)
-	{
-		try
-		{
-			$bEquals = $val1->Equals($val2);
-		}
-		catch (Exception $e)
-		{
-			false;
-		}
-		return $bEquals;
-	}
-}
-
-class AttributeArchiveFlag extends AttributeBoolean
-{
-	public function __construct($sCode)
-	{
-		parent::__construct($sCode, array("allowed_values" => null, "sql" => $sCode, "default_value" => false, "is_null_allowed" => false, "depends_on" => array()));
-	}
-	public function RequiresIndex()
-	{
-		return true;
-	}
-	public function CopyOnAllTables()
-	{
-		return true;
-	}
-	public function IsWritable()
-	{
-		return false;
-	}
-	public function IsMagic()
-	{
-		return true;
-	}
-	public function GetLabel($sDefault = null)
-	{
-		$sDefault = Dict::S('Core:AttributeArchiveFlag/Label', $sDefault);
-		return parent::GetLabel($sDefault);
-	}
-	public function GetDescription($sDefault = null)
-	{
-		$sDefault = Dict::S('Core:AttributeArchiveFlag/Label+', $sDefault);
-		return parent::GetDescription($sDefault);
-	}
-}
-class AttributeArchiveDate extends AttributeDate
-{
-	public function GetLabel($sDefault = null)
-	{
-		$sDefault = Dict::S('Core:AttributeArchiveDate/Label', $sDefault);
-		return parent::GetLabel($sDefault);
-	}
-	public function GetDescription($sDefault = null)
-	{
-		$sDefault = Dict::S('Core:AttributeArchiveDate/Label+', $sDefault);
-		return parent::GetDescription($sDefault);
-	}
-}
-
-class AttributeObsolescenceFlag extends AttributeBoolean
-{
-	public function __construct($sCode)
-	{
-		parent::__construct($sCode, array("allowed_values"=>null, "sql"=>$sCode, "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array()));
-	}
-	public function IsWritable()
-	{
-		return false;
-	}
-	public function IsMagic()
-	{
-		return true;
-	}
-
-	static public function IsBasedOnDBColumns() {return false;}
-	/**
-	 * Returns true if the attribute value is built after other attributes by the mean of an expression (obtained via GetOQLExpression)
-	 * @return bool
-	 */
-	static public function IsBasedOnOQLExpression() {return true;}
-	public function GetOQLExpression()
-	{
-		return MetaModel::GetObsolescenceExpression($this->GetHostClass());
-	}
-
-	public function GetSQLExpressions($sPrefix = '')
-	{
-		return array();
-		if ($sPrefix == '')
-		{
-			$sPrefix = $this->GetCode(); // Warning AttributeComputedFieldVoid does not have any sql property
-		}
-		return array('' => $sPrefix);
-	}
-	public function GetSQLColumns($bFullSpec = false) {return array();} // returns column/spec pairs (1 in most of the cases), for STRUCTURING (DB creation)
-	public function GetSQLValues($value) {return array();} // returns column/value pairs (1 in most of the cases), for WRITING (Insert, Update)
-
-	public function GetEditClass() {return "";}
-
-	public function GetValuesDef() {return null;}
-	public function GetPrerequisiteAttributes($sClass = null) {return $this->GetOptional("depends_on", array());}
-
-	public function IsDirectField() {return true;}
-	static public function IsScalar() {return true;}
-	public function GetSQLExpr()
-	{
-		return null;
-	}
-
-	public function GetDefaultValue(DBObject $oHostObject = null) {return $this->MakeRealValue("", $oHostObject);}
-	public function IsNullAllowed() {return false;}
-
-	public function GetLabel($sDefault = null)
-	{
-		$sDefault = Dict::S('Core:AttributeObsolescenceFlag/Label', $sDefault);
-		return parent::GetLabel($sDefault);
-	}
-	public function GetDescription($sDefault = null)
-	{
-		$sDefault = Dict::S('Core:AttributeObsolescenceFlag/Label+', $sDefault);
-		return parent::GetDescription($sDefault);
-	}
-}
-
-class AttributeObsolescenceDate extends AttributeDate
-{
-	public function GetLabel($sDefault = null)
-	{
-		$sDefault = Dict::S('Core:AttributeObsolescenceDate/Label', $sDefault);
-		return parent::GetLabel($sDefault);
-	}
-	public function GetDescription($sDefault = null)
-	{
-		$sDefault = Dict::S('Core:AttributeObsolescenceDate/Label+', $sDefault);
-		return parent::GetDescription($sDefault);
-	}
-}
+<?php
+// Copyright (C) 2010-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Typology for the attributes
+ *
+ * @copyright   Copyright (C) 2010-2017 Combodo SARL
+ * @license	 http://opensource.org/licenses/AGPL-3.0
+ */
+
+
+require_once('MyHelpers.class.inc.php');
+require_once('ormdocument.class.inc.php');
+require_once('ormstopwatch.class.inc.php');
+require_once('ormpassword.class.inc.php');
+require_once('ormcaselog.class.inc.php');
+require_once('ormlinkset.class.inc.php');
+require_once('htmlsanitizer.class.inc.php');
+require_once(APPROOT.'sources/autoload.php');
+require_once('customfieldshandler.class.inc.php');
+require_once('ormcustomfieldsvalue.class.inc.php');
+require_once('datetimeformat.class.inc.php');
+// This should be changed to a use when we go full-namespace
+require_once(APPROOT . 'sources/form/validator/validator.class.inc.php');
+require_once(APPROOT . 'sources/form/validator/notemptyextkeyvalidator.class.inc.php');
+
+/**
+ * MissingColumnException - sent if an attribute is being created but the column is missing in the row 
+ *
+ * @package	 iTopORM
+ */
+class MissingColumnException extends Exception
+{}
+
+/**
+ * add some description here... 
+ *
+ * @package	 iTopORM
+ */
+define('EXTKEY_RELATIVE', 1);
+
+/**
+ * add some description here... 
+ *
+ * @package	 iTopORM
+ */
+define('EXTKEY_ABSOLUTE', 2);
+
+/**
+ * Propagation of the deletion through an external key - ask the user to delete the referencing object 
+ *
+ * @package	 iTopORM
+ */
+define('DEL_MANUAL', 1);
+
+/**
+ * Propagation of the deletion through an external key - ask the user to delete the referencing object 
+ *
+ * @package	 iTopORM
+ */
+define('DEL_AUTO', 2);
+/**
+ * Fully silent delete... not yet implemented
+ */
+define('DEL_SILENT', 2);
+/**
+ * For HierarchicalKeys only: move all the children up one level automatically
+ */
+define('DEL_MOVEUP', 3);
+
+
+/**
+ * For Link sets: tracking_level
+ *
+ * @package	 iTopORM
+ */
+define('ATTRIBUTE_TRACKING_NONE', 0); // Do not track changes of the attribute
+define('ATTRIBUTE_TRACKING_ALL', 3); // Do track all changes of the attribute
+define('LINKSET_TRACKING_NONE', 0); // Do not track changes in the link set
+define('LINKSET_TRACKING_LIST', 1); // Do track added/removed items
+define('LINKSET_TRACKING_DETAILS', 2); // Do track modified items
+define('LINKSET_TRACKING_ALL', 3); // Do track added/removed/modified items
+
+define('LINKSET_EDITMODE_NONE', 0); // The linkset cannot be edited at all from inside this object
+define('LINKSET_EDITMODE_ADDONLY', 1); // The only possible action is to open a new window to create a new object
+define('LINKSET_EDITMODE_ACTIONS', 2); // Show the usual 'Actions' popup menu
+define('LINKSET_EDITMODE_INPLACE', 3); // The "linked" objects can be created/modified/deleted in place
+define('LINKSET_EDITMODE_ADDREMOVE', 4); // The "linked" objects can be added/removed in place
+
+
+/**
+ * Attribute definition API, implemented in and many flavours (Int, String, Enum, etc.) 
+ *
+ * @package	 iTopORM
+ */
+abstract class AttributeDefinition
+{
+	const SEARCH_WIDGET_TYPE_RAW = 'raw';
+	const SEARCH_WIDGET_TYPE_STRING = 'string';
+	const SEARCH_WIDGET_TYPE_LANGUAGE = 'language';
+	const SEARCH_WIDGET_TYPE_INTEGER = 'integer';
+	const SEARCH_WIDGET_TYPE_PERCENT = 'percent';
+	const SEARCH_WIDGET_TYPE_DECIMAL = 'decimal';
+	const SEARCH_WIDGET_TYPE_BOOLEAN = 'boolean';
+	const SEARCH_WIDGET_TYPE_ENUM = 'enum';
+	const SEARCH_WIDGET_TYPE_EXTERNAL_KEY = 'external_key';
+	const SEARCH_WIDGET_TYPE_EXTERNAL_FIELD = 'external_field';
+	const SEARCH_WIDGET_TYPE_DATE_TIME = 'date_time';
+	const SEARCH_WIDGET_TYPE_DATE = 'date';
+	const SEARCH_WIDGET_TYPE_REDUNDANCY = 'redundancy';
+
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
+
+	public function GetType()
+	{
+		return Dict::S('Core:'.get_class($this));
+	}
+	public function GetTypeDesc()
+	{
+		return Dict::S('Core:'.get_class($this).'+');
+	}
+
+	abstract public function GetEditClass();
+
+	/**
+	 * Return the search widget type corresponding to this attribute
+	 *
+	 * @return string
+	 */
+	public function GetSearchType()
+	{
+		return static::SEARCH_WIDGET_TYPE;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function IsSearchable()
+	{
+		return static::SEARCH_WIDGET_TYPE != static::SEARCH_WIDGET_TYPE_RAW;
+	}
+
+	protected $m_sCode;
+	private $m_aParams = array();
+	protected $m_sHostClass = '!undefined!';
+	public function Get($sParamName) {return $this->m_aParams[$sParamName];}
+	protected function IsParam($sParamName) {return (array_key_exists($sParamName, $this->m_aParams));}
+
+	protected function GetOptional($sParamName, $default)
+	{
+		if (array_key_exists($sParamName, $this->m_aParams))
+		{
+			return $this->m_aParams[$sParamName];
+		}
+		else
+		{
+			return $default;
+		}
+	}
+	
+	public function __construct($sCode, $aParams)
+	{
+		$this->m_sCode = $sCode;
+		$this->m_aParams = $aParams;
+		$this->ConsistencyCheck();
+	}
+
+	public function GetParams()
+	{
+		return $this->m_aParams;
+	}
+
+	public function HasParam($sParam)
+	{
+		return array_key_exists($sParam, $this->m_aParams);
+	}
+
+	public function SetHostClass($sHostClass)
+	{
+		$this->m_sHostClass = $sHostClass;
+	}
+	public function GetHostClass()
+	{
+		return $this->m_sHostClass;
+	}
+
+	public function ListSubItems()
+	{
+		$aSubItems = array();
+		foreach(MetaModel::ListAttributeDefs($this->m_sHostClass) as $sAttCode => $oAttDef)
+		{
+			if ($oAttDef instanceof AttributeSubItem)
+			{
+				if ($oAttDef->Get('target_attcode') == $this->m_sCode)
+				{
+					$aSubItems[$sAttCode] = $oAttDef;
+				}
+			}
+		}
+		return $aSubItems;
+	}
+
+	// Note: I could factorize this code with the parameter management made for the AttributeDef class
+	// to be overloaded
+	static public function ListExpectedParams()
+	{
+		return array();
+	}
+
+	private function ConsistencyCheck()
+	{
+		// Check that any mandatory param has been specified
+		//
+		$aExpectedParams = $this->ListExpectedParams();
+		foreach($aExpectedParams as $sParamName)
+		{
+			if (!array_key_exists($sParamName, $this->m_aParams))
+			{
+				$aBacktrace = debug_backtrace();
+				$sTargetClass = $aBacktrace[2]["class"];
+				$sCodeInfo = $aBacktrace[1]["file"]." - ".$aBacktrace[1]["line"];
+				throw new Exception("ERROR missing parameter '$sParamName' in ".get_class($this)." declaration for class $sTargetClass ($sCodeInfo)");
+			}
+		}
+	}
+
+	/**
+	 * Check the validity of the given value
+	 * @param DBObject $oHostObject
+	 * @param string An error if any, null otherwise
+	 */
+	public function CheckValue(DBObject $oHostObject, $value)
+	{
+		// todo: factorize here the cases implemented into DBObject
+		return true;
+	}
+
+	// table, key field, name field
+	public function ListDBJoins()
+	{
+		return "";
+		// e.g: return array("Site", "infrid", "name");
+	} 
+	public function GetFinalAttDef()
+	{
+		return $this;
+	}
+
+	/**
+	 * Deprecated - use IsBasedOnDBColumns instead
+	 * @return bool
+	 */
+	public function IsDirectField() {return static::IsBasedOnDBColumns();}
+
+	/**
+	 * Returns true if the attribute value is built after DB columns
+	 * @return bool
+	 */
+	static public function IsBasedOnDBColumns() {return false;}
+	/**
+	 * Returns true if the attribute value is built after other attributes by the mean of an expression (obtained via GetOQLExpression)
+	 * @return bool
+	 */
+	static public function IsBasedOnOQLExpression() {return false;}
+	/**
+	 * Returns true if the attribute value can be shown as a string
+	 * @return bool
+	 */
+	static public function IsScalar() {return false;}
+	/**
+	 * Returns true if the attribute value is a set of related objects (1-N or N-N)
+	 * @return bool
+	 */
+	static public function IsLinkSet() {return false;}
+	/**
+	 * Returns true if the attribute is an external key, either directly (RELATIVE to the host class), or indirectly (ABSOLUTELY)
+	 * @return bool
+	 */
+	public function IsExternalKey($iType = EXTKEY_RELATIVE) {return false;}
+	/**
+	 * Returns true if the attribute value is an external key, pointing to the host class
+	 * @return bool
+	 */
+	static public function IsHierarchicalKey() {return false;}
+	/**
+	 * Returns true if the attribute value is stored on an object pointed to be an external key
+	 * @return bool
+	 */
+	static public function IsExternalField() {return false;}
+	/**
+	 * Returns true if the attribute can be written (by essence : metamodel field option)
+	 *
+	 * @return bool
+	 * @see \DBObject::IsAttributeReadOnlyForCurrentState() for a specific object instance (depending on its workflow)
+	 */
+	public function IsWritable() {return false;}
+	/**
+	 * Returns true if the attribute has been added automatically by the framework
+	 * @return bool
+	 */
+	public function IsMagic() {return $this->GetOptional('magic', false);}
+	/**
+	 * Returns true if the attribute value is kept in the loaded object (in memory)
+	 * @return bool
+	 */
+	static public function LoadInObject() {return true;}
+	/**
+	 * Returns true if the attribute value comes from the database in one way or another
+	 * @return bool
+	 */
+	static public function LoadFromDB() {return true;}
+	/**
+	 * Returns true if the attribute should be loaded anytime (in addition to the column selected by the user)
+	 * @return bool
+	 */
+	public function AlwaysLoadInTables() {return $this->GetOptional('always_load_in_tables', false);}
+	/**
+	 * Must return the value if LoadInObject returns false
+	 * @return mixed
+	 */
+	public function GetValue($oHostObject){return null;}
+	/**
+	 * Returns true if the attribute must not be stored if its current value is "null" (Cf. IsNull())
+	 * @return bool
+	 */
+	public function IsNullAllowed() {return true;}
+	/**
+	 * Returns the attribute code (identifies the attribute in the host class)
+	 * @return string
+	 */
+	public function GetCode() {return $this->m_sCode;}
+
+	/**
+	 * Find the corresponding "link" attribute on the target class, if any
+	 * @return null | AttributeDefinition
+	 */
+	public function GetMirrorLinkAttribute() {return null;}
+
+	/**
+	 * Helper to browse the hierarchy of classes, searching for a label
+	 */	 	
+	protected function SearchLabel($sDictEntrySuffix, $sDefault, $bUserLanguageOnly)
+	{
+		$sLabel = Dict::S('Class:'.$this->m_sHostClass.$sDictEntrySuffix, '', $bUserLanguageOnly);
+		if (strlen($sLabel) == 0)
+		{
+			// Nothing found: go higher in the hierarchy (if possible)
+			//
+			$sLabel = $sDefault;
+			$sParentClass = MetaModel::GetParentClass($this->m_sHostClass);
+			if ($sParentClass)
+			{
+				if (MetaModel::IsValidAttCode($sParentClass, $this->m_sCode))
+				{
+					$oAttDef = MetaModel::GetAttributeDef($sParentClass, $this->m_sCode);
+					$sLabel = $oAttDef->SearchLabel($sDictEntrySuffix, $sDefault, $bUserLanguageOnly);
+				}
+			}
+		}
+		return $sLabel;
+	}
+
+	public function GetLabel($sDefault = null)
+	{
+		$sLabel = $this->SearchLabel('/Attribute:'.$this->m_sCode, null, true /*user lang*/);
+		if (is_null($sLabel))
+		{
+			// If no default value is specified, let's define the most relevant one for developping purposes
+			if (is_null($sDefault))
+			{
+				$sDefault = str_replace('_', ' ', $this->m_sCode);
+			}
+			// Browse the hierarchy again, accepting default (english) translations
+			$sLabel = $this->SearchLabel('/Attribute:'.$this->m_sCode, $sDefault, false);
+		}
+		return $sLabel;
+	}
+
+	/**
+	 * Get the label corresponding to the given value (in plain text)
+	 * To be overloaded for localized enums
+	 */
+	public function GetValueLabel($sValue)
+	{
+		return $sValue;
+	}
+
+	/**
+	 * Get the value from a given string (plain text, CSV import)
+	 * Return null if no match could be found	 
+	 */
+	public function MakeValueFromString($sProposedValue, $bLocalizedValue = false, $sSepItem = null, $sSepAttribute = null, $sSepValue = null, $sAttributeQualifier = null)
+	{
+		return $this->MakeRealValue($sProposedValue, null);
+	}
+
+	/**
+	 * Parses a search string coming from user input
+	 * @param string $sSearchString
+	 * @return string
+	 */
+	public function ParseSearchString($sSearchString)
+	{
+		return $sSearchString;
+	}
+	public function GetLabel_Obsolete()
+	{
+		// Written for compatibility with a data model written prior to version 0.9.1
+		if (array_key_exists('label', $this->m_aParams))
+		{
+			return $this->m_aParams['label'];
+		}
+		else
+		{
+			return $this->GetLabel();
+		}
+	}
+
+	public function GetDescription($sDefault = null)
+	{
+		$sLabel = $this->SearchLabel('/Attribute:'.$this->m_sCode.'+', null, true /*user lang*/);
+		if (is_null($sLabel))
+		{
+			// If no default value is specified, let's define the most relevant one for developping purposes
+			if (is_null($sDefault))
+			{
+				$sDefault = '';
+			}
+			// Browse the hierarchy again, accepting default (english) translations
+			$sLabel = $this->SearchLabel('/Attribute:'.$this->m_sCode.'+', $sDefault, false);
+		}
+		return $sLabel;
+	}
+
+	public function GetHelpOnEdition($sDefault = null)
+	{
+		$sLabel = $this->SearchLabel('/Attribute:'.$this->m_sCode.'?', null, true /*user lang*/);
+		if (is_null($sLabel))
+		{
+			// If no default value is specified, let's define the most relevant one for developping purposes
+			if (is_null($sDefault))
+			{
+				$sDefault = '';
+			}
+			// Browse the hierarchy again, accepting default (english) translations
+			$sLabel = $this->SearchLabel('/Attribute:'.$this->m_sCode.'?', $sDefault, false);
+		}
+		return $sLabel;
+	} 
+
+	public function GetHelpOnSmartSearch()
+	{
+		$aParents = array_merge(array(get_class($this) => get_class($this)), class_parents($this));
+		foreach ($aParents as $sClass)
+		{
+			$sHelp = Dict::S("Core:$sClass?SmartSearch", '-missing-');
+			if ($sHelp != '-missing-')
+			{
+				return $sHelp;
+			}
+		} 
+		return '';
+	} 
+
+	public function GetDescription_Obsolete()
+	{
+		// Written for compatibility with a data model written prior to version 0.9.1
+		if (array_key_exists('description', $this->m_aParams))
+		{
+			return $this->m_aParams['description'];
+		}
+		else
+		{
+			return $this->GetDescription();
+		}
+	}
+
+	public function GetTrackingLevel()
+	{
+		return $this->GetOptional('tracking_level', ATTRIBUTE_TRACKING_ALL);
+	}
+
+	public function GetValuesDef() {return null;} 
+	public function GetPrerequisiteAttributes($sClass = null) {return array();}
+
+	public function GetNullValue() {return null;} 
+	public function IsNull($proposedValue) {return is_null($proposedValue);} 
+
+	public function MakeRealValue($proposedValue, $oHostObj) {return $proposedValue;} // force an allowed value (type conversion and possibly forces a value as mySQL would do upon writing!)
+	public function Equals($val1, $val2) {return ($val1 == $val2);}
+
+	public function GetSQLExpressions($sPrefix = '') {return array();} // returns suffix/expression pairs (1 in most of the cases), for READING (Select)
+	public function FromSQLToValue($aCols, $sPrefix = '') {return null;} // returns a value out of suffix/value pairs, for SELECT result interpretation
+	public function GetSQLColumns($bFullSpec = false) {return array();} // returns column/spec pairs (1 in most of the cases), for STRUCTURING (DB creation)
+	public function GetSQLValues($value) {return array();} // returns column/value pairs (1 in most of the cases), for WRITING (Insert, Update)
+	public function RequiresIndex() {return false;}
+	public function CopyOnAllTables() {return false;}
+
+	public function GetOrderBySQLExpressions($sClassAlias)
+	{
+		// Note: This is the responsibility of this function to place backticks around column aliases
+		return array('`'.$sClassAlias.$this->GetCode().'`');
+	}
+	
+	public function GetOrderByHint()
+	{
+		return '';
+	}
+
+   // Import - differs slightly from SQL input, but identical in most cases
+   //
+	public function GetImportColumns() {return $this->GetSQLColumns();}
+	public function FromImportToValue($aCols, $sPrefix = '')
+	{
+		$aValues = array();
+		foreach ($this->GetSQLExpressions($sPrefix) as $sAlias => $sExpr)
+		{
+			// This is working, based on the assumption that importable fields
+			// are not computed fields => the expression is the name of a column
+			$aValues[$sPrefix.$sAlias] = $aCols[$sExpr];
+		}
+		return $this->FromSQLToValue($aValues, $sPrefix);
+	}
+
+	public function GetValidationPattern()
+	{
+		return '';
+	}
+	
+	public function CheckFormat($value)
+	{
+		return true;
+	}
+	 
+	public function GetMaxSize()
+	{
+		return null;
+	}
+	 
+	public function MakeValue()
+	{
+		$sComputeFunc = $this->Get("compute_func");
+		if (empty($sComputeFunc)) return null;
+
+		return call_user_func($sComputeFunc);
+	}
+	
+	abstract public function GetDefaultValue(DBObject $oHostObject = null);
+
+	//
+	// To be overloaded in subclasses
+	//
+	
+	abstract public function GetBasicFilterOperators(); // returns an array of "opCode"=>"description"
+	abstract public function GetBasicFilterLooseOperator(); // returns an "opCode"
+	//abstract protected GetBasicFilterHTMLInput();
+	abstract public function GetBasicFilterSQLExpr($sOpCode, $value); 
+
+	public function GetFilterDefinitions()
+	{
+		return array();
+	}
+
+	public function GetEditValue($sValue, $oHostObj = null)
+	{
+		return (string)$sValue;
+	}
+	
+	/**
+	 * For fields containing a potential markup, return the value without this markup
+	 * @return string
+	 */
+	public function GetAsPlainText($sValue, $oHostObj = null)
+	{
+		return (string) $this->GetEditValue($sValue, $oHostObj);
+	}
+
+	/**
+	 * Helper to get a value that will be JSON encoded
+	 * The operation is the opposite to FromJSONToValue	 
+	 */	 	
+	public function GetForJSON($value)
+	{
+		// In most of the cases, that will be the expected behavior...
+		return $this->GetEditValue($value);
+	}
+
+	/**
+	 * Helper to form a value, given JSON decoded data
+	 * The operation is the opposite to GetForJSON	 
+	 */	 	
+	public function FromJSONToValue($json)
+	{
+		// Passthrough in most of the cases
+		return $json;
+	}
+
+	/**
+	 * Override to display the value in the GUI
+	 */	
+	public function GetAsHTML($sValue, $oHostObject = null, $bLocalize = true)
+	{
+		return Str::pure2html((string)$sValue);
+	}
+
+	/**
+	 * Override to export the value in XML	
+	 */	
+	public function GetAsXML($sValue, $oHostObject = null, $bLocalize = true)
+	{
+		return Str::pure2xml((string)$sValue);
+	}
+
+	/**
+	 * Override to escape the value when read by DBObject::GetAsCSV()	
+	 */	
+	public function GetAsCSV($sValue, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
+	{
+		return (string)$sValue;
+	}
+
+	/**
+	 * Override to differentiate a value displayed in the UI or in the history
+	 */	
+	public function GetAsHTMLForHistory($sValue, $oHostObject = null, $bLocalize = true)
+	{
+		return $this->GetAsHTML($sValue, $oHostObject, $bLocalize);
+	}
+
+	static public function GetFormFieldClass()
+	{
+		return '\\Combodo\\iTop\\Form\\Field\\StringField';
+	}
+
+	/**
+	 * Override to specify Field class
+	 *
+	 * When called first, $oFormField is null and will be created (eg. Make). Then when the ::parent is called and the $oFormField is passed, MakeFormField behave more like a Prepare.
+	 */
+	public function MakeFormField(DBObject $oObject, $oFormField = null)
+	{
+		// This is a fallback in case the AttributeDefinition subclass has no overloading of this function.
+		if ($oFormField === null)
+		{
+			$sFormFieldClass = static::GetFormFieldClass();
+			$oFormField = new $sFormFieldClass($this->GetCode());
+			//$oFormField->SetReadOnly(true);
+		}
+
+		$oFormField->SetLabel($this->GetLabel());
+
+		// Attributes flags
+		// - Retrieving flags for the current object
+		if ($oObject->IsNew())
+		{
+			$iFlags = $oObject->GetInitialStateAttributeFlags($this->GetCode());
+		}
+		else
+		{
+			$iFlags = $oObject->GetAttributeFlags($this->GetCode());
+		}
+
+		// - Comparing flags
+		if ($this->IsWritable() && (!$this->IsNullAllowed() || (($iFlags & OPT_ATT_MANDATORY) === OPT_ATT_MANDATORY)))
+		{
+			$oFormField->SetMandatory(true);
+		}
+		if ((!$oObject->IsNew() || !$oFormField->GetMandatory()) && (($iFlags & OPT_ATT_READONLY) === OPT_ATT_READONLY))
+		{
+			$oFormField->SetReadOnly(true);
+		}
+		
+		// CurrentValue
+		$oFormField->SetCurrentValue($oObject->Get($this->GetCode()));
+
+		// Validation pattern
+		if ($this->GetValidationPattern() !== '')
+		{
+			$oFormField->AddValidator(new \Combodo\iTop\Form\Validator\Validator($this->GetValidationPattern()));
+		}
+
+		return $oFormField;
+	}
+
+	/**
+	 * List the available verbs for 'GetForTemplate'
+	 */	 
+	public function EnumTemplateVerbs()
+	{
+		return array(
+			'' => 'Plain text (unlocalized) representation',
+			'html' => 'HTML representation',
+			'label' => 'Localized representation',
+			'text' => 'Plain text representation (without any markup)',
+		);
+	}
+
+	/**
+	 * Get various representations of the value, for insertion into a template (e.g. in Notifications)
+	 * @param $value mixed The current value of the field
+	 * @param $sVerb string The verb specifying the representation of the value
+	 * @param $oHostObject DBObject The object
+	 * @param $bLocalize bool Whether or not to localize the value
+	 */
+	public function GetForTemplate($value, $sVerb, $oHostObject = null, $bLocalize = true)
+	{
+		if ($this->IsScalar())
+		{
+			switch ($sVerb)
+			{
+				case '':
+				return $value;
+				
+				case 'html':
+				return $this->GetAsHtml($value, $oHostObject, $bLocalize);
+				
+				case 'label':
+				return $this->GetEditValue($value);
+				
+				case 'text':
+				return $this->GetAsPlainText($value);
+				break;
+				
+				default:
+				throw new Exception("Unknown verb '$sVerb' for attribute ".$this->GetCode().' in class '.get_class($oHostObject));
+			}
+		}
+		return null;
+	}
+
+	public function GetAllowedValues($aArgs = array(), $sContains = '')
+	{
+		$oValSetDef = $this->GetValuesDef();
+		if (!$oValSetDef) return null;
+		return $oValSetDef->GetValues($aArgs, $sContains);
+	}
+
+	/**
+	 * Explain the change of the attribute (history)
+	 */	
+	public function DescribeChangeAsHTML($sOldValue, $sNewValue, $sLabel = null)
+	{
+		if (is_null($sLabel))
+		{
+			$sLabel = $this->GetLabel();
+		}
+
+		$sNewValueHtml = $this->GetAsHTMLForHistory($sNewValue);
+		$sOldValueHtml = $this->GetAsHTMLForHistory($sOldValue);
+
+		if($this->IsExternalKey())
+		{
+			$sTargetClass = $this->GetTargetClass();
+			$sOldValueHtml = (int)$sOldValue ? MetaModel::GetHyperLink($sTargetClass, (int)$sOldValue) : null;
+			$sNewValueHtml = (int)$sNewValue ? MetaModel::GetHyperLink($sTargetClass, (int)$sNewValue) : null;
+		}
+		if ( (($this->GetType() == 'String') || ($this->GetType() == 'Text')) &&
+			 (strlen($sNewValue) > strlen($sOldValue)) )
+		{
+			// Check if some text was not appended to the field
+			if (substr($sNewValue,0, strlen($sOldValue)) == $sOldValue) // Text added at the end
+			{
+				$sDelta = $this->GetAsHTML(substr($sNewValue, strlen($sOldValue)));
+				$sResult = Dict::Format('Change:Text_AppendedTo_AttName', $sDelta, $sLabel);
+			}
+			else if (substr($sNewValue, -strlen($sOldValue)) == $sOldValue)   // Text added at the beginning
+			{
+				$sDelta = $this->GetAsHTML(substr($sNewValue, 0, strlen($sNewValue) - strlen($sOldValue)));
+				$sResult = Dict::Format('Change:Text_AppendedTo_AttName', $sDelta, $sLabel);
+			}
+			else
+			{
+				if (strlen($sOldValue) == 0)
+				{
+					$sResult = Dict::Format('Change:AttName_SetTo', $sLabel, $sNewValueHtml);
+				}
+				else
+				{
+					if (is_null($sNewValue))
+					{
+						$sNewValueHtml = Dict::S('UI:UndefinedObject');
+					}
+					$sResult = Dict::Format('Change:AttName_SetTo_NewValue_PreviousValue_OldValue', $sLabel, $sNewValueHtml, $sOldValueHtml);
+				}
+			}
+		}
+		else
+		{
+			if (strlen($sOldValue) == 0)
+			{
+				$sResult = Dict::Format('Change:AttName_SetTo', $sLabel, $sNewValueHtml);
+			}
+			else
+			{
+				if (is_null($sNewValue))
+				{
+					$sNewValueHtml = Dict::S('UI:UndefinedObject');
+				}
+				$sResult = Dict::Format('Change:AttName_SetTo_NewValue_PreviousValue_OldValue', $sLabel, $sNewValueHtml, $sOldValueHtml);
+			}
+		}
+		return $sResult;
+	}
+
+
+	/**
+	 * Parses a string to find some smart search patterns and build the corresponding search/OQL condition
+	 * Each derived class is reponsible for defining and processing their own smart patterns, the base class
+	 * does nothing special, and just calls the default (loose) operator
+	 * @param string $sSearchText The search string to analyze for smart patterns
+	 * @param FieldExpression The FieldExpression representing the atttribute code in this OQL query
+	 * @param Hash $aParams Values of the query parameters
+	 * @return Expression The search condition to be added (AND) to the current search
+	 */
+	public function GetSmartConditionExpression($sSearchText, FieldExpression $oField, &$aParams)
+	{
+		$sParamName = $oField->GetParent().'_'.$oField->GetName();
+		$oRightExpr = new VariableExpression($sParamName);
+		$sOperator = $this->GetBasicFilterLooseOperator();
+		switch ($sOperator)
+		{
+			case 'Contains':
+			$aParams[$sParamName] = "%$sSearchText%";
+			$sSQLOperator = 'LIKE';
+			break;
+			
+			default:
+			$sSQLOperator = $sOperator;
+			$aParams[$sParamName] = $sSearchText;
+		}
+		$oNewCondition = new BinaryExpression($oField, $sSQLOperator, $oRightExpr);
+		return $oNewCondition;
+	}
+	
+	/**
+	 * Tells if an attribute is part of the unique fingerprint of the object (used for comparing two objects)
+	 * All attributes which value is not based on a value from the object itself (like ExternalFields or LinkedSet)
+	 * must be excluded from the object's signature
+	 * @return boolean
+	 */
+	public function IsPartOfFingerprint()
+	{
+		return true;
+	}
+	
+	/**
+	 * The part of the current attribute in the object's signature, for the supplied value
+	 * @param unknown $value The value of this attribute for the object
+	 * @return string The "signature" for this field/attribute
+	 */
+	public function Fingerprint($value)
+	{
+		return (string)$value;
+	}
+}
+
+/**
+ * Set of objects directly linked to an object, and being part of its definition  
+ *
+ * @package	 iTopORM
+ */
+class AttributeLinkedSet extends AttributeDefinition
+{
+	static public function ListExpectedParams()
+	{
+		return array_merge(parent::ListExpectedParams(), array("allowed_values", "depends_on", "linked_class", "ext_key_to_me", "count_min", "count_max"));
+	}
+
+	public function GetEditClass() {return "LinkedSet";}
+
+	public function IsWritable() {return true;}
+	static public function IsLinkSet() {return true;}
+	public function IsIndirect() {return false;} 
+
+	public function GetValuesDef() {return $this->Get("allowed_values");} 
+	public function GetPrerequisiteAttributes($sClass = null) {return $this->Get("depends_on");}
+	public function GetDefaultValue(DBObject $oHostObject = null)
+	{
+		$sLinkClass = $this->GetLinkedClass();
+		$sExtKeyToMe = $this->GetExtKeyToMe();
+
+		// The class to target is not the current class, because if this is a derived class,
+		// it may differ from the target class, then things start to become confusing
+		$oRemoteExtKeyAtt = MetaModel::GetAttributeDef($sLinkClass, $sExtKeyToMe);
+		$sMyClass = $oRemoteExtKeyAtt->GetTargetClass();
+
+		$oMyselfSearch = new DBObjectSearch($sMyClass);
+		if ($oHostObject !== null)
+		{
+			$oMyselfSearch->AddCondition('id', $oHostObject->GetKey(), '=');
+		}
+
+		$oLinkSearch = new DBObjectSearch($sLinkClass);
+		$oLinkSearch->AddCondition_PointingTo($oMyselfSearch, $sExtKeyToMe);
+		if ($this->IsIndirect())
+		{
+			// Join the remote class so that the archive flag will be taken into account
+			$sExtKeyToRemote = $this->GetExtKeyToRemote();
+			$oExtKeyToRemote = MetaModel::GetAttributeDef($sLinkClass, $sExtKeyToRemote);
+			$sRemoteClass = $oExtKeyToRemote->GetTargetClass();
+			if (MetaModel::IsArchivable($sRemoteClass))
+			{
+				$oRemoteSearch = new DBObjectSearch($sRemoteClass);
+				$oLinkSearch->AddCondition_PointingTo($oRemoteSearch, $this->GetExtKeyToRemote());
+			}
+		}
+		$oLinks = new DBObjectSet($oLinkSearch);
+		$oLinkSet = new ormLinkSet($this->GetHostClass(), $this->GetCode(), $oLinks);
+		return $oLinkSet;
+	}
+
+	public function GetTrackingLevel()
+	{
+		return $this->GetOptional('tracking_level', MetaModel::GetConfig()->Get('tracking_level_linked_set_default'));
+	}
+
+	public function GetEditMode()
+	{
+		return $this->GetOptional('edit_mode', LINKSET_EDITMODE_ACTIONS);
+	}
+	
+	public function GetLinkedClass() {return $this->Get('linked_class');}
+	public function GetExtKeyToMe() {return $this->Get('ext_key_to_me');}
+
+	public function GetBasicFilterOperators() {return array();}
+	public function GetBasicFilterLooseOperator() {return '';}
+	public function GetBasicFilterSQLExpr($sOpCode, $value) {return '';}
+
+	public function GetAsHTML($sValue, $oHostObject = null, $bLocalize = true)
+	{
+		if (is_object($sValue) && ($sValue instanceof ormLinkSet))
+		{
+			$sValue->Rewind();
+			$aItems = array();
+			while ($oObj = $sValue->Fetch())
+			{
+				// Show only relevant information (hide the external key to the current object)
+				$aAttributes = array();
+				foreach(MetaModel::ListAttributeDefs($this->GetLinkedClass()) as $sAttCode => $oAttDef)
+				{
+					if ($sAttCode == $this->GetExtKeyToMe()) continue;
+					if ($oAttDef->IsExternalField()) continue;
+					$sAttValue = $oObj->GetAsHTML($sAttCode);
+					if (strlen($sAttValue) > 0)
+					{
+						$aAttributes[] = $sAttValue;
+					}
+				}
+				$sAttributes = implode(', ', $aAttributes);
+				$aItems[] = $sAttributes;
+			}
+			return implode('<br/>', $aItems);
+		}
+		return null;
+	}
+
+	public function GetAsXML($sValue, $oHostObject = null, $bLocalize = true)
+	{
+		if (is_object($sValue) && ($sValue instanceof ormLinkSet))
+		{
+			$sValue->Rewind();
+			$sRes = "<Set>\n";
+			while ($oObj = $sValue->Fetch())
+			{
+				$sObjClass = get_class($oObj);
+				$sRes .= "<$sObjClass id=\"".$oObj->GetKey()."\">\n";
+				// Show only relevant information (hide the external key to the current object)
+				$aAttributes = array();
+				foreach(MetaModel::ListAttributeDefs($sObjClass) as $sAttCode => $oAttDef)
+				{
+					if ($sAttCode == 'finalclass')
+					{
+						if ($sObjClass == $this->GetLinkedClass())
+						{
+							// Simplify the output if the exact class could be determined implicitely
+							continue;
+						}
+					}
+					if ($sAttCode == $this->GetExtKeyToMe()) continue;
+					if ($oAttDef->IsExternalField())
+					{
+						if ($oAttDef->GetKeyAttCode() == $this->GetExtKeyToMe()) continue;
+						if ($oAttDef->IsFriendlyName()) continue;
+					}
+					if ($oAttDef instanceof AttributeFriendlyName) continue;
+					if (!$oAttDef->IsScalar()) continue;
+					$sAttValue = $oObj->GetAsXML($sAttCode, $bLocalize);
+					$sRes .= "<$sAttCode>$sAttValue</$sAttCode>\n";
+				}
+				$sRes .= "</$sObjClass>\n";
+			}
+			$sRes .= "</Set>\n";
+		}
+		else
+		{
+			$sRes = '';
+		}
+		return $sRes;
+	}
+
+	public function GetAsCSV($sValue, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
+	{
+		$sSepItem = MetaModel::GetConfig()->Get('link_set_item_separator');
+		$sSepAttribute = MetaModel::GetConfig()->Get('link_set_attribute_separator');
+		$sSepValue = MetaModel::GetConfig()->Get('link_set_value_separator');
+		$sAttributeQualifier = MetaModel::GetConfig()->Get('link_set_attribute_qualifier');
+
+		if (is_object($sValue) && ($sValue instanceof ormLinkSet))
+		{
+			$sValue->Rewind();
+			$aItems = array();
+			while ($oObj = $sValue->Fetch())
+			{
+				$sObjClass = get_class($oObj);
+				// Show only relevant information (hide the external key to the current object)
+				$aAttributes = array();
+				foreach(MetaModel::ListAttributeDefs($sObjClass) as $sAttCode => $oAttDef)
+				{
+					if ($sAttCode == 'finalclass')
+					{
+						if ($sObjClass == $this->GetLinkedClass())
+						{
+							// Simplify the output if the exact class could be determined implicitely 
+							continue;
+						}
+					}
+					if ($sAttCode == $this->GetExtKeyToMe()) continue;
+					if ($oAttDef->IsExternalField()) continue;
+					if (!$oAttDef->IsBasedOnDBColumns()) continue;
+					if (!$oAttDef->IsScalar()) continue;
+					$sAttValue = $oObj->GetAsCSV($sAttCode, $sSepValue, '', $bLocalize);
+					if (strlen($sAttValue) > 0)
+					{
+						$sAttributeData = str_replace($sAttributeQualifier, $sAttributeQualifier.$sAttributeQualifier, $sAttCode.$sSepValue.$sAttValue);
+						$aAttributes[] = $sAttributeQualifier.$sAttributeData.$sAttributeQualifier;
+					}
+				}
+				$sAttributes = implode($sSepAttribute, $aAttributes);
+				$aItems[] = $sAttributes;
+			}
+			$sRes = implode($sSepItem, $aItems);
+		}
+		else
+		{
+			$sRes = '';
+		}
+		$sRes = str_replace($sTextQualifier, $sTextQualifier.$sTextQualifier, $sRes);
+		$sRes = $sTextQualifier.$sRes.$sTextQualifier;
+		return $sRes;
+	}
+
+	/**
+	 * List the available verbs for 'GetForTemplate'
+	 */	 
+	public function EnumTemplateVerbs()
+	{
+		return array(
+			'' => 'Plain text (unlocalized) representation',
+			'html' => 'HTML representation (unordered list)',
+		);
+	}
+
+	/**
+	 * Get various representations of the value, for insertion into a template (e.g. in Notifications)
+	 * @param $value mixed The current value of the field
+	 * @param $sVerb string The verb specifying the representation of the value
+	 * @param $oHostObject DBObject The object
+	 * @param $bLocalize bool Whether or not to localize the value
+	 */
+	public function GetForTemplate($value, $sVerb, $oHostObject = null, $bLocalize = true)
+	{
+		$sRemoteName = $this->IsIndirect() ? $this->GetExtKeyToRemote().'_friendlyname' : 'friendlyname';
+		
+		$oLinkSet = clone $value; // Workaround/Safety net for Trac #887
+		$iLimit = MetaModel::GetConfig()->Get('max_linkset_output');
+		$iCount = 0;
+		$aNames = array();
+		foreach($oLinkSet as $oItem)
+		{
+			if (($iLimit > 0) && ($iCount == $iLimit))
+			{
+				$iTotal = $oLinkSet->Count();
+				$aNames[] = '... '.Dict::Format('UI:TruncatedResults', $iCount, $iTotal);
+				break;
+			}
+			$aNames[] = $oItem->Get($sRemoteName);
+			$iCount++;
+		}
+
+		switch($sVerb)
+		{
+			case '':
+			return implode("\n", $aNames);
+					
+			case 'html':
+			return '<ul><li>'.implode("</li><li>", $aNames).'</li></ul>';
+			
+			default:
+			throw new Exception("Unknown verb '$sVerb' for attribute ".$this->GetCode().' in class '.get_class($oHostObject));
+		}
+	}
+
+	public function DuplicatesAllowed() {return false;} // No duplicates for 1:n links, never
+
+	public function GetImportColumns()
+	{
+		$aColumns = array();
+		$aColumns[$this->GetCode()] = 'TEXT';
+		return $aColumns;
+	}
+
+	public function MakeValueFromString($sProposedValue, $bLocalizedValue = false, $sSepItem = null, $sSepAttribute = null, $sSepValue = null, $sAttributeQualifier = null)
+	{
+		if (is_null($sSepItem) || empty($sSepItem))
+		{
+			$sSepItem = MetaModel::GetConfig()->Get('link_set_item_separator');
+		}
+		if (is_null($sSepAttribute) || empty($sSepAttribute))
+		{
+			$sSepAttribute = MetaModel::GetConfig()->Get('link_set_attribute_separator');
+		}
+		if (is_null($sSepValue) || empty($sSepValue))
+		{
+			$sSepValue = MetaModel::GetConfig()->Get('link_set_value_separator');
+		}
+		if (is_null($sAttributeQualifier) || empty($sAttributeQualifier))
+		{
+			$sAttributeQualifier = MetaModel::GetConfig()->Get('link_set_attribute_qualifier');
+		}
+
+		$sTargetClass = $this->Get('linked_class');
+
+		$sInput = str_replace($sSepItem, "\n", $sProposedValue);
+		$oCSVParser = new CSVParser($sInput, $sSepAttribute, $sAttributeQualifier);
+
+		$aInput = $oCSVParser->ToArray(0 /* do not skip lines */);
+
+		$aLinks = array();
+		foreach($aInput as $aRow)
+		{
+			// 1st - get the values, split the extkey->searchkey specs, and eventually get the finalclass value
+			$aExtKeys = array();
+			$aValues = array();
+			foreach($aRow as $sCell)
+			{
+				$iSepPos = strpos($sCell, $sSepValue);
+				if ($iSepPos === false)
+				{
+					// Houston...
+					throw new CoreException('Wrong format for link attribute specification', array('value' => $sCell));
+				}
+
+				$sAttCode = trim(substr($sCell, 0, $iSepPos));
+				$sValue = substr($sCell, $iSepPos + strlen($sSepValue));
+
+				if (preg_match('/^(.+)->(.+)$/', $sAttCode, $aMatches))
+				{
+					$sKeyAttCode = $aMatches[1];
+					$sRemoteAttCode = $aMatches[2];
+					$aExtKeys[$sKeyAttCode][$sRemoteAttCode] = $sValue;
+					if (!MetaModel::IsValidAttCode($sTargetClass, $sKeyAttCode))
+					{
+						throw new CoreException('Wrong attribute code for link attribute specification', array('class' => $sTargetClass, 'attcode' => $sKeyAttCode));
+					}
+					$oKeyAttDef = MetaModel::GetAttributeDef($sTargetClass, $sKeyAttCode);
+					$sRemoteClass = $oKeyAttDef->GetTargetClass();
+					if (!MetaModel::IsValidAttCode($sRemoteClass, $sRemoteAttCode))
+					{
+						throw new CoreException('Wrong attribute code for link attribute specification', array('class' => $sRemoteClass, 'attcode' => $sRemoteAttCode));
+					}
+				}
+				else
+				{
+					if(!MetaModel::IsValidAttCode($sTargetClass, $sAttCode))
+					{
+						throw new CoreException('Wrong attribute code for link attribute specification', array('class' => $sTargetClass, 'attcode' => $sAttCode));
+					}
+					$oAttDef = MetaModel::GetAttributeDef($sTargetClass, $sAttCode);
+					$aValues[$sAttCode] = $oAttDef->MakeValueFromString($sValue, $bLocalizedValue, $sSepItem, $sSepAttribute, $sSepValue, $sAttributeQualifier);
+				}
+			}
+
+			// 2nd - Instanciate the object and set the value
+			if (isset($aValues['finalclass']))
+			{
+				$sLinkClass = $aValues['finalclass'];
+				if (!is_subclass_of($sLinkClass, $sTargetClass))
+				{
+					throw new CoreException('Wrong class for link attribute specification', array('requested_class' => $sLinkClass, 'expected_class' => $sTargetClass));
+				}
+			}
+			elseif (MetaModel::IsAbstract($sTargetClass))
+			{
+					throw new CoreException('Missing finalclass for link attribute specification');
+			}
+			else
+			{
+				$sLinkClass = $sTargetClass;
+			}
+
+			$oLink = MetaModel::NewObject($sLinkClass);
+			foreach ($aValues as $sAttCode => $sValue)
+			{
+				$oLink->Set($sAttCode, $sValue);
+			}
+
+			// 3rd - Set external keys from search conditions
+			foreach ($aExtKeys as $sKeyAttCode => $aReconciliation)
+			{
+				$oKeyAttDef = MetaModel::GetAttributeDef($sTargetClass, $sKeyAttCode);
+				$sKeyClass = $oKeyAttDef->GetTargetClass();
+				$oExtKeyFilter = new DBObjectSearch($sKeyClass);
+				$aReconciliationDesc = array();
+				foreach($aReconciliation as $sRemoteAttCode => $sValue)
+				{
+					$oExtKeyFilter->AddCondition($sRemoteAttCode, $sValue, '=');
+					$aReconciliationDesc[] = "$sRemoteAttCode=$sValue";
+				}
+				$oExtKeySet = new DBObjectSet($oExtKeyFilter);
+				switch($oExtKeySet->Count())
+				{
+				case 0:
+					$sReconciliationDesc = implode(', ', $aReconciliationDesc);
+					throw new CoreException("Found no match", array('ext_key' => $sKeyAttCode, 'reconciliation' => $sReconciliationDesc));
+					break;
+				case 1:
+					$oRemoteObj = $oExtKeySet->Fetch();
+					$oLink->Set($sKeyAttCode, $oRemoteObj->GetKey());
+					break;
+				default:
+					$sReconciliationDesc = implode(', ', $aReconciliationDesc);
+					throw new CoreException("Found several matches", array('ext_key' => $sKeyAttCode, 'reconciliation' => $sReconciliationDesc));
+					// Found several matches, ambiguous
+				}
+			}
+
+			// Check (roughly) if such a link is valid
+			$aErrors = array();
+			foreach(MetaModel::ListAttributeDefs($sTargetClass) as $sAttCode => $oAttDef)
+			{
+				if ($oAttDef->IsExternalKey())
+				{
+					if (($oAttDef->GetTargetClass() == $this->GetHostClass()) || (is_subclass_of($this->GetHostClass(), $oAttDef->GetTargetClass())))
+					{
+						continue; // Don't check the key to self
+					}
+				}
+				
+				if ($oAttDef->IsWritable() && $oAttDef->IsNull($oLink->Get($sAttCode)) && !$oAttDef->IsNullAllowed())
+				{
+					$aErrors[] = $sAttCode;
+				}
+			}
+			if (count($aErrors) > 0)
+			{
+				throw new CoreException("Missing value for mandatory attribute(s): ".implode(', ', $aErrors));
+			}
+
+			$aLinks[] = $oLink;
+		}
+		$oSet = DBObjectSet::FromArray($sTargetClass, $aLinks);
+		return $oSet;
+	}
+
+	/**
+	 * Helper to get a value that will be JSON encoded
+	 * The operation is the opposite to FromJSONToValue	 
+	 */	 	
+	public function GetForJSON($value)
+	{
+		$aRet = array();
+		if (is_object($value) && ($value instanceof ormLinkSet))
+		{
+			$value->Rewind();
+			while ($oObj = $value->Fetch())
+			{
+				$sObjClass = get_class($oObj);
+				// Show only relevant information (hide the external key to the current object)
+				$aAttributes = array();
+				foreach(MetaModel::ListAttributeDefs($sObjClass) as $sAttCode => $oAttDef)
+				{
+					if ($sAttCode == 'finalclass')
+					{
+						if ($sObjClass == $this->GetLinkedClass())
+						{
+							// Simplify the output if the exact class could be determined implicitely 
+							continue;
+						}
+					}
+					if ($sAttCode == $this->GetExtKeyToMe()) continue;
+					if ($oAttDef->IsExternalField()) continue;
+					if (!$oAttDef->IsBasedOnDBColumns()) continue;
+					if (!$oAttDef->IsScalar()) continue;
+					$attValue = $oObj->Get($sAttCode);
+					$aAttributes[$sAttCode] = $oAttDef->GetForJSON($attValue);
+				}
+				$aRet[] = $aAttributes;
+			}
+		}
+		return $aRet;
+	}
+
+	/**
+	 * Helper to form a value, given JSON decoded data
+	 * The operation is the opposite to GetForJSON	 
+	 */	 	
+	public function FromJSONToValue($json)
+	{
+		$sTargetClass = $this->Get('linked_class');
+
+		$aLinks = array();
+		foreach($json as $aValues)
+		{
+			if (isset($aValues['finalclass']))
+			{
+				$sLinkClass = $aValues['finalclass'];
+				if (!is_subclass_of($sLinkClass, $sTargetClass))
+				{
+					throw new CoreException('Wrong class for link attribute specification', array('requested_class' => $sLinkClass, 'expected_class' => $sTargetClass));
+				}
+			}
+			elseif (MetaModel::IsAbstract($sTargetClass))
+			{
+					throw new CoreException('Missing finalclass for link attribute specification');
+			}
+			else
+			{
+				$sLinkClass = $sTargetClass;
+			}
+
+			$oLink = MetaModel::NewObject($sLinkClass);
+			foreach ($aValues as $sAttCode => $sValue)
+			{
+				$oLink->Set($sAttCode, $sValue);
+			}
+
+			// Check (roughly) if such a link is valid
+			$aErrors = array();
+			foreach(MetaModel::ListAttributeDefs($sTargetClass) as $sAttCode => $oAttDef)
+			{
+				if ($oAttDef->IsExternalKey())
+				{
+					if (($oAttDef->GetTargetClass() == $this->GetHostClass()) || (is_subclass_of($this->GetHostClass(), $oAttDef->GetTargetClass())))
+					{
+						continue; // Don't check the key to self
+					}
+				}
+				
+				if ($oAttDef->IsWritable() && $oAttDef->IsNull($oLink->Get($sAttCode)) && !$oAttDef->IsNullAllowed())
+				{
+					$aErrors[] = $sAttCode;
+				}
+			}
+			if (count($aErrors) > 0)
+			{
+				throw new CoreException("Missing value for mandatory attribute(s): ".implode(', ', $aErrors));
+			}
+
+			$aLinks[] = $oLink;
+		}
+		$oSet = DBObjectSet::FromArray($sTargetClass, $aLinks);
+		return $oSet;
+	}
+
+	/**
+	 * @param ormLinkSet $val1
+	 * @param ormLinkSet $val2
+	 * @return bool
+	 */
+	public function Equals($val1, $val2)
+	{
+		if ($val1 === $val2)
+		{
+			$bAreEquivalent = true;
+		}
+		else
+		{
+            $bAreEquivalent = ($val2->HasDelta() === false);
+		}
+		return $bAreEquivalent;
+	}
+
+	/**
+	 * Find the corresponding "link" attribute on the target class, if any
+	 * @return null | AttributeDefinition
+	 */
+	public function GetMirrorLinkAttribute()
+	{
+		$oRemoteAtt = MetaModel::GetAttributeDef($this->GetLinkedClass(), $this->GetExtKeyToMe());
+		return $oRemoteAtt;
+	}
+
+	static public function GetFormFieldClass()
+	{
+		return '\\Combodo\\iTop\\Form\\Field\\LinkedSetField';
+	}
+
+	public function MakeFormField(DBObject $oObject, $oFormField = null)
+	{
+		if ($oFormField === null)
+		{
+			$sFormFieldClass = static::GetFormFieldClass();
+			$oFormField = new $sFormFieldClass($this->GetCode());
+		}
+		
+		// Setting target class
+		if (!$this->IsIndirect())
+		{
+			$sTargetClass = $this->GetLinkedClass();
+		}
+		else
+		{
+			$oRemoteAttDef = MetaModel::GetAttributeDef($this->GetLinkedClass(), $this->GetExtKeyToRemote());
+			$sTargetClass = $oRemoteAttDef->GetTargetClass();
+
+			$oFormField->SetExtKeyToRemote($this->GetExtKeyToRemote());
+		}
+		$oFormField->SetTargetClass($sTargetClass);
+		$oFormField->SetIndirect($this->IsIndirect());
+		// Setting attcodes to display
+		$aAttCodesToDisplay = MetaModel::FlattenZList(MetaModel::GetZListItems($sTargetClass, 'list'));
+		// - Adding friendlyname attribute to the list is not already in it
+		$sTitleAttCode = MetaModel::GetFriendlyNameAttributeCode($sTargetClass);
+		if (($sTitleAttCode !== null) && !in_array($sTitleAttCode, $aAttCodesToDisplay))
+		{
+			$aAttCodesToDisplay = array_merge(array($sTitleAttCode), $aAttCodesToDisplay);
+		}
+		// - Adding attribute labels
+		$aAttributesToDisplay = array();
+		foreach ($aAttCodesToDisplay as $sAttCodeToDisplay)
+		{
+			$oAttDefToDisplay = MetaModel::GetAttributeDef($sTargetClass, $sAttCodeToDisplay);
+			$aAttributesToDisplay[$sAttCodeToDisplay] = $oAttDefToDisplay->GetLabel();
+		}
+		$oFormField->SetAttributesToDisplay($aAttributesToDisplay);
+		
+		parent::MakeFormField($oObject, $oFormField);
+		
+		return $oFormField;
+	}
+
+	public function IsPartOfFingerprint() { return false; }
+}
+
+/**
+ * Set of objects linked to an object (n-n), and being part of its definition  
+ *
+ * @package	 iTopORM
+ */
+class AttributeLinkedSetIndirect extends AttributeLinkedSet
+{
+	static public function ListExpectedParams()
+	{
+		return array_merge(parent::ListExpectedParams(), array("ext_key_to_remote"));
+	}
+	public function IsIndirect() {return true;} 
+	public function GetExtKeyToRemote() { return $this->Get('ext_key_to_remote'); }
+	public function GetEditClass() {return "LinkedSet";}
+	public function DuplicatesAllowed() {return $this->GetOptional("duplicates", false);} // The same object may be linked several times... or not...
+
+	public function GetTrackingLevel()
+	{
+		return $this->GetOptional('tracking_level', MetaModel::GetConfig()->Get('tracking_level_linked_set_indirect_default'));
+	}
+
+	/**
+	 * Find the corresponding "link" attribute on the target class, if any
+	 * @return null | AttributeDefinition
+	 */
+	public function GetMirrorLinkAttribute()
+	{
+		$oRet = null;
+		$oExtKeyToRemote = MetaModel::GetAttributeDef($this->GetLinkedClass(), $this->GetExtKeyToRemote());
+		$sRemoteClass = $oExtKeyToRemote->GetTargetClass();
+		foreach (MetaModel::ListAttributeDefs($sRemoteClass) as $sRemoteAttCode => $oRemoteAttDef)
+		{
+			if (!$oRemoteAttDef instanceof AttributeLinkedSetIndirect) continue;
+			if ($oRemoteAttDef->GetLinkedClass() != $this->GetLinkedClass()) continue;
+			if ($oRemoteAttDef->GetExtKeyToMe() != $this->GetExtKeyToRemote()) continue;
+			if ($oRemoteAttDef->GetExtKeyToRemote() != $this->GetExtKeyToMe()) continue;
+			$oRet = $oRemoteAttDef;
+			break;
+		}
+		return $oRet;
+	}
+}
+
+/**
+ * Abstract class implementing default filters for a DB column  
+ *
+ * @package	 iTopORM
+ */
+class AttributeDBFieldVoid extends AttributeDefinition
+{	
+	static public function ListExpectedParams()
+	{
+		return array_merge(parent::ListExpectedParams(), array("allowed_values", "depends_on", "sql"));
+	}
+
+	// To be overriden, used in GetSQLColumns
+	protected function GetSQLCol($bFullSpec = false)
+	{
+		return "VARCHAR(255)".($bFullSpec ? $this->GetSQLColSpec() : '');
+	}
+	protected function GetSQLColSpec()
+	{
+		$default = $this->ScalarToSQL($this->GetDefaultValue());
+		if (is_null($default))
+		{
+			$sRet = '';
+		}
+		else
+		{
+			if (is_numeric($default))
+			{
+				// Though it is a string in PHP, it will be considered as a numeric value in MySQL
+				// Then it must not be quoted here, to preserve the compatibility with the value returned by CMDBSource::GetFieldSpec
+				$sRet = " DEFAULT $default";
+			}
+			else
+			{
+				$sRet = " DEFAULT ".CMDBSource::Quote($default);
+			}
+		}
+		return $sRet;
+	}
+
+	public function GetEditClass() {return "String";}
+	
+	public function GetValuesDef() {return $this->Get("allowed_values");} 
+	public function GetPrerequisiteAttributes($sClass = null) {return $this->Get("depends_on");}
+
+	static public function IsBasedOnDBColumns() {return true;}
+	static public function IsScalar() {return true;}
+	public function IsWritable() {return !$this->IsMagic();}
+	public function GetSQLExpr()
+	{
+		return $this->Get("sql");
+	}
+
+	public function GetDefaultValue(DBObject $oHostObject = null) {return $this->MakeRealValue("", $oHostObject);}
+	public function IsNullAllowed() {return false;}
+
+	// 
+	protected function ScalarToSQL($value) {return $value;} // format value as a valuable SQL literal (quoted outside)
+
+	public function GetSQLExpressions($sPrefix = '')
+	{
+		$aColumns = array();
+		// Note: to optimize things, the existence of the attribute is determined by the existence of one column with an empty suffix
+		$aColumns[''] = $this->Get("sql");
+		return $aColumns;
+	}
+
+	public function FromSQLToValue($aCols, $sPrefix = '')
+	{
+		$value = $this->MakeRealValue($aCols[$sPrefix.''], null);
+		return $value;
+	}
+	public function GetSQLValues($value)
+	{
+		$aValues = array();
+		$aValues[$this->Get("sql")] = $this->ScalarToSQL($value);
+		return $aValues;
+	}
+
+	public function GetSQLColumns($bFullSpec = false)
+	{
+		$aColumns = array();
+		$aColumns[$this->Get("sql")] = $this->GetSQLCol($bFullSpec);
+		return $aColumns;
+	}
+
+	public function GetFilterDefinitions()
+	{
+		return array($this->GetCode() => new FilterFromAttribute($this));
+	}
+
+	public function GetBasicFilterOperators()
+	{
+		return array("="=>"equals", "!="=>"differs from");
+	}
+	public function GetBasicFilterLooseOperator()
+	{
+		return "=";
+	}
+
+	public function GetBasicFilterSQLExpr($sOpCode, $value)
+	{
+		$sQValue = CMDBSource::Quote($value);
+		switch ($sOpCode)
+		{
+		case '!=':
+			return $this->GetSQLExpr()." != $sQValue";
+			break;
+		case '=':
+		default:
+			return $this->GetSQLExpr()." = $sQValue";
+		}
+	} 
+}
+
+/**
+ * Base class for all kind of DB attributes, with the exception of external keys 
+ *
+ * @package	 iTopORM
+ */
+class AttributeDBField extends AttributeDBFieldVoid
+{	
+	static public function ListExpectedParams()
+	{
+		return array_merge(parent::ListExpectedParams(), array("default_value", "is_null_allowed"));
+	}
+	public function GetDefaultValue(DBObject $oHostObject = null) {return $this->MakeRealValue($this->Get("default_value"), $oHostObject);}
+	public function IsNullAllowed() {return $this->Get("is_null_allowed");}
+}
+
+/**
+ * Map an integer column to an attribute 
+ *
+ * @package	 iTopORM
+ */
+class AttributeInteger extends AttributeDBField
+{
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_INTEGER;
+
+	static public function ListExpectedParams()
+	{
+		return parent::ListExpectedParams();
+		//return array_merge(parent::ListExpectedParams(), array());
+	}
+
+	public function GetEditClass() {return "String";}
+	protected function GetSQLCol($bFullSpec = false) {return "INT(11)".($bFullSpec ? $this->GetSQLColSpec() : '');}
+	
+	public function GetValidationPattern()
+	{
+		return "^[0-9]+$";
+	}
+
+	public function GetBasicFilterOperators()
+	{
+		return array(
+			"!="=>"differs from",
+			"="=>"equals",
+			">"=>"greater (strict) than",
+			">="=>"greater than",
+			"<"=>"less (strict) than",
+			"<="=>"less than",
+			"in"=>"in"
+		);
+	}
+	public function GetBasicFilterLooseOperator()
+	{
+		// Unless we implement an "equals approximately..." or "same order of magnitude"
+		return "=";
+	}
+
+	public function GetBasicFilterSQLExpr($sOpCode, $value)
+	{
+		$sQValue = CMDBSource::Quote($value);
+		switch ($sOpCode)
+		{
+		case '!=':
+			return $this->GetSQLExpr()." != $sQValue";
+			break;
+		case '>':
+			return $this->GetSQLExpr()." > $sQValue";
+			break;
+		case '>=':
+			return $this->GetSQLExpr()." >= $sQValue";
+			break;
+		case '<':
+			return $this->GetSQLExpr()." < $sQValue";
+			break;
+		case '<=':
+			return $this->GetSQLExpr()." <= $sQValue";
+			break;
+		case 'in':
+			if (!is_array($value)) throw new CoreException("Expected an array for argument value (sOpCode='$sOpCode')");
+			return $this->GetSQLExpr()." IN ('".implode("', '", $value)."')"; 
+			break;
+
+		case '=':
+		default:
+			return $this->GetSQLExpr()." = \"$value\"";
+		}
+	} 
+
+	public function GetNullValue()
+	{
+		return null;
+	} 
+	public function IsNull($proposedValue)
+	{
+		return is_null($proposedValue);
+	} 
+
+	public function MakeRealValue($proposedValue, $oHostObj)
+	{
+		if (is_null($proposedValue)) return null;
+		if ($proposedValue === '') return null; // 0 is transformed into '' !
+		return (int)$proposedValue;
+	}
+
+	public function ScalarToSQL($value)
+	{
+		assert(is_numeric($value) || is_null($value));
+		return $value; // supposed to be an int
+	}
+}
+
+/**
+ * An external key for which the class is defined as the value of another attribute 
+ *
+ * @package	 iTopORM
+ */
+class AttributeObjectKey extends AttributeDBFieldVoid
+{
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_EXTERNAL_KEY;
+
+	static public function ListExpectedParams()
+	{
+		return array_merge(parent::ListExpectedParams(), array('class_attcode', 'is_null_allowed'));
+	}
+
+	public function GetEditClass() {return "String";}
+	protected function GetSQLCol($bFullSpec = false) {return "INT(11)".($bFullSpec ? " DEFAULT 0" : "");}
+
+	public function GetDefaultValue(DBObject $oHostObject = null) {return 0;}
+	public function IsNullAllowed()
+	{
+		return $this->Get("is_null_allowed");
+	}
+
+
+	public function GetBasicFilterOperators()
+	{
+		return parent::GetBasicFilterOperators();
+	}
+	public function GetBasicFilterLooseOperator()
+	{
+		return parent::GetBasicFilterLooseOperator();
+	}
+
+	public function GetBasicFilterSQLExpr($sOpCode, $value)
+	{
+		return parent::GetBasicFilterSQLExpr($sOpCode, $value);
+	} 
+
+	public function GetNullValue()
+	{
+		return 0;
+	} 
+
+	public function IsNull($proposedValue)
+	{
+		return ($proposedValue == 0);
+	} 
+
+	public function MakeRealValue($proposedValue, $oHostObj)
+	{
+		if (is_null($proposedValue)) return 0;
+		if ($proposedValue === '') return 0;
+		if (MetaModel::IsValidObject($proposedValue)) return $proposedValue->GetKey();
+		return (int)$proposedValue;
+	}
+}
+
+/**
+ * Display an integer between 0 and 100 as a percentage / horizontal bar graph 
+ *
+ * @package	 iTopORM
+ */
+class AttributePercentage extends AttributeInteger
+{
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_PERCENT;
+
+	public function GetAsHTML($sValue, $oHostObject = null, $bLocalize = true)
+	{
+		$iWidth = 5; // Total width of the percentage bar graph, in em...
+		$iValue = (int)$sValue;
+		if ($iValue > 100)
+		{
+			$iValue = 100;
+		}
+		else if ($iValue < 0)
+		{
+			$iValue = 0;
+		}
+		if ($iValue > 90)
+		{
+			$sColor = "#cc3300";
+		}
+		else if ($iValue > 50)
+		{
+			$sColor = "#cccc00";
+		}
+		else
+		{
+			$sColor = "#33cc00";
+		}
+		$iPercentWidth = ($iWidth * $iValue) / 100;
+		return "<div style=\"width:{$iWidth}em;-moz-border-radius: 3px;-webkit-border-radius: 3px;border-radius: 3px;display:inline-block;border: 1px #ccc solid;\"><div style=\"width:{$iPercentWidth}em; display:inline-block;background-color:$sColor;\">&nbsp;</div></div>&nbsp;$sValue %";
+	}
+}
+
+/**
+ * Map a decimal value column (suitable for financial computations) to an attribute
+ * internally in PHP such numbers are represented as string. Should you want to perform
+ * a calculation on them, it is recommended to use the BC Math functions in order to
+ * retain the precision
+ *
+ * @package	 iTopORM
+ */
+class AttributeDecimal extends AttributeDBField
+{
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_DECIMAL;
+
+	static public function ListExpectedParams()
+	{
+		return array_merge(parent::ListExpectedParams(), array('digits', 'decimals' /* including precision */));
+	}
+
+	public function GetEditClass() {return "String";}
+	protected function GetSQLCol($bFullSpec = false)
+	{
+		return "DECIMAL(".$this->Get('digits').",".$this->Get('decimals').")".($bFullSpec ? $this->GetSQLColSpec() : '');
+	}
+	
+	public function GetValidationPattern()
+	{
+		$iNbDigits = $this->Get('digits');
+		$iPrecision = $this->Get('decimals');
+		$iNbIntegerDigits = $iNbDigits - $iPrecision - 1; // -1 because the first digit is treated separately in the pattern below
+		return "^[-+]?[0-9]\d{0,$iNbIntegerDigits}(\.\d{0,$iPrecision})?$";
+	}
+
+	public function GetBasicFilterOperators()
+	{
+		return array(
+			"!="=>"differs from",
+			"="=>"equals",
+			">"=>"greater (strict) than",
+			">="=>"greater than",
+			"<"=>"less (strict) than",
+			"<="=>"less than",
+			"in"=>"in"
+		);
+	}
+	public function GetBasicFilterLooseOperator()
+	{
+		// Unless we implement an "equals approximately..." or "same order of magnitude"
+		return "=";
+	}
+
+	public function GetBasicFilterSQLExpr($sOpCode, $value)
+	{
+		$sQValue = CMDBSource::Quote($value);
+		switch ($sOpCode)
+		{
+		case '!=':
+			return $this->GetSQLExpr()." != $sQValue";
+			break;
+		case '>':
+			return $this->GetSQLExpr()." > $sQValue";
+			break;
+		case '>=':
+			return $this->GetSQLExpr()." >= $sQValue";
+			break;
+		case '<':
+			return $this->GetSQLExpr()." < $sQValue";
+			break;
+		case '<=':
+			return $this->GetSQLExpr()." <= $sQValue";
+			break;
+		case 'in':
+			if (!is_array($value)) throw new CoreException("Expected an array for argument value (sOpCode='$sOpCode')");
+			return $this->GetSQLExpr()." IN ('".implode("', '", $value)."')"; 
+			break;
+
+		case '=':
+		default:
+			return $this->GetSQLExpr()." = \"$value\"";
+		}
+	} 
+
+	public function GetNullValue()
+	{
+		return null;
+	} 
+	public function IsNull($proposedValue)
+	{
+		return is_null($proposedValue);
+	} 
+
+	public function MakeRealValue($proposedValue, $oHostObj)
+	{
+		if (is_null($proposedValue)) return null;
+		if ($proposedValue === '') return null;
+		return (string)$proposedValue;
+	}
+
+	public function ScalarToSQL($value)
+	{
+		assert(is_null($value) || preg_match('/'.$this->GetValidationPattern().'/', $value));
+		return $value; // null or string
+	}
+}
+
+/**
+ * Map a boolean column to an attribute 
+ *
+ * @package	 iTopORM
+ */
+class AttributeBoolean extends AttributeInteger
+{
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_BOOLEAN;
+
+	static public function ListExpectedParams()
+	{
+		return parent::ListExpectedParams();
+		//return array_merge(parent::ListExpectedParams(), array());
+	}
+
+	public function GetEditClass() {return "Integer";}
+	protected function GetSQLCol($bFullSpec = false) {return "TINYINT(1)".($bFullSpec ? $this->GetSQLColSpec() : '');}
+
+	public function MakeRealValue($proposedValue, $oHostObj)
+	{
+		if (is_null($proposedValue)) return null;
+		if ($proposedValue === '') return null;
+		if ((int)$proposedValue) return true;
+		return false;
+	}
+
+	public function ScalarToSQL($value)
+	{
+		if ($value) return 1;
+		return 0;
+	}
+
+	public function GetValueLabel($bValue)
+	{
+		if (is_null($bValue))
+		{
+			$sLabel = Dict::S('Core:'.get_class($this).'/Value:null');
+		}
+		else
+		{
+			$sValue = $bValue ? 'yes' : 'no';
+			$sDefault = Dict::S('Core:'.get_class($this).'/Value:'.$sValue);
+			$sLabel = $this->SearchLabel('/Attribute:'.$this->m_sCode.'/Value:'.$sValue, $sDefault, true /*user lang*/);
+		}
+		return $sLabel;
+	}
+
+	public function GetValueDescription($bValue)
+	{
+		if (is_null($bValue))
+		{
+			$sDescription = Dict::S('Core:'.get_class($this).'/Value:null+');
+		}
+		else
+		{
+			$sValue = $bValue ? 'yes' : 'no';
+			$sDefault = Dict::S('Core:'.get_class($this).'/Value:'.$sValue.'+');
+			$sDescription = $this->SearchLabel('/Attribute:'.$this->m_sCode.'/Value:'.$sValue.'+', $sDefault, true /*user lang*/);
+		}
+		return $sDescription;
+	}
+
+	public function GetAsHTML($bValue, $oHostObject = null, $bLocalize = true)
+	{
+		if (is_null($bValue))
+		{
+			$sRes = '';
+		}
+		elseif ($bLocalize)
+		{
+			$sLabel = $this->GetValueLabel($bValue);
+			$sDescription = $this->GetValueDescription($bValue);
+			// later, we could imagine a detailed description in the title
+			$sRes = "<span title=\"$sDescription\">".parent::GetAsHtml($sLabel)."</span>";
+		}
+		else
+		{
+			$sRes = $bValue ? 'yes' : 'no';
+		}
+		return $sRes;
+	}
+
+	public function GetAsXML($bValue, $oHostObject = null, $bLocalize = true)
+	{
+		if (is_null($bValue))
+		{
+			$sFinalValue = '';
+		}
+		elseif ($bLocalize)
+		{
+			$sFinalValue = $this->GetValueLabel($bValue);
+		}
+		else
+		{
+			$sFinalValue = $bValue ? 'yes' : 'no';
+		}
+		$sRes = parent::GetAsXML($sFinalValue, $oHostObject, $bLocalize);
+		return $sRes;
+	}
+
+	public function GetAsCSV($bValue, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
+	{
+		if (is_null($bValue))
+		{
+			$sFinalValue = '';
+		}
+		elseif ($bLocalize)
+		{
+			$sFinalValue = $this->GetValueLabel($bValue);
+		}
+		else
+		{
+			$sFinalValue = $bValue ? 'yes' : 'no';
+		}
+		$sRes = parent::GetAsCSV($sFinalValue, $sSeparator, $sTextQualifier, $oHostObject, $bLocalize);
+		return $sRes;
+	}
+
+	static public function GetFormFieldClass()
+	{
+		return '\\Combodo\\iTop\\Form\\Field\\SelectField';
+	}
+
+	public function MakeFormField(DBObject $oObject, $oFormField = null)
+	{
+		if ($oFormField === null)
+		{
+			$sFormFieldClass = static::GetFormFieldClass();
+			$oFormField = new $sFormFieldClass($this->GetCode());
+		}
+
+		$oFormField->SetChoices(array('yes' => $this->GetValueLabel(true), 'no' => $this->GetValueLabel(false)));
+		parent::MakeFormField($oObject, $oFormField);
+
+		return $oFormField;
+	}
+
+	public function GetEditValue($value, $oHostObj = null)
+	{
+		if (is_null($value))
+		{
+			return '';
+		}
+		else
+		{
+			return $this->GetValueLabel($value);
+		}
+	}
+
+	/**
+	 * Helper to get a value that will be JSON encoded
+	 * The operation is the opposite to FromJSONToValue
+	 */
+	public function GetForJSON($value)
+	{
+		return (bool)$value;
+	}
+
+	public function MakeValueFromString($sProposedValue, $bLocalizedValue = false, $sSepItem = null, $sSepAttribute = null, $sSepValue = null, $sAttributeQualifier = null)
+	{
+		$sInput = strtolower(trim($sProposedValue));
+		if ($bLocalizedValue)
+		{
+			switch ($sInput)
+			{
+				case '1': // backward compatibility
+				case $this->GetValueLabel(true):
+					$value = true;
+					break;
+				case '0': // backward compatibility
+				case 'no':
+				case $this->GetValueLabel(false):
+					$value = false;
+					break;
+				default:
+					$value = null;
+			}
+		}
+		else
+		{
+			switch ($sInput)
+			{
+				case '1': // backward compatibility
+				case 'yes':
+					$value = true;
+					break;
+				case '0': // backward compatibility
+				case 'no':
+					$value = false;
+					break;
+				default:
+					$value = null;
+			}
+		}
+		return $value;
+	}
+}
+
+/**
+ * Map a varchar column (size < ?) to an attribute 
+ *
+ * @package	 iTopORM
+ */
+class AttributeString extends AttributeDBField
+{
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_STRING;
+
+	static public function ListExpectedParams()
+	{
+		return parent::ListExpectedParams();
+		//return array_merge(parent::ListExpectedParams(), array());
+	}
+
+	public function GetEditClass() {return "String";}
+	protected function GetSQLCol($bFullSpec = false) {return "VARCHAR(255)".($bFullSpec ? $this->GetSQLColSpec() : '');}
+
+	public function GetValidationPattern()
+	{
+		$sPattern = $this->GetOptional('validation_pattern', '');
+		if (empty($sPattern))
+		{
+			return parent::GetValidationPattern();
+		}
+		else
+		{
+			return $sPattern;
+		}
+	}
+
+	public function CheckFormat($value)
+	{
+		$sRegExp = $this->GetValidationPattern();
+		if (empty($sRegExp))
+		{
+			return true;
+		}
+		else
+		{
+			$sRegExp = str_replace('/', '\\/', $sRegExp);
+			return preg_match("/$sRegExp/", $value);
+		}
+	}
+
+	public function GetMaxSize()
+	{
+		return 255;
+	}
+
+	public function GetBasicFilterOperators()
+	{
+		return array(
+			"="=>"equals",
+			"!="=>"differs from",
+			"Like"=>"equals (no case)",
+			"NotLike"=>"differs from (no case)",
+			"Contains"=>"contains",
+			"Begins with"=>"begins with",
+			"Finishes with"=>"finishes with"
+		);
+	}
+	public function GetBasicFilterLooseOperator()
+	{
+		return "Contains";
+	}
+
+	public function GetBasicFilterSQLExpr($sOpCode, $value)
+	{
+		$sQValue = CMDBSource::Quote($value);
+		switch ($sOpCode)
+		{
+		case '=':
+		case '!=':
+			return $this->GetSQLExpr()." $sOpCode $sQValue";
+		case 'Begins with':
+			return $this->GetSQLExpr()." LIKE ".CMDBSource::Quote("$value%");
+		case 'Finishes with':
+			return $this->GetSQLExpr()." LIKE ".CMDBSource::Quote("%$value");
+		case 'Contains':
+			return $this->GetSQLExpr()." LIKE ".CMDBSource::Quote("%$value%");
+		case 'NotLike':
+			return $this->GetSQLExpr()." NOT LIKE $sQValue";
+		case 'Like':
+		default:
+			return $this->GetSQLExpr()." LIKE $sQValue";
+		}
+	} 
+
+	public function GetNullValue()
+	{
+		return '';
+	} 
+
+	public function IsNull($proposedValue)
+	{
+		return ($proposedValue == '');
+	} 
+
+	public function MakeRealValue($proposedValue, $oHostObj)
+	{
+		if (is_null($proposedValue)) return '';
+		return (string)$proposedValue;
+	}
+
+	public function ScalarToSQL($value)
+	{
+		if (!is_string($value) && !is_null($value))
+		{
+			throw new CoreWarning('Expected the attribute value to be a string', array('found_type' => gettype($value), 'value' => $value, 'class' => $this->GetHostClass(), 'attribute' => $this->GetCode()));
+		}
+		return $value;
+	}
+
+	public function GetAsCSV($sValue, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
+	{
+		$sFrom = array("\r\n", $sTextQualifier);
+		$sTo = array("\n", $sTextQualifier.$sTextQualifier);
+		$sEscaped = str_replace($sFrom, $sTo, (string)$sValue);
+		return $sTextQualifier.$sEscaped.$sTextQualifier;
+	}
+
+	public function GetDisplayStyle()
+	{
+		return $this->GetOptional('display_style', 'select');
+	}
+
+	static public function GetFormFieldClass()
+	{
+		return '\\Combodo\\iTop\\Form\\Field\\StringField';
+	}
+
+	public function MakeFormField(DBObject $oObject, $oFormField = null)
+	{
+		if ($oFormField === null)
+		{
+			$sFormFieldClass = static::GetFormFieldClass();
+			$oFormField = new $sFormFieldClass($this->GetCode());
+		}
+		parent::MakeFormField($oObject, $oFormField);
+
+		return $oFormField;
+	}
+
+}
+
+/**
+ * An attibute that matches an object class 
+ *
+ * @package	 iTopORM
+ */
+class AttributeClass extends AttributeString
+{
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
+
+	static public function ListExpectedParams()
+	{
+		return array_merge(parent::ListExpectedParams(), array("class_category", "more_values"));
+	}
+
+	public function __construct($sCode, $aParams)
+	{
+		$this->m_sCode = $sCode;
+		$aParams["allowed_values"] = new ValueSetEnumClasses($aParams['class_category'], $aParams['more_values']);
+		parent::__construct($sCode, $aParams);
+	}
+
+	public function GetDefaultValue(DBObject $oHostObject = null)
+	{
+		$sDefault = parent::GetDefaultValue($oHostObject);
+		if (!$this->IsNullAllowed() && $this->IsNull($sDefault))
+		{
+			// For this kind of attribute specifying null as default value
+			// is authorized even if null is not allowed
+			
+			// Pick the first one...
+			$aClasses = $this->GetAllowedValues();
+			$sDefault = key($aClasses);
+		}
+		return $sDefault;
+	}
+
+	public function GetAsHTML($sValue, $oHostObject = null, $bLocalize = true)
+	{
+		if (empty($sValue)) return '';
+		return MetaModel::GetName($sValue);
+	}
+
+	public function RequiresIndex()
+	{
+		return true;
+	}
+	
+	public function GetBasicFilterLooseOperator()
+	{
+		return '=';
+	}
+	
+}
+
+/**
+ * An attibute that matches one of the language codes availables in the dictionnary 
+ *
+ * @package	 iTopORM
+ */
+class AttributeApplicationLanguage extends AttributeString
+{
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_LANGUAGE;
+
+	static public function ListExpectedParams()
+	{
+		return parent::ListExpectedParams();
+	}
+
+	public function __construct($sCode, $aParams)
+	{
+		$this->m_sCode = $sCode;
+		$aAvailableLanguages = Dict::GetLanguages();
+		$aLanguageCodes = array();
+		foreach($aAvailableLanguages as $sLangCode => $aInfo)
+		{
+			$aLanguageCodes[$sLangCode] = $aInfo['description'].' ('.$aInfo['localized_description'].')';
+		}
+		$aParams["allowed_values"] = new ValueSetEnum($aLanguageCodes);
+		parent::__construct($sCode, $aParams);
+	}
+
+	public function RequiresIndex()
+	{
+		return true;
+	}
+	
+	public function GetBasicFilterLooseOperator()
+	{
+		return '=';
+	}
+}
+
+/**
+ * The attribute dedicated to the finalclass automatic attribute 
+ *
+ * @package	 iTopORM
+ */
+class AttributeFinalClass extends AttributeString
+{
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
+
+	public function __construct($sCode, $aParams)
+	{
+		$this->m_sCode = $sCode;
+		$aParams["allowed_values"] = null;
+		parent::__construct($sCode, $aParams);
+
+		$this->m_sValue = $this->Get("default_value");
+	}
+
+	public function IsWritable()
+	{
+		return false;
+	}
+	public function IsMagic()
+	{
+		return true;
+	}
+
+	public function RequiresIndex()
+	{
+		return true;
+	}
+
+	public function SetFixedValue($sValue)
+	{
+		$this->m_sValue = $sValue;
+	}
+	public function GetDefaultValue(DBObject $oHostObject = null)
+	{
+		return $this->m_sValue;
+	}
+
+	public function GetAsHTML($sValue, $oHostObject = null, $bLocalize = true)
+	{
+		if (empty($sValue)) return '';
+		if ($bLocalize)
+		{
+			return MetaModel::GetName($sValue);
+		}
+		else
+		{
+			return $sValue;
+		}
+	}
+
+	/**
+	 * An enum can be localized
+	 */
+	public function MakeValueFromString($sProposedValue, $bLocalizedValue = false, $sSepItem = null, $sSepAttribute = null, $sSepValue = null, $sAttributeQualifier = null)
+	{
+		if ($bLocalizedValue)
+		{
+			// Lookup for the value matching the input
+			//
+			$sFoundValue = null;
+			$aRawValues = self::GetAllowedValues();
+			if (!is_null($aRawValues))
+			{
+				foreach ($aRawValues as $sKey => $sValue)
+				{
+					if ($sProposedValue == $sValue)
+					{
+						$sFoundValue = $sKey;
+						break;
+					}
+				}
+			}
+			if (is_null($sFoundValue))
+			{
+				return null;
+			}
+			return $this->MakeRealValue($sFoundValue, null);
+		}
+		else
+		{
+			return parent::MakeValueFromString($sProposedValue, $bLocalizedValue, $sSepItem, $sSepAttribute, $sSepValue, $sAttributeQualifier);
+		}
+	}
+
+
+	// Because this is sometimes used to get a localized/string version of an attribute...
+	public function GetEditValue($sValue, $oHostObj = null)
+	{
+		if (empty($sValue)) return '';
+		return MetaModel::GetName($sValue);
+	}
+	/**
+	 * Helper to get a value that will be JSON encoded
+	 * The operation is the opposite to FromJSONToValue
+	 */
+	public function GetForJSON($value)
+	{
+		// JSON values are NOT localized
+		return $value;
+	}
+	
+ 	public function GetAsCSV($value, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
+	{
+		if ($bLocalize && $value != '')
+		{
+			$sRawValue = MetaModel::GetName($value);
+		}
+		else
+		{
+			$sRawValue = $value;
+		}
+		return parent::GetAsCSV($sRawValue, $sSeparator, $sTextQualifier, null, false, $bConvertToPlainText);
+	}
+
+	public function GetAsXML($value, $oHostObject = null, $bLocalize = true)
+	{
+		if (empty($value)) return '';
+		if ($bLocalize)
+		{
+			$sRawValue = MetaModel::GetName($value);
+		}
+		else
+		{
+			$sRawValue = $value;
+		}
+		return Str::pure2xml($sRawValue);
+	}
+
+	public function GetBasicFilterLooseOperator()
+	{
+		return '=';
+	}
+	
+	public function GetValueLabel($sValue)
+	{
+		if (empty($sValue)) return '';
+		return MetaModel::GetName($sValue);
+	}
+
+	public function GetAllowedValues($aArgs = array(), $sContains = '')
+	{
+		$aRawValues = MetaModel::EnumChildClasses($this->GetHostClass(), ENUM_CHILD_CLASSES_ALL);
+		$aLocalizedValues = array();
+		foreach ($aRawValues as $sClass)
+		{
+			$aLocalizedValues[$sClass] = MetaModel::GetName($sClass);
+		}
+  		return $aLocalizedValues;
+  	}
+}
+
+
+/**
+ * Map a varchar column (size < ?) to an attribute that must never be shown to the user 
+ *
+ * @package	 iTopORM
+ */
+class AttributePassword extends AttributeString
+{
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
+
+	static public function ListExpectedParams()
+	{
+		return parent::ListExpectedParams();
+		//return array_merge(parent::ListExpectedParams(), array());
+	}
+
+	public function GetEditClass() {return "Password";}
+	protected function GetSQLCol($bFullSpec = false) {return "VARCHAR(64)".($bFullSpec ? $this->GetSQLColSpec() : '');}
+
+	public function GetMaxSize()
+	{
+		return 64;
+	}
+
+	public function GetFilterDefinitions()
+	{
+	// Note: due to this, you will get an error if a password is being declared as a search criteria (see ZLists)
+		// not allowed to search on passwords!
+		return array();
+	}
+
+	public function GetAsHTML($sValue, $oHostObject = null, $bLocalize = true)
+	{
+		if (strlen($sValue) == 0)
+		{
+			return '';
+		}
+		else
+		{
+			return '******';
+		}
+	}
+	
+	public function IsPartOfFingerprint() { return false; } // Cannot reliably compare two encrypted passwords since the same password will be encrypted in diffferent manners depending on the random 'salt'
+}
+
+/**
+ * Map a text column (size < 255) to an attribute that is encrypted in the database
+ * The encryption is based on a key set per iTop instance. Thus if you export your
+ * database (in SQL) to someone else without providing the key at the same time
+ * the encrypted fields will remain encrypted
+ *
+ * @package	 iTopORM
+ */
+class AttributeEncryptedString extends AttributeString
+{
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
+
+	static $sKey = null; // Encryption key used for all encrypted fields
+
+	public function __construct($sCode, $aParams)
+	{
+		parent::__construct($sCode, $aParams);
+		if (self::$sKey == null)
+		{
+			self::$sKey = MetaModel::GetConfig()->GetEncryptionKey();
+		}
+	}
+	/**
+	 * When the attribute definitions are stored in APC cache:
+	 * 1) The static class variable $sKey is NOT serialized
+	 * 2) The object's constructor is NOT called upon wakeup
+	 * 3) mcrypt may crash the server if passed an empty key !!
+	 * 
+	 * So let's restore the key (if needed) when waking up
+	 **/
+	public function __wakeup()
+	{
+		if (self::$sKey == null)
+		{
+			self::$sKey = MetaModel::GetConfig()->GetEncryptionKey();
+		}
+	}
+	
+
+	protected function GetSQLCol($bFullSpec = false) {return "TINYBLOB";}	
+
+	public function GetMaxSize()
+	{
+		return 255;
+	}
+
+	public function GetFilterDefinitions()
+	{
+		// Note: due to this, you will get an error if a an encrypted field is declared as a search criteria (see ZLists)
+		// not allowed to search on encrypted fields !
+		return array();
+	}
+
+	public function MakeRealValue($proposedValue, $oHostObj)
+	{
+		if (is_null($proposedValue)) return null;
+		return (string)$proposedValue;
+	}
+
+	/**
+	 * Decrypt the value when reading from the database
+	 */
+	public function FromSQLToValue($aCols, $sPrefix = '')
+	{
+ 		$oSimpleCrypt = new SimpleCrypt();
+ 		$sValue = $oSimpleCrypt->Decrypt(self::$sKey, $aCols[$sPrefix]);
+		return $sValue;
+	}
+
+	/**
+	 * Encrypt the value before storing it in the database
+	 */
+	public function GetSQLValues($value)
+	{
+ 		$oSimpleCrypt = new SimpleCrypt();
+ 		$encryptedValue = $oSimpleCrypt->Encrypt(self::$sKey, $value);
+
+		$aValues = array();
+		$aValues[$this->Get("sql")] = $encryptedValue;
+		return $aValues;
+	}
+}
+
+
+// Wiki formatting - experimental
+//
+// [[<objClass>:<objName>]]
+// Example: [[Server:db1.tnut.com]]
+define('WIKI_OBJECT_REGEXP', '/\[\[(.+):(.+)\]\]/U');
+
+
+/**
+ * Map a text column (size > ?) to an attribute 
+ *
+ * @package	 iTopORM
+ */
+class AttributeText extends AttributeString
+{
+	public function GetEditClass() {return ($this->GetFormat() == 'text') ? 'Text' : "HTML";}
+	
+	protected function GetSQLCol($bFullSpec = false) {return "TEXT";}
+
+	public function GetSQLColumns($bFullSpec = false)
+	{
+		$aColumns = array();
+		$aColumns[$this->Get('sql')] = $this->GetSQLCol($bFullSpec);
+		if ($this->GetOptional('format', null) != null )
+		{
+			// Add the extra column only if the property 'format' is specified for the attribute
+			$aColumns[$this->Get('sql').'_format'] = "ENUM('text','html')";
+			if ($bFullSpec)
+			{
+				$aColumns[$this->Get('sql').'_format'].= " DEFAULT 'text'"; // default 'text' is for migrating old records
+			}
+		}
+		return $aColumns;
+	}
+
+	public function GetSQLExpressions($sPrefix = '')
+	{
+		if ($sPrefix == '')
+		{
+			$sPrefix = $this->Get('sql');
+		}
+		$aColumns = array();
+		// Note: to optimize things, the existence of the attribute is determined by the existence of one column with an empty suffix
+		$aColumns[''] = $sPrefix;
+		if ($this->GetOptional('format', null) != null )
+		{
+			// Add the extra column only if the property 'format' is specified for the attribute
+			$aColumns['_format'] = $sPrefix.'_format';
+		}
+		return $aColumns;
+	}
+	
+	public function GetMaxSize()
+	{
+		// Is there a way to know the current limitation for mysql?
+		// See mysql_field_len()
+		return 65535;
+	}
+
+	static public function RenderWikiHtml($sText, $bWikiOnly = false)
+	{
+		if (!$bWikiOnly)
+		{
+			$sPattern = '/'.str_replace('/', '\/', utils::GetConfig()->Get('url_validation_pattern')).'/i';
+			if (preg_match_all($sPattern, $sText, $aAllMatches, PREG_SET_ORDER /* important !*/ |PREG_OFFSET_CAPTURE /* important ! */))
+			{
+				$aUrls = array();
+				$i = count($aAllMatches);
+				// Replace the URLs by an actual hyperlink <a href="...">...</a>
+				// Let's do it backwards so that the initial positions are not modified by the replacement
+				// This works if the matches are captured: in the order they occur in the string  AND
+				// with their offset (i.e. position) inside the string
+				while($i > 0)
+				{
+					$i--;
+					$sUrl = $aAllMatches[$i][0][0]; // String corresponding to the main pattern
+					$iPos = $aAllMatches[$i][0][1]; // Position of the main pattern
+					$sText = substr_replace($sText, "<a href=\"$sUrl\">$sUrl</a>", $iPos, strlen($sUrl));
+					
+				}
+			}
+		}
+		if (preg_match_all(WIKI_OBJECT_REGEXP, $sText, $aAllMatches, PREG_SET_ORDER))
+		{
+			foreach($aAllMatches as $iPos => $aMatches)
+			{
+				$sClass = trim($aMatches[1]);
+				$sName = trim($aMatches[2]);
+				
+				if (MetaModel::IsValidClass($sClass))
+				{
+					$oObj = MetaModel::GetObjectByName($sClass, $sName, false /* MustBeFound */);
+					if (is_object($oObj))
+					{
+						// Propose a std link to the object
+						$sText = str_replace($aMatches[0], $oObj->GetHyperlink(), $sText);
+					}
+					else
+					{
+						// Propose a std link to the object
+						$sClassLabel = MetaModel::GetName($sClass);
+						$sText = str_replace($aMatches[0], "<span class=\"wiki_broken_link\">$sClassLabel:$sName</span>", $sText);
+						// Later: propose a link to create a new object
+						// Anyhow... there is no easy way to suggest default values based on the given FRIENDLY name
+						//$sText = preg_replace('/\[\[(.+):(.+)\]\]/', '<a href="'.utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=new&class='.$sClass.'&default[att1]=xxx&default[att2]=yyy">'.$sName.'</a>', $sText);
+					}
+				}
+			}
+		}
+		return $sText;
+	}
+
+	public function GetAsHTML($sValue, $oHostObject = null, $bLocalize = true)
+	{
+		$aStyles = array();
+		if ($this->GetWidth() != '')
+		{
+			$aStyles[] = 'width:'.$this->GetWidth();
+		}
+		if ($this->GetHeight() != '')
+		{
+			$aStyles[] = 'height:'.$this->GetHeight();
+		}
+		$sStyle = '';
+		if (count($aStyles) > 0)
+		{
+			$aStyles[] = 'overflow:auto';
+			$sStyle = 'style="'.implode(';', $aStyles).'"';
+		}
+		
+		if ($this->GetFormat() == 'text')
+		{
+			$sValue = parent::GetAsHTML($sValue, $oHostObject, $bLocalize);
+			$sValue = self::RenderWikiHtml($sValue);
+			return "<div $sStyle>".str_replace("\n", "<br>\n", $sValue).'</div>';			
+		}
+		else
+		{
+			$sValue = self::RenderWikiHtml($sValue, true /* wiki only */);
+			return "<div class=\"HTML\" $sStyle>".InlineImage::FixUrls($sValue).'</div>';
+		}
+		
+	}
+
+	public function GetEditValue($sValue, $oHostObj = null)
+	{
+		if ($this->GetFormat() == 'text')
+		{
+			if (preg_match_all(WIKI_OBJECT_REGEXP, $sValue, $aAllMatches, PREG_SET_ORDER))
+			{
+				foreach($aAllMatches as $iPos => $aMatches)
+				{
+					$sClass = $aMatches[1];
+					$sName = $aMatches[2];
+
+					if (MetaModel::IsValidClass($sClass))
+					{
+						$sClassLabel = MetaModel::GetName($sClass);
+						$sValue = str_replace($aMatches[0], "[[$sClassLabel:$sName]]", $sValue);
+					}
+				}
+			}
+		}
+		else
+		{
+			$sValue = str_replace('&', '&amp;', $sValue);
+		}
+		return $sValue;
+	}
+
+	/**
+	 * For fields containing a potential markup, return the value without this markup
+	 * @return string
+	 */
+	public function GetAsPlainText($sValue, $oHostObj = null)
+	{
+		if ($this->GetFormat() == 'html')
+		{
+			return (string) utils::HtmlToText($this->GetEditValue($sValue, $oHostObj));
+		}
+		else
+		{
+			return parent::GetAsPlainText($sValue, $oHostObj);
+		}
+	}
+	
+	public function MakeRealValue($proposedValue, $oHostObj)
+	{
+		$sValue = $proposedValue;
+		switch ($this->GetFormat())
+		{
+			case 'html':
+			if (($sValue !== null) && ($sValue !== ''))
+			{
+				$sValue = HTMLSanitizer::Sanitize($sValue);
+			}
+			break;
+			
+			case 'text':
+			default:
+			if (preg_match_all(WIKI_OBJECT_REGEXP, $sValue, $aAllMatches, PREG_SET_ORDER))
+			{
+				foreach($aAllMatches as $iPos => $aMatches)
+				{
+					$sClassLabel = $aMatches[1];
+					$sName = $aMatches[2];
+
+					if (!MetaModel::IsValidClass($sClassLabel))
+					{
+						$sClass = MetaModel::GetClassFromLabel($sClassLabel);
+						if ($sClass)
+						{
+							$sValue = str_replace($aMatches[0], "[[$sClass:$sName]]", $sValue);
+						}
+					}
+				}
+			}
+		}
+		return $sValue;
+	}
+
+	public function GetAsXML($value, $oHostObject = null, $bLocalize = true)
+	{
+		return Str::pure2xml($value);
+	}
+	
+	public function GetWidth()
+	{
+		return $this->GetOptional('width', '');		
+	}
+	
+	public function GetHeight()
+	{
+		return $this->GetOptional('height', '');		
+	}
+
+	static public function GetFormFieldClass()
+	{
+		return '\\Combodo\\iTop\\Form\\Field\\TextAreaField';
+	}
+
+	public function MakeFormField(DBObject $oObject, $oFormField = null)
+	{
+		if ($oFormField === null)
+		{
+			$sFormFieldClass = static::GetFormFieldClass();
+			$oFormField = new $sFormFieldClass($this->GetCode(), null, $oObject);
+			$oFormField->SetFormat($this->GetFormat());
+		}
+		parent::MakeFormField($oObject, $oFormField);
+
+		return $oFormField;
+	}
+
+	/**
+	 * The actual formatting of the field: either text (=plain text) or html (= text with HTML markup)
+	 * @return string
+	 */
+	public function GetFormat()
+	{
+		return $this->GetOptional('format', 'text');
+	}
+	
+	/**
+	 * Read the value from the row returned by the SQL query and transorms it to the appropriate
+	 * internal format (either text or html)
+	 * @see AttributeDBFieldVoid::FromSQLToValue()
+	 */
+	public function FromSQLToValue($aCols, $sPrefix = '')
+	{
+		$value = $aCols[$sPrefix.''];
+		if ($this->GetOptional('format', null) != null )
+		{
+			// Read from the extra column only if the property 'format' is specified for the attribute
+			$sFormat = $aCols[$sPrefix.'_format'];
+		}
+		else
+		{
+			$sFormat = $this->GetFormat();
+		}
+		
+		switch($sFormat)
+		{
+			case 'text':
+			if ($this->GetFormat() == 'html')
+			{
+				$value = utils::TextToHtml($value);
+			}
+			break;
+			
+			case 'html':
+			if ($this->GetFormat() == 'text')
+			{
+				$value = utils::HtmlToText($value);
+			}
+			else
+			{
+				$value = InlineImage::FixUrls((string)$value);
+			}
+			break;
+			
+			default:
+			// unknown format ??
+		}
+		return $value;
+	}
+	
+	public function GetSQLValues($value)
+	{
+		$aValues = array();
+		$aValues[$this->Get("sql")] = $this->ScalarToSQL($value);
+		if ($this->GetOptional('format', null) != null )
+		{
+			// Add the extra column only if the property 'format' is specified for the attribute
+			$aValues[$this->Get("sql").'_format'] = $this->GetFormat();
+		}
+		return $aValues;
+	}	
+	
+	public function GetAsCSV($sValue, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
+	{
+		switch($this->GetFormat())
+		{
+			case 'html':
+			if ($bConvertToPlainText)
+			{
+				$sValue = utils::HtmlToText((string)$sValue);
+			}
+			$sFrom = array("\r\n", $sTextQualifier);
+			$sTo = array("\n", $sTextQualifier.$sTextQualifier);
+			$sEscaped = str_replace($sFrom, $sTo, (string)$sValue);
+			return $sTextQualifier.$sEscaped.$sTextQualifier;
+			break;
+			
+			case 'text':
+			default:
+			return parent::GetAsCSV($sValue, $sSeparator, $sTextQualifier, $oHostObject, $bLocalize, $bConvertToPlainText);
+		}
+	}
+}
+
+/**
+ * Map a log to an attribute 
+ *
+ * @package	 iTopORM
+ */
+class AttributeLongText extends AttributeText
+{
+	protected function GetSQLCol($bFullSpec = false) {return "LONGTEXT";}
+
+	public function GetMaxSize()
+	{
+		// Is there a way to know the current limitation for mysql?
+		// See mysql_field_len()
+		return 65535*1024; // Limited... still 64 Mb!
+	}
+}
+
+/**
+ * An attibute that stores a case log (i.e journal) 
+ *
+ * @package	 iTopORM
+ */
+class AttributeCaseLog extends AttributeLongText
+{
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
+
+	public function GetNullValue()
+	{
+		return '';
+	} 
+
+	public function IsNull($proposedValue)
+	{
+		if (!($proposedValue instanceof ormCaseLog))
+		{
+			return ($proposedValue == '');
+		}
+		return ($proposedValue->GetText() == '');
+	} 
+
+	public function ScalarToSQL($value)
+	{
+		if (!is_string($value) && !is_null($value))
+		{
+			throw new CoreWarning('Expected the attribute value to be a string', array('found_type' => gettype($value), 'value' => $value, 'class' => $this->GetCode(), 'attribute' => $this->GetHostClass()));
+		}
+		return $value;
+	}
+	public function GetEditClass() {return "CaseLog";}
+
+	public function GetEditValue($sValue, $oHostObj = null)
+	{
+		if (!($sValue instanceOf ormCaseLog))
+		{
+			return '';
+		}
+		return $sValue->GetModifiedEntry();
+	}
+
+	/**
+	 * For fields containing a potential markup, return the value without this markup
+	 * @return string
+	 */
+	public function GetAsPlainText($value, $oHostObj = null)
+	{
+		if ($value instanceOf ormCaseLog)
+		{
+
+			return $value->GetAsPlainText();
+		}
+		else
+		{
+			return (string) $value;
+		}
+	}
+	
+	public function GetDefaultValue(DBObject $oHostObject = null) {return new ormCaseLog();}
+	public function Equals($val1, $val2) {return ($val1->GetText() == $val2->GetText());}
+	
+
+	// Facilitate things: allow the user to Set the value from a string
+	public function MakeRealValue($proposedValue, $oHostObj)
+	{
+		if ($proposedValue instanceof ormCaseLog)
+		{
+			// Passthrough
+			$ret = clone $proposedValue;
+		}
+		else
+		{
+			// Append the new value if an instance of the object is supplied
+			//
+			$oPreviousLog = null;
+			if ($oHostObj != null)
+			{
+				$oPreviousLog = $oHostObj->Get($this->GetCode());
+				if (!is_object($oPreviousLog))
+				{
+					$oPreviousLog = $oHostObj->GetOriginal($this->GetCode());;
+				}
+				
+			}
+			if (is_object($oPreviousLog))
+			{
+				$oCaseLog = clone($oPreviousLog);
+			}
+			else
+			{
+				$oCaseLog = new ormCaseLog();
+			}
+
+			if ($proposedValue instanceof stdClass)
+			{
+				$oCaseLog->AddLogEntryFromJSON($proposedValue);
+			}
+			else
+			{
+				if (strlen($proposedValue) > 0)
+				{
+					$oCaseLog->AddLogEntry($proposedValue);
+				}
+			}
+			$ret = $oCaseLog;
+		}
+		return $ret;
+	}
+
+	public function GetSQLExpressions($sPrefix = '')
+	{
+		if ($sPrefix == '')
+		{
+			$sPrefix = $this->Get('sql');
+		}
+		$aColumns = array();
+		// Note: to optimize things, the existence of the attribute is determined by the existence of one column with an empty suffix
+		$aColumns[''] = $sPrefix;
+		$aColumns['_index'] = $sPrefix.'_index';
+		return $aColumns;
+	}
+
+	public function FromSQLToValue($aCols, $sPrefix = '')
+	{
+		if (!array_key_exists($sPrefix, $aCols))
+		{
+			$sAvailable = implode(', ', array_keys($aCols));
+			throw new MissingColumnException("Missing column '$sPrefix' from {$sAvailable}");
+		} 
+		$sLog = $aCols[$sPrefix];
+
+		if (isset($aCols[$sPrefix.'_index'])) 
+		{
+			$sIndex = $aCols[$sPrefix.'_index'];
+		}
+		else
+		{
+			// For backward compatibility, allow the current state to be: 1 log, no index
+			$sIndex = '';
+		}
+
+		if (strlen($sIndex) > 0)
+		{ 
+			$aIndex = unserialize($sIndex);
+			$value = new ormCaseLog($sLog, $aIndex);
+		}
+		else
+		{
+			$value = new ormCaseLog($sLog);
+		}
+		return $value;
+	}
+
+	public function GetSQLValues($value)
+	{
+		if (!($value instanceOf ormCaseLog))
+		{
+			$value = new ormCaseLog('');
+		}
+		$aValues = array();
+		$aValues[$this->GetCode()] = $value->GetText();
+		$aValues[$this->GetCode().'_index'] = serialize($value->GetIndex());
+
+		return $aValues;
+	}
+
+	public function GetSQLColumns($bFullSpec = false)
+	{
+		$aColumns = array();
+		$aColumns[$this->GetCode()] = 'LONGTEXT'; // 2^32 (4 Gb)
+		$aColumns[$this->GetCode().'_index'] = 'BLOB';
+		return $aColumns;
+	}
+
+	public function GetAsHTML($value, $oHostObject = null, $bLocalize = true)
+	{
+		if ($value instanceOf ormCaseLog)
+		{
+			$sContent = $value->GetAsHTML(null, false, array(__class__, 'RenderWikiHtml'));
+		}
+		else
+		{
+			$sContent = '';
+		}
+		$aStyles = array();
+		if ($this->GetWidth() != '')
+		{
+			$aStyles[] = 'width:'.$this->GetWidth();
+		}
+		if ($this->GetHeight() != '')
+		{
+			$aStyles[] = 'height:'.$this->GetHeight();
+		}
+		$sStyle = '';
+		if (count($aStyles) > 0)
+		{
+			$sStyle = 'style="'.implode(';', $aStyles).'"';
+		}
+		return "<div class=\"caselog\" $sStyle>".$sContent.'</div>';	}
+
+
+	public function GetAsCSV($value, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
+	{
+		if ($value instanceOf ormCaseLog)
+		{
+			return parent::GetAsCSV($value->GetText($bConvertToPlainText), $sSeparator, $sTextQualifier, $oHostObject, $bLocalize, $bConvertToPlainText);
+		}
+		else
+		{
+			return '';
+		}
+	}
+	
+	public function GetAsXML($value, $oHostObject = null, $bLocalize = true)
+	{
+		if ($value instanceOf ormCaseLog)
+		{
+			return parent::GetAsXML($value->GetText(), $oHostObject, $bLocalize);
+		}
+		else
+		{
+			return '';
+		}
+	}
+
+	/**
+	 * List the available verbs for 'GetForTemplate'
+	 */	 
+	public function EnumTemplateVerbs()
+	{
+		return array(
+			'' => 'Plain text representation of all the log entries',
+			'head' => 'Plain text representation of the latest entry',
+			'head_html' => 'HTML representation of the latest entry',
+			'html' => 'HTML representation of all the log entries',
+		);
+	}
+
+	/**
+	 * Get various representations of the value, for insertion into a template (e.g. in Notifications)
+	 * @param $value mixed The current value of the field
+	 * @param $sVerb string The verb specifying the representation of the value
+	 * @param $oHostObject DBObject The object
+	 * @param $bLocalize bool Whether or not to localize the value
+	 */
+	public function GetForTemplate($value, $sVerb, $oHostObject = null, $bLocalize = true)
+	{
+		switch($sVerb)
+		{
+			case '':
+			return $value->GetText(true);
+			
+			case 'head':
+			return $value->GetLatestEntry('text');
+
+			case 'head_html':
+			return $value->GetLatestEntry('html');
+			
+			case 'html':
+			return $value->GetAsEmailHtml();
+	
+			default:
+			throw new Exception("Unknown verb '$sVerb' for attribute ".$this->GetCode().' in class '.get_class($oHostObject));
+		}
+	}
+	
+	/**
+	 * Helper to get a value that will be JSON encoded
+	 * The operation is the opposite to FromJSONToValue	 
+	 */	 	
+	public function GetForJSON($value)
+	{
+		return $value->GetForJSON();
+	}
+
+	/**
+	 * Helper to form a value, given JSON decoded data
+	 * The operation is the opposite to GetForJSON	 
+	 */	 	
+	public function FromJSONToValue($json)
+	{
+		if (is_string($json))
+		{
+			// Will be correctly handled in MakeRealValue
+			$ret = $json;
+		}
+		else
+		{
+			if (isset($json->add_item))
+			{
+				// Will be correctly handled in MakeRealValue
+				$ret = $json->add_item;
+				if (!isset($ret->message))
+				{
+					throw new Exception("Missing mandatory entry: 'message'");
+				}
+			}
+			else
+			{
+				$ret = ormCaseLog::FromJSON($json);
+			}
+		}
+		return $ret;
+	}
+	
+	public function Fingerprint($value)
+	{
+		$sFingerprint = '';
+		if ($value instanceOf ormCaseLog)
+		{
+			$sFingerprint = $value->GetText();
+		}
+		return $sFingerprint;
+	}
+	
+	/**
+	 * The actual formatting of the text: either text (=plain text) or html (= text with HTML markup)
+	 * @return string
+	 */
+	public function GetFormat()
+	{
+		return $this->GetOptional('format', 'html'); // default format for case logs is now HTML
+	}
+
+	static public function GetFormFieldClass()
+	{
+		return '\\Combodo\\iTop\\Form\\Field\\CaseLogField';
+	}
+
+	public function MakeFormField(DBObject $oObject, $oFormField = null)
+	{
+		// First we call the parent so the field is build
+		$oFormField = parent::MakeFormField($oObject, $oFormField);
+		// Then only we set the value
+		$oFormField->SetCurrentValue($this->GetEditValue($oObject->Get($this->GetCode())));
+		// And we set the entries
+		$oFormField->SetEntries($oObject->Get($this->GetCode())->GetAsArray());
+
+		return $oFormField;
+	}
+}
+
+/**
+ * Map a text column (size > ?), containing HTML code, to an attribute 
+ *
+ * @package	 iTopORM
+ */
+class AttributeHTML extends AttributeLongText
+{
+	public function GetSQLColumns($bFullSpec = false)
+	{
+		$aColumns = array();
+		$aColumns[$this->Get('sql')] = $this->GetSQLCol();
+		if ($this->GetOptional('format', null) != null )
+		{
+			// Add the extra column only if the property 'format' is specified for the attribute
+			$aColumns[$this->Get('sql').'_format'] = "ENUM('text','html')";
+			if ($bFullSpec)
+			{
+				$aColumns[$this->Get('sql').'_format'].= " DEFAULT 'html'"; // default 'html' is for migrating old records
+			}
+		}
+		return $aColumns;
+	}
+
+	/**
+	 * The actual formatting of the text: either text (=plain text) or html (= text with HTML markup)
+	 * @return string
+	 */
+	public function GetFormat()
+	{
+		return $this->GetOptional('format', 'html'); // Defaults to HTML
+	}
+}
+
+/**
+ * Specialization of a string: email 
+ *
+ * @package	 iTopORM
+ */
+class AttributeEmailAddress extends AttributeString
+{
+	public function GetValidationPattern()
+	{
+		return $this->GetOptional('validation_pattern', '^'.utils::GetConfig()->Get('email_validation_pattern').'$');
+	}
+
+    static public function GetFormFieldClass()
+    {
+        return '\\Combodo\\iTop\\Form\\Field\\EmailField';
+    }
+
+	public function GetAsHTML($sValue, $oHostObject = null, $bLocalize = true)
+	{
+		if (empty($sValue)) return '';
+		return '<a class="mailto" href="mailto:'.$sValue.'">'.parent::GetAsHTML($sValue).'</a>';
+	}
+}
+
+/**
+ * Specialization of a string: IP address 
+ *
+ * @package	 iTopORM
+ */
+class AttributeIPAddress extends AttributeString
+{
+	public function GetValidationPattern()
+	{
+		$sNum = '(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])';
+		return "^($sNum\\.$sNum\\.$sNum\\.$sNum)$";
+	}
+
+	public function GetOrderBySQLExpressions($sClassAlias)
+	{
+		// Note: This is the responsibility of this function to place backticks around column aliases
+		return array('INET_ATON(`'.$sClassAlias.$this->GetCode().'`)');
+	}
+}
+
+/**
+ * Specialization of a string: OQL expression 
+ *
+ * @package	 iTopORM
+ */
+class AttributeOQL extends AttributeText
+{
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
+
+	public function GetEditClass() {return "OQLExpression";}
+}
+
+/**
+ * Specialization of a string: template (contains iTop placeholders like $current_contact_id$ or $this->name$) 
+ *
+ * @package	 iTopORM
+ */
+class AttributeTemplateString extends AttributeString
+{
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
+}
+
+/**
+ * Specialization of a text: template (contains iTop placeholders like $current_contact_id$ or $this->name$)
+ *
+ * @package	 iTopORM
+ */
+class AttributeTemplateText extends AttributeText
+{
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
+}
+
+/**
+ * Specialization of a HTML: template (contains iTop placeholders like $current_contact_id$ or $this->name$)
+ *
+ * @package	 iTopORM
+ */
+class AttributeTemplateHTML extends AttributeText
+{
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
+
+	public function GetSQLColumns($bFullSpec = false)
+	{
+		$aColumns = array();
+		$aColumns[$this->Get('sql')] = $this->GetSQLCol();
+		if ($this->GetOptional('format', null) != null )
+		{
+			// Add the extra column only if the property 'format' is specified for the attribute
+			$aColumns[$this->Get('sql').'_format'] = "ENUM('text','html')";
+			if ($bFullSpec)
+			{
+				$aColumns[$this->Get('sql').'_format'].= " DEFAULT 'html'"; // default 'html' is for migrating old records
+			}
+		}
+		return $aColumns;
+	}
+
+	/**
+	 * The actual formatting of the text: either text (=plain text) or html (= text with HTML markup)
+	 * @return string
+	 */
+	public function GetFormat()
+	{
+		return $this->GetOptional('format', 'html'); // Defaults to HTML
+	}
+}
+
+
+/**
+ * Map a enum column to an attribute 
+ *
+ * @package	 iTopORM
+ */
+class AttributeEnum extends AttributeString
+{
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_ENUM;
+
+	static public function ListExpectedParams()
+	{
+		return parent::ListExpectedParams();
+		//return array_merge(parent::ListExpectedParams(), array());
+	}
+
+	public function GetEditClass() {return "String";}
+	protected function GetSQLCol($bFullSpec = false)
+	{
+		$oValDef = $this->GetValuesDef();
+		if ($oValDef)
+		{
+			$aValues = CMDBSource::Quote(array_keys($oValDef->GetValues(array(), "")), true);
+		}
+		else
+		{
+			$aValues = array();
+		}
+		if (count($aValues) > 0)
+		{
+			// The syntax used here do matters
+			// In particular, I had to remove unnecessary spaces to
+			// make sure that this string will match the field type returned by the DB
+			// (used to perform a comparison between the current DB format and the data model)
+			return "ENUM(".implode(",", $aValues).")".($bFullSpec ? $this->GetSQLColSpec() : '');
+		}
+		else
+		{
+			return "VARCHAR(255)".($bFullSpec ? " DEFAULT ''" : ""); // ENUM() is not an allowed syntax!
+		}
+	}
+	
+	protected function GetSQLColSpec()
+	{
+		$default = $this->ScalarToSQL($this->GetDefaultValue());
+		if (is_null($default))
+		{
+			$sRet = '';
+		}
+		else
+		{
+			// ENUMs values are strings so the default value must be a string as well,
+			// otherwise MySQL interprets the number as the zero-based index of the value in the list (i.e. the nth value in the list)
+			$sRet = " DEFAULT ".CMDBSource::Quote($default);
+		}
+		return $sRet;
+	}
+
+	public function ScalarToSQL($value)
+	{
+		// Note: for strings, the null value is an empty string and it is recorded as such in the DB
+		//	   but that wasn't working for enums, because '' is NOT one of the allowed values
+		//	   that's why a null value must be forced to a real null
+		$value = parent::ScalarToSQL($value);
+		if ($this->IsNull($value))
+		{
+			return null;
+		}
+		else
+		{
+			return $value;
+		}
+	}
+
+	public function RequiresIndex()
+	{
+		return false;
+	}
+
+	public function GetBasicFilterOperators()
+	{
+		return parent::GetBasicFilterOperators();
+	}
+	public function GetBasicFilterLooseOperator()
+	{
+		return '=';
+	}
+
+	public function GetBasicFilterSQLExpr($sOpCode, $value)
+	{
+		return parent::GetBasicFilterSQLExpr($sOpCode, $value);
+	} 
+
+	public function GetValueLabel($sValue)
+	{
+		if (is_null($sValue))
+		{
+			// Unless a specific label is defined for the null value of this enum, use a generic "undefined" label		
+			$sLabel = Dict::S('Class:'.$this->GetHostClass().'/Attribute:'.$this->GetCode().'/Value:'.$sValue, Dict::S('Enum:Undefined'));
+		}
+		else
+		{
+			$sLabel = $this->SearchLabel('/Attribute:'.$this->m_sCode.'/Value:'.$sValue, null, true /*user lang*/);
+			if (is_null($sLabel))
+			{
+				$sDefault = str_replace('_', ' ', $sValue);
+				// Browse the hierarchy again, accepting default (english) translations
+				$sLabel = $this->SearchLabel('/Attribute:'.$this->m_sCode.'/Value:'.$sValue, $sDefault, false);
+			}
+		}
+		return $sLabel;
+	}
+
+	public function GetValueDescription($sValue)
+	{
+		if (is_null($sValue))
+		{
+			// Unless a specific label is defined for the null value of this enum, use a generic "undefined" label		
+			$sDescription = Dict::S('Class:'.$this->GetHostClass().'/Attribute:'.$this->GetCode().'/Value:'.$sValue.'+', Dict::S('Enum:Undefined'));
+		}
+		else
+		{
+			$sDescription = Dict::S('Class:'.$this->GetHostClass().'/Attribute:'.$this->GetCode().'/Value:'.$sValue.'+', '', true /* user language only */);
+			if (strlen($sDescription) == 0)
+			{
+				$sParentClass = MetaModel::GetParentClass($this->m_sHostClass);
+				if ($sParentClass)
+				{
+					if (MetaModel::IsValidAttCode($sParentClass, $this->m_sCode))
+					{
+						$oAttDef = MetaModel::GetAttributeDef($sParentClass, $this->m_sCode);
+						$sDescription = $oAttDef->GetValueDescription($sValue);
+					}
+				}
+			}
+		}
+		return $sDescription;
+	}
+
+	public function GetAsHTML($sValue, $oHostObject = null, $bLocalize = true)
+	{
+		if ($bLocalize)
+		{
+			$sLabel = $this->GetValueLabel($sValue);
+			$sDescription = $this->GetValueDescription($sValue);
+			// later, we could imagine a detailed description in the title
+			$sRes = "<span title=\"$sDescription\">".parent::GetAsHtml($sLabel)."</span>";
+		}
+		else
+		{
+			$sRes = parent::GetAsHtml($sValue, $oHostObject, $bLocalize);
+		}
+		return $sRes;
+	}
+
+	public function GetAsXML($value, $oHostObject = null, $bLocalize = true)
+	{
+		if (is_null($value))
+		{
+			$sFinalValue = '';
+		}
+		elseif ($bLocalize)
+		{
+			$sFinalValue = $this->GetValueLabel($value);
+		}
+		else
+		{
+			$sFinalValue = $value;
+		}
+		$sRes = parent::GetAsXML($sFinalValue, $oHostObject, $bLocalize);
+		return $sRes;
+	}
+
+	public function GetAsCSV($sValue, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
+	{
+		if (is_null($sValue))
+		{
+			$sFinalValue = '';
+		}
+		elseif ($bLocalize)
+		{
+			$sFinalValue = $this->GetValueLabel($sValue);
+		}
+		else
+		{
+			$sFinalValue = $sValue;
+		}
+		$sRes = parent::GetAsCSV($sFinalValue, $sSeparator, $sTextQualifier, $oHostObject, $bLocalize);
+		return $sRes;
+	}
+
+	static public function GetFormFieldClass()
+	{
+		return '\\Combodo\\iTop\\Form\\Field\\SelectField';
+	}
+
+	public function MakeFormField(DBObject $oObject, $oFormField = null)
+	{
+		if ($oFormField === null)
+		{
+			// TODO : We should check $this->Get('display_style') and create a Radio / Select / ... regarding its value
+			$sFormFieldClass = static::GetFormFieldClass();
+			$oFormField = new $sFormFieldClass($this->GetCode());
+		}
+
+		$oFormField->SetChoices($this->GetAllowedValues($oObject->ToArgsForQuery()));
+		parent::MakeFormField($oObject, $oFormField);
+
+		return $oFormField;
+	}
+
+	public function GetEditValue($sValue, $oHostObj = null)
+	{
+		if (is_null($sValue))
+		{
+			return '';
+		}
+		else
+		{
+			return $this->GetValueLabel($sValue);
+		}
+	}
+
+	/**
+	 * Helper to get a value that will be JSON encoded
+	 * The operation is the opposite to FromJSONToValue	 
+	 */	 	
+	public function GetForJSON($value)
+	{
+		return $value;
+	}
+
+	public function GetAllowedValues($aArgs = array(), $sContains = '')
+	{
+		$aRawValues = parent::GetAllowedValues($aArgs, $sContains);
+		if (is_null($aRawValues)) return null;
+		$aLocalizedValues = array();
+		foreach ($aRawValues as $sKey => $sValue)
+		{
+			$aLocalizedValues[$sKey] = Str::pure2html($this->GetValueLabel($sKey));
+		}
+  		return $aLocalizedValues;
+  	}
+  	
+	/**
+	 * An enum can be localized
+	 */	 	
+	public function MakeValueFromString($sProposedValue, $bLocalizedValue = false, $sSepItem = null, $sSepAttribute = null, $sSepValue = null, $sAttributeQualifier = null)
+	{
+		if ($bLocalizedValue)
+		{
+			// Lookup for the value matching the input
+			//
+			$sFoundValue = null;
+			$aRawValues = parent::GetAllowedValues();
+			if (!is_null($aRawValues))
+			{
+				foreach ($aRawValues as $sKey => $sValue)
+				{
+					$sRefValue = $this->GetValueLabel($sKey);
+					if ($sProposedValue == $sRefValue)
+					{
+						$sFoundValue = $sKey;
+						break;
+					}
+				}
+			}
+			if (is_null($sFoundValue))
+			{
+				return null;
+			}
+	  		return $this->MakeRealValue($sFoundValue, null);
+		}
+		else
+		{
+			return parent::MakeValueFromString($sProposedValue, $bLocalizedValue, $sSepItem, $sSepAttribute, $sSepValue, $sAttributeQualifier);
+		}
+	}
+
+  	/**
+  	 * Processes the input value to align it with the values supported
+  	 * by this type of attribute. In this case: turns empty strings into nulls
+  	 * @param mixed $proposedValue The value to be set for the attribute
+  	 * @return mixed The actual value that will be set
+  	 */
+	public function MakeRealValue($proposedValue, $oHostObj)
+	{
+		if ($proposedValue == '') return null;
+		return parent::MakeRealValue($proposedValue, $oHostObj);
+	}
+	
+	public function GetOrderByHint()
+	{
+		$aValues = $this->GetAllowedValues();
+	
+		return Dict::Format('UI:OrderByHint_Values', implode(', ', $aValues));
+	}
+}
+
+/**
+ * A meta enum is an aggregation of enum from subclasses into an enum of a base class
+ * It has been designed is to cope with the fact that statuses must be defined in leaf classes, while it makes sense to
+ * have a superstatus available on the root classe(s)
+ *
+ * @package	 iTopORM
+ */
+class AttributeMetaEnum extends AttributeEnum
+{
+	static public function ListExpectedParams()
+	{
+		return array('allowed_values', 'sql', 'default_value', 'mapping');
+	}
+
+	public function IsNullAllowed()
+	{
+		return false; // Well... this actually depends on the mapping
+	}
+
+	public function IsWritable()
+	{
+		return false;
+	}
+
+	public function RequiresIndex()
+	{
+		return true;
+	}
+
+	public function GetPrerequisiteAttributes($sClass = null)
+	{
+		if (is_null($sClass))
+		{
+			$sClass = $this->GetHostClass();
+		}
+		$aMappingData = $this->GetMapRule($sClass);
+		if ($aMappingData == null)
+		{
+			$aRet = array();
+		}
+		else
+		{
+			$aRet = array($aMappingData['attcode']);
+		}
+		return $aRet;
+	}
+
+	/**
+	 * Overload the standard so as to leave the data unsorted
+	 *
+	 * @param array $aArgs
+	 * @param string $sContains
+	 * @return array|null
+	 */
+	public function GetAllowedValues($aArgs = array(), $sContains = '')
+	{
+		$oValSetDef = $this->GetValuesDef();
+		if (!$oValSetDef) return null;
+		$aRawValues = $oValSetDef->GetValueList();
+
+		if (is_null($aRawValues)) return null;
+		$aLocalizedValues = array();
+		foreach ($aRawValues as $sKey => $sValue)
+		{
+			$aLocalizedValues[$sKey] = Str::pure2html($this->GetValueLabel($sKey));
+		}
+		return $aLocalizedValues;
+	}
+
+	/**
+	 * Returns the meta value for the given object.
+	 * See also MetaModel::RebuildMetaEnums() that must be maintained when MapValue changes
+	 *
+	 * @param $oObject
+	 * @return mixed
+	 * @throws Exception
+	 */
+	public function MapValue($oObject)
+	{
+		$aMappingData = $this->GetMapRule(get_class($oObject));
+		if ($aMappingData == null)
+		{
+			$sRet = $this->GetDefaultValue();
+		}
+		else
+		{
+			$sAttCode = $aMappingData['attcode'];
+			$value = $oObject->Get($sAttCode);
+			if (array_key_exists($value, $aMappingData['values']))
+			{
+				$sRet = $aMappingData['values'][$value];
+			}
+			elseif ($this->GetDefaultValue() != '')
+			{
+				$sRet = $this->GetDefaultValue();
+			}
+			else
+			{
+				throw new Exception('AttributeMetaEnum::MapValue(): mapping not found for value "'.$value.'" in '.get_class($oObject).', on attribute '.MetaModel::GetAttributeOrigin($this->GetHostClass(), $this->GetCode()).'::'.$this->GetCode());
+			}
+		}
+		return $sRet;
+	}
+
+	public function GetMapRule($sClass)
+	{
+		$aMappings = $this->Get('mapping');
+		if (array_key_exists($sClass, $aMappings))
+		{
+			$aMappingData = $aMappings[$sClass];
+		}
+		else
+		{
+			$sParent = MetaModel::GetParentClass($sClass);
+			if (is_null($sParent))
+			{
+				$aMappingData = null;
+			}
+			else
+			{
+				$aMappingData = $this->GetMapRule($sParent);
+			}
+		}
+
+		return $aMappingData;
+	}
+}
+/**
+ * Map a date+time column to an attribute 
+ *
+ * @package	 iTopORM
+ */
+class AttributeDateTime extends AttributeDBField
+{
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_DATE_TIME;
+
+	static $oFormat = null;
+	
+	static public function GetFormat()
+	{
+		if (self::$oFormat == null)
+		{
+			static::LoadFormatFromConfig();		
+		}
+		return self::$oFormat;
+	}	
+	
+	/**
+	 * Load the 3 settings: date format, time format and data_time format from the configuration
+	 */
+	protected static function LoadFormatFromConfig()
+	{
+		$aFormats = MetaModel::GetConfig()->Get('date_and_time_format');
+		$sLang = Dict::GetUserLanguage();
+		$sDateFormat = isset($aFormats[$sLang]['date']) ? $aFormats[$sLang]['date'] : (isset($aFormats['default']['date']) ? $aFormats['default']['date'] : 'Y-m-d');
+		$sTimeFormat = isset($aFormats[$sLang]['time']) ? $aFormats[$sLang]['time'] : (isset($aFormats['default']['time']) ? $aFormats['default']['time'] : 'H:i:s');
+		$sDateAndTimeFormat = isset($aFormats[$sLang]['date_time']) ? $aFormats[$sLang]['date_time'] : (isset($aFormats['default']['date_time']) ? $aFormats['default']['date_time'] : '$date $time');
+		
+		$sFullFormat = str_replace(array('$date', '$time'), array($sDateFormat, $sTimeFormat), $sDateAndTimeFormat);
+		
+		self::SetFormat(new DateTimeFormat($sFullFormat));
+		AttributeDate::SetFormat(new DateTimeFormat($sDateFormat));		
+	}
+	
+	/**
+	 * Returns the format string used for the date & time stored in memory
+	 * @return string
+	 */
+	static public function GetInternalFormat()
+	{
+		return 'Y-m-d H:i:s';
+	}
+
+	/**
+	 * Returns the format string used for the date & time written to MySQL
+	 * @return string
+	 */
+	static public function GetSQLFormat()
+	{
+		return 'Y-m-d H:i:s';
+	}
+	
+	static public function SetFormat(DateTimeFormat $oDateTimeFormat)
+	{
+		self::$oFormat = $oDateTimeFormat;
+	}
+	
+	static public function GetSQLTimeFormat()
+	{
+		return 'H:i:s';
+	}
+	
+	/**
+	 * Parses a search string coming from user input
+	 * @param string $sSearchString
+	 * @return string
+	 */
+	public function ParseSearchString($sSearchString)
+	{
+		try
+		{
+			$oDateTime = $this->GetFormat()->Parse($sSearchString);
+			$sSearchString = $oDateTime->format($this->GetInternalFormat());
+		}
+		catch(Exception $e)
+		{
+			$sFormatString = '!'.(string)AttributeDate::GetFormat(); // BEWARE: ! is needed to set non-parsed fields to zero !!!
+			$oDateTime = DateTime::createFromFormat($sFormatString, $sSearchString); 
+			if ($oDateTime !== false)
+			{
+				$sSearchString = $oDateTime->format($this->GetInternalFormat());
+			}
+		}
+		return $sSearchString;
+	}
+	
+	static public function GetFormFieldClass()
+	{
+		return '\\Combodo\\iTop\\Form\\Field\\DateTimeField';
+	}
+	
+	/**
+	 * Override to specify Field class
+	 *
+	 * When called first, $oFormField is null and will be created (eg. Make). Then when the ::parent is called and the $oFormField is passed, MakeFormField behave more like a Prepare.
+	 */
+	public function MakeFormField(DBObject $oObject, $oFormField = null)
+	{
+		if ($oFormField === null)
+		{
+			$sFormFieldClass = static::GetFormFieldClass();
+			$oFormField = new $sFormFieldClass($this->GetCode());
+		}
+		$oFormField->SetPHPDateTimeFormat((string) $this->GetFormat());
+		$oFormField->SetJSDateTimeFormat($this->GetFormat()->ToMomentJS());
+
+		$oFormField = parent::MakeFormField($oObject, $oFormField);
+
+		// After call to the parent as it sets the current value
+		$oFormField->SetCurrentValue($this->GetFormat()->Format($oObject->Get($this->GetCode())));
+
+		return $oFormField;
+	}
+
+    /**
+     * @inheritdoc
+     */
+    public function EnumTemplateVerbs()
+    {
+        return array(
+            '' => 'Formatted representation',
+            'raw' => 'Not formatted representation',
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function GetForTemplate($value, $sVerb, $oHostObject = null, $bLocalize = true)
+    {
+        switch ($sVerb)
+        {
+            case '':
+            case 'text':
+                return static::GetFormat()->format($value);
+                break;
+            case 'html':
+                // Note: Not passing formatted value as the method will format it.
+                return $this->GetAsHTML($value);
+                break;
+            case 'raw':
+                return $value;
+                break;
+            default:
+                return parent::GetForTemplate($value, $sVerb, $oHostObject, $bLocalize);
+                break;
+        }
+        return null;
+    }
+
+	static public function ListExpectedParams()
+	{
+		return parent::ListExpectedParams();
+		//return array_merge(parent::ListExpectedParams(), array());
+	}
+
+	public function GetEditClass() {return "DateTime";}
+
+
+	public function GetEditValue($sValue, $oHostObj = null)
+	{
+		return (string)static::GetFormat()->format($sValue);
+	}	
+	public function GetValueLabel($sValue, $oHostObj = null)
+	{
+		return (string)static::GetFormat()->format($sValue);
+	}	
+	
+	protected function GetSQLCol($bFullSpec = false) {return "DATETIME";}
+
+	public function GetImportColumns()
+	{
+		// Allow an empty string to be a valid value (synonym for "reset")
+		$aColumns = array();
+		$aColumns[$this->GetCode()] = 'VARCHAR(19)';
+		return $aColumns;
+	}
+
+	public static function GetAsUnixSeconds($value)
+	{
+		$oDeadlineDateTime = new DateTime($value);
+		$iUnixSeconds = $oDeadlineDateTime->format('U');
+		return $iUnixSeconds;
+	}
+
+	public function GetDefaultValue(DBObject $oHostObject = null)
+	{
+		// null value will be replaced by the current date, if not already set, in DoComputeValues
+		return $this->GetNullValue();
+	}
+
+	public function GetValidationPattern()
+	{
+		return static::GetFormat()->ToRegExpr();
+	}
+
+	public function GetBasicFilterOperators()
+	{
+		return array(
+			"="=>"equals",
+			"!="=>"differs from",
+			"<"=>"before",
+			"<="=>"before",
+			">"=>"after (strictly)",
+			">="=>"after",
+			"SameDay"=>"same day (strip time)",
+			"SameMonth"=>"same year/month",
+			"SameYear"=>"same year",
+			"Today"=>"today",
+			">|"=>"after today + N days",
+			"<|"=>"before today + N days",
+			"=|"=>"equals today + N days",
+		);
+	}
+	public function GetBasicFilterLooseOperator()
+	{
+		// Unless we implement a "same xxx, depending on given precision" !
+		return "=";
+	}
+
+	public function GetBasicFilterSQLExpr($sOpCode, $value)
+	{
+		$sQValue = CMDBSource::Quote($value);
+
+		switch ($sOpCode)
+		{
+		case '=':
+		case '!=':
+		case '<':
+		case '<=':
+		case '>':
+		case '>=':
+			return $this->GetSQLExpr()." $sOpCode $sQValue";
+		case 'SameDay':
+			return "DATE(".$this->GetSQLExpr().") = DATE($sQValue)";
+		case 'SameMonth':
+			return "DATE_FORMAT(".$this->GetSQLExpr().", '%Y-%m') = DATE_FORMAT($sQValue, '%Y-%m')";
+		case 'SameYear':
+			return "MONTH(".$this->GetSQLExpr().") = MONTH($sQValue)";
+		case 'Today':
+			return "DATE(".$this->GetSQLExpr().") = CURRENT_DATE()";
+		case '>|':
+			return "DATE(".$this->GetSQLExpr().") > DATE_ADD(CURRENT_DATE(), INTERVAL $sQValue DAY)";
+		case '<|':
+			return "DATE(".$this->GetSQLExpr().") < DATE_ADD(CURRENT_DATE(), INTERVAL $sQValue DAY)";
+		case '=|':
+			return "DATE(".$this->GetSQLExpr().") = DATE_ADD(CURRENT_DATE(), INTERVAL $sQValue DAY)";
+		default:
+			return $this->GetSQLExpr()." = $sQValue";
+		}
+	}
+	
+	public function MakeRealValue($proposedValue, $oHostObj)
+	{
+		if (is_null($proposedValue))
+		{
+			return null;
+		}
+		if (is_string($proposedValue) && ($proposedValue == "") && $this->IsNullAllowed())
+		{
+			return null;
+		}
+		if (!is_numeric($proposedValue))
+		{
+			// Check the format
+			try
+			{
+				$oFormat = new DateTimeFormat($this->GetInternalFormat());
+				$oTrash = $oFormat->Parse($proposedValue);
+			}
+			catch (Exception $e)
+			{
+				throw new Exception('Wrong format for date attribute '.$this->GetCode().', expecting "'.$this->GetInternalFormat().'" and got "'.$proposedValue.'"');
+			}
+
+			return $proposedValue;
+		}
+
+		return date(static::GetInternalFormat(), $proposedValue);
+	}
+
+	public function ScalarToSQL($value)
+	{
+		if (is_null($value))
+		{	
+			return null;
+		}
+		elseif (empty($value))
+		{
+			// Make a valid date for MySQL. TO DO: support NULL as a literal value for fields that can be null.
+			// todo: this is NOT valid in strict mode (default setting for MySQL 5.7)
+			// todo: if to be kept, this should be overloaded for AttributeDate (0000-00-00)
+			return '0000-00-00 00:00:00';
+		}
+		return $value;
+	}
+
+	public function GetAsHTML($value, $oHostObject = null, $bLocalize = true)
+	{
+		return Str::pure2html(static::GetFormat()->format($value));
+	}
+
+	public function GetAsXML($value, $oHostObject = null, $bLocalize = true)
+	{
+		return Str::pure2xml($value);
+	}
+
+	public function GetAsCSV($sValue, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
+	{
+		if (empty($sValue) || ($sValue === '0000-00-00 00:00:00') || ($sValue === '0000-00-00'))
+		{
+			return '';
+		}
+		else if ((string)static::GetFormat() !== static::GetInternalFormat())
+		{
+			// Format conversion
+			$oDate = new DateTime($sValue);
+			if ($oDate !== false)
+			{
+				$sValue = static::GetFormat()->format($oDate);
+			}
+		}
+		$sFrom = array("\r\n", $sTextQualifier);
+		$sTo = array("\n", $sTextQualifier.$sTextQualifier);
+		$sEscaped = str_replace($sFrom, $sTo, (string)$sValue);
+		return $sTextQualifier.$sEscaped.$sTextQualifier;
+	}
+	
+	/**
+	 * Parses a string to find some smart search patterns and build the corresponding search/OQL condition
+	 * Each derived class is reponsible for defining and processing their own smart patterns, the base class
+	 * does nothing special, and just calls the default (loose) operator
+	 * @param string $sSearchText The search string to analyze for smart patterns
+	 * @param FieldExpression The FieldExpression representing the atttribute code in this OQL query
+	 * @param Hash $aParams Values of the query parameters
+	 * @return Expression The search condition to be added (AND) to the current search
+	 */
+	public function GetSmartConditionExpression($sSearchText, FieldExpression $oField, &$aParams, $bParseSearchString = false)
+	{
+		// Possible smart patterns
+		$aPatterns = array(
+			'between' => array('pattern' => '/^\[(.*),(.*)\]$/', 'operator' => 'n/a'),
+			'greater than or equal' => array('pattern' => '/^>=(.*)$/', 'operator' => '>='),
+			'greater than' => array('pattern' => '/^>(.*)$/', 'operator' => '>'),
+			'less than or equal' => array('pattern' => '/^<=(.*)$/', 'operator' => '<='),
+			'less than' =>  array('pattern' => '/^<(.*)$/', 'operator' => '<'),
+		);
+		
+		$sPatternFound = '';
+		$aMatches = array();
+		foreach($aPatterns as $sPatName => $sPattern)
+		{
+			if (preg_match($sPattern['pattern'], $sSearchText, $aMatches))
+			{
+				$sPatternFound = $sPatName;
+				break;
+			}			
+		}
+		
+		switch($sPatternFound)
+		{
+			case 'between':
+			
+			$sParamName1 = $oField->GetParent().'_'.$oField->GetName().'_1';
+			$oRightExpr = new VariableExpression($sParamName1);
+			if ($bParseSearchString)
+			{
+				$aParams[$sParamName1] = $this->ParseSearchString($aMatches[1]);
+			}
+			else
+			{
+			$aParams[$sParamName1] = $aMatches[1];
+			}
+			$oCondition1 = new BinaryExpression($oField, '>=', $oRightExpr);
+
+			$sParamName2 = $oField->GetParent().'_'.$oField->GetName().'_2';
+			$oRightExpr = new VariableExpression($sParamName2);
+			$sOperator = $this->GetBasicFilterLooseOperator();
+			if ($bParseSearchString)
+			{
+				$aParams[$sParamName2] = $this->ParseSearchString($aMatches[2]);
+			}
+			else
+			{
+			$aParams[$sParamName2] = $aMatches[2];
+			}
+			$oCondition2 = new BinaryExpression($oField, '<=', $oRightExpr);
+			
+			$oNewCondition = new BinaryExpression($oCondition1, 'AND', $oCondition2);
+			break;
+			
+			case 'greater than':
+			case 'greater than or equal':
+			case 'less than':
+			case 'less than or equal':
+			$sSQLOperator = $aPatterns[$sPatternFound]['operator'];
+			$sParamName = $oField->GetParent().'_'.$oField->GetName();
+			$oRightExpr = new VariableExpression($sParamName);
+			if ($bParseSearchString)
+			{
+				$aParams[$sParamName] = $this->ParseSearchString($aMatches[1]);
+			}
+			else
+			{
+			$aParams[$sParamName] = $aMatches[1];
+			}
+			$oNewCondition = new BinaryExpression($oField, $sSQLOperator, $oRightExpr);
+			
+			break;
+						
+			default:
+			$oNewCondition = parent::GetSmartConditionExpression($sSearchText, $oField, $aParams, $bParseSearchString);
+
+		}
+
+		return $oNewCondition;
+	}
+
+
+	public function GetHelpOnSmartSearch()
+	{
+		$sDict = parent::GetHelpOnSmartSearch();
+		
+		$oFormat = static::GetFormat();
+		$sExample = $oFormat->Format(new DateTime('2015-07-19 18:40:00'));
+		return vsprintf($sDict, array($oFormat->ToPlaceholder(), $sExample));
+	}	
+}
+
+/**
+ * Store a duration as a number of seconds 
+ *
+ * @package	 iTopORM
+ */
+class AttributeDuration extends AttributeInteger
+{
+	public function GetEditClass() {return "Duration";}
+	protected function GetSQLCol($bFullSpec = false) {return "INT(11) UNSIGNED";}
+
+	public function GetNullValue() {return '0';}
+
+	public function MakeRealValue($proposedValue, $oHostObj)
+	{
+		if (is_null($proposedValue)) return null;
+		if (!is_numeric($proposedValue)) return null;
+		if ( ((int)$proposedValue) < 0) return null;
+
+		return (int)$proposedValue;
+	}
+
+	public function ScalarToSQL($value)
+	{
+		if (is_null($value))
+		{	
+			return null;
+		}
+		return $value;
+	}
+
+	public function GetAsHTML($value, $oHostObject = null, $bLocalize = true)
+	{
+		return Str::pure2html(self::FormatDuration($value));
+	}
+
+	public static function FormatDuration($duration)
+	{
+		$aDuration = self::SplitDuration($duration);
+		$sResult = '';
+		
+		if ($duration < 60)
+		{
+			// Less than 1 min
+			$sResult = Dict::Format('Core:Duration_Seconds', $aDuration['seconds']);			
+		}
+		else if ($duration < 3600)
+		{
+			// less than 1 hour, display it in minutes/seconds
+			$sResult = Dict::Format('Core:Duration_Minutes_Seconds', $aDuration['minutes'], $aDuration['seconds']);			
+		}
+		else if ($duration < 86400)
+		{
+			// Less than 1 day, display it in hours/minutes/seconds	
+			$sResult = Dict::Format('Core:Duration_Hours_Minutes_Seconds', $aDuration['hours'], $aDuration['minutes'], $aDuration['seconds']);			
+		}
+		else
+		{
+			// more than 1 day, display it in days/hours/minutes/seconds
+			$sResult = Dict::Format('Core:Duration_Days_Hours_Minutes_Seconds', $aDuration['days'], $aDuration['hours'], $aDuration['minutes'], $aDuration['seconds']);			
+		}
+		return $sResult;
+	}
+	
+	static function SplitDuration($duration)
+	{
+		$duration = (int) $duration;
+		$days = floor($duration / 86400);
+		$hours = floor(($duration - (86400*$days)) / 3600);
+		$minutes = floor(($duration - (86400*$days + 3600*$hours)) / 60);
+		$seconds = ($duration % 60); // modulo
+		return array( 'days' => $days, 'hours' => $hours, 'minutes' => $minutes, 'seconds' => $seconds );		
+	}
+
+	static public function GetFormFieldClass()
+	{
+		return '\\Combodo\\iTop\\Form\\Field\\DurationField';
+	}
+
+	public function MakeFormField(DBObject $oObject, $oFormField = null)
+	{
+		if ($oFormField === null)
+		{
+			$sFormFieldClass = static::GetFormFieldClass();
+			$oFormField = new $sFormFieldClass($this->GetCode());
+		}
+		parent::MakeFormField($oObject, $oFormField);
+
+		// Note : As of today, this attribute is -by nature- only supported in readonly mode, not edition
+		$sAttCode = $this->GetCode();
+		$oFormField->SetCurrentValue($oObject->Get($sAttCode));
+		$oFormField->SetReadOnly(true);
+
+		return $oFormField;
+	}
+
+}
+/**
+ * Map a date+time column to an attribute 
+ *
+ * @package	 iTopORM
+ */
+class AttributeDate extends AttributeDateTime
+{
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_DATE;
+
+	static $oDateFormat = null;
+	
+	static public function GetFormat()
+	{
+		if (self::$oDateFormat == null)
+		{			
+			AttributeDateTime::LoadFormatFromConfig();		
+		}
+		return self::$oDateFormat;
+	}
+
+	static public function SetFormat(DateTimeFormat $oDateFormat)
+	{
+		self::$oDateFormat = $oDateFormat;
+	}
+
+	/**
+	 * Returns the format string used for the date & time stored in memory
+	 * @return string
+	 */
+	static public function GetInternalFormat()
+	{
+		return 'Y-m-d';
+	}
+
+	/**
+	 * Returns the format string used for the date & time written to MySQL
+	 * @return string
+	 */
+	static public function GetSQLFormat()
+	{
+		return 'Y-m-d';
+	}
+	
+	static public function ListExpectedParams()
+	{
+		return parent::ListExpectedParams();
+		//return array_merge(parent::ListExpectedParams(), array());
+	}
+
+	public function GetEditClass() {return "Date";}
+	protected function GetSQLCol($bFullSpec = false) {return "DATE";}
+	public function GetImportColumns()
+	{
+		// Allow an empty string to be a valid value (synonym for "reset")
+		$aColumns = array();
+		$aColumns[$this->GetCode()] = 'VARCHAR(10)';
+		return $aColumns;
+	}
+
+
+	/**
+	 * Override to specify Field class
+	 *
+	 * When called first, $oFormField is null and will be created (eg. Make). Then when the ::parent is called and the $oFormField is passed, MakeFormField behave more like a Prepare.
+	 */
+	public function MakeFormField(DBObject $oObject, $oFormField = null)
+	{
+		$oFormField = parent::MakeFormField($oObject, $oFormField);
+		$oFormField->SetDateOnly(true);
+		
+		return $oFormField;
+	}
+	
+}
+
+/**
+ * A dead line stored as a date & time
+ * The only difference with the DateTime attribute is the display:
+ * relative to the current time
+ */
+class AttributeDeadline extends AttributeDateTime
+{
+	public function GetAsHTML($value, $oHostObject = null, $bLocalize = true)
+	{
+		$sResult = self::FormatDeadline($value);
+		return $sResult;
+	}
+
+	public static function FormatDeadline($value)
+	{
+		$sResult = '';
+		if ($value !== null)
+		{
+			$iValue = AttributeDateTime::GetAsUnixSeconds($value);
+			$sDate = AttributeDateTime::GetFormat()->Format($value);
+			$difference = $iValue - time();
+	
+			if ($difference >= 0)
+			{
+				$sDifference = self::FormatDuration($difference);
+			}
+			else
+			{
+				$sDifference = Dict::Format('UI:DeadlineMissedBy_duration', self::FormatDuration(-$difference));
+			}
+			$sFormat = MetaModel::GetConfig()->Get('deadline_format', '$difference$');
+			$sResult = str_replace(array('$date$', '$difference$'), array($sDate, $sDifference), $sFormat);
+		}
+
+		return $sResult;
+	}
+
+	static function FormatDuration($duration)
+	{
+		$days = floor($duration / 86400);
+		$hours = floor(($duration - (86400*$days)) / 3600);
+		$minutes = floor(($duration - (86400*$days + 3600*$hours)) / 60);
+		$sResult = '';
+		
+		if ($duration < 60)
+		{
+			// Less than 1 min
+			$sResult =Dict::S('UI:Deadline_LessThan1Min');			
+		}
+		else if ($duration < 3600)
+		{
+			// less than 1 hour, display it in minutes
+			$sResult =Dict::Format('UI:Deadline_Minutes', $minutes);			
+		}
+		else if ($duration < 86400)
+		{
+			// Less that 1 day, display it in hours/minutes	
+			$sResult =Dict::Format('UI:Deadline_Hours_Minutes', $hours, $minutes);			
+		}
+		else
+		{
+			// Less that 1 day, display it in hours/minutes	
+			$sResult =Dict::Format('UI:Deadline_Days_Hours_Minutes', $days, $hours, $minutes);			
+		}
+		return $sResult;
+	}
+}
+
+/**
+ * Map a foreign key to an attribute 
+ *  AttributeExternalKey and AttributeExternalField may be an external key
+ *  the difference is that AttributeExternalKey corresponds to a column into the defined table
+ *  where an AttributeExternalField corresponds to a column into another table (class)
+ *
+ * @package	 iTopORM
+ */
+class AttributeExternalKey extends AttributeDBFieldVoid
+{
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_EXTERNAL_KEY;
+
+	static public function ListExpectedParams()
+	{
+		return array_merge(parent::ListExpectedParams(), array("targetclass", "is_null_allowed", "on_target_delete"));
+	}
+
+	public function GetEditClass() {return "ExtKey";}
+	protected function GetSQLCol($bFullSpec = false) {return "INT(11)".($bFullSpec ? " DEFAULT 0" : "");}
+	public function RequiresIndex()
+	{
+		return true;
+	}
+
+	public function IsExternalKey($iType = EXTKEY_RELATIVE) {return true;}
+	public function GetTargetClass($iType = EXTKEY_RELATIVE) {return $this->Get("targetclass");}
+	public function GetKeyAttDef($iType = EXTKEY_RELATIVE){return $this;}
+	public function GetKeyAttCode() {return $this->GetCode();} 
+	public function GetDisplayStyle() { return $this->GetOptional('display_style', 'select'); }
+	
+
+	public function GetDefaultValue(DBObject $oHostObject = null) {return 0;}
+	public function IsNullAllowed()
+	{
+		if (MetaModel::GetConfig()->Get('disable_mandatory_ext_keys'))
+		{
+			return true;
+		}
+		return $this->Get("is_null_allowed");
+	}
+
+
+	public function GetBasicFilterOperators()
+	{
+		return parent::GetBasicFilterOperators();
+	}
+	public function GetBasicFilterLooseOperator()
+	{
+		return parent::GetBasicFilterLooseOperator();
+	}
+
+	public function GetBasicFilterSQLExpr($sOpCode, $value)
+	{
+		return parent::GetBasicFilterSQLExpr($sOpCode, $value);
+	} 
+
+	// overloaded here so that an ext key always have the answer to
+	// "what are your possible values?"
+	public function GetValuesDef()
+	{
+		$oValSetDef = $this->Get("allowed_values");
+		if (!$oValSetDef)
+		{
+			// Let's propose every existing value
+			$oValSetDef = new ValueSetObjects('SELECT '.$this->GetTargetClass());
+		}
+		return $oValSetDef;
+	}
+
+	public function GetAllowedValues($aArgs = array(), $sContains = '')
+	{
+		//throw new Exception("GetAllowedValues on ext key has been deprecated");
+		try
+		{
+			return parent::GetAllowedValues($aArgs, $sContains);
+		}
+		catch (MissingQueryArgument $e)
+		{
+			// Some required arguments could not be found, enlarge to any existing value
+			$oValSetDef = new ValueSetObjects('SELECT '.$this->GetTargetClass());
+			return $oValSetDef->GetValues($aArgs, $sContains);
+		}
+	}
+
+	public function GetAllowedValuesAsObjectSet($aArgs = array(), $sContains = '', $iAdditionalValue = null)
+	{
+		$oValSetDef = $this->GetValuesDef();
+		$oSet = $oValSetDef->ToObjectSet($aArgs, $sContains, $iAdditionalValue);
+		return $oSet;
+	}
+
+	public function GetAllowedValuesAsFilter($aArgs = array(), $sContains = '', $iAdditionalValue = null)
+	{
+		return DBObjectSearch::FromOQL($this->GetValuesDef()->GetFilterExpression());
+	}
+
+	public function GetDeletionPropagationOption()
+	{
+		return $this->Get("on_target_delete");
+	}
+
+	public function GetNullValue()
+	{
+		return 0;
+	} 
+
+	public function IsNull($proposedValue)
+	{
+		return ($proposedValue == 0);
+	} 
+
+	public function MakeRealValue($proposedValue, $oHostObj)
+	{
+		if (is_null($proposedValue)) return 0;
+		if ($proposedValue === '') return 0;
+		if (MetaModel::IsValidObject($proposedValue)) return $proposedValue->GetKey();
+		return (int)$proposedValue;
+	}
+	
+	public function GetMaximumComboLength()
+	{
+		return $this->GetOptional('max_combo_length', MetaModel::GetConfig()->Get('max_combo_length'));
+	}
+	
+	public function GetMinAutoCompleteChars()
+	{
+		return $this->GetOptional('min_autocomplete_chars', MetaModel::GetConfig()->Get('min_autocomplete_chars'));
+	}
+	
+	public function AllowTargetCreation()
+	{
+		return $this->GetOptional('allow_target_creation', MetaModel::GetConfig()->Get('allow_target_creation'));
+	}
+
+	/**
+	 * Find the corresponding "link" attribute on the target class, if any
+	 * @return null | AttributeDefinition
+	 */
+	public function GetMirrorLinkAttribute()
+	{
+		$oRet = null;
+		$sRemoteClass = $this->GetTargetClass();
+		foreach (MetaModel::ListAttributeDefs($sRemoteClass) as $sRemoteAttCode => $oRemoteAttDef)
+		{
+			if (!$oRemoteAttDef->IsLinkSet()) continue;
+			if (!is_subclass_of($this->GetHostClass(), $oRemoteAttDef->GetLinkedClass()) && $oRemoteAttDef->GetLinkedClass() != $this->GetHostClass()) continue;
+			if ($oRemoteAttDef->GetExtKeyToMe() != $this->GetCode()) continue;
+			$oRet = $oRemoteAttDef;
+			break;
+		}
+		return $oRet;
+	}
+
+	static public function GetFormFieldClass()
+	{
+		return '\\Combodo\\iTop\\Form\\Field\\SelectObjectField';
+	}
+
+	public function MakeFormField(DBObject $oObject, $oFormField = null)
+	{
+		if ($oFormField === null)
+		{
+			// TODO : We should check $this->Get('display_style') and create a Radio / Select / ... regarding its value
+			$sFormFieldClass = static::GetFormFieldClass();
+			$oFormField = new $sFormFieldClass($this->GetCode());
+		}
+		
+		// Setting params
+		$oFormField->SetMaximumComboLength($this->GetMaximumComboLength());
+		$oFormField->SetMinAutoCompleteChars($this->GetMinAutoCompleteChars());
+		$oFormField->SetHierarchical(MetaModel::IsHierarchicalClass($this->GetTargetClass()));
+		// Setting choices regarding the field dependencies
+		$aFieldDependencies = $this->GetPrerequisiteAttributes();
+		if (!empty($aFieldDependencies))
+		{
+			$oTmpAttDef = $this;
+			$oTmpField = $oFormField;
+			$oFormField->SetOnFinalizeCallback(function() use ($oTmpField, $oTmpAttDef, $oObject)
+			{
+			    /** @var $oTmpField \Combodo\iTop\Form\Field\Field */
+			    /** @var $oTmpAttDef \AttributeDefinition */
+			    /** @var $oObject \DBObject */
+
+				// We set search object only if it has not already been set (overrided)
+				if ($oTmpField->GetSearch() === null)
+				{
+					$oSearch = DBSearch::FromOQL($oTmpAttDef->GetValuesDef()->GetFilterExpression());
+					$oSearch->SetInternalParams(array('this' => $oObject));
+					$oTmpField->SetSearch($oSearch);
+				}
+			});
+		}
+		else
+		{
+			$oSearch = DBSearch::FromOQL($this->GetValuesDef()->GetFilterExpression());
+			$oSearch->SetInternalParams(array('this' => $oObject));
+			$oFormField->SetSearch($oSearch);
+		}
+
+		// If ExtKey is mandatory, we add a validator to ensure that the value 0 is not selected
+		if ($oObject->GetAttributeFlags($this->GetCode()) & OPT_ATT_MANDATORY)
+		{
+			$oFormField->AddValidator(new \Combodo\iTop\Form\Validator\NotEmptyExtKeyValidator());
+		}
+
+		parent::MakeFormField($oObject, $oFormField);
+
+		return $oFormField;
+	}
+
+}
+
+/**
+ * Special kind of External Key to manage a hierarchy of objects
+ */
+class AttributeHierarchicalKey extends AttributeExternalKey
+{
+	protected $m_sTargetClass;
+
+	static public function ListExpectedParams()
+	{
+		$aParams = parent::ListExpectedParams();
+		$idx = array_search('targetclass', $aParams);
+		unset($aParams[$idx]);
+		$idx = array_search('jointype', $aParams);
+		unset($aParams[$idx]);
+		return $aParams; // TODO: mettre les bons parametres ici !!
+	}
+
+	public function GetEditClass() {return "ExtKey";}
+	public function RequiresIndex()
+	{
+		return true;
+	}
+
+	/*
+	*  The target class is the class for which the attribute has been defined first
+	*/	
+	public function SetHostClass($sHostClass)
+	{
+		if (!isset($this->m_sTargetClass))
+		{
+			$this->m_sTargetClass = $sHostClass;
+		}
+		parent::SetHostClass($sHostClass);
+	}
+
+	static public function IsHierarchicalKey() {return true;}
+	public function GetTargetClass($iType = EXTKEY_RELATIVE) {return $this->m_sTargetClass;}
+	public function GetKeyAttDef($iType = EXTKEY_RELATIVE){return $this;}
+	public function GetKeyAttCode() {return $this->GetCode();}
+
+	public function GetBasicFilterOperators()
+	{
+		return parent::GetBasicFilterOperators();
+	}
+	public function GetBasicFilterLooseOperator()
+	{
+		return parent::GetBasicFilterLooseOperator();
+	}
+
+	public function GetSQLColumns($bFullSpec = false)
+	{
+		$aColumns = array();
+		$aColumns[$this->GetCode()] = 'INT(11)'.($bFullSpec ? ' DEFAULT 0' : '');
+		$aColumns[$this->GetSQLLeft()] = 'INT(11)'.($bFullSpec ? ' DEFAULT 0' : '');
+		$aColumns[$this->GetSQLRight()] = 'INT(11)'.($bFullSpec ? ' DEFAULT 0' : '');
+		return $aColumns;
+	}
+	public function GetSQLRight()
+	{
+		return $this->GetCode().'_right';
+	}
+	public function GetSQLLeft()
+	{
+		return $this->GetCode().'_left';
+	}
+
+	public function GetSQLValues($value)
+	{
+		if (!is_array($value))
+		{
+			$aValues[$this->GetCode()] = $value;
+		}
+		else
+		{
+			$aValues = array();
+			$aValues[$this->GetCode()] = $value[$this->GetCode()];
+			$aValues[$this->GetSQLRight()] = $value[$this->GetSQLRight()];
+			$aValues[$this->GetSQLLeft()] = $value[$this->GetSQLLeft()];
+		}
+		return $aValues;
+	}
+
+	public function GetAllowedValues($aArgs = array(), $sContains = '')
+	{
+		$oFilter = $this->GetHierachicalFilter($aArgs, $sContains);
+		if ($oFilter)
+		{
+			$oValSetDef = $this->GetValuesDef();
+			$oValSetDef->AddCondition($oFilter);
+			return $oValSetDef->GetValues($aArgs, $sContains);
+		}
+		else
+		{
+			return parent::GetAllowedValues($aArgs, $sContains);
+		}
+	}
+
+	public function GetAllowedValuesAsObjectSet($aArgs = array(), $sContains = '', $iAdditionalValue = null)
+	{
+		$oValSetDef = $this->GetValuesDef();
+		$oFilter = $this->GetHierachicalFilter($aArgs, $sContains, $iAdditionalValue);
+		if ($oFilter)
+		{
+			$oValSetDef->AddCondition($oFilter);
+		}
+		$oSet = $oValSetDef->ToObjectSet($aArgs, $sContains, $iAdditionalValue);
+		return $oSet;
+	}
+
+	public function GetAllowedValuesAsFilter($aArgs = array(), $sContains = '', $iAdditionalValue = null)
+	{
+		$oFilter = $this->GetHierachicalFilter($aArgs, $sContains, $iAdditionalValue);
+		if ($oFilter)
+		{
+			return $oFilter;
+		}
+		return parent::GetAllowedValuesAsFilter($aArgs, $sContains, $iAdditionalValue);
+	}
+
+	private function GetHierachicalFilter($aArgs = array(), $sContains = '', $iAdditionalValue = null)
+	{
+		if (array_key_exists('this', $aArgs))
+		{
+			// Hierarchical keys have one more constraint: the "parent value" cannot be
+			// "under" themselves
+			$iRootId = $aArgs['this']->GetKey();
+			if ($iRootId > 0) // ignore objects that do no exist in the database...
+			{
+				$sClass = $this->m_sTargetClass;
+				return DBObjectSearch::FromOQL("SELECT $sClass AS node JOIN $sClass AS root ON node.".$this->GetCode()." NOT BELOW root.id WHERE root.id = $iRootId");
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Find the corresponding "link" attribute on the target class, if any
+	 * @return null | AttributeDefinition
+	 */
+	public function GetMirrorLinkAttribute()
+	{
+		return null;
+	}
+}
+
+/**
+ * An attribute which corresponds to an external key (direct or indirect) 
+ *
+ * @package	 iTopORM
+ */
+class AttributeExternalField extends AttributeDefinition
+{
+
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_EXTERNAL_FIELD;
+
+	static public function ListExpectedParams()
+	{
+		return array_merge(parent::ListExpectedParams(), array("extkey_attcode", "target_attcode"));
+	}
+
+	public function GetEditClass() {return "ExtField";}
+
+	public function GetFinalAttDef()
+	{
+		$oExtAttDef = $this->GetExtAttDef();
+		return $oExtAttDef->GetFinalAttDef(); 
+	}
+
+	protected function GetSQLCol($bFullSpec = false)
+	{
+		// throw new CoreException("external attribute: does it make any sense to request its type ?");  
+		$oExtAttDef = $this->GetExtAttDef();
+		return $oExtAttDef->GetSQLCol($bFullSpec); 
+	}
+
+	public function GetSQLExpressions($sPrefix = '')
+	{
+		if ($sPrefix == '')
+		{
+			return array('' => $this->GetCode()); // Warning: Use GetCode() since AttributeExternalField does not have any 'sql' property
+		}
+		else
+		{
+			return $sPrefix;
+		} 
+	}
+
+	public function GetLabel($sDefault = null)
+	{
+		if ($this->IsFriendlyName())
+		{
+			$sKeyAttCode = $this->Get("extkey_attcode");
+			$oExtKeyAttDef = MetaModel::GetAttributeDef($this->GetHostClass(), $sKeyAttCode);
+			$sLabel = $oExtKeyAttDef->GetLabel($this->m_sCode);
+		}
+		else
+		{
+			$sLabel = parent::GetLabel('');
+			if (strlen($sLabel) == 0)
+			{
+				$oRemoteAtt = $this->GetExtAttDef();
+				$sLabel = $oRemoteAtt->GetLabel($this->m_sCode);
+			}
+		}
+		return $sLabel;
+	}
+	public function GetDescription($sDefault = null)
+	{
+		$sLabel = parent::GetDescription('');
+		if (strlen($sLabel) == 0)
+		{
+			$oRemoteAtt = $this->GetExtAttDef();
+			$sLabel = $oRemoteAtt->GetDescription('');
+		}
+		return $sLabel;
+	} 
+	public function GetHelpOnEdition($sDefault = null)
+	{
+		$sLabel = parent::GetHelpOnEdition('');
+		if (strlen($sLabel) == 0)
+		{
+			$oRemoteAtt = $this->GetExtAttDef();
+			$sLabel = $oRemoteAtt->GetHelpOnEdition('');
+		}
+		return $sLabel;
+	} 
+
+	public function IsExternalKey($iType = EXTKEY_RELATIVE)
+	{
+		switch($iType)
+		{
+		case EXTKEY_ABSOLUTE:
+			// see further
+			$oRemoteAtt = $this->GetExtAttDef();
+			return $oRemoteAtt->IsExternalKey($iType);
+
+		case EXTKEY_RELATIVE:
+			return false;
+
+		default:
+			throw new CoreException("Unexpected value for argument iType: '$iType'");
+		}
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function IsFriendlyName()
+	{
+		$oRemoteAtt = $this->GetExtAttDef();
+		if ($oRemoteAtt instanceof AttributeExternalField)
+		{
+			$bRet = $oRemoteAtt->IsFriendlyName();
+		}
+		elseif ($oRemoteAtt instanceof  AttributeFriendlyName)
+		{
+			$bRet = true;
+		}
+		else
+		{
+			$bRet = false;
+		}
+		return $bRet;
+	}
+
+	public function GetTargetClass($iType = EXTKEY_RELATIVE)
+	{
+		return $this->GetKeyAttDef($iType)->GetTargetClass();
+	}
+
+	static public function IsExternalField() {return true;}
+	public function GetKeyAttCode() {return $this->Get("extkey_attcode");} 
+	public function GetExtAttCode() {return $this->Get("target_attcode");} 
+
+	public function GetKeyAttDef($iType = EXTKEY_RELATIVE)
+	{
+		switch($iType)
+		{
+		case EXTKEY_ABSOLUTE:
+			// see further
+			$oRemoteAtt = $this->GetExtAttDef();
+			if ($oRemoteAtt->IsExternalField())
+			{
+				return $oRemoteAtt->GetKeyAttDef(EXTKEY_ABSOLUTE);
+			}
+			else if ($oRemoteAtt->IsExternalKey())
+			{
+				return $oRemoteAtt;
+			}
+			return $this->GetKeyAttDef(EXTKEY_RELATIVE); // which corresponds to the code hereafter !
+
+		case EXTKEY_RELATIVE:
+			return MetaModel::GetAttributeDef($this->GetHostClass(), $this->Get("extkey_attcode"));
+
+		default:
+			throw new CoreException("Unexpected value for argument iType: '$iType'");
+		}
+	}
+	
+	public function GetPrerequisiteAttributes($sClass = null)
+	{
+		return array($this->Get("extkey_attcode"));
+	} 
+	
+
+	public function GetExtAttDef()
+	{
+		$oKeyAttDef = $this->GetKeyAttDef();
+		$oExtAttDef = MetaModel::GetAttributeDef($oKeyAttDef->GetTargetClass(), $this->Get("target_attcode"));
+		if (!is_object($oExtAttDef)) throw new CoreException("Invalid external field ".$this->GetCode()." in class ".$this->GetHostClass().". The class ".$oKeyAttDef->GetTargetClass()." has no attribute ".$this->Get("target_attcode"));
+		return $oExtAttDef;
+	}
+
+	public function GetSQLExpr()
+	{
+		$oExtAttDef = $this->GetExtAttDef();
+		return $oExtAttDef->GetSQLExpr(); 
+	} 
+
+	public function GetDefaultValue(DBObject $oHostObject = null)
+	{
+		$oExtAttDef = $this->GetExtAttDef();
+		return $oExtAttDef->GetDefaultValue();
+	}
+	public function IsNullAllowed()
+	{
+		$oExtAttDef = $this->GetExtAttDef();
+		return $oExtAttDef->IsNullAllowed(); 
+	}
+
+	static public function IsScalar()
+	{
+		return true;
+	}
+
+	public function GetFilterDefinitions()
+	{
+		return array($this->GetCode() => new FilterFromAttribute($this));
+	}
+
+	public function GetBasicFilterOperators()
+	{
+		$oExtAttDef = $this->GetExtAttDef();
+		return $oExtAttDef->GetBasicFilterOperators(); 
+	}
+	public function GetBasicFilterLooseOperator()
+	{
+		$oExtAttDef = $this->GetExtAttDef();
+		return $oExtAttDef->GetBasicFilterLooseOperator(); 
+	}
+
+	public function GetBasicFilterSQLExpr($sOpCode, $value)
+	{
+		$oExtAttDef = $this->GetExtAttDef();
+		return $oExtAttDef->GetBasicFilterSQLExpr($sOpCode, $value);
+	} 
+
+	public function GetNullValue()
+	{
+		$oExtAttDef = $this->GetExtAttDef();
+		return $oExtAttDef->GetNullValue();
+	} 
+
+	public function IsNull($proposedValue)
+	{
+		$oExtAttDef = $this->GetExtAttDef();
+		return $oExtAttDef->IsNull($proposedValue);
+	} 
+
+	public function MakeRealValue($proposedValue, $oHostObj)
+	{
+		$oExtAttDef = $this->GetExtAttDef();
+		return $oExtAttDef->MakeRealValue($proposedValue, $oHostObj);
+	}
+
+	public function ScalarToSQL($value)
+	{
+		// This one could be used in case of filtering only
+		$oExtAttDef = $this->GetExtAttDef();
+		return $oExtAttDef->ScalarToSQL($value);
+	}
+
+
+	// Do not overload GetSQLExpression here because this is handled in the joins
+	//public function GetSQLExpressions($sPrefix = '') {return array();}
+
+	// Here, we get the data...
+	public function FromSQLToValue($aCols, $sPrefix = '')
+	{
+		$oExtAttDef = $this->GetExtAttDef();
+		return $oExtAttDef->FromSQLToValue($aCols, $sPrefix);
+	}
+
+	public function GetAsHTML($value, $oHostObject = null, $bLocalize = true)
+	{
+		$oExtAttDef = $this->GetExtAttDef();
+		return $oExtAttDef->GetAsHTML($value, null, $bLocalize);
+	}
+	public function GetAsXML($value, $oHostObject = null, $bLocalize = true)
+	{
+		$oExtAttDef = $this->GetExtAttDef();
+		return $oExtAttDef->GetAsXML($value, null, $bLocalize);
+	}
+	public function GetAsCSV($value, $sSeparator = ',', $sTestQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
+	{
+		$oExtAttDef = $this->GetExtAttDef();
+		return $oExtAttDef->GetAsCSV($value, $sSeparator, $sTestQualifier, null, $bLocalize, $bConvertToPlainText);
+	}
+
+	static public function GetFormFieldClass()
+	{
+		return '\\Combodo\\iTop\\Form\\Field\\LabelField';
+	}
+
+	public function MakeFormField(DBObject $oObject, $oFormField = null)
+	{
+	    // Retrieving AttDef from the remote attribute
+        $oRemoteAttDef = $this->GetExtAttDef();
+
+        if ($oFormField === null)
+		{
+		    // ExternalField's FormField are actually based on the FormField from the target attribute.
+            // Except for the AttributeExternalKey because we have no OQL and stuff
+            if($oRemoteAttDef instanceof AttributeExternalKey)
+            {
+                $sFormFieldClass = static::GetFormFieldClass();
+            }
+            else
+            {
+                $sFormFieldClass = $oRemoteAttDef::GetFormFieldClass();
+            }
+			$oFormField = new $sFormFieldClass($this->GetCode());
+		}
+		parent::MakeFormField($oObject, $oFormField);
+
+        // Manually setting for remote ExternalKey, otherwise, the id would be displayed.
+		if($oRemoteAttDef instanceof AttributeExternalKey)
+        {
+            $oFormField->SetCurrentValue($oObject->Get($this->GetCode().'_friendlyname'));
+        }
+
+		// Readonly field because we can't update external fields
+		$oFormField->SetReadOnly(true);
+
+		return $oFormField;
+	}
+
+	public function IsPartOfFingerprint()
+	{
+		return false;
+	}
+
+}
+
+/**
+ * Map a varchar column to an URL (formats the ouput in HMTL) 
+ *
+ * @package	 iTopORM
+ */
+class AttributeURL extends AttributeString
+{
+	static public function ListExpectedParams()
+	{
+		//return parent::ListExpectedParams();
+		return array_merge(parent::ListExpectedParams(), array("target"));
+	}
+
+	protected function GetSQLCol($bFullSpec = false) {return "VARCHAR(2048)".($bFullSpec ? $this->GetSQLColSpec() : '');}
+
+	public function GetMaxSize()
+	{
+		return 2048;
+	}
+	
+	public function GetEditClass() {return "String";}
+
+	public function GetAsHTML($sValue, $oHostObject = null, $bLocalize = true)
+	{
+		$sTarget = $this->Get("target");
+		if (empty($sTarget)) $sTarget = "_blank";
+		$sLabel = Str::pure2html($sValue);
+		if (strlen($sLabel) > 128)
+		{
+			// Truncate the length to 128 characters, by removing the middle
+			$sLabel = substr($sLabel, 0, 100).'.....'.substr($sLabel, -20);
+		}
+		return "<a target=\"$sTarget\" href=\"$sValue\">$sLabel</a>";
+	}
+
+	public function GetValidationPattern()
+	{
+		return $this->GetOptional('validation_pattern', '^'.utils::GetConfig()->Get('url_validation_pattern').'$');
+	}
+
+    static public function GetFormFieldClass()
+    {
+        return '\\Combodo\\iTop\\Form\\Field\\UrlField';
+    }
+
+    public function MakeFormField(DBObject $oObject, $oFormField = null)
+    {
+        if ($oFormField === null)
+        {
+            $sFormFieldClass = static::GetFormFieldClass();
+            $oFormField = new $sFormFieldClass($this->GetCode());
+        }
+        parent::MakeFormField($oObject, $oFormField);
+
+        $oFormField->SetTarget($this->Get('target'));
+
+        return $oFormField;
+    }
+}
+
+/**
+ * A blob is an ormDocument, it is stored as several columns in the database  
+ *
+ * @package	 iTopORM
+ */
+class AttributeBlob extends AttributeDefinition
+{
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
+
+	static public function ListExpectedParams()
+	{
+		return array_merge(parent::ListExpectedParams(), array("depends_on"));
+	}
+
+	public function GetEditClass() {return "Document";}
+
+	static public function IsBasedOnDBColumns() {return true;}
+	static public function IsScalar() {return true;}
+	public function IsWritable() {return true;}
+	public function GetDefaultValue(DBObject $oHostObject = null) {return "";}
+	public function IsNullAllowed(DBObject $oHostObject = null) {return $this->GetOptional("is_null_allowed", false);}
+
+	public function GetEditValue($sValue, $oHostObj = null)
+	{
+		return '';
+	}
+	
+	/**
+	 * Users can provide the document from an URL (including an URL on iTop itself)
+	 * for CSV import. Administrators can even provide the path to a local file
+	 * {@inheritDoc}
+	 * @see AttributeDefinition::MakeRealValue()
+	 */
+	public function MakeRealValue($proposedValue, $oHostObj)
+	{
+		if ($proposedValue === null) return null;
+		
+		if (is_object($proposedValue))
+		{
+			$proposedValue = clone $proposedValue;
+		}
+		else
+		{
+			try
+			{
+				// Read the file from iTop, an URL (or the local file system - for admins only)
+				$proposedValue = Utils::FileGetContentsAndMIMEType($proposedValue);
+			}
+			catch(Exception $e)
+			{
+				IssueLog::Warning(get_class($this)."::MakeRealValue - ".$e->getMessage());
+				// Not a real document !! store is as text !!! (This was the default behavior before)
+				$proposedValue = new ormDocument($e->getMessage()." \n".$proposedValue, 'text/plain');
+			}	
+		}
+		return $proposedValue;
+	}
+
+	public function GetSQLExpressions($sPrefix = '')
+	{
+		if ($sPrefix == '')
+		{
+			$sPrefix = $this->GetCode();
+		}
+		$aColumns = array();
+		// Note: to optimize things, the existence of the attribute is determined by the existence of one column with an empty suffix
+		$aColumns[''] = $sPrefix.'_mimetype';
+		$aColumns['_data'] = $sPrefix.'_data';
+		$aColumns['_filename'] = $sPrefix.'_filename';
+		return $aColumns;
+	}
+
+	public function FromSQLToValue($aCols, $sPrefix = '')
+	{
+		if (!array_key_exists($sPrefix, $aCols))
+		{
+			$sAvailable = implode(', ', array_keys($aCols));
+			throw new MissingColumnException("Missing column '$sPrefix' from {$sAvailable}");
+		} 
+		$sMimeType = isset($aCols[$sPrefix]) ? $aCols[$sPrefix] : '';
+
+		if (!array_key_exists($sPrefix.'_data', $aCols)) 
+		{
+			$sAvailable = implode(', ', array_keys($aCols));
+			throw new MissingColumnException("Missing column '".$sPrefix."_data' from {$sAvailable}");
+		} 
+		$data = isset($aCols[$sPrefix.'_data']) ? $aCols[$sPrefix.'_data'] : null;
+
+		if (!array_key_exists($sPrefix.'_filename', $aCols)) 
+		{
+			$sAvailable = implode(', ', array_keys($aCols));
+			throw new MissingColumnException("Missing column '".$sPrefix."_filename' from {$sAvailable}");
+		} 
+		$sFileName =  isset($aCols[$sPrefix.'_filename']) ? $aCols[$sPrefix.'_filename'] : '';
+
+		$value = new ormDocument($data, $sMimeType, $sFileName);
+		return $value;
+	}
+
+	public function GetSQLValues($value)
+	{
+		// #@# Optimization: do not load blobs anytime
+		//	 As per mySQL doc, selecting blob columns will prevent mySQL from
+		//	 using memory in case a temporary table has to be created
+		//	 (temporary tables created on disk)
+		//	 We will have to remove the blobs from the list of attributes when doing the select
+		//	 then the use of Get() should finalize the load
+		if ($value instanceOf ormDocument && !$value->IsEmpty())
+		{
+			$aValues = array();
+			$aValues[$this->GetCode().'_data'] = $value->GetData();
+			$aValues[$this->GetCode().'_mimetype'] = $value->GetMimeType();
+			$aValues[$this->GetCode().'_filename'] = $value->GetFileName();
+		}
+		else
+		{
+			$aValues = array();
+			$aValues[$this->GetCode().'_data'] = '';
+			$aValues[$this->GetCode().'_mimetype'] = '';
+			$aValues[$this->GetCode().'_filename'] = '';
+		}
+		return $aValues;
+	}
+
+	public function GetSQLColumns($bFullSpec = false)
+	{
+		$aColumns = array();
+		$aColumns[$this->GetCode().'_data'] = 'LONGBLOB'; // 2^32 (4 Gb)
+		$aColumns[$this->GetCode().'_mimetype'] = 'VARCHAR(255)';
+		$aColumns[$this->GetCode().'_filename'] = 'VARCHAR(255)';
+		return $aColumns;
+	}
+
+	public function GetFilterDefinitions()
+	{
+		return array();
+		// still not working... see later...
+		return array(
+			$this->GetCode().'->filename' => new FilterFromAttribute($this, '_filename'),
+			$this->GetCode().'_mimetype' => new FilterFromAttribute($this, '_mimetype'),
+			$this->GetCode().'_mimetype' => new FilterFromAttribute($this, '_mimetype')
+		);
+	}
+
+	public function GetBasicFilterOperators()
+	{
+		return array();
+	}
+	public function GetBasicFilterLooseOperator()
+	{
+		return '=';
+	}
+
+	public function GetBasicFilterSQLExpr($sOpCode, $value)
+	{
+		return 'true';
+	} 
+
+	public function GetAsHTML($value, $oHostObject = null, $bLocalize = true)
+	{
+		if (is_object($value))
+		{
+			return $value->GetAsHTML();
+		}
+	}
+
+	public function GetAsCSV($sValue, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
+	{
+		$sAttCode = $this->GetCode();
+		if ($sValue instanceof ormDocument && !$sValue->IsEmpty())
+		{
+			return $sValue->GetDownloadURL(get_class($oHostObject), $oHostObject->GetKey(), $sAttCode);
+		}
+		return ''; // Not exportable in CSV !
+	}
+	
+	public function GetAsXML($value, $oHostObject = null, $bLocalize = true)
+	{
+		$sRet = '';
+		if (is_object($value))
+		{
+			if (!$value->IsEmpty())
+			{
+				$sRet = '<mimetype>'.$value->GetMimeType().'</mimetype>';
+				$sRet .= '<filename>'.$value->GetFileName().'</filename>';
+				$sRet .= '<data>'.base64_encode($value->GetData()).'</data>';
+			}
+		}
+		return $sRet;
+	}
+
+	/**
+	 * Helper to get a value that will be JSON encoded
+	 * The operation is the opposite to FromJSONToValue	 
+	 */	 	
+	public function GetForJSON($value)
+	{
+		if ($value instanceOf ormDocument)
+		{
+			$aValues = array();
+			$aValues['data'] = base64_encode($value->GetData());
+			$aValues['mimetype'] = $value->GetMimeType();
+			$aValues['filename'] = $value->GetFileName();
+		}
+		else
+		{
+			$aValues = null;
+		}
+		return $aValues;
+	}
+
+	/**
+	 * Helper to form a value, given JSON decoded data
+	 * The operation is the opposite to GetForJSON	 
+	 */	 	
+	public function FromJSONToValue($json)
+	{
+		if (isset($json->data))
+		{
+			$data = base64_decode($json->data);
+			$value = new ormDocument($data, $json->mimetype, $json->filename);
+		}
+		else
+		{
+			$value = null;
+		}
+		return $value;
+	}
+	
+	public function Fingerprint($value)
+	{
+		$sFingerprint = '';
+		if ($value instanceOf ormDocument)
+		{
+			$sFingerprint = md5($value->GetData());
+		}
+		return $sFingerprint;		
+	}
+
+	static public function GetFormFieldClass()
+	{
+		return '\\Combodo\\iTop\\Form\\Field\\BlobField';
+	}
+
+	public function MakeFormField(DBObject $oObject, $oFormField = null)
+	{
+		if ($oFormField === null)
+		{
+			$sFormFieldClass = static::GetFormFieldClass();
+			$oFormField = new $sFormFieldClass($this->GetCode());
+		}
+
+		// Note: As of today we want this field to always be read-only
+		$oFormField->SetReadOnly(true);
+
+		// Generating urls
+		$value = $oObject->Get($this->GetCode());
+		$oFormField->SetDownloadUrl($value->GetDownloadURL(get_class($oObject), $oObject->GetKey(), $this->GetCode()));
+		$oFormField->SetDisplayUrl($value->GetDisplayURL(get_class($oObject), $oObject->GetKey(), $this->GetCode()));
+
+		parent::MakeFormField($oObject, $oFormField);
+
+		return $oFormField;
+	}
+
+}
+
+/**
+ * An image is a specific type of document, it is stored as several columns in the database
+ *
+ * @package	 iTopORM
+ */
+class AttributeImage extends AttributeBlob
+{
+	public function GetEditClass() {return "Image";}
+
+	/**
+	 * {@inheritDoc}
+	 * @see AttributeBlob::MakeRealValue()
+	 */
+	public function MakeRealValue($proposedValue, $oHostObj)
+	{
+		$oDoc = parent::MakeRealValue($proposedValue, $oHostObj);
+		// The validation of the MIME Type is done by CheckFormat below
+		return $oDoc;
+	}
+	
+	/**
+	 * Check that the supplied ormDocument actually contains an image
+	 * {@inheritDoc}
+	 * @see AttributeDefinition::CheckFormat()
+	 */
+	public function CheckFormat($value)
+	{
+		if ($value instanceof ormDocument && !$value->IsEmpty())
+		{
+			return ($value->GetMainMimeType() == 'image');
+		}
+		return true;
+	}
+	
+	public function GetAsHTML($value, $oHostObject = null, $bLocalize = true)
+	{
+		$iMaxWidthPx = $this->Get('display_max_width');
+		$iMaxHeightPx = $this->Get('display_max_height');
+		$sUrl = $this->Get('default_image');
+		$sRet = ($sUrl !== null) ? '<img src="'.$sUrl.'" style="max-width: '.$iMaxWidthPx.'px; max-height: '.$iMaxHeightPx.'px">' : '';
+		if (is_object($value) && !$value->IsEmpty())
+		{
+			if ($oHostObject->IsNew() || ($oHostObject->IsModified() && (array_key_exists($this->GetCode(), $oHostObject->ListChanges()))))
+			{
+				// If the object is modified (or not yet stored in the database) we must serve the content of the image directly inline
+				// otherwise (if we just give an URL) the browser will be given the wrong content... and may cache it
+				$sUrl = 'data:'.$value->GetMimeType().';base64,'.base64_encode($value->GetData());
+			}
+			else
+			{
+				$sUrl = $value->GetDownloadURL(get_class($oHostObject), $oHostObject->GetKey(), $this->GetCode());
+			}
+			$sRet = '<img src="'.$sUrl.'" style="max-width: '.$iMaxWidthPx.'px; max-height: '.$iMaxHeightPx.'px">';
+		}
+		return '<div class="view-image" style="width: '.$iMaxWidthPx.'px; height: '.$iMaxHeightPx.'px;"><span class="helper-middle"></span>'.$sRet.'</div>';
+	}
+
+    static public function GetFormFieldClass()
+    {
+        return '\\Combodo\\iTop\\Form\\Field\\ImageField';
+    }
+}
+/**
+ * A stop watch is an ormStopWatch object, it is stored as several columns in the database  
+ *
+ * @package	 iTopORM
+ */
+class AttributeStopWatch extends AttributeDefinition
+{
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
+
+	static public function ListExpectedParams()
+	{
+		// The list of thresholds must be an array of iPercent => array of 'option' => value
+		return array_merge(parent::ListExpectedParams(), array("states", "goal_computing", "working_time_computing", "thresholds"));
+	}
+
+	public function GetEditClass() {return "StopWatch";}
+
+	static public function IsBasedOnDBColumns() {return true;}
+	static public function IsScalar() {return true;}
+	public function IsWritable() {return true;}
+	public function GetDefaultValue(DBObject $oHostObject = null) {return $this->NewStopWatch();}
+
+	public function GetEditValue($value, $oHostObj = null)
+	{
+		return $value->GetTimeSpent();
+	}
+
+	public function GetStates()
+	{
+		return $this->Get('states');
+	}
+
+	public function AlwaysLoadInTables()
+	{
+		// Each and every stop watch is accessed for computing the highlight code (DBObject::GetHighlightCode())
+		return true;
+	}
+
+	/**
+	 * Construct a brand new (but configured) stop watch
+	 */	 	
+	public function NewStopWatch()
+	{
+		$oSW = new ormStopWatch();
+		foreach ($this->ListThresholds() as $iThreshold => $aFoo)
+		{
+			$oSW->DefineThreshold($iThreshold);
+		}
+		return $oSW;
+	}
+
+	// Facilitate things: allow the user to Set the value from a string
+	public function MakeRealValue($proposedValue, $oHostObj)
+	{
+		if (!$proposedValue instanceof ormStopWatch)
+		{
+			return $this->NewStopWatch();
+		}
+		return $proposedValue;
+	}
+
+	public function GetSQLExpressions($sPrefix = '')
+	{
+		if ($sPrefix == '')
+		{
+			$sPrefix = $this->GetCode(); // Warning: a stopwatch does not have any 'sql' property, so its SQL column is equal to its attribute code !!
+		}
+		$aColumns = array();
+		// Note: to optimize things, the existence of the attribute is determined by the existence of one column with an empty suffix
+		$aColumns[''] = $sPrefix.'_timespent';
+		$aColumns['_started'] = $sPrefix.'_started';
+		$aColumns['_laststart'] = $sPrefix.'_laststart';
+		$aColumns['_stopped'] = $sPrefix.'_stopped';
+		foreach ($this->ListThresholds() as $iThreshold => $aFoo)
+		{
+			$sThPrefix = '_'.$iThreshold;
+			$aColumns[$sThPrefix.'_deadline'] = $sPrefix.$sThPrefix.'_deadline';
+			$aColumns[$sThPrefix.'_passed'] = $sPrefix.$sThPrefix.'_passed';
+			$aColumns[$sThPrefix.'_triggered'] = $sPrefix.$sThPrefix.'_triggered';
+			$aColumns[$sThPrefix.'_overrun'] = $sPrefix.$sThPrefix.'_overrun';
+		}
+		return $aColumns;
+	}
+
+	public static function DateToSeconds($sDate)
+	{
+		if (is_null($sDate))
+		{
+			return null;
+		}
+		$oDateTime = new DateTime($sDate);
+		$iSeconds = $oDateTime->format('U');
+		return $iSeconds;
+	}
+
+	public static function SecondsToDate($iSeconds)
+	{
+		if (is_null($iSeconds))
+		{
+			return null;
+		}
+		return date("Y-m-d H:i:s", $iSeconds);
+	}
+
+	public function FromSQLToValue($aCols, $sPrefix = '')
+	{
+		$aExpectedCols = array($sPrefix, $sPrefix.'_started', $sPrefix.'_laststart', $sPrefix.'_stopped');
+		foreach ($this->ListThresholds() as $iThreshold => $aFoo)
+		{
+			$sThPrefix = '_'.$iThreshold;
+			$aExpectedCols[] = $sPrefix.$sThPrefix.'_deadline';
+			$aExpectedCols[] = $sPrefix.$sThPrefix.'_passed';
+			$aExpectedCols[] = $sPrefix.$sThPrefix.'_triggered';
+			$aExpectedCols[] = $sPrefix.$sThPrefix.'_overrun';
+		}
+		foreach ($aExpectedCols as $sExpectedCol)
+		{
+			if (!array_key_exists($sExpectedCol, $aCols))
+			{
+				$sAvailable = implode(', ', array_keys($aCols));
+				throw new MissingColumnException("Missing column '$sExpectedCol' from {$sAvailable}");
+			} 
+		}
+
+		$value = new ormStopWatch(
+			$aCols[$sPrefix],
+			self::DateToSeconds($aCols[$sPrefix.'_started']),
+			self::DateToSeconds($aCols[$sPrefix.'_laststart']),
+			self::DateToSeconds($aCols[$sPrefix.'_stopped'])
+		);
+
+		$aThresholds = array();
+		foreach ($this->ListThresholds() as $iThreshold => $aDefinition)
+		{
+			$sThPrefix = '_'.$iThreshold;
+			$value->DefineThreshold(
+				$iThreshold,
+				self::DateToSeconds($aCols[$sPrefix.$sThPrefix.'_deadline']),
+				(bool)($aCols[$sPrefix.$sThPrefix.'_passed'] == 1),
+				(bool)($aCols[$sPrefix.$sThPrefix.'_triggered'] == 1),
+				$aCols[$sPrefix.$sThPrefix.'_overrun'],
+				array_key_exists('highlight', $aDefinition) ? $aDefinition['highlight'] : null
+			);
+		}
+
+		return $value;
+	}
+
+	public function GetSQLValues($value)
+	{
+		if ($value instanceOf ormStopWatch)
+		{
+			$aValues = array();
+			$aValues[$this->GetCode().'_timespent'] = $value->GetTimeSpent();
+			$aValues[$this->GetCode().'_started'] = self::SecondsToDate($value->GetStartDate());
+			$aValues[$this->GetCode().'_laststart'] = self::SecondsToDate($value->GetLastStartDate());
+			$aValues[$this->GetCode().'_stopped'] = self::SecondsToDate($value->GetStopDate());
+
+			foreach ($this->ListThresholds() as $iThreshold => $aFoo)
+			{
+				$sPrefix = $this->GetCode().'_'.$iThreshold;
+				$aValues[$sPrefix.'_deadline'] = self::SecondsToDate($value->GetThresholdDate($iThreshold));
+				$aValues[$sPrefix.'_passed'] = $value->IsThresholdPassed($iThreshold) ? '1' : '0';
+				$aValues[$sPrefix.'_triggered'] = $value->IsThresholdTriggered($iThreshold) ? '1' : '0';
+				$aValues[$sPrefix.'_overrun'] = $value->GetOverrun($iThreshold);
+			}
+		}
+		else
+		{
+			$aValues = array();
+			$aValues[$this->GetCode().'_timespent'] = '';
+			$aValues[$this->GetCode().'_started'] = '';
+			$aValues[$this->GetCode().'_laststart'] = '';
+			$aValues[$this->GetCode().'_stopped'] = '';
+		}
+		return $aValues;
+	}
+
+	public function GetSQLColumns($bFullSpec = false)
+	{
+		$aColumns = array();
+		$aColumns[$this->GetCode().'_timespent'] = 'INT(11) UNSIGNED';
+		$aColumns[$this->GetCode().'_started'] = 'DATETIME';
+		$aColumns[$this->GetCode().'_laststart'] = 'DATETIME';
+		$aColumns[$this->GetCode().'_stopped'] = 'DATETIME';
+		foreach ($this->ListThresholds() as $iThreshold => $aFoo)
+		{
+			$sPrefix = $this->GetCode().'_'.$iThreshold;
+			$aColumns[$sPrefix.'_deadline'] = 'DATETIME';
+			$aColumns[$sPrefix.'_passed'] = 'TINYINT(1) UNSIGNED';
+			$aColumns[$sPrefix.'_triggered'] = 'TINYINT(1)';
+			$aColumns[$sPrefix.'_overrun'] = 'INT(11) UNSIGNED';
+		}
+		return $aColumns;
+	}
+
+	public function GetFilterDefinitions()
+	{
+		$aRes = array(
+			$this->GetCode() => new FilterFromAttribute($this),
+			$this->GetCode().'_started' => new FilterFromAttribute($this, '_started'),
+			$this->GetCode().'_laststart' => new FilterFromAttribute($this, '_laststart'),
+			$this->GetCode().'_stopped' => new FilterFromAttribute($this, '_stopped')
+		);
+		foreach ($this->ListThresholds() as $iThreshold => $aFoo)
+		{
+			$sPrefix = $this->GetCode().'_'.$iThreshold;
+			$aRes[$sPrefix.'_deadline'] = new FilterFromAttribute($this, '_deadline');
+			$aRes[$sPrefix.'_passed'] = new FilterFromAttribute($this, '_passed');
+			$aRes[$sPrefix.'_triggered'] = new FilterFromAttribute($this, '_triggered');
+			$aRes[$sPrefix.'_overrun'] = new FilterFromAttribute($this, '_overrun');
+		}
+		return $aRes;
+	}
+
+	public function GetBasicFilterOperators()
+	{
+		return array();
+	}
+	public function GetBasicFilterLooseOperator()
+	{
+		return '=';
+	}
+
+	public function GetBasicFilterSQLExpr($sOpCode, $value)
+	{
+		return 'true';
+	}
+
+	public function GetAsHTML($value, $oHostObject = null, $bLocalize = true)
+	{
+		if (is_object($value))
+		{
+			return $value->GetAsHTML($this, $oHostObject);
+		}
+	}
+
+	public function GetAsCSV($value, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
+	{
+		return $value->GetTimeSpent();
+	}
+	
+	public function GetAsXML($value, $oHostObject = null, $bLocalize = true)
+	{
+		return $value->GetTimeSpent();
+	}
+
+	public function ListThresholds()
+	{
+		return $this->Get('thresholds');
+	}
+	
+	public function Fingerprint($value)
+	{
+		$sFingerprint = '';
+		if (is_object($value))
+		{
+			$sFingerprint = $value->GetAsHTML($this);
+		}
+		return $sFingerprint;
+	}
+
+	/**
+	 * To expose internal values: Declare an attribute AttributeSubItem
+	 * and implement the GetSubItemXXXX verbs
+	 */	 	
+	public function GetSubItemSQLExpression($sItemCode)
+	{
+		$sPrefix = $this->GetCode();
+		switch($sItemCode)
+		{
+		case 'timespent':
+			return array('' => $sPrefix.'_timespent');
+		case 'started':
+			return array('' => $sPrefix.'_started');
+		case 'laststart':
+			return array('' => $sPrefix.'_laststart');
+		case 'stopped':
+			return array('' => $sPrefix.'_stopped');
+		}
+
+		foreach ($this->ListThresholds() as $iThreshold => $aFoo)
+		{
+			$sThPrefix = $iThreshold.'_';
+			if (substr($sItemCode, 0, strlen($sThPrefix)) == $sThPrefix)
+			{
+				// The current threshold is concerned
+				$sThresholdCode = substr($sItemCode, strlen($sThPrefix));
+				switch($sThresholdCode)
+				{
+				case 'deadline':
+					return array('' => $sPrefix.'_'.$iThreshold.'_deadline');
+				case 'passed':
+					return array('' => $sPrefix.'_'.$iThreshold.'_passed');
+				case 'triggered':
+					return array('' => $sPrefix.'_'.$iThreshold.'_triggered');
+				case 'overrun':
+					return array('' => $sPrefix.'_'.$iThreshold.'_overrun');
+				}
+			}
+		}
+		throw new CoreException("Unknown item code '$sItemCode' for attribute ".$this->GetHostClass().'::'.$this->GetCode());
+	}
+
+	public function GetSubItemValue($sItemCode, $value, $oHostObject = null)
+	{
+		$oStopWatch = $value;
+		switch($sItemCode)
+		{
+		case 'timespent':
+			return $oStopWatch->GetTimeSpent();
+		case 'started':
+			return $oStopWatch->GetStartDate();
+		case 'laststart':
+			return $oStopWatch->GetLastStartDate();
+		case 'stopped':
+			return $oStopWatch->GetStopDate();
+		}
+
+		foreach ($this->ListThresholds() as $iThreshold => $aFoo)
+		{
+			$sThPrefix = $iThreshold.'_';
+			if (substr($sItemCode, 0, strlen($sThPrefix)) == $sThPrefix)
+			{
+				// The current threshold is concerned
+				$sThresholdCode = substr($sItemCode, strlen($sThPrefix));
+				switch($sThresholdCode)
+				{
+				case 'deadline':
+					return $oStopWatch->GetThresholdDate($iThreshold);
+				case 'passed':
+					return $oStopWatch->IsThresholdPassed($iThreshold);
+				case 'triggered':
+					return $oStopWatch->IsThresholdTriggered($iThreshold);
+				case 'overrun':
+					return $oStopWatch->GetOverrun($iThreshold);
+				}
+			}
+		}
+
+		throw new CoreException("Unknown item code '$sItemCode' for attribute ".$this->GetHostClass().'::'.$this->GetCode());
+	}
+
+	protected function GetBooleanLabel($bValue)
+	{
+		$sDictKey = $bValue ? 'yes' : 'no';
+		return Dict::S('BooleanLabel:'.$sDictKey, 'def:'.$sDictKey);
+	}
+
+	public function GetSubItemAsHTMLForHistory($sItemCode, $sValue)
+	{
+		switch($sItemCode)
+		{
+		case 'timespent':
+			$sHtml = (int)$sValue ? Str::pure2html(AttributeDuration::FormatDuration($sValue)) : null;
+			break;
+		case 'started':
+		case 'laststart':
+		case 'stopped':
+			$sHtml = (int)$sValue ? date((string)AttributeDateTime::GetFormat(), (int)$sValue) : null;
+			break;
+
+		default:
+			foreach ($this->ListThresholds() as $iThreshold => $aFoo)
+			{
+				$sThPrefix = $iThreshold.'_';
+				if (substr($sItemCode, 0, strlen($sThPrefix)) == $sThPrefix)
+				{
+					// The current threshold is concerned
+					$sThresholdCode = substr($sItemCode, strlen($sThPrefix));
+					switch($sThresholdCode)
+					{
+					case 'deadline':
+						$sHtml = (int)$sValue ? date((string)AttributeDateTime::GetFormat(), (int)$sValue) : null;
+						break;
+					case 'passed':
+						$sHtml = $this->GetBooleanLabel((int)$sValue);
+						break;
+					case 'triggered':
+						$sHtml = $this->GetBooleanLabel((int)$sValue);
+						break;
+					case 'overrun':
+						$sHtml = (int)$sValue > 0 ? Str::pure2html(AttributeDuration::FormatDuration((int)$sValue)) : '';
+					}
+				}
+			}
+		}
+		return $sHtml;
+	}
+
+	public function GetSubItemAsPlainText($sItemCode, $value)
+	{
+		$sRet = $value;
+
+		switch ($sItemCode)
+		{
+			case 'timespent':
+				$sRet = AttributeDuration::FormatDuration($value);
+				break;
+			case 'started':
+			case 'laststart':
+			case 'stopped':
+				if (is_null($value))
+				{
+					$sRet = ''; // Undefined
+				}
+				else
+				{
+					$oDateTime = new DateTime();
+					$oDateTime->setTimestamp($value);
+					$oDateTimeFormat = AttributeDateTime::GetFormat();
+					$sRet = $oDateTimeFormat->Format($oDateTime);
+				}
+				break;
+
+			default:
+				foreach ($this->ListThresholds() as $iThreshold => $aFoo)
+				{
+					$sThPrefix = $iThreshold . '_';
+					if (substr($sItemCode, 0, strlen($sThPrefix)) == $sThPrefix)
+					{
+						// The current threshold is concerned
+						$sThresholdCode = substr($sItemCode, strlen($sThPrefix));
+						switch ($sThresholdCode)
+						{
+							case 'deadline':
+								if ($value)
+								{
+									$sDate = date(AttributeDateTime::GetInternalFormat(), $value);
+									$sRet = AttributeDeadline::FormatDeadline($sDate);
+								}
+								else
+								{
+									$sRet = '';
+								}
+								break;
+							case 'passed':
+							case 'triggered':
+								$sRet = $this->GetBooleanLabel($value);
+								break;
+							case 'overrun':
+								$sRet = AttributeDuration::FormatDuration($value);
+								break;
+						}
+					}
+				}
+		}
+		return $sRet;
+	}
+
+	public function GetSubItemAsHTML($sItemCode, $value)
+	{
+		$sHtml = $value;
+
+		switch ($sItemCode)
+		{
+			case 'timespent':
+				$sHtml = Str::pure2html(AttributeDuration::FormatDuration($value));
+				break;
+			case 'started':
+			case 'laststart':
+			case 'stopped':
+				if (is_null($value))
+				{
+					$sHtml = ''; // Undefined
+				}
+				else
+				{
+					$oDateTime = new DateTime();
+					$oDateTime->setTimestamp($value);
+					$oDateTimeFormat = AttributeDateTime::GetFormat();
+					$sHtml = Str::pure2html($oDateTimeFormat->Format($oDateTime));
+				}
+				break;
+
+			default:
+				foreach ($this->ListThresholds() as $iThreshold => $aFoo)
+				{
+					$sThPrefix = $iThreshold . '_';
+					if (substr($sItemCode, 0, strlen($sThPrefix)) == $sThPrefix)
+					{
+						// The current threshold is concerned
+						$sThresholdCode = substr($sItemCode, strlen($sThPrefix));
+						switch ($sThresholdCode)
+						{
+							case 'deadline':
+								if ($value)
+								{
+									$sDate = date(AttributeDateTime::GetInternalFormat(), $value);
+									$sHtml = Str::pure2html(AttributeDeadline::FormatDeadline($sDate));
+								}
+								else
+								{
+									$sHtml = '';
+								}
+								break;
+							case 'passed':
+							case 'triggered':
+								$sHtml = $this->GetBooleanLabel($value);
+								break;
+							case 'overrun':
+								$sHtml = Str::pure2html(AttributeDuration::FormatDuration($value));
+								break;
+						}
+					}
+				}
+		}
+		return $sHtml;
+	}
+
+	public function GetSubItemAsCSV($sItemCode, $value, $sSeparator = ',', $sTextQualifier = '"', $bConvertToPlainText = false)
+	{
+		$sFrom = array("\r\n", $sTextQualifier);
+		$sTo = array("\n", $sTextQualifier.$sTextQualifier);
+		$sEscaped = str_replace($sFrom, $sTo, (string)$value);
+		$sRet = $sTextQualifier.$sEscaped.$sTextQualifier;
+
+		switch($sItemCode)
+		{
+		case 'timespent':
+				$sRet = $sTextQualifier . AttributeDuration::FormatDuration($value) . $sTextQualifier;
+				break;
+		case 'started':
+		case 'laststart':
+		case 'stopped':
+				if ($value !== null)
+				{
+					$oDateTime = new DateTime();
+					$oDateTime->setTimestamp($value);
+					$oDateTimeFormat = AttributeDateTime::GetFormat();
+					$sRet = $sTextQualifier . $oDateTimeFormat->Format($oDateTime) . $sTextQualifier;
+				}
+				break;
+
+		default:
+			foreach ($this->ListThresholds() as $iThreshold => $aFoo)
+			{
+				$sThPrefix = $iThreshold.'_';
+				if (substr($sItemCode, 0, strlen($sThPrefix)) == $sThPrefix)
+				{
+					// The current threshold is concerned
+					$sThresholdCode = substr($sItemCode, strlen($sThPrefix));
+					switch($sThresholdCode)
+					{
+						case 'deadline':
+								if ($value != '')
+								{
+									$oDateTime = new DateTime();
+									$oDateTime->setTimestamp($value);
+									$oDateTimeFormat = AttributeDateTime::GetFormat();
+									$sRet = $sTextQualifier . $oDateTimeFormat->Format($oDateTime) . $sTextQualifier;
+								}
+								break;
+
+							case 'passed':
+							case 'triggered':
+								$sRet = $sTextQualifier . $this->GetBooleanLabel($value) . $sTextQualifier;
+								break;
+
+							case 'overrun':
+								$sRet = $sTextQualifier . AttributeDuration::FormatDuration($value) . $sTextQualifier;
+								break;
+						}
+				}
+			}
+		}
+		return $sRet;
+	}
+
+	public function GetSubItemAsXML($sItemCode, $value)
+	{
+		$sRet = Str::pure2xml((string)$value);
+
+		switch($sItemCode)
+		{
+		case 'timespent':
+		case 'started':
+		case 'laststart':
+		case 'stopped':
+				break;
+
+		default:
+			foreach ($this->ListThresholds() as $iThreshold => $aFoo)
+			{
+				$sThPrefix = $iThreshold.'_';
+				if (substr($sItemCode, 0, strlen($sThPrefix)) == $sThPrefix)
+				{
+					// The current threshold is concerned
+					$sThresholdCode = substr($sItemCode, strlen($sThPrefix));
+					switch($sThresholdCode)
+					{
+					case 'deadline':
+						break;
+
+					case 'passed':
+					case 'triggered':
+						$sRet = $this->GetBooleanLabel($value);
+						break;
+
+					case 'overrun':
+						break;
+					}
+				}
+			}
+		}
+		return $sRet;
+	}
+
+	/**
+	 * Implemented for the HTML spreadsheet format!	
+	 */	
+	public function GetSubItemAsEditValue($sItemCode, $value)
+	{
+		$sRet = $value;
+
+		switch($sItemCode)
+		{
+		case 'timespent':
+			break;
+
+		case 'started':
+		case 'laststart':
+		case 'stopped':
+			if (is_null($value))
+			{
+				$sRet = ''; // Undefined
+			}
+			else
+			{
+				$sRet = date((string)AttributeDateTime::GetFormat(), $value);
+			}
+			break;
+
+		default:
+			foreach ($this->ListThresholds() as $iThreshold => $aFoo)
+			{
+				$sThPrefix = $iThreshold.'_';
+				if (substr($sItemCode, 0, strlen($sThPrefix)) == $sThPrefix)
+				{
+					// The current threshold is concerned
+					$sThresholdCode = substr($sItemCode, strlen($sThPrefix));
+					switch($sThresholdCode)
+					{
+					case 'deadline':
+						if ($value)
+						{
+							$sRet = date((string)AttributeDateTime::GetFormat(), $value);
+						}
+						else
+						{
+							$sRet = '';
+						}
+						break;
+					case 'passed':
+					case 'triggered':
+						$sRet = $this->GetBooleanLabel($value);
+						break;
+					case 'overrun':
+						break;
+					}
+				}
+			}
+		}
+		return $sRet;
+	}
+}
+
+/**
+ * View of a subvalue of another attribute
+ * If an attribute implements the verbs GetSubItem.... then it can expose
+ * internal values, each of them being an attribute and therefore they
+ * can be displayed at different times in the object lifecycle, and used for
+ * reporting (as a condition in OQL, or as an additional column in an export)  
+ * Known usages: Stop Watches can expose threshold statuses
+ */
+class AttributeSubItem extends AttributeDefinition
+{
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
+
+	static public function ListExpectedParams()
+	{
+		return array_merge(parent::ListExpectedParams(), array('target_attcode', 'item_code'));
+	}
+
+	public function GetParentAttCode() {return $this->Get("target_attcode");} 
+
+	/**
+	 * Helper : get the attribute definition to which the execution will be forwarded	
+	 */	
+	public function GetTargetAttDef()
+	{
+		$sClass = $this->GetHostClass();
+		$oParentAttDef = MetaModel::GetAttributeDef($sClass, $this->Get('target_attcode'));
+		return $oParentAttDef;
+	}
+
+	public function GetEditClass() {return "";}
+	
+	public function GetValuesDef() {return null;}
+
+	static public function IsBasedOnDBColumns() {return true;}
+	static public function IsScalar() {return true;}
+	public function IsWritable() {return false;}
+	public function GetDefaultValue(DBObject $oHostObject = null) {return null;}
+//	public function IsNullAllowed() {return false;}
+
+	static public function LoadInObject() {return false;} // if this verb returns false, then GetValue must be implemented
+
+	/**
+	 * Used by DBOBject::Get()
+	 */
+	public function GetValue($oHostObject)
+	{
+		$oParent = $this->GetTargetAttDef();
+		$parentValue = $oHostObject->GetStrict($oParent->GetCode());
+		$res = $oParent->GetSubItemValue($this->Get('item_code'), $parentValue, $oHostObject);
+		return $res;
+	}
+
+	// 
+//	protected function ScalarToSQL($value) {return $value;} // format value as a valuable SQL literal (quoted outside)
+
+	public function FromSQLToValue($aCols, $sPrefix = '')
+	{
+	}
+
+	public function GetSQLColumns($bFullSpec = false)
+	{
+		return array();
+	}
+
+	public function GetFilterDefinitions()
+	{
+		return array($this->GetCode() => new FilterFromAttribute($this));
+	}
+
+	public function GetBasicFilterOperators()
+	{
+		return array();
+	}
+	public function GetBasicFilterLooseOperator()
+	{
+		return "=";
+	}
+
+	public function GetBasicFilterSQLExpr($sOpCode, $value)
+	{
+		$sQValue = CMDBSource::Quote($value);
+		switch ($sOpCode)
+		{
+		case '!=':
+			return $this->GetSQLExpr()." != $sQValue";
+			break;
+		case '=':
+		default:
+			return $this->GetSQLExpr()." = $sQValue";
+		}
+	} 
+
+	public function GetSQLExpressions($sPrefix = '')
+	{
+		$oParent = $this->GetTargetAttDef();
+		$res = $oParent->GetSubItemSQLExpression($this->Get('item_code'));
+		return $res;
+	}
+
+	public function GetAsPlainText($value, $oHostObject = null, $bLocalize = true)
+	{
+		$oParent = $this->GetTargetAttDef();
+		$res = $oParent->GetSubItemAsPlainText($this->Get('item_code'), $value);
+		return $res;
+	}
+
+	public function GetAsHTML($value, $oHostObject = null, $bLocalize = true)
+	{
+		$oParent = $this->GetTargetAttDef();
+		$res = $oParent->GetSubItemAsHTML($this->Get('item_code'), $value);
+		return $res;
+	}
+
+	public function GetAsHTMLForHistory($value, $oHostObject = null, $bLocalize = true)
+	{
+		$oParent = $this->GetTargetAttDef();
+		$res = $oParent->GetSubItemAsHTMLForHistory($this->Get('item_code'), $value);
+		return $res;
+	}
+
+	public function GetAsCSV($value, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
+	{
+		$oParent = $this->GetTargetAttDef();
+		$res = $oParent->GetSubItemAsCSV($this->Get('item_code'), $value, $sSeparator, $sTextQualifier, $bConvertToPlainText);
+		return $res;
+	}
+	
+	public function GetAsXML($value, $oHostObject = null, $bLocalize = true)
+	{
+		$oParent = $this->GetTargetAttDef();
+		$res = $oParent->GetSubItemAsXML($this->Get('item_code'), $value);
+		return $res;
+	}
+
+	/**
+	 * As of now, this function must be implemented to have the value in spreadsheet format
+	 */	 	
+	public function GetEditValue($value, $oHostObj = null)
+	{
+		$oParent = $this->GetTargetAttDef();
+		$res = $oParent->GetSubItemAsEditValue($this->Get('item_code'), $value);
+		return $res;
+	}
+	
+	public function IsPartOfFingerprint()
+	{
+		return false;
+	}
+
+	static public function GetFormFieldClass()
+	{
+		return '\\Combodo\\iTop\\Form\\Field\\LabelField';
+	}
+
+	public function MakeFormField(DBObject $oObject, $oFormField = null)
+	{
+		if ($oFormField === null)
+		{
+			$sFormFieldClass = static::GetFormFieldClass();
+			$oFormField = new $sFormFieldClass($this->GetCode());
+		}
+		parent::MakeFormField($oObject, $oFormField);
+
+		// Note : As of today, this attribute is -by nature- only supported in readonly mode, not edition
+		$sAttCode = $this->GetCode();
+		$oFormField->SetCurrentValue(html_entity_decode($oObject->GetAsHTML($sAttCode), ENT_QUOTES, 'UTF-8'));
+		$oFormField->SetReadOnly(true);
+
+		return $oFormField;
+	}
+
+}
+
+/**
+ * One way encrypted (hashed) password
+ */
+class AttributeOneWayPassword extends AttributeDefinition
+{
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
+
+	static public function ListExpectedParams()
+	{
+		return array_merge(parent::ListExpectedParams(), array("depends_on"));
+	}
+
+	public function GetEditClass() {return "One Way Password";}
+
+	static public function IsBasedOnDBColumns() {return true;}
+	static public function IsScalar() {return true;}
+	public function IsWritable() {return true;}
+	public function GetDefaultValue(DBObject $oHostObject = null) {return "";}
+	public function IsNullAllowed() {return $this->GetOptional("is_null_allowed", false);}
+
+	// Facilitate things: allow the user to Set the value from a string or from an ormPassword (already encrypted)
+	public function MakeRealValue($proposedValue, $oHostObj)
+	{
+		$oPassword = $proposedValue;
+		if (is_object($oPassword))
+		{
+			$oPassword = clone $proposedValue;
+		}
+		else
+		{
+			$oPassword = new ormPassword('', '');
+			$oPassword->SetPassword($proposedValue);
+		}
+		return $oPassword;
+	}
+
+	public function GetSQLExpressions($sPrefix = '')
+	{
+		if ($sPrefix == '')
+		{
+			$sPrefix = $this->GetCode(); // Warning: AttributeOneWayPassword does not have any sql property so code = sql !
+		}
+		$aColumns = array();
+		// Note: to optimize things, the existence of the attribute is determined by the existence of one column with an empty suffix
+		$aColumns[''] = $sPrefix.'_hash';
+		$aColumns['_salt'] = $sPrefix.'_salt';
+		return $aColumns;
+	}
+
+	public function FromSQLToValue($aCols, $sPrefix = '')
+	{
+		if (!array_key_exists($sPrefix, $aCols))
+		{
+			$sAvailable = implode(', ', array_keys($aCols));
+			throw new MissingColumnException("Missing column '$sPrefix' from {$sAvailable}");
+		} 
+		$hashed = isset($aCols[$sPrefix]) ? $aCols[$sPrefix] : '';
+
+		if (!array_key_exists($sPrefix.'_salt', $aCols)) 
+		{
+			$sAvailable = implode(', ', array_keys($aCols));
+			throw new MissingColumnException("Missing column '".$sPrefix."_salt' from {$sAvailable}");
+		} 
+		$sSalt = isset($aCols[$sPrefix.'_salt']) ? $aCols[$sPrefix.'_salt'] : '';
+
+		$value = new ormPassword($hashed, $sSalt);
+		return $value;
+	}
+
+	public function GetSQLValues($value)
+	{
+		// #@# Optimization: do not load blobs anytime
+		//	 As per mySQL doc, selecting blob columns will prevent mySQL from
+		//	 using memory in case a temporary table has to be created
+		//	 (temporary tables created on disk)
+		//	 We will have to remove the blobs from the list of attributes when doing the select
+		//	 then the use of Get() should finalize the load
+		if ($value instanceOf ormPassword)
+		{
+			$aValues = array();
+			$aValues[$this->GetCode().'_hash'] = $value->GetHash();
+			$aValues[$this->GetCode().'_salt'] = $value->GetSalt();
+		}
+		else
+		{
+			$aValues = array();
+			$aValues[$this->GetCode().'_hash'] = '';
+			$aValues[$this->GetCode().'_salt'] = '';
+		}
+		return $aValues;
+	}
+
+	public function GetSQLColumns($bFullSpec = false)
+	{
+		$aColumns = array();
+		$aColumns[$this->GetCode().'_hash'] = 'TINYBLOB';
+		$aColumns[$this->GetCode().'_salt'] = 'TINYBLOB';
+		return $aColumns;
+	}
+
+	public function GetImportColumns()
+	{
+		$aColumns = array();
+		$aColumns[$this->GetCode()] = 'TINYTEXT';
+		return $aColumns;
+	}
+
+	public function FromImportToValue($aCols, $sPrefix = '')
+	{
+		if (!isset($aCols[$sPrefix]))
+		{
+			$sAvailable = implode(', ', array_keys($aCols));
+			throw new MissingColumnException("Missing column '$sPrefix' from {$sAvailable}");
+		} 
+		$sClearPwd = $aCols[$sPrefix];
+
+		$oPassword = new ormPassword('', '');
+		$oPassword->SetPassword($sClearPwd);
+		return $oPassword;
+	}
+
+	public function GetFilterDefinitions()
+	{
+		return array();
+		// still not working... see later...
+	}
+
+	public function GetBasicFilterOperators()
+	{
+		return array();
+	}
+	public function GetBasicFilterLooseOperator()
+	{
+		return '=';
+	}
+
+	public function GetBasicFilterSQLExpr($sOpCode, $value)
+	{
+		return 'true';
+	} 
+
+	public function GetAsHTML($value, $oHostObject = null, $bLocalize = true)
+	{
+		if (is_object($value))
+		{
+			return $value->GetAsHTML();
+		}
+	}
+
+	public function GetAsCSV($sValue, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
+	{
+		return ''; // Not exportable in CSV
+	}
+	
+	public function GetAsXML($value, $oHostObject = null, $bLocalize = true)
+	{
+		return ''; // Not exportable in XML
+	}
+	
+	public function GetValueLabel($sValue, $oHostObj = null)
+	{
+		// Don't display anything in "group by" reports
+		return '*****';
+	}
+	
+}
+
+// Indexed array having two dimensions
+class AttributeTable extends AttributeDBField
+{
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
+
+	public function GetEditClass() {return "Table";}
+	protected function GetSQLCol($bFullSpec = false) {return "LONGTEXT";}
+
+	public function GetMaxSize()
+	{
+		return null;
+	}
+
+	public function GetNullValue()
+	{
+		return array();
+	} 
+
+	public function IsNull($proposedValue)
+	{
+		return (count($proposedValue) == 0);
+	} 
+
+	public function GetEditValue($sValue, $oHostObj = null)
+	{
+		return '';
+	}
+
+	// Facilitate things: allow the user to Set the value from a string
+	public function MakeRealValue($proposedValue, $oHostObj)
+	{
+		if (is_null($proposedValue))
+		{
+			return array();
+		}
+		else if (!is_array($proposedValue))
+		{
+			return array(0 => array(0 => $proposedValue));
+		}
+		return $proposedValue;
+	}
+
+	public function FromSQLToValue($aCols, $sPrefix = '')
+	{
+		try
+		{
+			$value = @unserialize($aCols[$sPrefix.'']);
+			if ($value === false)
+			{
+				$value = $this->MakeRealValue($aCols[$sPrefix.''], null);
+			}
+		}
+		catch(Exception $e)
+		{
+			$value = $this->MakeRealValue($aCols[$sPrefix.''], null);
+		}
+
+		return $value;
+	}
+
+	public function GetSQLValues($value)
+	{
+		$aValues = array();
+		$aValues[$this->Get("sql")] = serialize($value);
+		return $aValues;
+	}
+
+	public function GetAsHTML($value, $oHostObject = null, $bLocalize = true)
+	{
+		if (!is_array($value))
+		{
+			throw new CoreException('Expecting an array', array('found' => get_class($value)));
+		}
+		if (count($value) == 0)
+		{
+			return "";
+		}
+
+		$sRes = "<TABLE class=\"listResults\">";
+		$sRes .= "<TBODY>";
+		foreach($value as $iRow => $aRawData)
+		{
+			$sRes .= "<TR>";
+			foreach ($aRawData as $iCol => $cell)
+			{
+				// Note: avoid the warning in case the cell is made of an array
+				$sCell = @Str::pure2html((string)$cell);
+				$sCell = str_replace("\n", "<br>\n", $sCell);
+				$sRes .= "<TD>$sCell</TD>";
+			}
+			$sRes .= "</TR>";
+		}
+		$sRes .= "</TBODY>";
+		$sRes .= "</TABLE>";
+		return $sRes;
+	}
+
+	public function GetAsCSV($sValue, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
+	{
+		// Not implemented
+		return '';
+	}
+
+	public function GetAsXML($value, $oHostObject = null, $bLocalize = true)
+	{
+		if (count($value) == 0)
+		{
+			return "";
+		}
+
+		$sRes = "";
+		foreach($value as $iRow => $aRawData)
+		{
+			$sRes .= "<row>";
+			foreach ($aRawData as $iCol => $cell)
+			{
+				$sCell = Str::pure2xml((string)$cell);
+				$sRes .= "<cell icol=\"$iCol\">$sCell</cell>";
+			}
+			$sRes .= "</row>";
+		}
+		return $sRes;
+	}
+}
+
+// The PHP value is a hash array, it is stored as a TEXT column
+class AttributePropertySet extends AttributeTable
+{
+	public function GetEditClass() {return "PropertySet";}
+
+	// Facilitate things: allow the user to Set the value from a string
+	public function MakeRealValue($proposedValue, $oHostObj)
+	{
+		if (!is_array($proposedValue))
+		{
+			return array('?' => (string)$proposedValue);
+		}
+		return $proposedValue;
+	}
+
+	public function GetAsHTML($value, $oHostObject = null, $bLocalize = true)
+	{
+		if (!is_array($value))
+		{
+			throw new CoreException('Expecting an array', array('found' => get_class($value)));
+		}
+		if (count($value) == 0)
+		{
+			return "";
+		}
+
+		$sRes = "<TABLE class=\"listResults\">";
+		$sRes .= "<TBODY>";
+		foreach($value as $sProperty => $sValue)
+		{
+			if ($sProperty == 'auth_pwd')
+			{
+				$sValue = '*****';
+			}
+			$sRes .= "<TR>";
+			$sCell = str_replace("\n", "<br>\n", Str::pure2html((string)$sValue));
+			$sRes .= "<TD class=\"label\">$sProperty</TD><TD>$sCell</TD>";
+			$sRes .= "</TR>";
+		}
+		$sRes .= "</TBODY>";
+		$sRes .= "</TABLE>";
+		return $sRes;
+	}
+
+	public function GetAsCSV($value, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
+	{
+		if (count($value) == 0)
+		{
+			return "";
+		}
+
+		$aRes = array();
+		foreach($value as $sProperty => $sValue)
+		{
+			if ($sProperty == 'auth_pwd')
+			{
+				$sValue = '*****';
+			}
+			$sFrom = array(',', '=');
+			$sTo = array('\,', '\=');
+			$aRes[] = $sProperty.'='.str_replace($sFrom, $sTo, (string)$sValue);
+		}
+		$sRaw = implode(',', $aRes);
+
+		$sFrom = array("\r\n", $sTextQualifier);
+		$sTo = array("\n", $sTextQualifier.$sTextQualifier);
+		$sEscaped = str_replace($sFrom, $sTo, $sRaw);
+		return $sTextQualifier.$sEscaped.$sTextQualifier;
+	}
+
+	public function GetAsXML($value, $oHostObject = null, $bLocalize = true)
+	{
+		if (count($value) == 0)
+		{
+			return "";
+		}
+
+		$sRes = "";
+		foreach($value as $sProperty => $sValue)
+		{
+			if ($sProperty == 'auth_pwd')
+			{
+				$sValue = '*****';
+			}
+			$sRes .= "<property id=\"$sProperty\">";
+			$sRes .= Str::pure2xml((string)$sValue);
+			$sRes .= "</property>";
+		}
+		return $sRes;
+	}
+}
+
+/**
+ * The attribute dedicated to the friendly name automatic attribute (not written) 
+ *
+ * @package	 iTopORM
+ */
+
+/**
+ * The attribute dedicated to the friendly name automatic attribute (not written) 
+ *
+ * @package	 iTopORM
+ */
+class AttributeFriendlyName extends AttributeDefinition
+{
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_STRING;
+
+	public function __construct($sCode)
+	{
+		$this->m_sCode = $sCode;
+		$aParams = array();
+		$aParams["default_value"] = '';
+		parent::__construct($sCode, $aParams);
+
+		$this->m_sValue = $this->Get("default_value");
+	}
+
+
+	public function GetEditClass() {return "";}
+
+	public function GetValuesDef() {return null;}
+	public function GetPrerequisiteAttributes($sClass = null) {return $this->GetOptional("depends_on", array());}
+
+	static public function IsScalar() {return true;}
+	public function IsNullAllowed() {return false;}
+
+	public function GetSQLExpressions($sPrefix = '')
+	{
+		if ($sPrefix == '')
+		{
+			$sPrefix = $this->GetCode(); // Warning AttributeComputedFieldVoid does not have any sql property
+		}
+		return array('' => $sPrefix);
+	}
+
+	static public function IsBasedOnOQLExpression() {return true;}
+	public function GetOQLExpression()
+	{
+		return MetaModel::GetNameExpression($this->GetHostClass());
+	}
+
+	public function GetLabel($sDefault = null)
+	{
+		$sLabel = parent::GetLabel('');
+		if (strlen($sLabel) == 0)
+		{
+			$sLabel = Dict::S('Core:FriendlyName-Label');
+		}
+		return $sLabel;
+	}
+	public function GetDescription($sDefault = null)
+	{
+		$sLabel = parent::GetDescription('');
+		if (strlen($sLabel) == 0)
+		{
+			$sLabel = Dict::S('Core:FriendlyName-Description');
+		}
+		return $sLabel;
+	} 
+
+	public function FromSQLToValue($aCols, $sPrefix = '')
+	{
+ 		$sValue = $aCols[$sPrefix];
+		return $sValue;
+	}
+
+	public function IsWritable()
+	{
+		return false;
+	}
+	public function IsMagic()
+	{
+		return true;
+	}
+
+	static public function IsBasedOnDBColumns()
+	{
+		return false;
+	}
+
+	public function SetFixedValue($sValue)
+	{
+		$this->m_sValue = $sValue;
+	}
+	public function GetDefaultValue(DBObject $oHostObject = null)
+	{
+		return $this->m_sValue;
+	}
+
+	public function GetAsHTML($sValue, $oHostObject = null, $bLocalize = true)
+	{
+		return Str::pure2html((string)$sValue);
+	}
+
+	public function GetAsCSV($sValue, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
+	{
+		$sFrom = array("\r\n", $sTextQualifier);
+		$sTo = array("\n", $sTextQualifier.$sTextQualifier);
+		$sEscaped = str_replace($sFrom, $sTo, (string)$sValue);
+		return $sTextQualifier.$sEscaped.$sTextQualifier;
+	}
+
+	static function GetFormFieldClass()
+	{
+		return '\\Combodo\\iTop\\Form\\Field\\StringField';
+	}
+
+	public function MakeFormField(DBObject $oObject, $oFormField = null)
+	{
+		if ($oFormField === null)
+		{
+			$sFormFieldClass = static::GetFormFieldClass();
+			$oFormField = new $sFormFieldClass($this->GetCode());
+		}
+		$oFormField->SetReadOnly(true);
+		parent::MakeFormField($oObject, $oFormField);
+
+		return $oFormField;
+	}
+
+	// Do not display friendly names in the history of change
+	public function DescribeChangeAsHTML($sOldValue, $sNewValue, $sLabel = null)
+	{
+		return '';
+	}
+
+	public function GetFilterDefinitions()
+	{
+		return array($this->GetCode() => new FilterFromAttribute($this));
+	}
+
+	public function GetBasicFilterOperators()
+	{
+		return array("="=>"equals", "!="=>"differs from");
+	}
+
+	public function GetBasicFilterLooseOperator()
+	{
+		return "Contains";
+	}
+
+	public function GetBasicFilterSQLExpr($sOpCode, $value)
+	{
+		$sQValue = CMDBSource::Quote($value);
+		switch ($sOpCode)
+		{
+		case '=':
+		case '!=':
+			return $this->GetSQLExpr()." $sOpCode $sQValue";
+		case 'Contains':
+			return $this->GetSQLExpr()." LIKE ".CMDBSource::Quote("%$value%");
+		case 'NotLike':
+			return $this->GetSQLExpr()." NOT LIKE $sQValue";
+		case 'Like':
+		default:
+			return $this->GetSQLExpr()." LIKE $sQValue";
+		}
+	}
+	
+	public function IsPartOfFingerprint() { return false; }
+}
+
+/**
+ * Holds the setting for the redundancy on a specific relation
+ * Its value is a string, containing either:
+ * - 'disabled'
+ * - 'n', where n is a positive integer value giving the minimum count of items upstream
+ * - 'n%', where n is a positive integer value, giving the minimum as a percentage of the total count of items upstream
+ *
+ * @package	 iTopORM
+ */
+class AttributeRedundancySettings extends AttributeDBField
+{
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_REDUNDANCY;
+
+	static public function ListExpectedParams()
+	{
+		return array('sql', 'relation_code', 'from_class', 'neighbour_id', 'enabled', 'enabled_mode', 'min_up', 'min_up_type', 'min_up_mode');
+	}
+
+	public function GetValuesDef() {return null;} 
+	public function GetPrerequisiteAttributes($sClass = null) {return array();}
+
+	public function GetEditClass() {return "RedundancySetting";}
+	protected function GetSQLCol($bFullSpec = false)
+	{
+		return "VARCHAR(20)".($bFullSpec ? $this->GetSQLColSpec() : '');
+	}
+
+
+	public function GetValidationPattern()
+	{
+		return "^[0-9]{1,3}|[0-9]{1,2}%|disabled$";
+	}
+
+	public function GetMaxSize()
+	{
+		return 20;
+	}
+
+	public function GetDefaultValue(DBObject $oHostObject = null)
+	{
+		$sRet = 'disabled';
+		if ($this->Get('enabled'))
+		{
+			if ($this->Get('min_up_type') == 'count')
+			{
+				$sRet = (string) $this->Get('min_up');
+			}
+			else // percent
+			{
+				$sRet = $this->Get('min_up').'%';
+			}
+		}
+		return $sRet;
+	}
+
+	public function IsNullAllowed()
+	{
+		return false;
+	} 
+
+	public function GetNullValue()
+	{
+		return '';
+	} 
+
+	public function IsNull($proposedValue)
+	{
+		return ($proposedValue == '');
+	} 
+
+	public function MakeRealValue($proposedValue, $oHostObj)
+	{
+		if (is_null($proposedValue)) return '';
+		return (string)$proposedValue;
+	}
+
+	public function ScalarToSQL($value)
+	{
+		if (!is_string($value))
+		{
+			throw new CoreException('Expected the attribute value to be a string', array('found_type' => gettype($value), 'value' => $value, 'class' => $this->GetHostClass(), 'attribute' => $this->GetCode()));
+		}
+		return $value;
+	}
+
+	public function GetRelationQueryData()
+	{
+		foreach (MetaModel::EnumRelationQueries($this->GetHostClass(), $this->Get('relation_code'), false) as $sDummy => $aQueryInfo)
+		{
+			if ($aQueryInfo['sFromClass'] == $this->Get('from_class'))
+			{
+				if ($aQueryInfo['sNeighbour'] == $this->Get('neighbour_id'))
+				{
+					return $aQueryInfo;
+				}
+			}
+		}
+	}
+
+	/**
+	 * Find the user option label
+	 * @param user option : disabled|cout|percent	 	
+	 */	
+	public function GetUserOptionFormat($sUserOption, $sDefault = null)
+	{
+		$sLabel = $this->SearchLabel('/Attribute:'.$this->m_sCode.'/'.$sUserOption, null, true /*user lang*/);
+		if (is_null($sLabel))
+		{
+			// If no default value is specified, let's define the most relevant one for developping purposes
+			if (is_null($sDefault))
+			{
+				$sDefault = str_replace('_', ' ', $this->m_sCode.':'.$sUserOption.'(%1$s)');
+			}
+			// Browse the hierarchy again, accepting default (english) translations
+			$sLabel = $this->SearchLabel('/Attribute:'.$this->m_sCode.'/'.$sUserOption, $sDefault, false);
+		}
+		return $sLabel;
+	}
+
+	/**
+	 * Override to display the value in the GUI
+	 */	
+	public function GetAsHTML($sValue, $oHostObject = null, $bLocalize = true)
+	{
+		$sCurrentOption = $this->GetCurrentOption($sValue);
+		$sClass = $oHostObject ? get_class($oHostObject) : $this->m_sHostClass;
+		return sprintf($this->GetUserOptionFormat($sCurrentOption), $this->GetMinUpValue($sValue), MetaModel::GetName($sClass));
+	}
+
+	public function GetAsCSV($sValue, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
+	{
+		$sFrom = array("\r\n", $sTextQualifier);
+		$sTo = array("\n", $sTextQualifier.$sTextQualifier);
+		$sEscaped = str_replace($sFrom, $sTo, (string)$sValue);
+		return $sTextQualifier.$sEscaped.$sTextQualifier;
+	}
+
+	/**
+	 * Helper to interpret the value, given the current settings and string representation of the attribute	
+	 */	
+	public function IsEnabled($sValue)
+	{
+		if ($this->get('enabled_mode') == 'fixed')
+		{
+			$bRet = $this->get('enabled');
+		}
+		else
+		{
+			$bRet = ($sValue != 'disabled');
+		}
+		return $bRet;
+	}
+
+	/**
+	 * Helper to interpret the value, given the current settings and string representation of the attribute	
+	 */	
+	public function GetMinUpType($sValue)
+	{
+		if ($this->get('min_up_mode') == 'fixed')
+		{
+			$sRet = $this->get('min_up_type');
+		}
+		else
+		{
+			$sRet = 'count';
+			if (substr(trim($sValue), -1, 1) == '%')
+			{
+				$sRet = 'percent';
+			}
+		}
+		return $sRet;
+	}
+
+	/**
+	 * Helper to interpret the value, given the current settings and string representation of the attribute	
+	 */	
+	public function GetMinUpValue($sValue)
+	{
+		if ($this->get('min_up_mode') == 'fixed')
+		{
+			$iRet = (int) $this->Get('min_up');
+		}
+		else
+		{
+			$sRefValue = $sValue;
+			if (substr(trim($sValue), -1, 1) == '%')
+			{
+				$sRefValue = substr(trim($sValue), 0, -1);
+			}
+			$iRet = (int) trim($sRefValue);
+		}
+		return $iRet;
+	}
+
+	/**
+	 * Helper to determine if the redundancy can be viewed/edited by the end-user
+	 */	
+	public function IsVisible()
+	{
+		$bRet = false;
+		if ($this->Get('enabled_mode') == 'fixed')
+		{
+			$bRet = $this->Get('enabled');
+		}
+		elseif ($this->Get('enabled_mode') == 'user')
+		{
+			$bRet = true;
+		}
+		return $bRet;
+	}
+
+	public function IsWritable()
+	{
+		if (($this->Get('enabled_mode') == 'fixed') && ($this->Get('min_up_mode') == 'fixed'))
+		{
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	 * Returns an HTML form that can be read by ReadValueFromPostedForm
+	 */	
+	public function GetDisplayForm($sCurrentValue, $oPage, $bEditMode = false, $sFormPrefix = '')
+	{
+		$sRet = '';
+		$aUserOptions = $this->GetUserOptions($sCurrentValue);
+		if (count($aUserOptions) < 2)
+		{
+			$bEditOption = false;
+		}
+		else
+		{
+			$bEditOption = $bEditMode;
+		}
+		$sCurrentOption = $this->GetCurrentOption($sCurrentValue);
+		foreach($aUserOptions as $sUserOption)
+		{
+			$bSelected = ($sUserOption == $sCurrentOption);
+			$sRet .= '<div>';
+			$sRet .= $this->GetDisplayOption($sCurrentValue, $oPage, $sFormPrefix, $bEditOption, $sUserOption, $bSelected);
+			$sRet .= '</div>';
+		}
+		return $sRet;
+	}
+
+	const USER_OPTION_DISABLED = 'disabled';
+	const USER_OPTION_ENABLED_COUNT = 'count';
+	const USER_OPTION_ENABLED_PERCENT = 'percent';
+
+	/**
+	 * Depending on the xxx_mode parameters, build the list of options that are allowed to the end-user
+	 */	 	
+	protected function GetUserOptions($sValue)
+	{
+		$aRet = array();
+		if ($this->Get('enabled_mode') == 'user')
+		{
+			$aRet[] = self::USER_OPTION_DISABLED;
+		}
+		
+		if ($this->Get('min_up_mode') == 'user')
+		{
+			$aRet[] = self::USER_OPTION_ENABLED_COUNT;
+			$aRet[] = self::USER_OPTION_ENABLED_PERCENT;
+		}
+		else
+		{
+			if ($this->GetMinUpType($sValue) == 'count')
+			{
+				$aRet[] = self::USER_OPTION_ENABLED_COUNT;
+			}
+			else
+			{
+				$aRet[] = self::USER_OPTION_ENABLED_PERCENT;
+			}
+		}
+		return $aRet;
+	}
+
+	/**
+	 * Convert the string representation into one of the existing options	
+	 */	
+	protected function GetCurrentOption($sValue)
+	{
+		$sRet = self::USER_OPTION_DISABLED;
+		if ($this->IsEnabled($sValue))
+		{
+			if ($this->GetMinUpType($sValue) == 'count')
+			{
+				$sRet = self::USER_OPTION_ENABLED_COUNT;
+			}
+			else
+			{
+				$sRet = self::USER_OPTION_ENABLED_PERCENT;
+			}
+		}
+		return $sRet;
+	}
+
+	/**
+	 * Display an option (form, or current value)
+	 */	 	
+	protected function GetDisplayOption($sCurrentValue, $oPage, $sFormPrefix, $bEditMode, $sUserOption, $bSelected = true)
+	{
+		$sRet = '';
+
+		$iCurrentValue = $this->GetMinUpValue($sCurrentValue);
+		if ($bEditMode)
+		{
+			$sHtmlNamesPrefix = 'rddcy_'.$this->Get('relation_code').'_'.$this->Get('from_class').'_'.$this->Get('neighbour_id');
+			switch ($sUserOption)
+			{
+			case self::USER_OPTION_DISABLED:
+				$sValue = ''; // Empty placeholder
+				break;
+	
+			case self::USER_OPTION_ENABLED_COUNT:
+				if ($bEditMode)
+				{
+					$sName = $sHtmlNamesPrefix.'_min_up_count';
+					$sEditValue = $bSelected ? $iCurrentValue : '';
+					$sValue = '<input class="redundancy-min-up-count" type="string" size="3" name="'.$sName.'" value="'.$sEditValue.'">';
+					// To fix an issue on Firefox: focus set to the option (because the input is within the label for the option)
+					$oPage->add_ready_script("\$('[name=\"$sName\"]').click(function(){var me=this; setTimeout(function(){\$(me).focus();}, 100);});");
+				}
+				else
+				{
+					$sValue = $iCurrentValue;
+				}
+				break;
+	
+			case self::USER_OPTION_ENABLED_PERCENT:
+				if ($bEditMode)
+				{
+					$sName = $sHtmlNamesPrefix.'_min_up_percent';
+					$sEditValue = $bSelected ? $iCurrentValue : '';
+					$sValue = '<input class="redundancy-min-up-percent" type="string" size="3" name="'.$sName.'" value="'.$sEditValue.'">';
+					// To fix an issue on Firefox: focus set to the option (because the input is within the label for the option)
+					$oPage->add_ready_script("\$('[name=\"$sName\"]').click(function(){var me=this; setTimeout(function(){\$(me).focus();}, 100);});");
+				}
+				else
+				{
+					$sValue = $iCurrentValue;
+				}
+				break;
+			}
+			$sLabel = sprintf($this->GetUserOptionFormat($sUserOption), $sValue, MetaModel::GetName($this->GetHostClass()));
+
+			$sOptionName = $sHtmlNamesPrefix.'_user_option';
+			$sOptionId = $sOptionName.'_'.$sUserOption;
+			$sChecked = $bSelected ? 'checked' : '';
+			$sRet = '<input type="radio" name="'.$sOptionName.'" id="'.$sOptionId.'" value="'.$sUserOption.'"'.$sChecked.'> <label for="'.$sOptionId.'">'.$sLabel.'</label>';
+		}
+		else
+		{
+			// Read-only: display only the currently selected option
+			if ($bSelected)
+			{
+				$sRet = sprintf($this->GetUserOptionFormat($sUserOption), $iCurrentValue, MetaModel::GetName($this->GetHostClass()));
+			}
+		}
+		return $sRet;
+	}
+
+	/**
+	 * Makes the string representation out of the values given by the form defined in GetDisplayForm	
+	 */	
+	public function ReadValueFromPostedForm($sFormPrefix)
+	{
+		$sHtmlNamesPrefix = 'rddcy_'.$this->Get('relation_code').'_'.$this->Get('from_class').'_'.$this->Get('neighbour_id');
+
+		$iMinUpCount = (int) utils::ReadPostedParam($sHtmlNamesPrefix.'_min_up_count', null, 'raw_data');
+		$iMinUpPercent = (int) utils::ReadPostedParam($sHtmlNamesPrefix.'_min_up_percent', null, 'raw_data');
+		$sSelectedOption = utils::ReadPostedParam($sHtmlNamesPrefix.'_user_option', null, 'raw_data');
+		switch ($sSelectedOption)
+		{
+		case self::USER_OPTION_ENABLED_COUNT:
+			$sRet = $iMinUpCount;
+			break;
+
+		case self::USER_OPTION_ENABLED_PERCENT:
+			$sRet = $iMinUpPercent.'%';
+			break;
+
+		case self::USER_OPTION_DISABLED:
+		default:
+			$sRet = 'disabled';
+			break;
+		}
+		return $sRet;
+	}
+}
+
+/**
+ * Custom fields managed by an external implementation
+ *
+ * @package     iTopORM
+ */
+class AttributeCustomFields extends AttributeDefinition
+{
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_STRING;
+
+	static public function ListExpectedParams()
+	{
+		return array_merge(parent::ListExpectedParams(), array("handler_class"));
+	}
+
+	public function GetEditClass() {return "CustomFields";}
+	public function IsWritable() {return true;}
+	static public function LoadFromDB() {return false;} // See ReadValue...
+
+	public function GetDefaultValue(DBObject $oHostObject = null)
+	{
+		return new ormCustomFieldsValue($oHostObject, $this->GetCode());
+	}
+
+	public function GetBasicFilterOperators() {return array();}
+	public function GetBasicFilterLooseOperator() {return '';}
+	public function GetBasicFilterSQLExpr($sOpCode, $value) {return '';}
+
+	/**
+	 * @param DBObject $oHostObject
+	 * @param array|null $aValues
+	 * @return CustomFieldsHandler
+	 */
+	public function GetHandler($aValues = null)
+	{
+		$sHandlerClass = $this->Get('handler_class');
+		$oHandler = new $sHandlerClass($this->GetCode());
+		if (!is_null($aValues))
+		{
+			$oHandler->SetCurrentValues($aValues);
+		}
+		return $oHandler;
+	}
+
+	public function GetPrerequisiteAttributes($sClass = null)
+	{
+		$sHandlerClass = $this->Get('handler_class');
+		return $sHandlerClass::GetPrerequisiteAttributes($sClass);
+	}
+
+	public function GetEditValue($sValue, $oHostObj = null)
+	{
+		return $this->GetForTemplate($sValue, '', $oHostObj, true);
+	}
+
+	/**
+	 * Makes the string representation out of the values given by the form defined in GetDisplayForm
+	 */
+	public function ReadValueFromPostedForm($oHostObject, $sFormPrefix)
+	{
+		$aRawData = json_decode(utils::ReadPostedParam("attr_{$sFormPrefix}{$this->GetCode()}", '{}', 'raw_data'), true);
+		return new ormCustomFieldsValue($oHostObject, $this->GetCode(), $aRawData);
+	}
+
+	public function MakeRealValue($proposedValue, $oHostObject)
+	{
+		if (is_object($proposedValue) && ($proposedValue instanceof ormCustomFieldsValue))
+		{
+			return $proposedValue;
+		}
+		elseif (is_string($proposedValue))
+		{
+			$aValues = json_decode($proposedValue, true);
+			return new ormCustomFieldsValue($oHostObject, $this->GetCode(), $aValues);
+		}
+		elseif (is_array($proposedValue))
+		{
+			return new ormCustomFieldsValue($oHostObject, $this->GetCode(), $proposedValue);
+		}
+		elseif (is_null($proposedValue))
+		{
+			return new ormCustomFieldsValue($oHostObject, $this->GetCode());
+		}
+		throw new Exception('Unexpected type for the value of a custom fields attribute: '.gettype($proposedValue));
+	}
+
+	static public function GetFormFieldClass()
+	{
+		return '\\Combodo\\iTop\\Form\\Field\\SubFormField';
+	}
+
+	/**
+	 * Override to build the relevant form field
+	 *
+	 * When called first, $oFormField is null and will be created (eg. Make). Then when the ::parent is called and the $oFormField is passed, MakeFormField behaves more like a Prepare.
+	 */
+	public function MakeFormField(DBObject $oObject, $oFormField = null)
+	{
+		if ($oFormField === null)
+		{
+			$sFormFieldClass = static::GetFormFieldClass();
+			$oFormField = new $sFormFieldClass($this->GetCode());
+			$oFormField->SetForm($this->GetForm($oObject));
+		}
+		parent::MakeFormField($oObject, $oFormField);
+		
+		return $oFormField;
+	}
+
+	/**
+	 * @param DBObject $oHostObject
+	 * @return Combodo\iTop\Form\Form
+	 */
+	public function GetForm(DBObject $oHostObject, $sFormPrefix = null)
+	{
+		try
+		{
+			$oValue = $oHostObject->Get($this->GetCode());
+			$oHandler = $this->GetHandler($oValue->GetValues());
+			$sFormId = is_null($sFormPrefix) ? 'cf_'.$this->GetCode() : $sFormPrefix.'_cf_'.$this->GetCode();
+			$oHandler->BuildForm($oHostObject, $sFormId);
+			$oForm = $oHandler->GetForm();
+		}
+		catch (Exception $e)
+		{
+			$oForm = new \Combodo\iTop\Form\Form('');
+			$oField = new \Combodo\iTop\Form\Field\LabelField('');
+			$oField->SetLabel('Custom field error: '.$e->getMessage());
+			$oForm->AddField($oField);
+			$oForm->Finalize();
+		}
+		return $oForm;
+	}
+
+	/**
+	 * Read the data from where it has been stored. This verb must be implemented as soon as LoadFromDB returns false and LoadInObject returns true
+	 * @param $oHostObject
+	 * @return ormCustomFieldsValue
+	 */
+	public function ReadValue($oHostObject)
+	{
+		try
+		{
+			$oHandler = $this->GetHandler();
+			$aValues = $oHandler->ReadValues($oHostObject);
+			$oRet = new ormCustomFieldsValue($oHostObject, $this->GetCode(), $aValues);
+		}
+		catch (Exception $e)
+		{
+			$oRet = new ormCustomFieldsValue($oHostObject, $this->GetCode());
+		}
+		return $oRet;
+	}
+
+	/**
+	 * Record the data (currently in the processing of recording the host object)
+	 * It is assumed that the data has been checked prior to calling Write()
+	 * @param DBObject $oHostObject
+	 * @param ormCustomFieldsValue|null $oValue (null is the default value)
+	 */
+	public function WriteValue(DBObject $oHostObject, ormCustomFieldsValue $oValue = null)
+	{
+		if (is_null($oValue))
+		{
+			$oHandler = $this->GetHandler();
+			$aValues = array();
+		}
+		else
+		{
+			// Pass the values through the form to make sure that they are correct
+			$oHandler = $this->GetHandler($oValue->GetValues());
+			$oHandler->BuildForm($oHostObject, '');
+			$oForm = $oHandler->GetForm();
+			$aValues = $oForm->GetCurrentValues();
+		}
+		return $oHandler->WriteValues($oHostObject, $aValues);
+	}
+
+	/**
+	 * The part of the current attribute in the object's signature, for the supplied value
+	 * @param $value The value of this attribute for the object
+	 * @return string The "signature" for this field/attribute
+	 */
+	public function Fingerprint($value)
+	{
+		$oHandler = $this->GetHandler($value->GetValues());
+		return $oHandler->GetValueFingerprint();
+	}
+
+	/**
+	 * Check the validity of the data
+	 * @param DBObject $oHostObject
+	 * @param $value
+	 * @return bool|string true or error message
+	 */
+	public function CheckValue(DBObject $oHostObject, $value)
+	{
+		try
+		{
+			$oHandler = $this->GetHandler($value->GetValues());
+			$oHandler->BuildForm($oHostObject, '');
+			$oForm = $oHandler->GetForm();
+			$oForm->Validate();
+			if ($oForm->GetValid())
+			{
+				$ret = true;
+			}
+			else
+			{
+				$aMessages = array();
+				foreach ($oForm->GetErrorMessages() as $sFieldId => $aFieldMessages)
+				{
+					$aMessages[] = $sFieldId.': '.implode(', ', $aFieldMessages);
+				}
+				$ret = 'Invalid value: '.implode(', ', $aMessages);
+			}
+		}
+		catch (Exception $e)
+		{
+			$ret = $e->getMessage();
+		}
+		return $ret;
+	}
+
+	/**
+	 * Cleanup data upon object deletion (object id still available here)
+	 * @param DBObject $oHostObject
+	 */
+	public function DeleteValue(DBObject $oHostObject)
+	{
+		$oValue = $oHostObject->Get($this->GetCode());
+		$oHandler = $this->GetHandler($oValue->GetValues());
+		return $oHandler->DeleteValues($oHostObject);
+	}
+
+	public function GetAsHTML($value, $oHostObject = null, $bLocalize = true)
+	{
+		try
+		{
+			$sRet = $value->GetAsHTML($bLocalize);
+		}
+		catch (Exception $e)
+		{
+			$sRet = 'Custom field error: '.htmlentities($e->getMessage(), ENT_QUOTES, 'UTF-8');
+		}
+		return $sRet;
+	}
+
+	public function GetAsXML($value, $oHostObject = null, $bLocalize = true)
+	{
+		try
+		{
+			$sRet = $value->GetAsXML($bLocalize);
+		}
+		catch (Exception $e)
+		{
+			$sRet = Str::pure2xml('Custom field error: '.$e->getMessage());
+		}
+		return $sRet;
+	}
+
+	public function GetAsCSV($value, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
+	{
+		try
+		{
+			$sRet = $value->GetAsCSV($sSeparator, $sTextQualifier, $bLocalize, $bConvertToPlainText);
+		}
+		catch (Exception $e)
+		{
+			$sFrom = array("\r\n", $sTextQualifier);
+			$sTo = array("\n", $sTextQualifier.$sTextQualifier);
+			$sEscaped = str_replace($sFrom, $sTo, 'Custom field error: '.$e->getMessage());
+			$sRet = $sTextQualifier.$sEscaped.$sTextQualifier;
+		}
+		return $sRet;
+	}
+
+	/**
+	 * List the available verbs for 'GetForTemplate'
+	 */
+	public function EnumTemplateVerbs()
+	{
+		$sHandlerClass = $this->Get('handler_class');
+		return $sHandlerClass::EnumTemplateVerbs();
+	}
+
+	/**
+	 * Get various representations of the value, for insertion into a template (e.g. in Notifications)
+	 * @param $value mixed The current value of the field
+	 * @param $sVerb string The verb specifying the representation of the value
+	 * @param $oHostObject DBObject The object
+	 * @param $bLocalize bool Whether or not to localize the value
+	 */
+	public function GetForTemplate($value, $sVerb, $oHostObject = null, $bLocalize = true)
+	{
+		try
+		{
+			$sRet = $value->GetForTemplate($sVerb, $bLocalize);
+		}
+		catch (Exception $e)
+		{
+			$sRet = 'Custom field error: '.$e->getMessage();
+		}
+		return $sRet;
+	}
+
+	public function MakeValueFromString($sProposedValue, $bLocalizedValue = false, $sSepItem = null, $sSepAttribute = null, $sSepValue = null, $sAttributeQualifier = null)
+	{
+		return null;
+	}
+
+	/**
+	 * Helper to get a value that will be JSON encoded
+	 * The operation is the opposite to FromJSONToValue
+	 */
+	public function GetForJSON($value)
+	{
+		return null;
+	}
+
+	/**
+	 * Helper to form a value, given JSON decoded data
+	 * The operation is the opposite to GetForJSON
+	 */
+	public function FromJSONToValue($json)
+	{
+		return null;
+	}
+
+	public function Equals($val1, $val2)
+	{
+		try
+		{
+			$bEquals = $val1->Equals($val2);
+		}
+		catch (Exception $e)
+		{
+			false;
+		}
+		return $bEquals;
+	}
+}
+
+class AttributeArchiveFlag extends AttributeBoolean
+{
+	public function __construct($sCode)
+	{
+		parent::__construct($sCode, array("allowed_values" => null, "sql" => $sCode, "default_value" => false, "is_null_allowed" => false, "depends_on" => array()));
+	}
+	public function RequiresIndex()
+	{
+		return true;
+	}
+	public function CopyOnAllTables()
+	{
+		return true;
+	}
+	public function IsWritable()
+	{
+		return false;
+	}
+	public function IsMagic()
+	{
+		return true;
+	}
+	public function GetLabel($sDefault = null)
+	{
+		$sDefault = Dict::S('Core:AttributeArchiveFlag/Label', $sDefault);
+		return parent::GetLabel($sDefault);
+	}
+	public function GetDescription($sDefault = null)
+	{
+		$sDefault = Dict::S('Core:AttributeArchiveFlag/Label+', $sDefault);
+		return parent::GetDescription($sDefault);
+	}
+}
+class AttributeArchiveDate extends AttributeDate
+{
+	public function GetLabel($sDefault = null)
+	{
+		$sDefault = Dict::S('Core:AttributeArchiveDate/Label', $sDefault);
+		return parent::GetLabel($sDefault);
+	}
+	public function GetDescription($sDefault = null)
+	{
+		$sDefault = Dict::S('Core:AttributeArchiveDate/Label+', $sDefault);
+		return parent::GetDescription($sDefault);
+	}
+}
+
+class AttributeObsolescenceFlag extends AttributeBoolean
+{
+	public function __construct($sCode)
+	{
+		parent::__construct($sCode, array("allowed_values"=>null, "sql"=>$sCode, "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array()));
+	}
+	public function IsWritable()
+	{
+		return false;
+	}
+	public function IsMagic()
+	{
+		return true;
+	}
+
+	static public function IsBasedOnDBColumns() {return false;}
+	/**
+	 * Returns true if the attribute value is built after other attributes by the mean of an expression (obtained via GetOQLExpression)
+	 * @return bool
+	 */
+	static public function IsBasedOnOQLExpression() {return true;}
+	public function GetOQLExpression()
+	{
+		return MetaModel::GetObsolescenceExpression($this->GetHostClass());
+	}
+
+	public function GetSQLExpressions($sPrefix = '')
+	{
+		return array();
+		if ($sPrefix == '')
+		{
+			$sPrefix = $this->GetCode(); // Warning AttributeComputedFieldVoid does not have any sql property
+		}
+		return array('' => $sPrefix);
+	}
+	public function GetSQLColumns($bFullSpec = false) {return array();} // returns column/spec pairs (1 in most of the cases), for STRUCTURING (DB creation)
+	public function GetSQLValues($value) {return array();} // returns column/value pairs (1 in most of the cases), for WRITING (Insert, Update)
+
+	public function GetEditClass() {return "";}
+
+	public function GetValuesDef() {return null;}
+	public function GetPrerequisiteAttributes($sClass = null) {return $this->GetOptional("depends_on", array());}
+
+	public function IsDirectField() {return true;}
+	static public function IsScalar() {return true;}
+	public function GetSQLExpr()
+	{
+		return null;
+	}
+
+	public function GetDefaultValue(DBObject $oHostObject = null) {return $this->MakeRealValue("", $oHostObject);}
+	public function IsNullAllowed() {return false;}
+
+	public function GetLabel($sDefault = null)
+	{
+		$sDefault = Dict::S('Core:AttributeObsolescenceFlag/Label', $sDefault);
+		return parent::GetLabel($sDefault);
+	}
+	public function GetDescription($sDefault = null)
+	{
+		$sDefault = Dict::S('Core:AttributeObsolescenceFlag/Label+', $sDefault);
+		return parent::GetDescription($sDefault);
+	}
+}
+
+class AttributeObsolescenceDate extends AttributeDate
+{
+	public function GetLabel($sDefault = null)
+	{
+		$sDefault = Dict::S('Core:AttributeObsolescenceDate/Label', $sDefault);
+		return parent::GetLabel($sDefault);
+	}
+	public function GetDescription($sDefault = null)
+	{
+		$sDefault = Dict::S('Core:AttributeObsolescenceDate/Label+', $sDefault);
+		return parent::GetDescription($sDefault);
+	}
+}
diff --git a/sources/application/search/searchform.class.inc.php b/sources/application/search/searchform.class.inc.php
index 0c9ed9776..c2d7f44a0 100644
--- a/sources/application/search/searchform.class.inc.php
+++ b/sources/application/search/searchform.class.inc.php
@@ -29,7 +29,9 @@ use CMDBObjectSet;
 use Combodo\iTop\Application\Search\CriterionConversion\CriterionToSearchForm;
 use CoreException;
 use DBObjectSearch;
+use DBObjectSet;
 use Dict;
+use Exception;
 use Expression;
 use IssueLog;
 use MetaModel;
@@ -176,25 +178,29 @@ class SearchForm
 		{
 			$aList = MetaModel::GetZListItems($sClassName, 'standard_search');
 			$aAttrDefs = MetaModel::ListAttributeDefs($sClassName);
+			$aZList = array();
 			foreach($aList as $sFilterCode)
 			{
-				$aField = array();
-				$aField['code'] = $sFilterCode;
-				$aField['class'] = $sClassName;
-				$aField['class_alias'] = $sClassAlias;
 				if (array_key_exists($sFilterCode, $aAttrDefs))
 				{
 					$oAttrDef = $aAttrDefs[$sFilterCode];
-					$aField['label'] = $oAttrDef->GetLabel();
-					$aField['widget'] = $oAttrDef->GetSearchType();
-					$aField['allowed_values'] = self::GetFieldAllowedValues($oAttrDef);
 				}
 				else
 				{
-					$aField['widget'] = AttributeDefinition::SEARCH_WIDGET_TYPE;
+					$oAttrDef = null;
 				}
-				$aFields[$sClassAlias.'.'.$sFilterCode] = $aField;
+				$aZList = self::AppendField($sClassName, $sClassAlias, $sFilterCode, $oAttrDef, $aZList);
 			}
+			$aFields['zlist'] = $aZList;
+			$aOthers = array();
+			foreach($aAttrDefs as $sFilterCode => $oAttrDef)
+			{
+				if (!in_array($sFilterCode, $aList))
+				{
+					$aOthers = self::AppendField($sClassName, $sClassAlias, $sFilterCode, $oAttrDef, $aOthers);
+				}
+			}
+			$aFields['others'] = $aOthers;
 		} catch (CoreException $e)
 		{
 			IssueLog::Error($e->getMessage());
@@ -210,14 +216,36 @@ class SearchForm
 	 */
 	public static function GetFieldAllowedValues($oAttrDef)
 	{
-		if (method_exists($oAttrDef, 'GetAllowedValuesAsObjectSet'))
+		if ($oAttrDef->IsExternalKey(EXTKEY_ABSOLUTE))
 		{
-			$oSet = $oAttrDef->GetAllowedValuesAsObjectSet();
+			$sTargetClass = $oAttrDef->GetTargetClass();
+			try
+			{
+				$oSearch = new DBObjectSearch($sTargetClass);
+			} catch (Exception $e)
+			{
+				IssueLog::Error($e->getMessage());
+
+				return array('values' => array());
+			}
+			$oSearch->SetModifierProperty('UserRightsGetSelectFilter', 'bSearchMode', true);
+			$oSet = new DBObjectSet($oSearch);
 			if ($oSet->Count() > MetaModel::GetConfig()->Get('max_combo_length'))
 			{
 				return array('autocomplete' => true);
 			}
 		}
+		else
+		{
+			if (method_exists($oAttrDef, 'GetAllowedValuesAsObjectSet'))
+			{
+				$oSet = $oAttrDef->GetAllowedValuesAsObjectSet();
+				if ($oSet->Count() > MetaModel::GetConfig()->Get('max_combo_length'))
+				{
+					return array('autocomplete' => true);
+				}
+			}
+		}
 
 		return array('values' => $oAttrDef->GetAllowedValues());
 	}
@@ -249,4 +277,30 @@ class SearchForm
 
 		return array('or' => $aOrCriterion);
 	}
+
+	/**
+	 * @param $sClassName
+	 * @param $sClassAlias
+	 * @param $sFilterCode
+	 * @param $oAttrDef
+	 * @param $aFields
+	 *
+	 * @return mixed
+	 */
+	private static function AppendField($sClassName, $sClassAlias, $sFilterCode, $oAttrDef, $aFields)
+	{
+		if (!is_null($oAttrDef) && ($oAttrDef->GetSearchType() != AttributeDefinition::SEARCH_WIDGET_TYPE_RAW))
+		{
+			$aField = array();
+			$aField['code'] = $sFilterCode;
+			$aField['class'] = $sClassName;
+			$aField['class_alias'] = $sClassAlias;
+			$aField['label'] = $oAttrDef->GetLabel();
+			$aField['widget'] = $oAttrDef->GetSearchType();
+			$aField['allowed_values'] = self::GetFieldAllowedValues($oAttrDef);
+			$aFields[$sClassAlias.'.'.$sFilterCode] = $aField;
+		}
+
+		return $aFields;
+	}
 }
\ No newline at end of file

From 0c8650d2e56e09c020c87cfe9315d6663410e97f Mon Sep 17 00:00:00 2001
From: Bruno Da Silva <bruno.dasilva@combodo.com>
Date: Tue, 13 Mar 2018 10:22:48 +0000
Subject: [PATCH 024/202] Search form jquery expect html responses to begin
 with a <

SVN:b1162[5410]
---
 pages/ajax.searchform.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pages/ajax.searchform.php b/pages/ajax.searchform.php
index d7624e40c..57d362573 100644
--- a/pages/ajax.searchform.php
+++ b/pages/ajax.searchform.php
@@ -104,18 +104,18 @@ try
 {
 	http_response_code($e->getCode());
 	// note: transform to cope with XSS attacks
-	echo htmlentities($e->GetMessage(), ENT_QUOTES, 'utf-8');
+	echo '<html><head></head><body><div>' . htmlentities($e->GetMessage(), ENT_QUOTES, 'utf-8') . '</div></body></html>';
 	IssueLog::Error($e->getMessage()."\nDebug trace:\n".$e->getTraceAsString());
 } catch (SecurityException $e)
 {
 	http_response_code(403);
 	// note: transform to cope with XSS attacks
-	echo htmlentities($e->GetMessage(), ENT_QUOTES, 'utf-8');
+	echo '<html><head></head><body><div>' . htmlentities($e->GetMessage(), ENT_QUOTES, 'utf-8') . '</div></body></html>';
 	IssueLog::Error($e->getMessage()."\nDebug trace:\n".$e->getTraceAsString());
 } catch (Exception $e)
 {
 	http_response_code(500);
 	// note: transform to cope with XSS attacks
-	echo htmlentities($e->GetMessage(), ENT_QUOTES, 'utf-8');
+	echo '<html><head></head><body><div>' . htmlentities($e->GetMessage(), ENT_QUOTES, 'utf-8') . '</div></body></html>';
 	IssueLog::Error($e->getMessage()."\nDebug trace:\n".$e->getTraceAsString());
 }
\ No newline at end of file

From 2038785b09fe7a86a869726c3a0a36ba5b2dce5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Tue, 13 Mar 2018 10:27:08 +0000
Subject: [PATCH 025/202] SVN:b1162[5411]

---
 application/cmdbabstract.class.inc.php        | 15 ++++++-
 .../criteriontosearchform.class.inc.php       |  4 +-
 .../search/criterionparser.class.inc.php      |  1 -
 .../search/searchform.class.inc.php           | 45 ++++++++++---------
 4 files changed, 41 insertions(+), 24 deletions(-)

diff --git a/application/cmdbabstract.class.inc.php b/application/cmdbabstract.class.inc.php
index 64b024094..798dec7bf 100644
--- a/application/cmdbabstract.class.inc.php
+++ b/application/cmdbabstract.class.inc.php
@@ -1532,10 +1532,21 @@ EOF
 
 		$oPage->add(self::GetSearchForm($oPage, $oSet, $aExtraParams));
 	}
-	
+
+	/**
+	 * @param WebPage $oPage
+	 * @param CMDBObjectSet $oSet
+	 * @param array $aExtraParams
+	 *
+	 * @return string
+	 * @throws CoreException
+	 * @throws DictExceptionMissingString
+	 */
 	public static function GetSearchForm(WebPage $oPage, CMDBObjectSet $oSet, $aExtraParams = array())
 	{
-		return \Combodo\iTop\Application\Search\SearchForm::GetSearchForm($oPage, $oSet, $aExtraParams);
+		$oSearchForm = new \Combodo\iTop\Application\Search\SearchForm();
+
+		return $oSearchForm->GetSearchForm($oPage, $oSet, $aExtraParams);
 	}
 
 	/**
diff --git a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
index f884d3739..cd3402ee6 100644
--- a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
+++ b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
@@ -19,7 +19,9 @@
  *
  */
 
-
+/**
+ * Convert OQL expressions into structure for the search form
+ */
 namespace Combodo\iTop\Application\Search\CriterionConversion;
 
 
diff --git a/sources/application/search/criterionparser.class.inc.php b/sources/application/search/criterionparser.class.inc.php
index 4aaa58b86..0c8365a22 100644
--- a/sources/application/search/criterionparser.class.inc.php
+++ b/sources/application/search/criterionparser.class.inc.php
@@ -65,7 +65,6 @@ class CriterionParser
 				return $oSearch;
 			}
 
-			$oSearch->ResetCondition();
 			$oExpression = \Expression::FromOQL(implode(" OR ", $aExpression));
 			$oSearch->AddConditionExpression($oExpression);
 			
diff --git a/sources/application/search/searchform.class.inc.php b/sources/application/search/searchform.class.inc.php
index c2d7f44a0..fd5a092e3 100644
--- a/sources/application/search/searchform.class.inc.php
+++ b/sources/application/search/searchform.class.inc.php
@@ -41,6 +41,8 @@ use WebPage;
 
 class SearchForm
 {
+	private $aLabels = array();
+
 	/**
 	 * @param \WebPage $oPage
 	 * @param \CMDBObjectSet $oSet
@@ -50,9 +52,10 @@ class SearchForm
 	 * @throws \CoreException
 	 * @throws \DictExceptionMissingString
 	 */
-	public static function GetSearchForm(WebPage $oPage, CMDBObjectSet $oSet, $aExtraParams = array())
+	public function GetSearchForm(WebPage $oPage, CMDBObjectSet $oSet, $aExtraParams = array())
 	{
 		$sHtml = '';
+		$this->aLabels = array();
 		$oAppContext = new ApplicationContext();
 		$sClassName = $oSet->GetFilter()->GetClass();
 		$aListParams = array();
@@ -87,14 +90,11 @@ class SearchForm
 		{
 			$aListParams['selection_type'] = $aExtraParams['selection_type'];
 		}
-
 		$sJson = stripslashes(utils::ReadParam('json', '', false, 'raw_data'));
 		if (!empty($sJson))
 		{
 			$aListParams['json'] = json_decode($sJson, true);
 		}
-
-
 		if (array_key_exists('cssCount', $aExtraParams))
 		{
 			$aListParams['cssCount'] = $aExtraParams['cssCount'];
@@ -128,9 +128,9 @@ class SearchForm
 		$sPrimaryClassName = $oSet->GetClass();
 		$sPrimaryClassAlias = $oSet->GetClassAlias();
 
-		$aFields = self::GetFields($sPrimaryClassName, $sPrimaryClassAlias);
+		$aFields = $this->GetFields($sPrimaryClassName, $sPrimaryClassAlias);
 		$oSearch = $oSet->GetFilter();
-		$aCriterion = self::GetCriterion($oSearch);
+		$aCriterion = $this->GetCriterion($oSearch);
 
 		$oBaseSearch = $oSearch->DeepClone();
 		$oBaseSearch->ResetCondition();
@@ -171,7 +171,7 @@ class SearchForm
 	 *
 	 * @return array
 	 */
-	public static function GetFields($sClassName, $sClassAlias)
+	public function GetFields($sClassName, $sClassAlias)
 	{
 		$aFields = array();
 		try
@@ -189,7 +189,7 @@ class SearchForm
 				{
 					$oAttrDef = null;
 				}
-				$aZList = self::AppendField($sClassName, $sClassAlias, $sFilterCode, $oAttrDef, $aZList);
+				$aZList = $this->AppendField($sClassName, $sClassAlias, $sFilterCode, $oAttrDef, $aZList);
 			}
 			$aFields['zlist'] = $aZList;
 			$aOthers = array();
@@ -197,7 +197,7 @@ class SearchForm
 			{
 				if (!in_array($sFilterCode, $aList))
 				{
-					$aOthers = self::AppendField($sClassName, $sClassAlias, $sFilterCode, $oAttrDef, $aOthers);
+					$aOthers = $this->AppendField($sClassName, $sClassAlias, $sFilterCode, $oAttrDef, $aOthers);
 				}
 			}
 			$aFields['others'] = $aOthers;
@@ -214,7 +214,7 @@ class SearchForm
 	 *
 	 * @return array
 	 */
-	public static function GetFieldAllowedValues($oAttrDef)
+	public function GetFieldAllowedValues($oAttrDef)
 	{
 		if ($oAttrDef->IsExternalKey(EXTKEY_ABSOLUTE))
 		{
@@ -253,7 +253,7 @@ class SearchForm
 	/**
 	 * @param DBObjectSearch $oSearch
 	 */
-	public static function GetCriterion($oSearch)
+	public function GetCriterion($oSearch)
 	{
 		$oExpression = $oSearch->GetCriteria();
 
@@ -287,18 +287,23 @@ class SearchForm
 	 *
 	 * @return mixed
 	 */
-	private static function AppendField($sClassName, $sClassAlias, $sFilterCode, $oAttrDef, $aFields)
+	private function AppendField($sClassName, $sClassAlias, $sFilterCode, $oAttrDef, $aFields)
 	{
 		if (!is_null($oAttrDef) && ($oAttrDef->GetSearchType() != AttributeDefinition::SEARCH_WIDGET_TYPE_RAW))
 		{
-			$aField = array();
-			$aField['code'] = $sFilterCode;
-			$aField['class'] = $sClassName;
-			$aField['class_alias'] = $sClassAlias;
-			$aField['label'] = $oAttrDef->GetLabel();
-			$aField['widget'] = $oAttrDef->GetSearchType();
-			$aField['allowed_values'] = self::GetFieldAllowedValues($oAttrDef);
-			$aFields[$sClassAlias.'.'.$sFilterCode] = $aField;
+			$sLabel = $oAttrDef->GetLabel();
+			if (!array_key_exists($sLabel, $this->aLabels))
+			{
+				$aField = array();
+				$aField['code'] = $sFilterCode;
+				$aField['class'] = $sClassName;
+				$aField['class_alias'] = $sClassAlias;
+				$aField['label'] = $sLabel;
+				$aField['widget'] = $oAttrDef->GetSearchType();
+				$aField['allowed_values'] = $this->GetFieldAllowedValues($oAttrDef);
+				$aFields[$sClassAlias.'.'.$sFilterCode] = $aField;
+				$this->aLabels[$sLabel] = true;
+			}
 		}
 
 		return $aFields;

From e2174b9ad48b22fd9e555e7392f79c4479a5dec3 Mon Sep 17 00:00:00 2001
From: Guillaume Lajarige <guillaume.lajarige@combodo.com>
Date: Tue, 13 Mar 2018 10:47:54 +0000
Subject: [PATCH 026/202] Advanced search: WIP POC, integration with endpoint.

SVN:b1162[5412]
---
 application/nicewebpage.class.inc.php    |  11 ++
 css/light-grey.css                       |   7 +
 css/light-grey.scss                      |   5 +-
 dictionaries/en.dictionary.itop.ui.php   |  10 +
 js/search/search_form_criteria.js        | 225 ++++++++++++++++++++---
 js/search/search_form_criteria_raw.js    |   8 +
 js/search/search_form_criteria_string.js |  55 +++---
 js/search/search_form_handler.js         | 106 +++++++++--
 8 files changed, 363 insertions(+), 64 deletions(-)

diff --git a/application/nicewebpage.class.inc.php b/application/nicewebpage.class.inc.php
index 4a3338bd6..a9f3b4ed9 100644
--- a/application/nicewebpage.class.inc.php
+++ b/application/nicewebpage.class.inc.php
@@ -54,6 +54,17 @@ class NiceWebPage extends WebPage
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria.js');
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_raw.js');
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_string.js');
+	    // TODO: Remove
+	    $this->add_dict_entry('UI:Search:Criteria:Operator:Default:Empty');
+	    $this->add_dict_entry('UI:Search:Criteria:Operator:Default:NotEmpty');
+	    $this->add_dict_entry('UI:Search:Criteria:Operator:Default:Equals');
+	    $this->add_dict_entry('UI:Search:Criteria:Operator:String:Contains');
+	    $this->add_dict_entry('UI:Search:Criteria:Operator:String:StartsWith');
+	    $this->add_dict_entry('UI:Search:Criteria:Operator:String:EndsWith');
+	    $this->add_dict_entry('UI:Button:Apply');
+	    $this->add_dict_entry('UI:Button:Cancel');
+	    $this->add_dict_entry('UI:Button:More');
+	    $this->add_dict_entry('UI:Button:Less');
 	    $this->add_ready_script(
 <<< EOF
 	//add new widget called TruncatedList to properly display truncated lists when they are sorted
diff --git a/css/light-grey.css b/css/light-grey.css
index 389c48217..1182e55f9 100644
--- a/css/light-grey.css
+++ b/css/light-grey.css
@@ -789,6 +789,13 @@ div.HRDrawer {
 .search_form_handler .sf_criterion_area .search_form_criteria.locked {
   background-color: #f1f1f1;
 }
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_toggle {
+  display: inline-block;
+  transition: all 0.2s ease-in-out;
+}
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_toggle.opened {
+  transform: rotateZ(180deg);
+}
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_title {
   cursor: pointer;
 }
diff --git a/css/light-grey.scss b/css/light-grey.scss
index ef223d102..80d8efc8c 100644
--- a/css/light-grey.scss
+++ b/css/light-grey.scss
@@ -880,8 +880,11 @@ div.HRDrawer {
 
 			}
 			.sfc_toggle{
-				&.opened{
+				display: inline-block;
+				transition: all 0.2s ease-in-out;
 
+				&.opened{
+					transform: rotateZ(180deg);
 				}
 			}
 			.sfc_title{
diff --git a/dictionaries/en.dictionary.itop.ui.php b/dictionaries/en.dictionary.itop.ui.php
index 4ecf30635..0ab1badc9 100644
--- a/dictionaries/en.dictionary.itop.ui.php
+++ b/dictionaries/en.dictionary.itop.ui.php
@@ -389,6 +389,8 @@ Dict::Add('EN US', 'English', 'English', array(
 	'UI:Button:ChangePassword' => ' Change Password ',
 	'UI:Button:ResetPassword' => ' Reset Password ',
 	'UI:Button:Insert' => 'Insert',
+	'UI:Button:More' => 'More',
+	'UI:Button:Less' => 'Less',
 	
 	'UI:SearchToggle' => 'Search',
 	'UI:ClickToCreateNew' => 'Create a new %1$s',
@@ -1367,4 +1369,12 @@ When associated with a trigger, each action is given an "order" number, specifyi
 	'UI:Button:ResetImage' => 'Recover the previous image',
 	'UI:Button:RemoveImage' => 'Remove the image',
 	'UI:UploadNotSupportedInThisMode' => 'The modification of images or files is not supported in this mode.',
+
+	// TODO: Reorganize those entries with other search entries and make entries for other languages.
+	'UI:Search:Criteria:Operator:Default:Empty' => 'Is empty:',
+	'UI:Search:Criteria:Operator:Default:NotEmpty' => 'Is not empty:',
+	'UI:Search:Criteria:Operator:Default:Equals' => 'Equals:',
+	'UI:Search:Criteria:Operator:String:Contains' => 'Contains:',
+	'UI:Search:Criteria:Operator:String:StartsWith' => 'Starts with:',
+	'UI:Search:Criteria:Operator:String:EndsWith' => 'Ends with:',
 ));
diff --git a/js/search/search_form_criteria.js b/js/search/search_form_criteria.js
index 4244f716c..779797614 100644
--- a/js/search/search_form_criteria.js
+++ b/js/search/search_form_criteria.js
@@ -9,6 +9,7 @@ $(function()
 		// default options
 		options:
 		{
+			// Default values for the criteria
 			ref: '',
 			operator: '=',
 			values: [],
@@ -18,9 +19,33 @@ $(function()
 			field: {
 				label: '',
 			},
+
+			// Available operators (merged with derived widgets, ordered and then copied to this.operators)
+			available_operators: {
+				'=': {
+					'label': Dict.S('UI:Search:Criteria:Operator:Default:Equals'),
+					'code': 'equals',
+					'rank': 10,
+				},
+				'empty': {
+					'label': Dict.S('UI:Search:Criteria:Operator:Default:Empty'),
+					'code': 'empty',
+					'rank': 90,
+				},
+				'not_empty': {
+					'label': Dict.S('UI:Search:Criteria:Operator:Default:NotEmpty'),
+					'code': 'not_empty',
+					'rank': 100,
+				},
+			},
+
 			is_modified: false, // TODO: change this on value change and remove oql property value
 		},
 
+		// Operators
+		operators: {},
+
+		// Form handler
 		handler: null,
    
 		// the constructor
@@ -30,33 +55,13 @@ $(function()
 			
 			this.element.addClass('search_form_criteria');
 
+			this._orderOperators();
+
 			// Link search form handler
 			this.handler = this.element.closest('.search_form_handler');
 
-			// GetData
-			this.element.bind('itop.search.criteria.get_data', function(oEvent, oData){
-				return me._onGetData(oData);
-			});
-			// Get/SetCurrentValues callbacks handler
-			this.element.bind('itop.search.criteria.get_current_values itop.search.criteria.set_current_values', function(oEvent, oData){
-					oEvent.stopPropagation();
-
-					var callback = me.options[oEvent.type+'_callback'];
-
-					if(typeof callback === 'string')
-					{
-						return me[callback](oEvent, oData);
-					}
-					else if(typeof callback === 'function')
-					{
-						return callback(me, oEvent, oData);
-					}
-					else
-					{
-						console.log('search form criteria: callback type must be a function or a existing function name of the widget');
-						return false;
-					}
-				});
+			// Bind events
+			this._bindEvents();
 
 			this._prepareElement();
 		},
@@ -85,6 +90,43 @@ $(function()
 
 
 		// Protected methods
+		// - Order available operators
+		_orderOperators: function()
+		{
+			console.log(this.options.available_operators);
+
+		},
+		// - Bind external events
+		_bindEvents: function()
+		{
+			var me = this;
+
+			// Get criteria data
+			this.element.bind('itop.search.criteria.get_data', function(oEvent, oData){
+				return me._onGetData(oData);
+			});
+
+			// Get/SetCurrentValues callbacks handler
+			this.element.bind('itop.search.criteria.get_current_values itop.search.criteria.set_current_values', function(oEvent, oData){
+				oEvent.stopPropagation();
+
+				var callback = me.options[oEvent.type+'_callback'];
+
+				if(typeof callback === 'string')
+				{
+					return me[callback](oEvent, oData);
+				}
+				else if(typeof callback === 'function')
+				{
+					return callback(me, oEvent, oData);
+				}
+				else
+				{
+					console.log('search form criteria: callback type must be a function or a existing function name of the widget');
+					return false;
+				}
+			});
+		},
 		_remove: function()
 		{
 			this.element.remove();
@@ -93,6 +135,25 @@ $(function()
 
 
 		// Event callbacks
+		// - Internal events
+		_onButtonApply: function()
+		{
+			this._trace('TODO: Apply button');
+			this.handler.triggerHandler('itop.search.criteria.value_changed');
+		},
+		_onButtonCancel: function()
+		{
+			this._trace('TODO: Cancel button');
+		},
+		_onButtonMore: function()
+		{
+			this.element.find('.sfc_form_group').addClass('advanced');
+		},
+		_onButtonLess: function()
+		{
+			this.element.find('.sfc_form_group').removeClass('advanced');
+		},
+		// - External events
 		_onGetData: function(oData)
 		{
 			var oCriteriaData = {
@@ -113,16 +174,16 @@ $(function()
 			var me = this;
 
 			// Prepare base DOM structure
-			//this.options.ref+' '+this.options.operator+' '+this.options.values
 			this.element
 				.append('<div class="sfc_title"></div>')
-				.append('<div class="sfc_form_group"></div>')
+				.append('<div class="sfc_form_group"><div class="sfc_fg_operators"></div><div class="sfc_fg_buttons"></div></div>')
 				.append('<span class="sfc_toggle"><a class="fa fa-caret-down" href="#"></a></span>');
 
 			// Bind events
 			// - Toggler
 			this.element.find('.sfc_toggle, .sfc_title').on('click', function(){
 				me.element.find('.sfc_form_group').toggle();
+				me.element.find('.sfc_toggle').toggleClass('opened');
 			});
 
 			// Removable / locked decoration
@@ -138,9 +199,64 @@ $(function()
 				this.element.append('<div class="sfc_locked"><span class="fa fa-lock"></span></div>');
 			}
 
+			// Form group
+			this._prepareOperators();
+			this._prepareButtons();
+
 			// Fill criteria
+			// - Title
 			this._setTitle();
 		},
+		// - Prepare the available operators for the criteria
+		//   Meant for overloading.
+		_prepareOperators: function()
+		{
+			for(var sOpIdx in this.options.available_operators)
+			{
+				var oOp = this.options.available_operators[sOpIdx];
+				var sMethod = '_prepare' + this._toCamelCase(oOp.code) + 'Operator';
+
+				// Create DOM element from template
+				var oOpElem = $(this._getOperatorTemplate()).uniqueId();
+
+				// Prepare operator's base elements
+				this._prepareOperator(oOpElem, oOp);
+
+				// Prepare operator's specific elements
+				if(this[sMethod] !== undefined)
+				{
+					this[sMethod](oOpElem, oOp);
+				}
+				else
+				{
+					this._prepareDefaultOperator(oOpElem, oOp);
+				}
+
+				// Append to form group
+				oOpElem.appendTo(this.element.find('.sfc_fg_operators'));
+			}
+		},
+		// - Prepare the buttons (DOM and events) for a criteria
+		_prepareButtons: function()
+		{
+			var me = this;
+
+			// DOM elements
+			this.element.find('.sfc_fg_buttons')
+				.append('<button type="button" name="apply" class="sfc_fg_button sfc_fg_apply">' + Dict.S('UI:Button:Apply') + '</button>')
+				.append('<button type="button" name="cancel" class="sfc_fg_button sfc_fg_cancel">' + Dict.S('UI:Button:Cancel') + '</button>')
+				.append('<button type="button" name="more" class="sfc_fg_button sfc_fg_more">' + Dict.S('UI:Button:More') + '</button>')
+				.append('<button type="button" name="less" class="sfc_fg_button sfc_fg_less">' + Dict.S('UI:Button:Less') + '</button>');
+
+			// Events
+			this.element.find('.sfc_fg_button').on('click', function(oEvent){
+				oEvent.preventDefault();
+				oEvent.stopPropagation();
+
+				var sCallback = '_onButton' + me._toCamelCase($(this).attr('name'));
+				me[sCallback]();
+			});
+		},
 		// - Set the title element
 		_setTitle: function(sTitle)
 		{
@@ -151,7 +267,49 @@ $(function()
 			}
 			this.element.find('.sfc_title').text(sTitle);
 		},
+		// - Return a HTML template for operators
+		_getOperatorTemplate: function()
+		{
+			return '<div class="sfc_fg_operator"><label><input type="radio" class="sfc_op_radio" name="operator" value="" /><span class="sfc_op_name"></span><span class="sfc_op_content"></span></label></div>';
+		},
 
+		// Operators helpers
+		_prepareOperator: function(oOpElem, oOp)
+		{
+			var sInputId = oOp.code + '_' + oOpElem.attr('id');
+
+			// Set label
+			oOpElem.find('.sfc_op_name').text(oOp.label);
+			oOpElem.find('> label').attr('for', sInputId);
+
+			// Set value
+			oOpElem.find('.sfc_op_radio').val(oOpElem.id);
+			oOpElem.find('.sfc_op_radio').attr('id', sInputId);
+
+			// Bind events
+			// - Check radio button on click
+			oOpElem.on('click', function(){
+				oOpElem.find('.sfc_op_radio').prop('checked', true);
+			});
+		},
+		_prepareDefaultOperator: function(oOpElem, oOp)
+		{
+			var me = this;
+
+			// DOM element
+			var oOpContentElem = $('<input type="text" />');
+			oOpContentElem.val(this._getValuesAsText());
+
+			oOpElem.append(oOpContentElem);
+		},
+		_prepareEmptyOperator: function(oOpElem, oOp)
+		{
+			// Do nothing as only the label is necessary
+		},
+		_prepareNotEmptyOperator: function(oOpElem, oOp)
+		{
+			// Do nothing as only the label is necessary
+		},
 
 		// Values helpers
 		// - Convert values to a standard string
@@ -181,6 +339,21 @@ $(function()
 		},
 
 
+		// Global helpers
+		// - Converts a snake_case string to CamelCase
+		_toCamelCase: function(sString)
+		{
+			var aParts = sString.split('_');
+
+			for(var i in aParts)
+			{
+				aParts[i] = aParts[i].charAt(0).toUpperCase() + aParts[i].substr(1);
+			}
+
+			return aParts.join('');
+		},
+
+
 		// Debug helpers
 		// - Show a trace in the javascript console
 		_trace: function(sMessage, oData)
diff --git a/js/search/search_form_criteria_raw.js b/js/search/search_form_criteria_raw.js
index 3e91bf6e4..bb877a53e 100644
--- a/js/search/search_form_criteria_raw.js
+++ b/js/search/search_form_criteria_raw.js
@@ -55,6 +55,14 @@ $(function()
 			// Remove toggler as it's a non sense here
 			this.element.find('.sfc_toggle').remove();
 		},
+		_prepareOperators: function()
+		{
+			// Overloading function and doing nothing for this special kind of criteria.
+		},
+		_prepareButtons: function()
+		{
+			// Overloading function and doing nothing for this special kind of criteria.
+		},
 		_setTitle: function(sTitle)
 		{
 			if(sTitle === undefined)
diff --git a/js/search/search_form_criteria_string.js b/js/search/search_form_criteria_string.js
index 883b2c73a..522b22486 100644
--- a/js/search/search_form_criteria_string.js
+++ b/js/search/search_form_criteria_string.js
@@ -9,8 +9,21 @@ $(function()
 		// default options
 		options:
 		{
+			// Overload default operator
 			operator: 'contains',
+			// Available operators
+			available_operators: {
+				'contains': {
+					'label': Dict.S('UI:Search:Criteria:Operator:String:Contains'),
+					'code': 'contains',
+					'rank': 5,
+				},
+				'=': {
+					'rank': false,
+				},
+			},
 		},
+
    
 		// the constructor
 		_create: function()
@@ -49,26 +62,26 @@ $(function()
 		//------------------
 
 		// DOM element helpers
-		_prepareElement: function()
-		{
-			var me = this;
-
-			this._super();
-
-			// TODO: Refactor this after UI mockups
-			var oInputElem = $('<input type="text" />');
-			oInputElem.on('change', function(){
-				var sValue = $(this).val();
-
-				me.options.values = [{
-					value: sValue,
-					label: sValue,
-				}];
-				me._setTitle();
-
-				me.handler.triggerHandler('itop.search.criteria.value_changed');
-			})
-				.appendTo(this.element.find('.sfc_form_group'));
-		},
+		// _prepareElement: function()
+		// {
+		// 	var me = this;
+		//
+		// 	this._super();
+		//
+		// 	// TODO: Refactor this after UI mockups
+		// 	var oInputElem = $('<input type="text" />');
+		// 	oInputElem.on('change', function(){
+		// 		var sValue = $(this).val();
+		//
+		// 		me.options.values = [{
+		// 			value: sValue,
+		// 			label: sValue,
+		// 		}];
+		// 		me._setTitle();
+		//
+		// 		me.handler.triggerHandler('itop.search.criteria.value_changed');
+		// 	})
+		// 		.appendTo(this.element.find('.sfc_form_group'));
+		// },
 	});
 });
diff --git a/js/search/search_form_handler.js b/js/search/search_form_handler.js
index 33db6cdb6..765e5eb64 100644
--- a/js/search/search_form_handler.js
+++ b/js/search/search_form_handler.js
@@ -41,14 +41,26 @@ $(function()
 				],
 				'fields': [
 					// Structure
+					// 'zlist': {
 					// 	'alias.code': {
 					// 		'class_alias': '',
-					// 		'class': '',
-					// 		'code': '',
-					// 		'label': '',
-					// 		'type': '',
-					// 		'allowed_values': {...},
+					// 			'class': '',
+					// 			'code': '',
+					// 			'label': '',
+					// 			'type': '',
+					// 			'allowed_values': {...},
 					// 	},
+					// },
+					// 'others': {
+					// 	'alias.code': {
+					// 		'class_alias': '',
+					// 			'class': '',
+					// 			'code': '',
+					// 			'label': '',
+					// 			'type': '',
+					// 			'allowed_values': {...},
+					// 	},
+					// },
 				],
 			},
 			'list_params': {},	// Passed through to the endpoint so it can render the list correctly regarding the context.
@@ -204,15 +216,32 @@ $(function()
 
 			// Add fields
 			// TODO: Find a widget to handle dropdown menu
-			for(var sFieldRef in this.options.search.fields)
+			// - From "search" zlist
+			for(var sFieldRef in this.options.search.fields.zlist)
 			{
-				var oField = this.options.search.fields[sFieldRef];
+				var oField = this.options.search.fields.zlist[sFieldRef];
 				var oFieldElem = $('<li></li>')
 					.addClass('sf_mc_field')
 					.attr('data-field-ref', sFieldRef)
 					.text(oField.label);
 				this.elements.more_criterion.find('> .sf_mc_list').append(oFieldElem);
 			}
+			// - Others
+			if(this.options.search.fields.others !== undefined)
+			{
+				this.elements.more_criterion.find('> .sf_mc_list').append('<li>==================</li>');
+				this.elements.more_criterion.find('> .sf_mc_list').append('<li>|| TODO: Better separation ||</li>');
+				this.elements.more_criterion.find('> .sf_mc_list').append('<li>==================</li>');
+				for(var sFieldRef in this.options.search.fields.others)
+				{
+					var oField = this.options.search.fields.others[sFieldRef];
+					var oFieldElem = $('<li></li>')
+						.addClass('sf_mc_field')
+						.attr('data-field-ref', sFieldRef)
+						.text(oField.label);
+					this.elements.more_criterion.find('> .sf_mc_list').append(oFieldElem);
+				}
+			}
 
 			// Bind events
 			this.elements.more_criterion.find('.sf_mc_field').on('click', function(){
@@ -260,8 +289,9 @@ $(function()
 				// Add some informations from the field
 				if(this._hasFieldDefinition(sRef))
 				{
+					var oFieldDef = this._getFieldDefinition(sRef);
 					oData.field = {
-						label: this.options.search.fields[sRef].label,
+						label: oFieldDef.label,
 					};
 				}
 
@@ -283,18 +313,24 @@ $(function()
 		{
 			var sType = null;
 
-			if(this.options.search.fields[sRef] !== undefined)
+			for(var sListIdx in this.options.search.fields)
 			{
-				sType = this.options.search.fields[sRef].widget.toLowerCase();
-
-				// Make sure the criteria type is supported, otherwise we might try to initialize a unknown widget.
-				if(this.options.supported_criterion_types.indexOf(sType) < 0)
+				if(this.options.search.fields[sListIdx][sRef] !== undefined)
 				{
-					sType = this.options.default_criteria_type;
+					sType = this.options.search.fields[sListIdx][sRef].widget.toLowerCase();
+
+					// Make sure the criteria type is supported, otherwise we might try to initialize a unknown widget.
+					if(this.options.supported_criterion_types.indexOf(sType) < 0)
+					{
+						sType = this.options.default_criteria_type;
+					}
+
+					break;
 				}
 			}
+
 			// Fallback for unknown widget types or unknown field refs
-			else
+			if(sType === null)
 			{
 				sType = this.options.default_criteria_type;
 			}
@@ -321,7 +357,33 @@ $(function()
 		// Field helpers
 		_hasFieldDefinition: function(sRef)
 		{
-			return (this.options.search.fields[sRef] !== undefined);
+			var bFound = false;
+
+			for(var sListIdx in this.options.search.fields)
+			{
+				if(this.options.search.fields[sListIdx][sRef] !== undefined)
+				{
+					bFound = true;
+					break;
+				}
+			}
+
+			return bFound;
+		},
+		_getFieldDefinition: function(sRef)
+		{
+			var oFieldDef = false;
+
+			for(var sListIdx in this.options.search.fields)
+			{
+				if(this.options.search.fields[sListIdx][sRef] !== undefined)
+				{
+					oFieldDef = this.options.search.fields[sListIdx][sRef];
+					break;
+				}
+			}
+
+			return oFieldDef;
 		},
 
 		// Button handlers
@@ -388,6 +450,18 @@ $(function()
 			// TODO: Hide loader
 			this._trace('Hide loader');
 		},
+		// - Converts a snake_case string to CamelCase
+		_toCamelCase: function(sString)
+		{
+			var aParts = sString.split('_');
+
+			for(var i in aParts)
+			{
+				aParts[i] = aParts[i].charAt(0).toUpperCase() + aParts[i].substr(1);
+			}
+
+			return aParts.join('');
+		},
 
 
 		// Debug helpers

From 6d13dac2c3ae1bf8159051be187c1afc7f3dbdb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Tue, 13 Mar 2018 11:15:29 +0000
Subject: [PATCH 027/202] Advanced Search: Smart conversion

SVN:b1162[5413]
---
 .../criteriontosearchform.class.inc.php       |   5 +
 .../search/searchform.class.inc.php           |   2 +-
 .../search/CriterionConversionTest.php        | 574 +++++++++---------
 test/application/search/SearchFormTest.php    |  25 +-
 4 files changed, 316 insertions(+), 290 deletions(-)

diff --git a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
index cd3402ee6..4a68e0bc4 100644
--- a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
+++ b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
@@ -54,6 +54,11 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 			}
 		}
 
+		// Regroup criterion by variable name
+		usort($aAndCriterion, function ($a, $b) {
+			return strcmp($a['ref'], $b['ref']);
+		});
+
 		return $aAndCriterion;
 	}
 
diff --git a/sources/application/search/searchform.class.inc.php b/sources/application/search/searchform.class.inc.php
index fd5a092e3..d1facfa7f 100644
--- a/sources/application/search/searchform.class.inc.php
+++ b/sources/application/search/searchform.class.inc.php
@@ -251,7 +251,7 @@ class SearchForm
 	}
 
 	/**
-	 * @param DBObjectSearch $oSearch
+	 * @param \DBSearch $oSearch
 	 */
 	public function GetCriterion($oSearch)
 	{
diff --git a/test/application/search/CriterionConversionTest.php b/test/application/search/CriterionConversionTest.php
index b90098bed..1ceefbdb6 100644
--- a/test/application/search/CriterionConversionTest.php
+++ b/test/application/search/CriterionConversionTest.php
@@ -1,284 +1,290 @@
-<?php
-/**
- * Copyright (C) 2010-2018 Combodo SARL
- *
- * This file is part of iTop.
- *
- *  iTop is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * iTop is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with iTop. If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-/**
- * Created by PhpStorm.
- * User: Eric
- * Date: 08/03/2018
- * Time: 16:46
- */
-
-namespace Combodo\iTop\Test\UnitTest\Application\Search;
-
-use Combodo\iTop\Application\Search\CriterionConversion\CriterionToOQL;
-use Combodo\iTop\Application\Search\CriterionConversion\CriterionToSearchForm;
-use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
-
-class CriterionConversionTest extends ItopDataTestCase
-{
-	/**
-	 * @throws Exception
-	 */
-	protected function setUp()
-	{
-		parent::setUp();
-
-		require_once(APPROOT."sources/application/search/criterionconversionabstract.class.inc.php");
-	}
-
-	/**
-	 * @dataProvider ToOqlProvider
-	 */
-	public function testToOql($sJSONCriterion, $sExpectedOQL)
-	{
-		$sOql = CriterionToOQL::Convert(
-			json_decode($sJSONCriterion, true)
-		);
-
-		$this->debug($sOql);
-		$this->assertEquals($sExpectedOQL, $sOql);
-	}
-
-	public function ToOqlProvider()
-	{
-		return array(
-			'>' => array(
-				'{
-                    "ref": "UserRequest.start_date",
-                    "values": [
-                        {
-                            "value": "2017-01-01",
-                            "label": "2017-01-01 00:00:00"
-                        }
-                    ],
-                    "operator": ">",
-                    "oql": ""
-                }',
-				"(`UserRequest`.`start_date` > '2017-01-01')"
-			),
-			'contains' => array(
-				'{
-                    "ref": "Contact.name",
-                    "values": [
-                        {
-                            "value": "toto",
-                            "label": "toto"
-                        }
-                    ],
-                    "operator": "contains",
-                    "oql": ""
-                }',
-				"(`Contact`.`name` LIKE '%toto%')"
-			),
-			'starts_with' => array(
-				'{
-                    "ref": "Contact.name",
-                    "values": [
-                        {
-                            "value": "toto",
-                            "label": "toto"
-                        }
-                    ],
-                    "operator": "starts_with",
-                    "oql": ""
-                }',
-				"(`Contact`.`name` LIKE 'toto%')"
-			),
-			'ends_with' => array(
-				'{
-                    "ref": "Contact.name",
-                    "values": [
-                        {
-                            "value": "toto",
-                            "label": "toto"
-                        }
-                    ],
-                    "operator": "ends_with",
-                    "oql": ""
-                }',
-				"(`Contact`.`name` LIKE '%toto')"
-			),
-			'empty' => array(
-				'{
-                    "ref": "Contact.name",
-                    "values": [
-                        {
-                            "value": "",
-                            "label": ""
-                        }
-                    ],
-                    "operator": "empty",
-                    "oql": ""
-                }',
-				"(`Contact`.`name` = '')"
-			),
-			'not_empty' => array(
-				'{
-                    "ref": "Contact.name",
-                    "values": [
-                        {
-                            "value": "",
-                            "label": ""
-                        }
-                    ],
-                    "operator": "not_empty",
-                    "oql": ""
-                }',
-				"(`Contact`.`name` != '')"
-			),
-		);
-	}
-
-	/**
-	 * @dataProvider ToSearchFormProvider
-	 */
-	function testToSearchForm($aCriterion, $sExpectedOperator)
-	{
-		$aRes = CriterionToSearchForm::Convert($aCriterion);
-		$this->debug($aRes);
-		$this->assertEquals($sExpectedOperator, $aRes[0]['operator']);
-	}
-
-	function ToSearchFormProvider()
-	{
-		return array(
-			'=' => array(
-				json_decode('[
-                {
-                    "ref": "Contact.name",
-                    "widget": "string",
-                    "values": [
-                        {
-                            "value": "toto",
-                            "label": "toto"
-                        }
-                    ],
-                    "operator": "=",
-                    "oql": "(`Contact`.`name` = \'toto\')"
-                }
-            ]', true),
-				'='
-			),
-			'starts_with' => array(
-				json_decode('[
-                {
-                    "ref": "Contact.name",
-                    "widget": "string",
-                    "values": [
-                        {
-                            "value": "toto%",
-                            "label": "toto%"
-                        }
-                    ],
-                    "operator": "LIKE",
-                    "oql": "(`Contact`.`name` LIKE \'toto%\')"
-                }
-            ]', true),
-				'starts_with'
-			),
-			'ends_with' => array(
-				json_decode('[
-                {
-                    "ref": "Contact.name",
-                    "widget": "string",
-                    "values": [
-                        {
-                            "value": "%toto",
-                            "label": "%toto"
-                        }
-                    ],
-                    "operator": "LIKE",
-                    "oql": "(`Contact`.`name` LIKE \'%toto\')"
-                }
-            ]', true),
-				'ends_with'
-			),
-			'contains' => array(
-				json_decode('[
-                {
-                    "widget": "string",
-                    "ref": "Contact.name",
-                    "values": [
-                        {
-                            "value": "%toto%",
-                            "label": "%toto%"
-                        }
-                    ],
-                    "operator": "LIKE",
-                    "oql": "(`Contact`.`name` LIKE \'%toto%\')"
-                }
-            ]', true),
-				'contains'
-			),
-			'empty1' => array(
-				json_decode('[
-                {
-                    "widget": "string",
-                    "ref": "Contact.name",
-                    "values": [
-                        {
-                            "value": "",
-                            "label": ""
-                        }
-                    ],
-                    "operator": "LIKE",
-                    "oql": "(`Contact`.`name` LIKE \'\')"
-                }
-            ]', true),
-				'empty'
-			),
-			'empty2' => array(
-				json_decode('[
-                {
-                    "widget": "string",
-                    "ref": "Contact.name",
-                    "values": [
-                        {
-                            "value": "",
-                            "label": ""
-                        }
-                    ],
-                    "operator": "=",
-                    "oql": "(`Contact`.`name` = \'\')"
-                }
-            ]', true),
-				'empty'
-			),
-			'not_empty' => array(
-				json_decode('[
-                {
-                    "widget": "string",
-                    "ref": "Contact.name",
-                    "values": [
-                        {
-                            "value": "",
-                            "label": ""
-                        }
-                    ],
-                    "operator": "!=",
-                    "oql": "(`Contact`.`name` != \'\')"
-                }
-            ]', true),
-				'not_empty'
-			),
-		);
-	}
-}
+<?php
+/**
+ * Copyright (C) 2010-2018 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ *  iTop is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with iTop. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+/**
+ * Created by PhpStorm.
+ * User: Eric
+ * Date: 08/03/2018
+ * Time: 16:46
+ */
+
+namespace Combodo\iTop\Test\UnitTest\Application\Search;
+
+use Combodo\iTop\Application\Search\CriterionConversion\CriterionToOQL;
+use Combodo\iTop\Application\Search\CriterionConversion\CriterionToSearchForm;
+use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
+
+class CriterionConversionTest extends ItopDataTestCase
+{
+	/**
+	 * @throws \Exception
+	 */
+	protected function setUp()
+	{
+		parent::setUp();
+
+		require_once(APPROOT."sources/application/search/criterionconversionabstract.class.inc.php");
+	}
+
+	/**
+	 * @dataProvider ToOqlProvider
+	 *
+	 * @param $sJSONCriterion
+	 * @param $sExpectedOQL
+	 */
+	public function testToOql($sJSONCriterion, $sExpectedOQL)
+	{
+		$sOql = CriterionToOQL::Convert(
+			json_decode($sJSONCriterion, true)
+		);
+
+		$this->debug($sOql);
+		$this->assertEquals($sExpectedOQL, $sOql);
+	}
+
+	public function ToOqlProvider()
+	{
+		return array(
+			'>' => array(
+				'{
+                    "ref": "UserRequest.start_date",
+                    "values": [
+                        {
+                            "value": "2017-01-01",
+                            "label": "2017-01-01 00:00:00"
+                        }
+                    ],
+                    "operator": ">",
+                    "oql": ""
+                }',
+				"(`UserRequest`.`start_date` > '2017-01-01')"
+			),
+			'contains' => array(
+				'{
+                    "ref": "Contact.name",
+                    "values": [
+                        {
+                            "value": "toto",
+                            "label": "toto"
+                        }
+                    ],
+                    "operator": "contains",
+                    "oql": ""
+                }',
+				"(`Contact`.`name` LIKE '%toto%')"
+			),
+			'starts_with' => array(
+				'{
+                    "ref": "Contact.name",
+                    "values": [
+                        {
+                            "value": "toto",
+                            "label": "toto"
+                        }
+                    ],
+                    "operator": "starts_with",
+                    "oql": ""
+                }',
+				"(`Contact`.`name` LIKE 'toto%')"
+			),
+			'ends_with' => array(
+				'{
+                    "ref": "Contact.name",
+                    "values": [
+                        {
+                            "value": "toto",
+                            "label": "toto"
+                        }
+                    ],
+                    "operator": "ends_with",
+                    "oql": ""
+                }',
+				"(`Contact`.`name` LIKE '%toto')"
+			),
+			'empty' => array(
+				'{
+                    "ref": "Contact.name",
+                    "values": [
+                        {
+                            "value": "",
+                            "label": ""
+                        }
+                    ],
+                    "operator": "empty",
+                    "oql": ""
+                }',
+				"(`Contact`.`name` = '')"
+			),
+			'not_empty' => array(
+				'{
+                    "ref": "Contact.name",
+                    "values": [
+                        {
+                            "value": "",
+                            "label": ""
+                        }
+                    ],
+                    "operator": "not_empty",
+                    "oql": ""
+                }',
+				"(`Contact`.`name` != '')"
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider ToSearchFormProvider
+	 *
+	 * @param $aCriterion
+	 * @param $sExpectedOperator
+	 */
+	function testToSearchForm($aCriterion, $sExpectedOperator)
+	{
+		$aRes = CriterionToSearchForm::Convert($aCriterion);
+		$this->debug($aRes);
+		$this->assertEquals($sExpectedOperator, $aRes[0]['operator']);
+	}
+
+	function ToSearchFormProvider()
+	{
+		return array(
+			'=' => array(
+				json_decode('[
+                {
+                    "ref": "Contact.name",
+                    "widget": "string",
+                    "values": [
+                        {
+                            "value": "toto",
+                            "label": "toto"
+                        }
+                    ],
+                    "operator": "=",
+                    "oql": "(`Contact`.`name` = \'toto\')"
+                }
+            ]', true),
+				'='
+			),
+			'starts_with' => array(
+				json_decode('[
+                {
+                    "ref": "Contact.name",
+                    "widget": "string",
+                    "values": [
+                        {
+                            "value": "toto%",
+                            "label": "toto%"
+                        }
+                    ],
+                    "operator": "LIKE",
+                    "oql": "(`Contact`.`name` LIKE \'toto%\')"
+                }
+            ]', true),
+				'starts_with'
+			),
+			'ends_with' => array(
+				json_decode('[
+                {
+                    "ref": "Contact.name",
+                    "widget": "string",
+                    "values": [
+                        {
+                            "value": "%toto",
+                            "label": "%toto"
+                        }
+                    ],
+                    "operator": "LIKE",
+                    "oql": "(`Contact`.`name` LIKE \'%toto\')"
+                }
+            ]', true),
+				'ends_with'
+			),
+			'contains' => array(
+				json_decode('[
+                {
+                    "widget": "string",
+                    "ref": "Contact.name",
+                    "values": [
+                        {
+                            "value": "%toto%",
+                            "label": "%toto%"
+                        }
+                    ],
+                    "operator": "LIKE",
+                    "oql": "(`Contact`.`name` LIKE \'%toto%\')"
+                }
+            ]', true),
+				'contains'
+			),
+			'empty1' => array(
+				json_decode('[
+                {
+                    "widget": "string",
+                    "ref": "Contact.name",
+                    "values": [
+                        {
+                            "value": "",
+                            "label": ""
+                        }
+                    ],
+                    "operator": "LIKE",
+                    "oql": "(`Contact`.`name` LIKE \'\')"
+                }
+            ]', true),
+				'empty'
+			),
+			'empty2' => array(
+				json_decode('[
+                {
+                    "widget": "string",
+                    "ref": "Contact.name",
+                    "values": [
+                        {
+                            "value": "",
+                            "label": ""
+                        }
+                    ],
+                    "operator": "=",
+                    "oql": "(`Contact`.`name` = \'\')"
+                }
+            ]', true),
+				'empty'
+			),
+			'not_empty' => array(
+				json_decode('[
+                {
+                    "widget": "string",
+                    "ref": "Contact.name",
+                    "values": [
+                        {
+                            "value": "",
+                            "label": ""
+                        }
+                    ],
+                    "operator": "!=",
+                    "oql": "(`Contact`.`name` != \'\')"
+                }
+            ]', true),
+				'not_empty'
+			),
+		);
+	}
+}
diff --git a/test/application/search/SearchFormTest.php b/test/application/search/SearchFormTest.php
index 68c3fce7c..14e91471e 100644
--- a/test/application/search/SearchFormTest.php
+++ b/test/application/search/SearchFormTest.php
@@ -40,25 +40,39 @@ class SearchFormTest extends ItopDataTestCase
 	}
 
 	/**
+	 * @throws \OQLException
 	 */
 	public function testGetFields()
 	{
-		$aFields = SearchForm::GetFields('Contact', 'Contact');
+		$oSearchForm = new SearchForm();
+		$aFields = $oSearchForm->GetFields('Contact', 'Contact');
 		$this->debug(json_encode($aFields, JSON_PRETTY_PRINT));
-		$this->assertCount(7, $aFields);
+		$this->assertCount(7, $aFields['zlist']);
 
 		$oSearch = \DBSearch::FromOQL("SELECT Contact AS C WHERE C.status = 'active'");
-		$aFields = SearchForm::GetFields($oSearch->GetClass(), $oSearch->GetClassAlias());
+		$aFields = $oSearchForm->GetFields($oSearch->GetClass(), $oSearch->GetClassAlias());
 		$this->debug(json_encode($aFields, JSON_PRETTY_PRINT));
 	}
 
 	/**
 	 * @dataProvider GetCriterionProvider
-	 * @throws \OQLException
+	 *
+	 * @param $sOQL
+	 * @param $iOrCount
+	 *
 	 */
 	public function testGetCriterion($sOQL, $iOrCount)
 	{
-		$aCriterion = SearchForm::GetCriterion(\DBObjectSearch::FromOQL($sOQL));
+		$oSearchForm = new SearchForm();
+		try
+		{
+			$aCriterion = $oSearchForm->GetCriterion(\DBSearch::FromOQL($sOQL));
+		} catch (\OQLException $e)
+		{
+			$this->assertTrue(false);
+
+			return;
+		}
 		$aRes = array('base_oql' => $sOQL, 'criterion' => $aCriterion);
 		$this->debug(json_encode($aRes));
 		$this->debug($sOQL);
@@ -78,6 +92,7 @@ class SearchFormTest extends ItopDataTestCase
 			array('OQL' => "SELECT Contact WHERE status = 'active' OR name LIKE 'toto%'", 2),
 			array('OQL' => "SELECT UserRequest WHERE DATE_SUB(NOW(), INTERVAL 14 DAY) < start_date", 1),
 			array('OQL' => "SELECT UserRequest WHERE start_date > '2017-01-01' AND '2018-01-01' >= start_date", 1),
+			array('OQL' => "SELECT UserRequest WHERE start_date > '2017-01-01' AND status = 'active' AND org_id = 3 AND '2018-01-01' >= start_date", 1),
 		);
 	}
 }

From 0351ff30b4a0b1bdfbc23843d8b4eab3275e642a Mon Sep 17 00:00:00 2001
From: Bruno Da Silva <bruno.dasilva@combodo.com>
Date: Tue, 13 Mar 2018 13:00:14 +0000
Subject: [PATCH 028/202] Search form Result list now expose their extra params
 using jQuery().data() function

SVN:b1162[5414]
---
 application/displayblock.class.inc.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/application/displayblock.class.inc.php b/application/displayblock.class.inc.php
index ab12d90a8..3907e8112 100644
--- a/application/displayblock.class.inc.php
+++ b/application/displayblock.class.inc.php
@@ -280,9 +280,17 @@ class DisplayBlock
 			 );
 			 ');
 		}
+
+
+        if ($this->m_sStyle != 'search') // Search form need to extract result list extra data, the simplest way is to expose this configuration
+        {
+            $oPage->add_script("$('#$sId').data('sExtraParams', \"$sExtraParams\");");
+            $oPage->add_script("$('#$sId').data('bAutoReload', ".json_encode($bAutoReload).");");
+        }
+
 		if (($bAutoReload) && ($this->m_sStyle != 'search')) // Search form do NOT auto-reload
 		{
-			$oPage->add_script('setInterval("ReloadBlock(\''.$sId.'\', \''.$this->m_sStyle.'\', \''.$sFilter.'\', \"'.$sExtraParams.'\")", '.$iReloadInterval.');');
+			$oPage->add_script('aAutoReloadBlock["'.$sId.'"] = setInterval("ReloadBlock(\''.$sId.'\', \''.$this->m_sStyle.'\', \''.$sFilter.'\', \"'.$sExtraParams.'\")", '.$iReloadInterval.');');
 		}
 		return $sHtml;
 	}

From 2d9140e56c6759bf27e9b9e83b8b35ddced4aad7 Mon Sep 17 00:00:00 2001
From: Bruno Da Silva <bruno.dasilva@combodo.com>
Date: Tue, 13 Mar 2018 13:03:14 +0000
Subject: [PATCH 029/202] Search form Result list now expose their extra params
 using jQuery().data() function

SVN:b1162[5415]
---
 application/displayblock.class.inc.php        |  2 +-
 application/ui.extkeywidget.class.inc.php     | 65 +++++++++++--------
 .../ui.linksdirectwidget.class.inc.php        |  5 +-
 application/ui.linkswidget.class.inc.php      |  1 +
 pages/ajax.searchform.php                     | 45 +++++++------
 5 files changed, 67 insertions(+), 51 deletions(-)

diff --git a/application/displayblock.class.inc.php b/application/displayblock.class.inc.php
index 3907e8112..a740f7cf6 100644
--- a/application/displayblock.class.inc.php
+++ b/application/displayblock.class.inc.php
@@ -290,7 +290,7 @@ class DisplayBlock
 
 		if (($bAutoReload) && ($this->m_sStyle != 'search')) // Search form do NOT auto-reload
 		{
-			$oPage->add_script('aAutoReloadBlock["'.$sId.'"] = setInterval("ReloadBlock(\''.$sId.'\', \''.$this->m_sStyle.'\', \''.$sFilter.'\', \"'.$sExtraParams.'\")", '.$iReloadInterval.');');
+			$oPage->add_script('aAutoReloadBlock = setInterval("ReloadBlock(\''.$sId.'\', \''.$this->m_sStyle.'\', \''.$sFilter.'\', \"'.$sExtraParams.'\")", '.$iReloadInterval.');');
 		}
 		return $sHtml;
 	}
diff --git a/application/ui.extkeywidget.class.inc.php b/application/ui.extkeywidget.class.inc.php
index f260b7cd4..d16fb0242 100644
--- a/application/ui.extkeywidget.class.inc.php
+++ b/application/ui.extkeywidget.class.inc.php
@@ -19,15 +19,15 @@
  * Class UIExtKeyWidget
  * UI wdiget for displaying and editing external keys when
  * A simple drop-down list is not enough...
- * 
+ *
  * The layout is the following
- * 
+ *
  * +-- #label_<id> (input)-------+  +-----------+
  * |                             |  | Browse... |
  * +-----------------------------+  +-----------+
- * 
+ *
  * And the popup dialog has the following layout:
- * 
+ *
  * +------------------- ac_dlg_<id> (div)-----------+
  * + +--- ds_<id> (div)---------------------------+ |
  * | | +------------- fs_<id> (form)------------+ | |
@@ -61,13 +61,13 @@
 require_once(APPROOT.'/application/webpage.class.inc.php');
 require_once(APPROOT.'/application/displayblock.class.inc.php');
 
-class UIExtKeyWidget 
+class UIExtKeyWidget
 {
 	protected $iId;
 	protected $sTargetClass;
 	protected $sAttCode;
 	protected $bSearchMode;
-	
+
 	//public function __construct($sAttCode, $sClass, $sTitle, $oAllowedValues, $value, $iInputId, $bMandatory, $sNameSuffix = '', $sFieldPrefix = '', $sFormPrefix = '')
 	static public function DisplayFromAttCode($oPage, $sAttCode, $sClass, $sTitle, $oAllowedValues, $value, $iInputId, $bMandatory, $sFieldName = '', $sFormPrefix = '', $aArgs, $bSearchMode = false)
 	{
@@ -94,7 +94,7 @@ class UIExtKeyWidget
 		$this->sAttCode = $sAttCode;
 		$this->bSearchMode = $bSearchMode;
 	}
-	
+
 	/**
 	 * Get the HTML fragment corresponding to the ext key editing widget
 	 * @param WebPage $oP The web page used for all the output
@@ -107,10 +107,10 @@ class UIExtKeyWidget
 		{
 			$this->bSearchMode = $bSearchMode;
 		}
-		$sTitle = addslashes($sTitle);	
+		$sTitle = addslashes($sTitle);
 		$oPage->add_linked_script('../js/extkeywidget.js');
 		$oPage->add_linked_script('../js/forms-json-utils.js');
-		
+
 		$bCreate = (!$this->bSearchMode) && (UserRights::IsActionAllowed($this->sTargetClass, UR_ACTION_BULK_MODIFY) && $bAllowTargetCreation);
 		$bExtensions = true;
 		$sMessage = Dict::S('UI:Message:EmptyList:UseSearchForm');
@@ -123,7 +123,7 @@ class UIExtKeyWidget
 			$sWizHelper = 'null';
 			$sWizHelperJSON = "''";
 			$sJSSearchMode = 'true';
-		} 
+		}
 		else
 		{
 			if (isset($aArgs['wizHelper']))
@@ -159,7 +159,7 @@ class UIExtKeyWidget
 				while($oObj = $oAllowedValues->Fetch())
 				{
 					$aAllowedValues[$oObj->GetKey()] = $oObj->GetName();
-				}				
+				}
 				$sHTMLValue .= $oPage->GetRadioButtons($aAllowedValues, $value, $this->iId, "{$sAttrFieldPrefix}{$sFieldName}", false /*  $bMandatory will be placed manually */, $bVertical, $sValidationField);
 				$aEventsList[] ='change';
 				break;
@@ -168,7 +168,7 @@ class UIExtKeyWidget
 				case 'list':
 				default:
 				$sSelectMode = 'true';
-				
+
 				$sHelpText = ''; //$this->oAttDef->GetHelpOnEdition();
 				$sHTMLValue .= "<div class=\"field_select_wrapper\">\n";
 
@@ -196,7 +196,7 @@ class UIExtKeyWidget
 				{
 					$key = $oObj->GetKey();
 					$display_value = $oObj->GetName();
-	
+
 					if (($oAllowedValues->Count() == 1) && ($bMandatory == 'true') )
 					{
 						// When there is only once choice, select it by default
@@ -239,7 +239,7 @@ EOF
 		{
 			// Too many choices, use an autocomplete
 			$sSelectMode = 'false';
-		
+
 			// Check that the given value is allowed
 			$oSearch = $oAllowedValues->GetFilter();
 			$oSearch->AddCondition('id', $value);
@@ -259,15 +259,15 @@ EOF
 			}
 			$iMinChars = isset($aArgs['iMinChars']) ? $aArgs['iMinChars'] : 3; //@@@ $this->oAttDef->GetMinAutoCompleteChars();
 			$iFieldSize = isset($aArgs['iFieldSize']) ? $aArgs['iFieldSize'] : 20; //@@@ $this->oAttDef->GetMaxSize();
-	
+
 			// the input for the auto-complete
 			$sHTMLValue .= "<input class=\"field_autocomplete\" count=\"".$oAllowedValues->Count()."\" type=\"text\" id=\"label_$this->iId\" value=\"$sDisplayValue\"/>";
 			$sHTMLValue .= "<span class=\"field_input_btn\"><img id=\"mini_search_{$this->iId}\" style=\"border:0;vertical-align:middle;cursor:pointer;\" src=\"../images/mini_search.gif?itopversion=".ITOP_VERSION."\" onClick=\"oACWidget_{$this->iId}.Search();\"/></span>";
-	
+
 			// another hidden input to store & pass the object's Id
 			$sHTMLValue .= "<input type=\"hidden\" id=\"$this->iId\" name=\"{$sAttrFieldPrefix}{$sFieldName}\" value=\"".htmlentities($value, ENT_QUOTES, 'UTF-8')."\" />\n";
 
-			$JSSearchMode = $this->bSearchMode ? 'true' : 'false';	
+			$JSSearchMode = $this->bSearchMode ? 'true' : 'false';
 			// Scripts to start the autocomplete and bind some events to it
 			$oPage->add_ready_script(
 <<<EOF
@@ -320,7 +320,7 @@ EOF
 
 		return $sHTMLValue;
 	}
-	
+
 	public function GetSearchDialog(WebPage $oPage, $sTitle, $oCurrObject = null)
 	{
 		$sHTML = '<div class="wizContainer" style="vertical-align:top;"><div id="dc_'.$this->iId.'">';
@@ -342,7 +342,16 @@ EOF
 		$oFilter->SetModifierProperty('UserRightsGetSelectFilter', 'bSearchMode', $this->bSearchMode);
 		$oBlock = new DisplayBlock($oFilter, 'search', false, $aParams);
 		$sHTML .= $oBlock->GetDisplay($oPage, $this->iId,
-			array('open' => $bOpen, 'currentId' => $this->iId, 'table_id' => "dr_{$this->iId}", 'table_inner_id' => "{$this->iId}_results", 'selection_mode' => true, 'selection_type' => 'single', 'cssCount' => '#count_'.$this->iId));
+            array(
+                'menu' => false,
+                'open' => $bOpen,
+                'currentId' => $this->iId,
+                'table_id' => "dr_{$this->iId}",
+                'table_inner_id' => "{$this->iId}_results",
+                'selection_mode' => true,
+                'selection_type' => 'single',
+                'cssCount' => '#count_'.$this->iId)
+        );
 		$sHTML .= "<form id=\"fr_{$this->iId}\" OnSubmit=\"return oACWidget_{$this->iId}.DoOk();\">\n";
 		$sHTML .= "<div id=\"dr_{$this->iId}\" style=\"vertical-align:top;background: #fff;height:100%;overflow:auto;padding:0;border:0;\">\n";
 		$sHTML .= "<div style=\"background: #fff; border:0; text-align:center; vertical-align:middle;\"><p>".Dict::S('UI:Message:EmptyList:UseSearchForm')."</p></div>\n";
@@ -376,7 +385,7 @@ EOF
 		{
 			throw new Exception('Implementation: null value for allowed values definition');
 		}
-		
+
 		$oFilter = DBObjectSearch::FromOQL($sFilter);
 		if (strlen($sRemoteClass) > 0)
 		{
@@ -390,7 +399,7 @@ EOF
 		$oBlock = new DisplayBlock($oFilter, 'list', false, array('query_params' => array('this' => $oObj, 'current_extkey_id' => $iCurrentExtKeyId)));
 		$oBlock->Display($oP, $this->iId.'_results', array('this' => $oObj, 'cssCount'=> '#count_'.$this->iId, 'menu' => false, 'selection_mode' => true, 'selection_type' => 'single', 'table_id' => 'select_'.$this->sAttCode)); // Don't display the 'Actions' menu on the results
 	}
-	
+
 	/**
 	 * Search for objects to be selected
 	 * @param WebPage $oP The page used for the output (usually an AjaxWebPage)
@@ -416,7 +425,7 @@ EOF
 			$oP->add(trim($sFriendlyName)."\t".$sKey."\n");
 		}
 	}
-	
+
 	/**
 	 * Get the display name of the selected object, to fill back the autocomplete
 	 */
@@ -506,7 +515,7 @@ EOF
 				}
 			}
 		}
-		
+
 		// 3rd - set values from the page argument 'default'
 		$oNewObj->UpdateObjectFromArg('default');
 
@@ -523,7 +532,7 @@ EOF
 				$aFieldsComments[$sAttCode] = '&nbsp;<img src="../images/transp-lock.png" style="vertical-align:middle" title="'.htmlentities(Dict::S('UI:UploadNotSupportedInThisMode')).'"/>';
 			}
 		}
-	 	cmdbAbstractObject::DisplayCreationForm($oPage, $this->sTargetClass, $oNewObj, array(), array('formPrefix' => $this->iId, 'noRelations' => true, 'fieldsFlags' => $aFieldsFlags, 'fieldsComments' => $aFieldsComments));	
+	 	cmdbAbstractObject::DisplayCreationForm($oPage, $this->sTargetClass, $oNewObj, array(), array('formPrefix' => $this->iId, 'noRelations' => true, 'fieldsFlags' => $aFieldsFlags, 'fieldsComments' => $aFieldsComments));
 		$oPage->add('</div></div></div>');
 //		$oPage->add_ready_script("\$('#ac_create_$this->iId').dialog({ width: $(window).width()*0.8, height: 'auto', autoOpen: false, modal: true, title: '$sDialogTitle'});\n");
 		$oPage->add_ready_script("\$('#ac_create_$this->iId').dialog({ width: 'auto', height: 'auto', maxHeight: $(window).height() - 50, autoOpen: false, modal: true, title: '$sDialogTitle'});\n");
@@ -567,7 +576,7 @@ EOF
 		$oPage->add('</div>');
 		$oPage->add("<input type=\"button\" id=\"btn_cancel_{$this->iId}\" value=\"".Dict::S('UI:Button:Cancel')."\" onClick=\"$('#dlg_tree_{$this->iId}').dialog('close');\">&nbsp;&nbsp;");
 		$oPage->add("<input type=\"button\" id=\"btn_ok_{$this->iId}\" value=\"".Dict::S('UI:Button:Ok')."\"  onClick=\"oACWidget_{$this->iId}.DoHKOk();\">");
-		
+
 		$oPage->add('</div></div>');
 		$oPage->add_ready_script("\$('#tree_$this->iId ul').treeview();\n");
 		$oPage->add_ready_script("\$('#dlg_tree_$this->iId').dialog({ width: 'auto', height: 'auto', autoOpen: true, modal: true, title: '$sDialogTitle', resizeStop: oACWidget_{$this->iId}.OnHKResize, close: oACWidget_{$this->iId}.OnHKClose });\n");
@@ -589,7 +598,7 @@ EOF
 			}
 			else
 			{
-				return array('error' => implode(' ', $aErrors), 'id' => 0);		
+				return array('error' => implode(' ', $aErrors), 'id' => 0);
 			}
 		}
 		catch(Exception $e)
@@ -612,7 +621,7 @@ EOF
 			$aTree[$iParentId][$oObj->GetKey()] = $oObj->GetName();
 			$aNodes[$oObj->GetKey()] = $oObj;
 		}
-		
+
 		$aParents = array_keys($aTree);
 		$aRoots = array();
 		foreach($aParents as $id)
@@ -627,7 +636,7 @@ EOF
 			$this->DumpNodes($oP, $iRootId, $aTree, $aNodes, $currValue);
 		}
 	}
-	
+
 	function DumpNodes($oP, $iRootId, $aTree, $aNodes, $currValue)
 	{
 		$bSelect = true;
diff --git a/application/ui.linksdirectwidget.class.inc.php b/application/ui.linksdirectwidget.class.inc.php
index ff2abafc5..499f6695f 100644
--- a/application/ui.linksdirectwidget.class.inc.php
+++ b/application/ui.linksdirectwidget.class.inc.php
@@ -305,7 +305,10 @@ class UILinksWidgetDirect
 		$bOpen = MetaModel::GetConfig()->Get('legacy_search_drawer_open');
 		$oBlock = new DisplayBlock($oFilter, 'search', false);
 		$sHtml .= $oBlock->GetDisplay($oPage, "SearchFormToAdd_{$this->sInputid}",
-			array('open' => $bOpen, 'table_id' => "SearchResultsToAdd_{$this->sInputid}"));
+			array(
+			    'open' => $bOpen,
+                'table_id' => "SearchResultsToAdd_{$this->sInputid}")
+        );
 		$sHtml .= "<form id=\"ObjectsAddForm_{$this->sInputid}\">\n";
 		$sHtml .= "<div id=\"SearchResultsToAdd_{$this->sInputid}\" style=\"vertical-align:top;background: #fff;height:100%;overflow:auto;padding:0;border:0;\">\n";
 		$sHtml .= "<div style=\"background: #fff; border:0; text-align:center; vertical-align:middle;\"><p>".Dict::S('UI:Message:EmptyList:UseSearchForm')."</p></div>\n";
diff --git a/application/ui.linkswidget.class.inc.php b/application/ui.linkswidget.class.inc.php
index acdf2c4b2..41dec06c0 100644
--- a/application/ui.linkswidget.class.inc.php
+++ b/application/ui.linkswidget.class.inc.php
@@ -401,6 +401,7 @@ EOF
 		$oBlock = new DisplayBlock($oFilter, 'search', false);
 		$sHtml .= $oBlock->GetDisplay($oPage, "SearchFormToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}",
 			array(
+                'menu' => false,
 				'open' => $bOpen,
 				'table_id' => "SearchResultsToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}",
 				'table_inner_id' => "ResultsToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}",
diff --git a/pages/ajax.searchform.php b/pages/ajax.searchform.php
index 57d362573..ad2543132 100644
--- a/pages/ajax.searchform.php
+++ b/pages/ajax.searchform.php
@@ -57,19 +57,23 @@ try
 	$sListParams = stripslashes(utils::ReadParam('list_params', '{}', false, 'raw_data'));
 	$aListParams = json_decode($sListParams, true);
 
-	if (array_key_exists('currentId', $aListParams))
-	{
-		$aExtraParams['currentId'] = $aListParams['currentId'];
-	}
-	if (array_key_exists('selection_mode', $aListParams))
-	{
-		$aExtraParams['selection_mode'] = $aListParams['selection_mode'];
-	}
-	if (array_key_exists('selection_type', $aListParams))
-	{
-		$aExtraParams['selection_type'] = $aListParams['selection_type'];
-		// In case of single selection, the root of the HTML identifiers used is suffixed with "_results" (at least in the external keys)
-	}
+
+	$aPassFromExtraParamsToListParams = array(
+        'currentId',
+        'selection_mode',
+        'selection_type',// In case of single selection, the root of the HTML identifiers used is suffixed with "_results" (at least in the external keys)
+        'cssCount',
+        'table_inner_id',
+    );
+	foreach ($aPassFromExtraParamsToListParams as $passThroughKey)
+    {
+        if (array_key_exists($passThroughKey, $aListParams))
+        {
+            $aExtraParams[$passThroughKey] = $aListParams[$passThroughKey];
+        }
+    }
+
+
 	if (array_key_exists('json', $aListParams))
 	{
 		$aJson = $aListParams['json'];
@@ -77,15 +81,14 @@ try
 		$oWizardHelper = WizardHelper::FromJSON($sJson);
 		$oObj = $oWizardHelper->GetTargetObject();
 		$aExtraParams['query_params'] = array('this' => $oObj);
+
+
+//        // Current extkey value, so we can display event if it is not available anymore (eg. archived).
+//        $iCurrentExtKeyId = (is_null($oObj)) ? 0 : $oObj->Get($this->sAttCode);
+//        $aExtraParams['current_extkey_id'] = $iCurrentExtKeyId;
+
 	}
-	if (array_key_exists('cssCount', $aListParams))
-	{
-		$aExtraParams['cssCount'] = $aListParams['cssCount'];
-	}
-	if (array_key_exists('table_inner_id', $aListParams))
-	{
-		$sListId = $aListParams['table_inner_id'];
-	}
+
 
 	$aExtraParams['display_limit'] = true;
 	$aExtraParams['truncated'] = true;

From af12b47c900e53a714af05bb128a71c7284dd05c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Tue, 13 Mar 2018 13:50:04 +0000
Subject: [PATCH 030/202] Advanced Search: Field List

SVN:b1162[5416]
---
 .../search/searchform.class.inc.php           | 91 +++++++++++++------
 1 file changed, 62 insertions(+), 29 deletions(-)

diff --git a/sources/application/search/searchform.class.inc.php b/sources/application/search/searchform.class.inc.php
index d1facfa7f..ce1c418e0 100644
--- a/sources/application/search/searchform.class.inc.php
+++ b/sources/application/search/searchform.class.inc.php
@@ -125,10 +125,7 @@ class SearchForm
 		$sHtml .= "<div id=\"fs_{$sSearchFormId}_criterion_outer\">\n";
 		$sHtml .= "</div>\n";
 
-		$sPrimaryClassName = $oSet->GetClass();
-		$sPrimaryClassAlias = $oSet->GetClassAlias();
-
-		$aFields = $this->GetFields($sPrimaryClassName, $sPrimaryClassAlias);
+		$aFields = $this->GetFields($oSet);
 		$oSearch = $oSet->GetFilter();
 		$aCriterion = $this->GetCriterion($oSearch);
 
@@ -165,48 +162,68 @@ class SearchForm
 	}
 
 	/**
-	 * @param $sClassName
-	 *
-	 * @param $sClassAlias
+	 * @param DBObjectSet $oSet
 	 *
 	 * @return array
 	 */
-	public function GetFields($sClassName, $sClassAlias)
+	public function GetFields($oSet)
 	{
-		$aFields = array();
+		$oSearch = $oSet->GetFilter();
+		$aSelectedClasses = $oSearch->GetSelectedClasses();
+		$aAuthorizedClasses = array();
+		foreach($aSelectedClasses as $sAlias => $sClassName)
+		{
+			if (\UserRights::IsActionAllowed($sClassName, UR_ACTION_BULK_READ, $oSet) != UR_ALLOWED_NO)
+			{
+				$aAuthorizedClasses[$sAlias] = $sClassName;
+			}
+		}
+		$aAllFields = array();
 		try
 		{
-			$aList = MetaModel::GetZListItems($sClassName, 'standard_search');
-			$aAttrDefs = MetaModel::ListAttributeDefs($sClassName);
-			$aZList = array();
-			foreach($aList as $sFilterCode)
+			foreach($aAuthorizedClasses as $sAlias => $sClass)
 			{
-				if (array_key_exists($sFilterCode, $aAttrDefs))
+				$aAttributeDefs = MetaModel::ListAttributeDefs($sClass);
+				$aList = MetaModel::GetZListItems($sClass, 'standard_search');
+				$aZList = array();
+				foreach($aList as $sAttCode)
 				{
-					$oAttrDef = $aAttrDefs[$sFilterCode];
+					if (array_key_exists($sAttCode, $aAttributeDefs))
+					{
+						$oAttDef = $aAttributeDefs[$sAttCode];
+						$aZList = $this->AppendField($sClass, $sAlias, $sAttCode, $oAttDef, $aZList);
+						unset($aAttributeDefs[$sAttCode]);
+					}
 				}
-				else
+				usort($aZList, function ($aItem1, $aItem2) {
+					return strcmp($aItem1['label'], $aItem2['label']);
+				});
+				$aAllFields['zlist'] = $aZList;
+
+				$aOthers = array();
+				foreach($aAttributeDefs as $sAttCode => $oAttDef)
 				{
-					$oAttrDef = null;
+					if ($this->IsSubAttribute($oAttDef)) continue;
+
+					$aOthers = $this->AppendField($sClass, $sAlias, $sAttCode, $oAttDef, $aOthers);
 				}
-				$aZList = $this->AppendField($sClassName, $sClassAlias, $sFilterCode, $oAttrDef, $aZList);
+				usort($aOthers, function ($aItem1, $aItem2) {
+					return strcmp($aItem1['label'], $aItem2['label']);
+				});
+
+				$aAllFields['others'] = $aOthers;
 			}
-			$aFields['zlist'] = $aZList;
-			$aOthers = array();
-			foreach($aAttrDefs as $sFilterCode => $oAttrDef)
-			{
-				if (!in_array($sFilterCode, $aList))
-				{
-					$aOthers = $this->AppendField($sClassName, $sClassAlias, $sFilterCode, $oAttrDef, $aOthers);
-				}
-			}
-			$aFields['others'] = $aOthers;
 		} catch (CoreException $e)
 		{
 			IssueLog::Error($e->getMessage());
 		}
 
-		return $aFields;
+		return $aAllFields;
+	}
+
+	protected function IsSubAttribute($oAttDef)
+	{
+		return (($oAttDef instanceof AttributeFriendlyName) || ($oAttDef instanceof AttributeExternalField) || ($oAttDef instanceof AttributeSubItem));
 	}
 
 	/**
@@ -304,6 +321,22 @@ class SearchForm
 				$aFields[$sClassAlias.'.'.$sFilterCode] = $aField;
 				$this->aLabels[$sLabel] = true;
 			}
+
+			// Sub items
+			//
+			//	if ($oAttDef->IsSearchable())
+			//	{
+			//		$sShortLabel = $oAttDef->GetLabel();
+			//		$sLabel = $sShortAlias.$oAttDef->GetLabel();
+			//		$aSubAttr = $this->GetSubAttributes($sClass, $sAttCode, $oAttDef);
+			//		$aValidSubAttr = array();
+			//		foreach($aSubAttr as $aSubAttDef)
+			//		{
+			//			$aValidSubAttr[] = array('attcodeex' => $aSubAttDef['code'], 'code' => $sShortAlias.$aSubAttDef['code'], 'label' => $aSubAttDef['label'], 'unique_label' => $sShortAlias.$aSubAttDef['unique_label']);
+			//		}
+			//		$aAllFields[] = array('attcodeex' => $sAttCode, 'code' => $sShortAlias.$sAttCode, 'label' => $sShortLabel, 'unique_label' => $sLabel, 'subattr' => $aValidSubAttr);
+			//	}
+
 		}
 
 		return $aFields;

From 3b7c92d022079ed30f6ee59ccaf54500328d17a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Tue, 13 Mar 2018 16:04:11 +0000
Subject: [PATCH 031/202] Advanced Search: Field List

SVN:b1162[5417]
---
 .../criteriontooql.class.inc.php              | 50 ++++++++++++---
 .../criteriontosearchform.class.inc.php       | 62 +++++++++++++++++--
 .../criterionconversionabstract.class.inc.php |  1 +
 .../search/searchform.class.inc.php           | 19 +++---
 test/application/search/SearchFormTest.php    | 13 +++-
 5 files changed, 121 insertions(+), 24 deletions(-)

diff --git a/sources/application/search/criterionconversion/criteriontooql.class.inc.php b/sources/application/search/criterionconversion/criteriontooql.class.inc.php
index 036124f2f..8591e3d45 100644
--- a/sources/application/search/criterionconversion/criteriontooql.class.inc.php
+++ b/sources/application/search/criterionconversion/criteriontooql.class.inc.php
@@ -24,6 +24,7 @@ namespace Combodo\iTop\Application\Search\CriterionConversion;
 
 
 use Combodo\iTop\Application\Search\CriterionConversionAbstract;
+use Combodo\iTop\Application\Search\SearchForm;
 
 class CriterionToOQL extends CriterionConversionAbstract
 {
@@ -50,6 +51,7 @@ class CriterionToOQL extends CriterionConversionAbstract
 			self::OP_ENDS_WITH => 'EndsWithToOql',
 			self::OP_EMPTY => 'EmptyToOql',
 			self::OP_NOT_EMPTY => 'NotEmptyToOql',
+			self::OP_IN => 'InToOql',
 			self::OP_ALL => 'AllToOql',
 		);
 
@@ -57,7 +59,7 @@ class CriterionToOQL extends CriterionConversionAbstract
 		{
 			$sFct = $aMappedOperators[$sOperator];
 
-			return self::$sFct($sRef, $sOperator, self::GetValues($aCriteria));
+			return self::$sFct($sRef, $sOperator, $aCriteria);
 		}
 
 		$sValue = self::GetValue(self::GetValues($aCriteria), 0);
@@ -87,38 +89,72 @@ class CriterionToOQL extends CriterionConversionAbstract
 		return $aValues[$iIndex]['value'];
 	}
 
-	protected static function ContainsToOql($sRef, $sOperator, $aValues)
+	protected static function ContainsToOql($sRef, $sOperator, $aCriteria)
 	{
+		$aValues = self::GetValues($aCriteria);
 		$sValue = self::GetValue($aValues, 0);
 
 		return "({$sRef} LIKE '%{$sValue}%')";
 	}
 
-	protected static function StartsWithToOql($sRef, $sOperator, $aValues)
+	protected static function StartsWithToOql($sRef, $sOperator, $aCriteria)
 	{
+		$aValues = self::GetValues($aCriteria);
 		$sValue = self::GetValue($aValues, 0);
 
 		return "({$sRef} LIKE '{$sValue}%')";
 	}
 
-	protected static function EndsWithToOql($sRef, $sOperator, $aValues)
+	protected static function EndsWithToOql($sRef, $sOperator, $aCriteria)
 	{
+		$aValues = self::GetValues($aCriteria);
 		$sValue = self::GetValue($aValues, 0);
 
 		return "({$sRef} LIKE '%{$sValue}')";
 	}
 
-	protected static function EmptyToOql($sRef, $sOperator, $aValues)
+	protected static function EmptyToOql($sRef, $sOperator, $aCriteria)
 	{
 		return "({$sRef} = '')";
 	}
 
-	protected static function NotEmptyToOql($sRef, $sOperator, $aValues)
+	protected static function NotEmptyToOql($sRef, $sOperator, $aCriteria)
 	{
 		return "({$sRef} != '')";
 	}
 
-	protected static function AllToOql($sRef, $sOperator, $aValues)
+	protected static function InToOql($sRef, $sOperator, $aCriteria)
+	{
+		$sAttCode = $aCriteria['code'];
+		$sClass = $aCriteria['class'];
+		$aValues = $aCriteria['values'];
+
+		$aAttributeDefs = MetaModel::ListAttributeDefs($sClass);
+		if (array_key_exists($sAttCode, $aAttributeDefs))
+		{
+			$oAttDef = $aAttributeDefs[$sAttCode];
+			$aAllowedValues = SearchForm::GetFieldAllowedValues($oAttDef);
+			if (array_key_exists('values', $aAllowedValues))
+			{
+				$aAllowedValues = $aAllowedValues['values'];
+				// more selected values than remaining so use NOT IN
+				if (count($aValues) > (count($aAllowedValues) / 2))
+				{
+					foreach($aValues as $aValue)
+					{
+						unset($aAllowedValues[$aValue['value']]);
+					}
+					$sOQL = "({$sRef} NOT IN (";
+					$s .= implode(',', array_keys($aAllowedValues));
+
+				}
+			}
+		}
+
+		return "({$sRef} != '')";
+	}
+
+	protected static function AllToOql($sRef, $sOperator, $aCriteria)
 	{
 		return "1";
 	}
diff --git a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
index 4a68e0bc4..5c1d5620a 100644
--- a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
+++ b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
@@ -20,22 +20,33 @@
  */
 
 /**
- * Convert OQL expressions into structure for the search form
+ * Convert structures from OQL expressions into structure for the search form
  */
 namespace Combodo\iTop\Application\Search\CriterionConversion;
 
 
-use AttributeString;
+use AttributeDefinition;
 use Combodo\iTop\Application\Search\CriterionConversionAbstract;
 
 class CriterionToSearchForm extends CriterionConversionAbstract
 {
 
-	public static function Convert($aAndCriterionRaw)
+	public static function Convert($aAndCriterionRaw, $aFieldsByCategory)
 	{
+		$aAllFields = array();
+		foreach($aFieldsByCategory as $aFields)
+		{
+			foreach($aFields as $aField)
+			{
+				$sAlias = $aField['class_alias'];
+				$sCode = $aField['code'];
+				$aAllFields["$sAlias.$sCode"] = $aField;
+			}
+		}
 		$aAndCriterion = array();
 		$aMappingOperatorToFunction = array(
-			AttributeString::SEARCH_WIDGET_TYPE => 'TextToSearchForm',
+			AttributeDefinition::SEARCH_WIDGET_TYPE_STRING => 'TextToSearchForm',
+			AttributeDefinition::SEARCH_WIDGET_TYPE_ENUM => 'EnumToSearchForm',
 		);
 
 		foreach($aAndCriterionRaw as $aCriteria)
@@ -45,7 +56,7 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 				if (array_key_exists($aCriteria['widget'], $aMappingOperatorToFunction))
 				{
 					$sFct = $aMappingOperatorToFunction[$aCriteria['widget']];
-					$aAndCriterion[] = self::$sFct($aCriteria);
+					$aAndCriterion[] = self::$sFct($aCriteria, $aAllFields);
 				}
 				else
 				{
@@ -62,7 +73,7 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 		return $aAndCriterion;
 	}
 
-	protected static function TextToSearchForm($aCriteria)
+	protected static function TextToSearchForm($aCriteria, $aFields)
 	{
 		$sOperator = $aCriteria['operator'];
 		$sValue = $aCriteria['values'][0]['value'];
@@ -100,4 +111,43 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 
 		return $aCriteria;
 	}
+
+	protected static function EnumToSearchForm($aCriteria, $aFields)
+	{
+		$sOperator = $aCriteria['operator'];
+		$sRef = $aCriteria['ref'];
+		$aValues = $aCriteria['values'];
+		if (array_key_exists($sRef, $aFields))
+		{
+			$aField = $aFields[$sRef];
+			if (array_key_exists('allowed_values', $aField) && array_key_exists('values', $aField['allowed_values']))
+			{
+				$aAllowedValues = $aField['allowed_values']['values'];
+			}
+		}
+
+		switch (true)
+		{
+			case ($sOperator == 'NOT IN'):
+				if (isset($aAllowedValues))
+				{
+					foreach($aValues as $aValue)
+					{
+						$sValue = $aValue['value'];
+						unset($aAllowedValues[$sValue]);
+					}
+					$aCriteria['values'] = array();
+					
+					foreach($aAllowedValues as $sValue => $sLabel)
+					{
+						$aValue = array('value' => $sValue, 'label' => $sLabel);
+						$aCriteria['values'][] = $aValue;
+					}
+					$aCriteria['operator'] = 'IN';
+				}
+				break;
+		}
+
+		return $aCriteria;
+	}
 }
\ No newline at end of file
diff --git a/sources/application/search/criterionconversionabstract.class.inc.php b/sources/application/search/criterionconversionabstract.class.inc.php
index 04ede456b..469cfd631 100644
--- a/sources/application/search/criterionconversionabstract.class.inc.php
+++ b/sources/application/search/criterionconversionabstract.class.inc.php
@@ -31,6 +31,7 @@ abstract class CriterionConversionAbstract
 	const OP_ENDS_WITH = 'ends_with';
 	const OP_EMPTY = 'empty';
 	const OP_NOT_EMPTY = 'not_empty';
+	const OP_IN = 'IN';
 	const OP_ALL = 'all';
 
 }
diff --git a/sources/application/search/searchform.class.inc.php b/sources/application/search/searchform.class.inc.php
index ce1c418e0..68eaa90c5 100644
--- a/sources/application/search/searchform.class.inc.php
+++ b/sources/application/search/searchform.class.inc.php
@@ -127,7 +127,7 @@ class SearchForm
 
 		$aFields = $this->GetFields($oSet);
 		$oSearch = $oSet->GetFilter();
-		$aCriterion = $this->GetCriterion($oSearch);
+		$aCriterion = $this->GetCriterion($oSearch, $aFields);
 
 		$oBaseSearch = $oSearch->DeepClone();
 		$oBaseSearch->ResetCondition();
@@ -173,7 +173,7 @@ class SearchForm
 		$aAuthorizedClasses = array();
 		foreach($aSelectedClasses as $sAlias => $sClassName)
 		{
-			if (\UserRights::IsActionAllowed($sClassName, UR_ACTION_BULK_READ, $oSet) != UR_ALLOWED_NO)
+			if (\UserRights::IsActionAllowed($sClassName, UR_ACTION_READ, $oSet) != UR_ALLOWED_NO)
 			{
 				$aAuthorizedClasses[$sAlias] = $sClassName;
 			}
@@ -195,7 +195,7 @@ class SearchForm
 						unset($aAttributeDefs[$sAttCode]);
 					}
 				}
-				usort($aZList, function ($aItem1, $aItem2) {
+				uasort($aZList, function ($aItem1, $aItem2) {
 					return strcmp($aItem1['label'], $aItem2['label']);
 				});
 				$aAllFields['zlist'] = $aZList;
@@ -207,7 +207,7 @@ class SearchForm
 
 					$aOthers = $this->AppendField($sClass, $sAlias, $sAttCode, $oAttDef, $aOthers);
 				}
-				usort($aOthers, function ($aItem1, $aItem2) {
+				uasort($aOthers, function ($aItem1, $aItem2) {
 					return strcmp($aItem1['label'], $aItem2['label']);
 				});
 
@@ -231,7 +231,7 @@ class SearchForm
 	 *
 	 * @return array
 	 */
-	public function GetFieldAllowedValues($oAttrDef)
+	public static function GetFieldAllowedValues($oAttrDef)
 	{
 		if ($oAttrDef->IsExternalKey(EXTKEY_ABSOLUTE))
 		{
@@ -269,8 +269,11 @@ class SearchForm
 
 	/**
 	 * @param \DBSearch $oSearch
+	 * @param array $aFields
+	 *
+	 * @return array
 	 */
-	public function GetCriterion($oSearch)
+	public function GetCriterion($oSearch, $aFields)
 	{
 		$oExpression = $oSearch->GetCriteria();
 
@@ -288,7 +291,7 @@ class SearchForm
 				}
 				$aAndCriterion[] = $oAndSubExpr->GetCriterion($oSearch);
 			}
-			$aAndCriterion = CriterionToSearchForm::Convert($aAndCriterion);
+			$aAndCriterion = CriterionToSearchForm::Convert($aAndCriterion, $aFields);
 			$aOrCriterion[] = array('and' => $aAndCriterion);
 		}
 
@@ -317,7 +320,7 @@ class SearchForm
 				$aField['class_alias'] = $sClassAlias;
 				$aField['label'] = $sLabel;
 				$aField['widget'] = $oAttrDef->GetSearchType();
-				$aField['allowed_values'] = $this->GetFieldAllowedValues($oAttrDef);
+				$aField['allowed_values'] = self::GetFieldAllowedValues($oAttrDef);
 				$aFields[$sClassAlias.'.'.$sFilterCode] = $aField;
 				$this->aLabels[$sLabel] = true;
 			}
diff --git a/test/application/search/SearchFormTest.php b/test/application/search/SearchFormTest.php
index 14e91471e..97e5d5924 100644
--- a/test/application/search/SearchFormTest.php
+++ b/test/application/search/SearchFormTest.php
@@ -45,13 +45,16 @@ class SearchFormTest extends ItopDataTestCase
 	public function testGetFields()
 	{
 		$oSearchForm = new SearchForm();
-		$aFields = $oSearchForm->GetFields('Contact', 'Contact');
+		$oSearch = \DBSearch::FromOQL("SELECT Contact");
+		$aFields = $oSearchForm->GetFields(new \DBObjectSet($oSearch));
 		$this->debug(json_encode($aFields, JSON_PRETTY_PRINT));
 		$this->assertCount(7, $aFields['zlist']);
 
+		$oSearchForm = new SearchForm();
 		$oSearch = \DBSearch::FromOQL("SELECT Contact AS C WHERE C.status = 'active'");
-		$aFields = $oSearchForm->GetFields($oSearch->GetClass(), $oSearch->GetClassAlias());
+		$aFields = $oSearchForm->GetFields(new \DBObjectSet($oSearch));
 		$this->debug(json_encode($aFields, JSON_PRETTY_PRINT));
+		$this->assertCount(4, $aFields['others']);
 	}
 
 	/**
@@ -66,7 +69,9 @@ class SearchFormTest extends ItopDataTestCase
 		$oSearchForm = new SearchForm();
 		try
 		{
-			$aCriterion = $oSearchForm->GetCriterion(\DBSearch::FromOQL($sOQL));
+			$oSearch = \DBSearch::FromOQL($sOQL);
+			$aFields = $oSearchForm->GetFields(new \DBObjectSet($oSearch));
+			$aCriterion = $oSearchForm->GetCriterion($oSearch, $aFields);
 		} catch (\OQLException $e)
 		{
 			$this->assertTrue(false);
@@ -89,6 +94,8 @@ class SearchFormTest extends ItopDataTestCase
 			array('OQL' => "SELECT Contact WHERE status = 'active' AND name LIKE 'toto%'", 1),
 			array('OQL' => "SELECT Contact WHERE status = 'active' AND org_id = 3", 1),
 			array('OQL' => "SELECT Contact WHERE status IN ('active', 'inactive')", 1),
+			array('OQL' => "SELECT Contact WHERE status NOT IN ('active')", 1),
+			array('OQL' => "SELECT Contact WHERE status NOT IN ('active', 'inactive')", 1),
 			array('OQL' => "SELECT Contact WHERE status = 'active' OR name LIKE 'toto%'", 2),
 			array('OQL' => "SELECT UserRequest WHERE DATE_SUB(NOW(), INTERVAL 14 DAY) < start_date", 1),
 			array('OQL' => "SELECT UserRequest WHERE start_date > '2017-01-01' AND '2018-01-01' >= start_date", 1),

From 6f750cf584d9a2c25df17f3f07635ae872a7b6b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Tue, 13 Mar 2018 16:06:15 +0000
Subject: [PATCH 032/202] Advanced Search: Unit tests

SVN:b1162[5418]
---
 test/application/search/CriterionConversionTest.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/test/application/search/CriterionConversionTest.php b/test/application/search/CriterionConversionTest.php
index 1ceefbdb6..239781fa4 100644
--- a/test/application/search/CriterionConversionTest.php
+++ b/test/application/search/CriterionConversionTest.php
@@ -30,6 +30,7 @@ namespace Combodo\iTop\Test\UnitTest\Application\Search;
 
 use Combodo\iTop\Application\Search\CriterionConversion\CriterionToOQL;
 use Combodo\iTop\Application\Search\CriterionConversion\CriterionToSearchForm;
+use Combodo\iTop\Application\Search\SearchForm;
 use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
 
 class CriterionConversionTest extends ItopDataTestCase
@@ -155,10 +156,15 @@ class CriterionConversionTest extends ItopDataTestCase
 	 *
 	 * @param $aCriterion
 	 * @param $sExpectedOperator
+	 *
+	 * @throws \OQLException
 	 */
 	function testToSearchForm($aCriterion, $sExpectedOperator)
 	{
-		$aRes = CriterionToSearchForm::Convert($aCriterion);
+		$oSearchForm = new SearchForm();
+		$oSearch = \DBSearch::FromOQL("SELECT Contact");
+		$aFields = $oSearchForm->GetFields(new \DBObjectSet($oSearch));
+		$aRes = CriterionToSearchForm::Convert($aCriterion, $aFields);
 		$this->debug($aRes);
 		$this->assertEquals($sExpectedOperator, $aRes[0]['operator']);
 	}

From 601f18bbabfea2c6df65bff81c5c1c543fccadd0 Mon Sep 17 00:00:00 2001
From: Guillaume Lajarige <guillaume.lajarige@combodo.com>
Date: Tue, 13 Mar 2018 16:10:17 +0000
Subject: [PATCH 033/202] Advanced search: WIP POC, integration with endpoint.

SVN:b1162[5419]
---
 css/css-variables.scss                   |   9 ++
 css/light-grey.css                       | 136 ++++++++++++++++++-----
 css/light-grey.scss                      | 100 +++++++++++++++--
 js/search/search_form_criteria.js        |  68 ++++++++----
 js/search/search_form_criteria_string.js |   8 +-
 js/search/search_form_handler.js         |  17 ++-
 6 files changed, 271 insertions(+), 67 deletions(-)

diff --git a/css/css-variables.scss b/css/css-variables.scss
index e4e13bdcd..962c33cb7 100644
--- a/css/css-variables.scss
+++ b/css/css-variables.scss
@@ -24,5 +24,14 @@ $complement-color: #1c94c4;
 $complement-light: #d6e8ef;
 $frame-background-color: $gray-extra-light;
 $text-color: #000;
+$box-radius: 0px;
+$box-shadow-regular: 0 1px 1px rgba(0, 0, 0, 0.15);
+// - Boxes
+$box-blue-color: #2D2D2D;
+$box-blue-bg-color: #d6e8ef;
+$box-blue-border-color: #1c94c4;
+$box-blue-border: 1px solid $box-blue-border-color;
+$box-blue-radius: 1px;
+
 // Beware the version number MUST be enclosed with quotes otherwise v2.3.0 becomes v2 0.3 .0
 $version: "v2.4.0";
\ No newline at end of file
diff --git a/css/light-grey.css b/css/light-grey.css
index 1182e55f9..1349ad534 100644
--- a/css/light-grey.css
+++ b/css/light-grey.css
@@ -676,31 +676,34 @@ input.dp-applied {
 }
 /* For search forms */
 /* TODO: Remove when cleaning up old search */
-.SearchDrawer {
-  border-top: 5px solid #1c94c4;
-  border-left: 5px solid #1c94c4;
-  border-right: 5px solid #1c94c4;
-  border-bottom: 0;
-  background: #d6e8ef;
-  color: #000;
-  padding: 10px;
-  margin: 0;
-  font-size: 12px;
-}
-.SearchDrawer label {
-  background: #d6e8ef;
-  color: #000;
-  text-align: right;
-}
-.SearchDrawer h1 {
-  color: #000;
-}
-.SearchDrawer .SearchAttribute > .field_input_zone {
-  display: inline-block;
-}
-.SearchDrawer .SearchAttribute > .field_input_zone > .field_select_wrapper {
-  display: inline-block;
-}
+/*.SearchDrawer {
+ //background: $complement-color url(../images/search-top-left-corner.png?v=#{$version}) top left no-repeat;
+ border-top: 5px solid $complement-color;
+ border-left: 5px solid $complement-color;
+ border-right: 5px solid $complement-color;
+ border-bottom: 0;
+ background: $complement-light;
+ color: #000;
+ padding: 10px;
+ margin: 0;
+ font-size: 12px;
+ }
+ .SearchDrawer label {
+ background: $complement-light;
+ color: #000;
+ text-align: right;
+ }
+ .SearchDrawer h1 {
+ color: #000;
+ }
+ .SearchDrawer .SearchAttribute{
+ > .field_input_zone{
+ display: inline-block;
+ > .field_select_wrapper{
+ display: inline-block;
+ }
+ }
+ }*/
 .DrawerClosed {
   display: none;
 }
@@ -757,6 +760,9 @@ div.HRDrawer {
 /* Search forms v2 */
 /* TODO: Remove comment before final commit */
 .search_form_handler {
+  position: relative;
+  z-index: 10;
+  font-size: 12px;
   /* Sizing reset */
   /* Hyperlink reset */
 }
@@ -777,20 +783,34 @@ div.HRDrawer {
 }
 .search_form_handler .sf_criterion_area .sf_more_criterion, .search_form_handler .sf_criterion_area .search_form_criteria {
   position: relative;
-  padding: 8px 10px;
-  background-color: #ea7d1e;
-  color: #fff;
+  padding: 7px 8px;
+  background-color: #d6e8ef;
+  color: #2d2d2d;
+  border: 1px solid #1c94c4;
+  border-radius: 1px;
+  box-shadow: 0 1px 1px rgba(0, 0, 0, 0.15);
 }
 .search_form_handler .sf_criterion_area .search_form_criteria {
   display: inline-block;
-  margin-right: 3px;
+  margin-right: 5px;
+  padding-right: 35px;
+  /* Top left corner icons */
   /* Special criterion processing */
 }
 .search_form_handler .sf_criterion_area .search_form_criteria.locked {
   background-color: #f1f1f1;
 }
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_close, .search_form_handler .sf_criterion_area .search_form_criteria .sfc_toggle {
+  position: absolute;
+  top: 7px;
+  color: #1c94c4;
+}
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_close {
+  right: 7px;
+}
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_toggle {
   display: inline-block;
+  right: 20px;
   transition: all 0.2s ease-in-out;
 }
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_toggle.opened {
@@ -800,20 +820,76 @@ div.HRDrawer {
   cursor: pointer;
 }
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group {
+  /* Form group (operators) is displayed only when the criteria is toggled to opened state */
   display: none;
 }
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened {
   display: block;
+  margin-top: 5px;
+  /* Show only first operator in simple mode */
+}
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_apply, .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_cancel {
+  margin-top: 8px;
+  padding: 3px 6px;
+  font-size: 11px;
+  /* Not bold, so it looks like 10px/bold of more/less buttons */
+}
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_apply {
+  margin-right: 5px;
+}
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_more, .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_less {
+  position: absolute;
+  bottom: 3px;
+  right: 0px;
+  cursor: pointer;
+  color: #1c94c4;
+  font-size: 10px;
+  font-weight: bold;
+  border: none;
+  background-color: transparent;
+}
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_more > span, .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_less > span {
+  margin-left: 3px;
+}
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_operator:not(:first-of-type), .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_operator:first-of-type .sfc_op_radio {
+  display: none;
+}
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_less {
+  display: none;
+}
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_more {
+  display: inline-block;
+}
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened.advanced {
+  /* Show all operators in simple mode */
+}
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened.advanced .sfc_fg_operator {
+  margin-bottom: 3px;
+}
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened.advanced .sfc_fg_operator:last-of-type {
+  margin-bottom: 0px;
+}
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened.advanced .sfc_fg_operator:not(:first-of-type), .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened.advanced .sfc_fg_operator:first-of-type .sfc_op_radio {
+  display: inherit;
+}
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened.advanced .sfc_fg_less {
+  display: inline-block;
+}
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened.advanced .sfc_fg_more {
+  display: none;
 }
 .search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_raw .sfc_title {
   cursor: initial;
 }
 .search_form_handler .sf_criterion_area .sf_more_criterion .sf_mc_list {
   position: absolute;
+  max-height: 420px;
   margin: 0px;
   top: 100%;
   left: 0px;
-  background-color: #ea7d1e;
+  overflow-y: auto;
+  background-color: #d6e8ef;
+  border: 1px solid #1c94c4;
 }
 .search_form_handler .sf_criterion_area .sf_more_criterion .sf_mc_list .sf_mc_field {
   cursor: pointer;
diff --git a/css/light-grey.scss b/css/light-grey.scss
index 80d8efc8c..fef2bdeaa 100644
--- a/css/light-grey.scss
+++ b/css/light-grey.scss
@@ -757,7 +757,7 @@ input.dp-applied {
 
 /* For search forms */
 /* TODO: Remove when cleaning up old search */
-.SearchDrawer {
+/*.SearchDrawer {
 	//background: $complement-color url(../images/search-top-left-corner.png?v=#{$version}) top left no-repeat;
 	border-top: 5px solid $complement-color;
 	border-left: 5px solid $complement-color;
@@ -785,7 +785,7 @@ input.dp-applied {
 			display: inline-block;
 		}
 	}
-}
+}*/
 .DrawerClosed {
 	display: none;
 }
@@ -843,6 +843,10 @@ div.HRDrawer {
 /* Search forms v2 */
 /* TODO: Remove comment before final commit */
 .search_form_handler{
+	position: relative;
+	z-index: 10;
+	font-size: 12px;
+
 	/* Sizing reset */
 	*{
 		box-sizing: border-box;
@@ -862,39 +866,116 @@ div.HRDrawer {
 		.sf_more_criterion,
 		.search_form_criteria{
 			position: relative;
-			padding: 8px 10px;
-			background-color: $combodo-orange;
-			color: $white;
+			padding: 7px 8px;
+			background-color: $box-blue-bg-color;
+			color: $box-blue-color;
+			border: $box-blue-border;
+			border-radius: $box-blue-radius;
+			box-shadow: $box-shadow-regular;
 		}
 
 		/* Criteria tags */
 		.search_form_criteria{
 			display: inline-block;
-			margin-right: 3px;
+			margin-right: 5px;
+			padding-right: 35px;
 
 			&.locked{
 				background-color: $gray-extra-light;
 			}
 
+			/* Top left corner icons */
+			.sfc_close,
+			.sfc_toggle{
+				position: absolute;
+				top: 7px;
+				color: $box-blue-border-color;
+			}
 			.sfc_close{
-
+				right: 7px;
 			}
 			.sfc_toggle{
 				display: inline-block;
+				right: 20px;
 				transition: all 0.2s ease-in-out;
 
 				&.opened{
 					transform: rotateZ(180deg);
 				}
 			}
+
 			.sfc_title{
 				cursor: pointer;
 			}
 			.sfc_form_group{
+				/* Form group (operators) is displayed only when the criteria is toggled to opened state */
 				display: none;
 
 				&.opened{
 					display: block;
+					margin-top: 5px;
+
+					.sfc_fg_apply,
+					.sfc_fg_cancel{
+						margin-top: 8px;
+						padding: 3px 6px;
+						font-size: 11px; /* Not bold, so it looks like 10px/bold of more/less buttons */
+					}
+					.sfc_fg_apply{
+						margin-right: 5px;
+					}
+
+					.sfc_fg_more,
+					.sfc_fg_less{
+						position: absolute;
+						bottom: 3px;
+						right: 0px;
+						cursor: pointer;
+						color: $box-blue-border-color;
+						font-size: 10px;
+						font-weight: bold;
+						border: none;
+						background-color: transparent;
+
+						> span{
+							margin-left: 3px;
+						}
+					}
+
+					/* Show only first operator in simple mode */
+					.sfc_fg_operator:not(:first-of-type),
+					.sfc_fg_operator:first-of-type .sfc_op_radio{
+						display: none;
+					}
+					.sfc_fg_less{
+						display: none;
+					}
+					.sfc_fg_more{
+						display: inline-block;
+					}
+
+					&.advanced{
+
+						.sfc_fg_operator{
+							margin-bottom: 3px;
+
+							&:last-of-type{
+								margin-bottom: 0px;
+							}
+						}
+
+						/* Show all operators in simple mode */
+						.sfc_fg_operator:not(:first-of-type),
+						.sfc_fg_operator:first-of-type .sfc_op_radio{
+							display: inherit;
+						}
+						.sfc_fg_less{
+							display: inline-block;
+						}
+						.sfc_fg_more{
+							display: none;
+						}
+					}
 				}
 			}
 
@@ -910,10 +991,13 @@ div.HRDrawer {
 		.sf_more_criterion{
 			.sf_mc_list{
 				position: absolute;
+				max-height: 420px;
 				margin: 0px;
 				top: 100%;
 				left: 0px;
-				background-color: $combodo-orange;
+				overflow-y: auto;
+				background-color: $box-blue-bg-color;
+				border: $box-blue-border;
 
 				.sf_mc_field{
 					cursor: pointer;
diff --git a/js/search/search_form_criteria.js b/js/search/search_form_criteria.js
index 779797614..5b4e0cdd6 100644
--- a/js/search/search_form_criteria.js
+++ b/js/search/search_form_criteria.js
@@ -10,18 +10,18 @@ $(function()
 		options:
 		{
 			// Default values for the criteria
-			ref: '',
-			operator: '=',
-			values: [],
-			oql: '',
-			is_removable: true,
+			'ref': '',
+			'operator': '=',
+			'values': [],
+			'oql': '',
+			'is_removable': true,
 
-			field: {
-				label: '',
+			'field': {
+				'label': '',
 			},
 
-			// Available operators (merged with derived widgets, ordered and then copied to this.operators)
-			available_operators: {
+			// Available operators. They can be extended or restricted by derivated widgets (see this._initOperators() for more informations)
+			'available_operators': {
 				'=': {
 					'label': Dict.S('UI:Search:Criteria:Operator:Default:Equals'),
 					'code': 'equals',
@@ -39,7 +39,7 @@ $(function()
 				},
 			},
 
-			is_modified: false, // TODO: change this on value change and remove oql property value
+			'is_modified': false, // TODO: change this on value change and remove oql property value
 		},
 
 		// Operators
@@ -55,7 +55,8 @@ $(function()
 			
 			this.element.addClass('search_form_criteria');
 
-			this._orderOperators();
+			// Init operators
+			this._initOperators();
 
 			// Link search form handler
 			this.handler = this.element.closest('.search_form_handler');
@@ -90,11 +91,37 @@ $(function()
 
 
 		// Protected methods
-		// - Order available operators
-		_orderOperators: function()
+		// - Init operators by cleaning up available operators and ordering them.
+		//   Note: A null operator or an operator with a rank "false" will be removed.
+		_initOperators: function()
 		{
-			console.log(this.options.available_operators);
+			// Reset oprators
+			this.operators = {};
 
+			// Temp array to sort operators
+			var aSortable = [];
+			for(var sOpIdx in this.options.available_operators)
+			{
+				var oOp = this.options.available_operators[sOpIdx];
+
+				// Some operator can be disabled by the derivated widget, so we check it.
+				if(oOp !== null && oOp.rank !== false)
+				{
+					aSortable.push([sOpIdx, oOp.rank]);
+				}
+			}
+
+			// Sort the array
+			aSortable.sort(function(a, b){
+				return a[1] - b[1];
+			})
+
+			// Populate this.operators
+			for(var iIdx in aSortable)
+			{
+				var sOpIdx = aSortable[iIdx][0];
+				this.operators[sOpIdx] = this.options.available_operators[sOpIdx];
+			}
 		},
 		// - Bind external events
 		_bindEvents: function()
@@ -138,7 +165,7 @@ $(function()
 		// - Internal events
 		_onButtonApply: function()
 		{
-			this._trace('TODO: Apply button');
+			this._trace('TODO: Apply button (call selected operator callback)');
 			this.handler.triggerHandler('itop.search.criteria.value_changed');
 		},
 		_onButtonCancel: function()
@@ -182,8 +209,7 @@ $(function()
 			// Bind events
 			// - Toggler
 			this.element.find('.sfc_toggle, .sfc_title').on('click', function(){
-				me.element.find('.sfc_form_group').toggle();
-				me.element.find('.sfc_toggle').toggleClass('opened');
+				me.element.find('.sfc_form_group, .sfc_toggle').toggleClass('opened');
 			});
 
 			// Removable / locked decoration
@@ -211,9 +237,9 @@ $(function()
 		//   Meant for overloading.
 		_prepareOperators: function()
 		{
-			for(var sOpIdx in this.options.available_operators)
+			for(var sOpIdx in this.operators)
 			{
-				var oOp = this.options.available_operators[sOpIdx];
+				var oOp = this.operators[sOpIdx];
 				var sMethod = '_prepare' + this._toCamelCase(oOp.code) + 'Operator';
 
 				// Create DOM element from template
@@ -245,8 +271,8 @@ $(function()
 			this.element.find('.sfc_fg_buttons')
 				.append('<button type="button" name="apply" class="sfc_fg_button sfc_fg_apply">' + Dict.S('UI:Button:Apply') + '</button>')
 				.append('<button type="button" name="cancel" class="sfc_fg_button sfc_fg_cancel">' + Dict.S('UI:Button:Cancel') + '</button>')
-				.append('<button type="button" name="more" class="sfc_fg_button sfc_fg_more">' + Dict.S('UI:Button:More') + '</button>')
-				.append('<button type="button" name="less" class="sfc_fg_button sfc_fg_less">' + Dict.S('UI:Button:Less') + '</button>');
+				.append('<button type="button" name="more" class="sfc_fg_button sfc_fg_more">' + Dict.S('UI:Button:More') + '<span class="fa fa-angle-double-down"></span></button>')
+				.append('<button type="button" name="less" class="sfc_fg_button sfc_fg_less">' + Dict.S('UI:Button:Less') + '<span class="fa fa-angle-double-up"></span></button>');
 
 			// Events
 			this.element.find('.sfc_fg_button').on('click', function(oEvent){
diff --git a/js/search/search_form_criteria_string.js b/js/search/search_form_criteria_string.js
index 522b22486..f25122f8d 100644
--- a/js/search/search_form_criteria_string.js
+++ b/js/search/search_form_criteria_string.js
@@ -10,17 +10,15 @@ $(function()
 		options:
 		{
 			// Overload default operator
-			operator: 'contains',
+			'operator': 'contains',
 			// Available operators
-			available_operators: {
+			'available_operators': {
 				'contains': {
 					'label': Dict.S('UI:Search:Criteria:Operator:String:Contains'),
 					'code': 'contains',
 					'rank': 5,
 				},
-				'=': {
-					'rank': false,
-				},
+				'=': null,	// Remove this one from string widget.
 			},
 		},
 
diff --git a/js/search/search_form_handler.js b/js/search/search_form_handler.js
index 765e5eb64..d907a0d02 100644
--- a/js/search/search_form_handler.js
+++ b/js/search/search_form_handler.js
@@ -63,7 +63,6 @@ $(function()
 					// },
 				],
 			},
-			'list_params': {},	// Passed through to the endpoint so it can render the list correctly regarding the context.
 			'supported_criterion_types': ['raw', 'string'],
 			'default_criteria_type': 'raw',
 		},
@@ -144,6 +143,8 @@ $(function()
 		// - Update search option of the widget
 		_updateSearch: function()
 		{
+			var me = this;
+
 			// Criterion
 			// - Note: As of today, only a "or" level with a "and" is supported, so the following part
 			//         will need some refactoring when introducing new stuff.
@@ -154,7 +155,17 @@ $(function()
 			};
 			// - Retrieve criterion
 			this.elements.active_criterion.find('.search_form_criteria').each(function(){
+				// Retrieve criteria data
 				var oCriteriaData = $(this).triggerHandler('itop.search.criteria.get_data');
+
+				// Add some of the field data to criteria data to help server rebuild query
+				// Note: This would be better to be passed in oCriteriaData.field but it's not how server is handling it.
+				var oFieldDef = me._getFieldDefinition(oCriteriaData.ref);
+				oCriteriaData.class = oFieldDef.class;
+				oCriteriaData.class_alias = oFieldDef.class_alias;
+				oCriteriaData.code = oFieldDef.code;
+				oCriteriaData.widget = oFieldDef.widget;
+
 				oCriterion['or'][0]['and'].push(oCriteriaData);
 			});
 			// - Update search
@@ -372,7 +383,7 @@ $(function()
 		},
 		_getFieldDefinition: function(sRef)
 		{
-			var oFieldDef = false;
+			var oFieldDef = null;
 
 			for(var sListIdx in this.options.search.fields)
 			{
@@ -403,7 +414,7 @@ $(function()
 					'base_oql': this.options.search.base_oql,
 					'criterion': this.options.search.criterion,
 				}),
-				'list_params': JSON.stringify(this.options.list_params),
+				'list_params': this.elements.results_area.data('sExtraParams'),
 			};
 
 			// Show loader

From 6f79e07e90fdc02392d78a86e8c1d810773f4690 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Tue, 13 Mar 2018 16:16:33 +0000
Subject: [PATCH 034/202] Advanced Search: NOT IN

SVN:b1162[5420]
---
 .../criteriontooql.class.inc.php              | 40 ++++++++++++-------
 1 file changed, 26 insertions(+), 14 deletions(-)

diff --git a/sources/application/search/criterionconversion/criteriontooql.class.inc.php b/sources/application/search/criterionconversion/criteriontooql.class.inc.php
index 8591e3d45..4dfc68192 100644
--- a/sources/application/search/criterionconversion/criteriontooql.class.inc.php
+++ b/sources/application/search/criterionconversion/criteriontooql.class.inc.php
@@ -129,29 +129,41 @@ class CriterionToOQL extends CriterionConversionAbstract
 		$sClass = $aCriteria['class'];
 		$aValues = $aCriteria['values'];
 
-		$aAttributeDefs = MetaModel::ListAttributeDefs($sClass);
-		if (array_key_exists($sAttCode, $aAttributeDefs))
+		try
 		{
-			$oAttDef = $aAttributeDefs[$sAttCode];
-			$aAllowedValues = SearchForm::GetFieldAllowedValues($oAttDef);
-			if (array_key_exists('values', $aAllowedValues))
+			$aAttributeDefs = \MetaModel::ListAttributeDefs($sClass);
+			if (array_key_exists($sAttCode, $aAttributeDefs))
 			{
-				$aAllowedValues = $aAllowedValues['values'];
-				// more selected values than remaining so use NOT IN
-				if (count($aValues) > (count($aAllowedValues) / 2))
+				$oAttDef = $aAttributeDefs[$sAttCode];
+				$aAllowedValues = SearchForm::GetFieldAllowedValues($oAttDef);
+				if (array_key_exists('values', $aAllowedValues))
 				{
-					foreach($aValues as $aValue)
+					$aAllowedValues = $aAllowedValues['values'];
+					// more selected values than remaining so use NOT IN
+					if (count($aValues) > (count($aAllowedValues) / 2))
 					{
-						unset($aAllowedValues[$aValue['value']]);
-					}
-					$sOQL = "({$sRef} NOT IN (";
-					$s .= implode(',', array_keys($aAllowedValues));
+						foreach($aValues as $aValue)
+						{
+							unset($aAllowedValues[$aValue['value']]);
+						}
+						$sInList = implode(',', array_keys($aAllowedValues));
 
+						return "({$sRef} NOT IN ($sInList))";
+					}
 				}
 			}
+		} catch (\CoreException $e)
+		{
 		}
 
-		return "({$sRef} != '')";
+		$aInValues = array();
+		foreach($aValues as $aValue)
+		{
+			$aInValues[] = $aValue['value'];
+		}
+		$sInList = implode(',', $aInValues);
+
+		return "({$sRef} IN ($sInList))";
 	}
 
 	protected static function AllToOql($sRef, $sOperator, $aCriteria)

From 5632f9786caf0264b998fd28d44e9d20e53ed2a7 Mon Sep 17 00:00:00 2001
From: Guillaume Lajarige <guillaume.lajarige@combodo.com>
Date: Wed, 14 Mar 2018 08:33:17 +0000
Subject: [PATCH 035/202] Advanced search: WIP POC, UI/UX.

SVN:b1162[5421]
---
 css/light-grey.css                       | 40 +++++++++++++++----
 css/light-grey.scss                      | 49 ++++++++++++++++++++---
 dictionaries/en.dictionary.itop.ui.php   |  4 +-
 js/search/search_form_criteria.js        | 51 +++++++++++++++++++-----
 js/search/search_form_criteria_raw.js    |  2 +
 js/search/search_form_criteria_string.js | 12 +++++-
 js/search/search_form_handler.js         | 17 +++-----
 7 files changed, 138 insertions(+), 37 deletions(-)

diff --git a/css/light-grey.css b/css/light-grey.css
index 1349ad534..115b541c3 100644
--- a/css/light-grey.css
+++ b/css/light-grey.css
@@ -728,7 +728,7 @@ div.HRDrawer {
   width: 100%;
   margin: 0;
   background-color: #1c94c4;
-  margin: 0;
+  margin-top: 10px;
   padding: 0;
   border: 0;
   display: block;
@@ -784,6 +784,7 @@ div.HRDrawer {
 .search_form_handler .sf_criterion_area .sf_more_criterion, .search_form_handler .sf_criterion_area .search_form_criteria {
   position: relative;
   padding: 7px 8px;
+  vertical-align: top;
   background-color: #d6e8ef;
   color: #2d2d2d;
   border: 1px solid #1c94c4;
@@ -793,7 +794,7 @@ div.HRDrawer {
 .search_form_handler .sf_criterion_area .search_form_criteria {
   display: inline-block;
   margin-right: 5px;
-  padding-right: 35px;
+  margin-bottom: 5px;
   /* Top left corner icons */
   /* Special criterion processing */
 }
@@ -811,12 +812,13 @@ div.HRDrawer {
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_toggle {
   display: inline-block;
   right: 20px;
-  transition: all 0.2s ease-in-out;
+  transition: all 0.4s ease-in-out;
 }
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_toggle.opened {
-  transform: rotateZ(180deg);
+  transform: rotateZ(-180deg);
 }
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_title {
+  padding-right: 35px;
   cursor: pointer;
 }
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group {
@@ -827,6 +829,31 @@ div.HRDrawer {
   display: block;
   margin-top: 5px;
   /* Show only first operator in simple mode */
+  /* Show all operators in advanced mode */
+}
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_operators {
+  font-size: 12px;
+}
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_operators .sfc_fg_operator {
+  /* Common operators for most criteria types processing*/
+}
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_operators .sfc_fg_operator > label {
+  line-height: 20px;
+}
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_operators .sfc_fg_operator > label > * {
+  display: inline-block;
+  vertical-align: middle;
+}
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_operators .sfc_fg_operator .sfc_op_radio {
+  width: 12px;
+  margin: 0px;
+  margin-right: 7px;
+}
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_operators .sfc_fg_operator.sfc_fg_operator_contains .sfc_op_name, .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_operators .sfc_fg_operator.sfc_fg_operator_starts_with .sfc_op_name, .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_operators .sfc_fg_operator.sfc_fg_operator_ends_with .sfc_op_name {
+  width: 90px;
+}
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_operators .sfc_fg_operator.sfc_fg_operator_contains .sfc_op_content input, .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_operators .sfc_fg_operator.sfc_fg_operator_starts_with .sfc_op_content input, .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_operators .sfc_fg_operator.sfc_fg_operator_ends_with .sfc_op_content input {
+  width: 130px;
 }
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_apply, .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_cancel {
   margin-top: 8px;
@@ -839,7 +866,7 @@ div.HRDrawer {
 }
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_more, .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_less {
   position: absolute;
-  bottom: 3px;
+  bottom: 4px;
   right: 0px;
   cursor: pointer;
   color: #1c94c4;
@@ -860,9 +887,6 @@ div.HRDrawer {
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_more {
   display: inline-block;
 }
-.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened.advanced {
-  /* Show all operators in simple mode */
-}
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened.advanced .sfc_fg_operator {
   margin-bottom: 3px;
 }
diff --git a/css/light-grey.scss b/css/light-grey.scss
index fef2bdeaa..6d222cc82 100644
--- a/css/light-grey.scss
+++ b/css/light-grey.scss
@@ -811,7 +811,7 @@ div.HRDrawer {
 	width: 100%;
 	margin: 0;
 	background-color:  $complement-color;
-	margin: 0;
+	margin-top: 10px;
 	padding: 0;
 	border: 0;
 	display: block;
@@ -867,6 +867,7 @@ div.HRDrawer {
 		.search_form_criteria{
 			position: relative;
 			padding: 7px 8px;
+			vertical-align: top;
 			background-color: $box-blue-bg-color;
 			color: $box-blue-color;
 			border: $box-blue-border;
@@ -878,7 +879,7 @@ div.HRDrawer {
 		.search_form_criteria{
 			display: inline-block;
 			margin-right: 5px;
-			padding-right: 35px;
+			margin-bottom: 5px;
 
 			&.locked{
 				background-color: $gray-extra-light;
@@ -897,14 +898,15 @@ div.HRDrawer {
 			.sfc_toggle{
 				display: inline-block;
 				right: 20px;
-				transition: all 0.2s ease-in-out;
+				transition: all 0.4s ease-in-out;
 
 				&.opened{
-					transform: rotateZ(180deg);
+					transform: rotateZ(-180deg);
 				}
 			}
 
 			.sfc_title{
+				padding-right: 35px;
 				cursor: pointer;
 			}
 			.sfc_form_group{
@@ -915,6 +917,41 @@ div.HRDrawer {
 					display: block;
 					margin-top: 5px;
 
+					.sfc_fg_operators{
+						font-size: 12px;
+
+						.sfc_fg_operator{
+							> label{
+								line-height: 20px;
+
+								> *{
+									display: inline-block;
+									vertical-align: middle;
+								}
+							}
+
+							.sfc_op_radio{
+								width: 12px;
+								margin: 0px;
+								margin-right: 7px;
+							}
+
+							/* Common operators for most criteria types processing*/
+							&.sfc_fg_operator_contains,
+							&.sfc_fg_operator_starts_with,
+							&.sfc_fg_operator_ends_with{
+								.sfc_op_name{
+									width: 90px;
+								}
+								.sfc_op_content{
+									input{
+										width: 130px;
+									}
+								}
+							}
+						}
+					}
+
 					.sfc_fg_apply,
 					.sfc_fg_cancel{
 						margin-top: 8px;
@@ -928,7 +965,7 @@ div.HRDrawer {
 					.sfc_fg_more,
 					.sfc_fg_less{
 						position: absolute;
-						bottom: 3px;
+						bottom: 4px;
 						right: 0px;
 						cursor: pointer;
 						color: $box-blue-border-color;
@@ -954,6 +991,7 @@ div.HRDrawer {
 						display: inline-block;
 					}
 
+					/* Show all operators in advanced mode */
 					&.advanced{
 
 						.sfc_fg_operator{
@@ -964,7 +1002,6 @@ div.HRDrawer {
 							}
 						}
 
-						/* Show all operators in simple mode */
 						.sfc_fg_operator:not(:first-of-type),
 						.sfc_fg_operator:first-of-type .sfc_op_radio{
 							display: inherit;
diff --git a/dictionaries/en.dictionary.itop.ui.php b/dictionaries/en.dictionary.itop.ui.php
index 0ab1badc9..50378c8ce 100644
--- a/dictionaries/en.dictionary.itop.ui.php
+++ b/dictionaries/en.dictionary.itop.ui.php
@@ -1371,8 +1371,8 @@ When associated with a trigger, each action is given an "order" number, specifyi
 	'UI:UploadNotSupportedInThisMode' => 'The modification of images or files is not supported in this mode.',
 
 	// TODO: Reorganize those entries with other search entries and make entries for other languages.
-	'UI:Search:Criteria:Operator:Default:Empty' => 'Is empty:',
-	'UI:Search:Criteria:Operator:Default:NotEmpty' => 'Is not empty:',
+	'UI:Search:Criteria:Operator:Default:Empty' => 'Is empty',
+	'UI:Search:Criteria:Operator:Default:NotEmpty' => 'Is not empty',
 	'UI:Search:Criteria:Operator:Default:Equals' => 'Equals:',
 	'UI:Search:Criteria:Operator:String:Contains' => 'Contains:',
 	'UI:Search:Criteria:Operator:String:StartsWith' => 'Starts with:',
diff --git a/js/search/search_form_criteria.js b/js/search/search_form_criteria.js
index 5b4e0cdd6..355306dd4 100644
--- a/js/search/search_form_criteria.js
+++ b/js/search/search_form_criteria.js
@@ -39,6 +39,7 @@ $(function()
 				},
 			},
 
+			'init_opened': false,
 			'is_modified': false, // TODO: change this on value change and remove oql property value
 		},
 
@@ -189,6 +190,12 @@ $(function()
 				'values': this.options.values,
 				'is_removable': this.options.is_removable,
 				'oql': this.options.oql,
+
+				// Field data
+				'class': this.options.field.class,
+				'class_alias': this.options.field.class_alias,
+				'code': this.options.field.code,
+				'widget': this.options.field.widget,
 			};
 			return oCriteriaData;
 		},
@@ -209,7 +216,15 @@ $(function()
 			// Bind events
 			// - Toggler
 			this.element.find('.sfc_toggle, .sfc_title').on('click', function(){
-				me.element.find('.sfc_form_group, .sfc_toggle').toggleClass('opened');
+				// First memorize if current criteria is close
+				var bOpen = !me.element.find('.sfc_toggle').hasClass('opened');
+				// Then close every criterion
+				me.handler.find('.sfc_form_group, .sfc_toggle').removeClass('opened');
+				// Finally open current criteria if necessary
+				if(bOpen === true)
+				{
+					me.element.find('.sfc_form_group, .sfc_toggle').toggleClass('opened');
+				}
 			});
 
 			// Removable / locked decoration
@@ -232,6 +247,13 @@ $(function()
 			// Fill criteria
 			// - Title
 			this._setTitle();
+
+			// Init opened to improve UX (toggle & focus in main operator's input)
+			if(this.options.init_opened === true)
+			{
+				this.element.find('.sfc_toggle').trigger('click');
+				this.element.find('.sfc_fg_operator:first .sfc_op_content input:first').trigger('click').trigger('focus');
+			}
 		},
 		// - Prepare the available operators for the criteria
 		//   Meant for overloading.
@@ -246,16 +268,16 @@ $(function()
 				var oOpElem = $(this._getOperatorTemplate()).uniqueId();
 
 				// Prepare operator's base elements
-				this._prepareOperator(oOpElem, oOp);
+				this._prepareOperator(oOpElem, sOpIdx, oOp);
 
 				// Prepare operator's specific elements
 				if(this[sMethod] !== undefined)
 				{
-					this[sMethod](oOpElem, oOp);
+					this[sMethod](oOpElem, sOpIdx, oOp);
 				}
 				else
 				{
-					this._prepareDefaultOperator(oOpElem, oOp);
+					this._prepareDefaultOperator(oOpElem, sOpIdx, oOp);
 				}
 
 				// Append to form group
@@ -300,10 +322,13 @@ $(function()
 		},
 
 		// Operators helpers
-		_prepareOperator: function(oOpElem, oOp)
+		_prepareOperator: function(oOpElem, sOpIdx, oOp)
 		{
 			var sInputId = oOp.code + '_' + oOpElem.attr('id');
 
+			// Set radio
+			oOpElem.find('.sfc_op_radio').val(sOpIdx);
+
 			// Set label
 			oOpElem.find('.sfc_op_name').text(oOp.label);
 			oOpElem.find('> label').attr('for', sInputId);
@@ -312,13 +337,16 @@ $(function()
 			oOpElem.find('.sfc_op_radio').val(oOpElem.id);
 			oOpElem.find('.sfc_op_radio').attr('id', sInputId);
 
+			// Set helper classes
+			oOpElem.addClass('sfc_fg_operator_' + oOp.code);
+
 			// Bind events
 			// - Check radio button on click
 			oOpElem.on('click', function(){
 				oOpElem.find('.sfc_op_radio').prop('checked', true);
 			});
 		},
-		_prepareDefaultOperator: function(oOpElem, oOp)
+		_prepareDefaultOperator: function(oOpElem, sOpIdx, oOp)
 		{
 			var me = this;
 
@@ -326,13 +354,18 @@ $(function()
 			var oOpContentElem = $('<input type="text" />');
 			oOpContentElem.val(this._getValuesAsText());
 
-			oOpElem.append(oOpContentElem);
+			// Events
+			oOpElem.on('click', ':not(input[type="text"])', function(){
+				oOpContentElem.focus();
+			});
+
+			oOpElem.find('.sfc_op_content').append(oOpContentElem);
 		},
-		_prepareEmptyOperator: function(oOpElem, oOp)
+		_prepareEmptyOperator: function(oOpElem, sOpIdx, oOp)
 		{
 			// Do nothing as only the label is necessary
 		},
-		_prepareNotEmptyOperator: function(oOpElem, oOp)
+		_prepareNotEmptyOperator: function(oOpElem, sOpIdx, oOp)
 		{
 			// Do nothing as only the label is necessary
 		},
diff --git a/js/search/search_form_criteria_raw.js b/js/search/search_form_criteria_raw.js
index bb877a53e..6a908499d 100644
--- a/js/search/search_form_criteria_raw.js
+++ b/js/search/search_form_criteria_raw.js
@@ -54,6 +54,8 @@ $(function()
 
 			// Remove toggler as it's a non sense here
 			this.element.find('.sfc_toggle').remove();
+			this.element.find('.sfc_toggle, .sfc_title').off('click');
+
 		},
 		_prepareOperators: function()
 		{
diff --git a/js/search/search_form_criteria_string.js b/js/search/search_form_criteria_string.js
index f25122f8d..7c0e9176d 100644
--- a/js/search/search_form_criteria_string.js
+++ b/js/search/search_form_criteria_string.js
@@ -16,7 +16,17 @@ $(function()
 				'contains': {
 					'label': Dict.S('UI:Search:Criteria:Operator:String:Contains'),
 					'code': 'contains',
-					'rank': 5,
+					'rank': 10,
+				},
+				'starts_with': {
+					'label': Dict.S('UI:Search:Criteria:Operator:String:StartsWith'),
+					'code': 'starts_with',
+					'rank': 20,
+				},
+				'ends_with': {
+					'label': Dict.S('UI:Search:Criteria:Operator:String:EndsWith'),
+					'code': 'ends_with',
+					'rank': 30,
 				},
 				'=': null,	// Remove this one from string widget.
 			},
diff --git a/js/search/search_form_handler.js b/js/search/search_form_handler.js
index d907a0d02..47b7edcce 100644
--- a/js/search/search_form_handler.js
+++ b/js/search/search_form_handler.js
@@ -155,17 +155,7 @@ $(function()
 			};
 			// - Retrieve criterion
 			this.elements.active_criterion.find('.search_form_criteria').each(function(){
-				// Retrieve criteria data
 				var oCriteriaData = $(this).triggerHandler('itop.search.criteria.get_data');
-
-				// Add some of the field data to criteria data to help server rebuild query
-				// Note: This would be better to be passed in oCriteriaData.field but it's not how server is handling it.
-				var oFieldDef = me._getFieldDefinition(oCriteriaData.ref);
-				oCriteriaData.class = oFieldDef.class;
-				oCriteriaData.class_alias = oFieldDef.class_alias;
-				oCriteriaData.code = oFieldDef.code;
-				oCriteriaData.widget = oFieldDef.widget;
-
 				oCriterion['or'][0]['and'].push(oCriteriaData);
 			});
 			// - Update search
@@ -256,9 +246,10 @@ $(function()
 
 			// Bind events
 			this.elements.more_criterion.find('.sf_mc_field').on('click', function(){
-				// Prepare new criterion data
+				// Prepare new criterion data (as already opened to increase UX)
 				var oData = {
 					'ref': $(this).attr('data-field-ref'),
+					'init_opened': true,
 				};
 
 				// Add criteria but don't submit form as the user has not specified the value yet.
@@ -303,6 +294,10 @@ $(function()
 					var oFieldDef = this._getFieldDefinition(sRef);
 					oData.field = {
 						label: oFieldDef.label,
+						class: oFieldDef.class,
+						class_alias: oFieldDef.class_alias,
+						code: oFieldDef.code,
+						widget: oFieldDef.widget,
 					};
 				}
 

From 9499799f80db009be14171c1d156a3416e4523ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Wed, 14 Mar 2018 08:50:54 +0000
Subject: [PATCH 036/202] Advanced Search: IN/NOT IN

SVN:b1162[5422]
---
 .../criterionconversion/criteriontooql.class.inc.php   | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/sources/application/search/criterionconversion/criteriontooql.class.inc.php b/sources/application/search/criterionconversion/criteriontooql.class.inc.php
index 4dfc68192..1b43e52f6 100644
--- a/sources/application/search/criterionconversion/criteriontooql.class.inc.php
+++ b/sources/application/search/criterionconversion/criteriontooql.class.inc.php
@@ -129,6 +129,11 @@ class CriterionToOQL extends CriterionConversionAbstract
 		$sClass = $aCriteria['class'];
 		$aValues = $aCriteria['values'];
 
+		if (count($aValues) == 0)
+		{
+			return "({$sRef}  = '')";
+		}
+
 		try
 		{
 			$aAttributeDefs = \MetaModel::ListAttributeDefs($sClass);
@@ -163,6 +168,11 @@ class CriterionToOQL extends CriterionConversionAbstract
 		}
 		$sInList = implode(',', $aInValues);
 
+		if (count($aInValues) == 1)
+		{
+			return "({$sRef} = '$sInList')";
+		}
+
 		return "({$sRef} IN ($sInList))";
 	}
 

From 6a6c0698967a5dee796ffe0e06c5bf2715eb85e2 Mon Sep 17 00:00:00 2001
From: Guillaume Lajarige <guillaume.lajarige@combodo.com>
Date: Wed, 14 Mar 2018 11:03:32 +0000
Subject: [PATCH 037/202] Advanced search: WIP POC, integration with endpoint.

SVN:b1162[5423]
---
 css/light-grey.css                |  4 +--
 css/light-grey.scss               |  1 +
 js/search/search_form_criteria.js | 55 ++++++++++++++++++++++++++-----
 3 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/css/light-grey.css b/css/light-grey.css
index 115b541c3..69c432ddf 100644
--- a/css/light-grey.css
+++ b/css/light-grey.css
@@ -849,10 +849,10 @@ div.HRDrawer {
   margin: 0px;
   margin-right: 7px;
 }
-.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_operators .sfc_fg_operator.sfc_fg_operator_contains .sfc_op_name, .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_operators .sfc_fg_operator.sfc_fg_operator_starts_with .sfc_op_name, .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_operators .sfc_fg_operator.sfc_fg_operator_ends_with .sfc_op_name {
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_operators .sfc_fg_operator.sfc_fg_operator_equals .sfc_op_name, .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_operators .sfc_fg_operator.sfc_fg_operator_contains .sfc_op_name, .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_operators .sfc_fg_operator.sfc_fg_operator_starts_with .sfc_op_name, .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_operators .sfc_fg_operator.sfc_fg_operator_ends_with .sfc_op_name {
   width: 90px;
 }
-.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_operators .sfc_fg_operator.sfc_fg_operator_contains .sfc_op_content input, .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_operators .sfc_fg_operator.sfc_fg_operator_starts_with .sfc_op_content input, .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_operators .sfc_fg_operator.sfc_fg_operator_ends_with .sfc_op_content input {
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_operators .sfc_fg_operator.sfc_fg_operator_equals .sfc_op_content input, .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_operators .sfc_fg_operator.sfc_fg_operator_contains .sfc_op_content input, .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_operators .sfc_fg_operator.sfc_fg_operator_starts_with .sfc_op_content input, .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_operators .sfc_fg_operator.sfc_fg_operator_ends_with .sfc_op_content input {
   width: 130px;
 }
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_apply, .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_cancel {
diff --git a/css/light-grey.scss b/css/light-grey.scss
index 6d222cc82..95572abb5 100644
--- a/css/light-grey.scss
+++ b/css/light-grey.scss
@@ -937,6 +937,7 @@ div.HRDrawer {
 							}
 
 							/* Common operators for most criteria types processing*/
+							&.sfc_fg_operator_equals,
 							&.sfc_fg_operator_contains,
 							&.sfc_fg_operator_starts_with,
 							&.sfc_fg_operator_ends_with{
diff --git a/js/search/search_form_criteria.js b/js/search/search_form_criteria.js
index 355306dd4..7c8eac777 100644
--- a/js/search/search_form_criteria.js
+++ b/js/search/search_form_criteria.js
@@ -155,6 +155,35 @@ $(function()
 				}
 			});
 		},
+		_apply: function()
+		{
+			this._trace('TODO: Apply button (call selected operator callback)');
+			// Find active operator
+			var oActiveOpElem = this.element.find('.sfc_op_radio:checked').closest('.sfc_fg_operator');
+			if(oActiveOpElem.length === 0)
+			{
+				this._trace('Could not apply new value as there seems to be no active operator.');
+				return false;
+			}
+
+			// Get value from operator (polymorphic method)
+			var sCallback = '_get' + this._toCamelCase(oActiveOpElem.attr('data-operator-code')) + 'OperatorValues';
+			if(this[sCallback] === undefined)
+			{
+				this._trace('Callback ' + sCallback + ' is undefined, using _getOperatorValues instead.');
+				sCallback = '_getOperatorValues';
+			}
+			var aValues = this[sCallback](oActiveOpElem);
+
+			// Update widget
+			this.options.operator = oActiveOpElem.find('.sfc_op_radio').val();
+			this.options.values = aValues;
+			// TODO: Update title
+			this._setTitle();
+
+			// Trigger event to handler
+			this.handler.triggerHandler('itop.search.criteria.value_changed');
+		},
 		_remove: function()
 		{
 			this.element.remove();
@@ -166,8 +195,7 @@ $(function()
 		// - Internal events
 		_onButtonApply: function()
 		{
-			this._trace('TODO: Apply button (call selected operator callback)');
-			this.handler.triggerHandler('itop.search.criteria.value_changed');
+			this._apply();
 		},
 		_onButtonCancel: function()
 		{
@@ -318,7 +346,7 @@ $(function()
 		// - Return a HTML template for operators
 		_getOperatorTemplate: function()
 		{
-			return '<div class="sfc_fg_operator"><label><input type="radio" class="sfc_op_radio" name="operator" value="" /><span class="sfc_op_name"></span><span class="sfc_op_content"></span></label></div>';
+			return '<div class="sfc_fg_operator"><label><input type="radio" class="sfc_op_radio" name="operator" /><span class="sfc_op_name"></span><span class="sfc_op_content"></span></label></div>';
 		},
 
 		// Operators helpers
@@ -328,17 +356,15 @@ $(function()
 
 			// Set radio
 			oOpElem.find('.sfc_op_radio').val(sOpIdx);
+			oOpElem.find('.sfc_op_radio').attr('id', sInputId);
 
 			// Set label
 			oOpElem.find('.sfc_op_name').text(oOp.label);
 			oOpElem.find('> label').attr('for', sInputId);
 
-			// Set value
-			oOpElem.find('.sfc_op_radio').val(oOpElem.id);
-			oOpElem.find('.sfc_op_radio').attr('id', sInputId);
-
 			// Set helper classes
-			oOpElem.addClass('sfc_fg_operator_' + oOp.code);
+			oOpElem.addClass('sfc_fg_operator_' + oOp.code)
+				.attr('data-operator-code', oOp.code);
 
 			// Bind events
 			// - Check radio button on click
@@ -369,6 +395,19 @@ $(function()
 		{
 			// Do nothing as only the label is necessary
 		},
+		// - Fallback for operators without a specific callback
+		_getOperatorValues: function(oOpElem)
+		{
+			var aValues = [];
+
+			oOpElem.find('.sfc_op_content input').each(function(){
+				var sValue = $(this).val();
+				aValues.push({value: sValue, label: sValue});
+			});
+
+			return aValues;
+		},
+
 
 		// Values helpers
 		// - Convert values to a standard string

From 5bc756716e79ceae293db497057ed624f0af983d Mon Sep 17 00:00:00 2001
From: Bruno Da Silva <bruno.dasilva@combodo.com>
Date: Wed, 14 Mar 2018 11:14:45 +0000
Subject: [PATCH 038/202] search widget

- ajax endpoint parameter reading refactoring
- displayBlock "list" aExtraParams exposition in js

SVN:b1162[5424]
---
 application/displayblock.class.inc.php | 31 ++++++++++++++++++++------
 pages/ajax.searchform.php              |  6 ++++-
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/application/displayblock.class.inc.php b/application/displayblock.class.inc.php
index a740f7cf6..2e10275f7 100644
--- a/application/displayblock.class.inc.php
+++ b/application/displayblock.class.inc.php
@@ -259,7 +259,7 @@ class DisplayBlock
 		if (!$this->m_bAsynchronous)
 		{
 			// render now
-			$sHtml .= "<div id=\"$sId\" class=\"display_block\">\n";
+			$sHtml .= "<div id=\"$sId\" class=\"display_block\" >\n";
 			$sHtml .= $this->GetRenderContent($oPage, $aExtraParams, $sId);
 			$sHtml .= "</div>\n";
 		}
@@ -273,9 +273,11 @@ class DisplayBlock
 			$.post("ajax.render.php?style='.$this->m_sStyle.'",
 			   { operation: "ajax", filter: "'.$sFilter.'", extra_params: "'.$sExtraParams.'" },
 			   function(data){
-				 $("#'.$sId.'").empty();
-				 $("#'.$sId.'").append(data);
-				 $("#'.$sId.'").removeClass("loading");
+				 $("#'.$sId.'")
+				    .empty()
+				    .append(data)
+				    .removeClass("loading")
+                 ;
 				}
 			 );
 			 ');
@@ -284,13 +286,28 @@ class DisplayBlock
 
         if ($this->m_sStyle != 'search') // Search form need to extract result list extra data, the simplest way is to expose this configuration
         {
-            $oPage->add_script("$('#$sId').data('sExtraParams', \"$sExtraParams\");");
-            $oPage->add_script("$('#$sId').data('bAutoReload', ".json_encode($bAutoReload).");");
+            $oPage->add_ready_script("
+            $('#$sId').data('sExtraParams', \"$sExtraParams\");
+            $('#$sId').data('bAutoReload', \"$sExtraParams\");
+            console.debug($('#$sId').data());
+            console.debug($('#$sId'));
+            console.debug('#$sId');
+            
+            ");
+
+//            $oPage->add_ready_script("console.debug($('#Menu_UserRequest_OpenRequests').data());");
+
         }
 
 		if (($bAutoReload) && ($this->m_sStyle != 'search')) // Search form do NOT auto-reload
 		{
-			$oPage->add_script('aAutoReloadBlock = setInterval("ReloadBlock(\''.$sId.'\', \''.$this->m_sStyle.'\', \''.$sFilter.'\', \"'.$sExtraParams.'\")", '.$iReloadInterval.');');
+			$oPage->add_script('if (typeof aAutoReloadBlock == "undefined") {
+			    aAutoReloadBlock = [];
+			}
+			if (typeof aAutoReloadBlock[\''.$sId.'\'] != "undefined") {
+			    clearInterval(aAutoReloadBlock[\''.$sId.'\']);
+			}
+			aAutoReloadBlock[\''.$sId.'\'] = setInterval("ReloadBlock(\''.$sId.'\', \''.$this->m_sStyle.'\', \''.$sFilter.'\', \"'.$sExtraParams.'\")", '.$iReloadInterval.');');
 		}
 		return $sHtml;
 	}
diff --git a/pages/ajax.searchform.php b/pages/ajax.searchform.php
index ad2543132..741d83917 100644
--- a/pages/ajax.searchform.php
+++ b/pages/ajax.searchform.php
@@ -63,7 +63,6 @@ try
         'selection_mode',
         'selection_type',// In case of single selection, the root of the HTML identifiers used is suffixed with "_results" (at least in the external keys)
         'cssCount',
-        'table_inner_id',
     );
 	foreach ($aPassFromExtraParamsToListParams as $passThroughKey)
     {
@@ -73,6 +72,10 @@ try
         }
     }
 
+    if (array_key_exists('table_inner_id', $aListParams))
+    {
+        $sListId = $aListParams['table_inner_id'];
+    }
 
 	if (array_key_exists('json', $aListParams))
 	{
@@ -90,6 +93,7 @@ try
 	}
 
 
+
 	$aExtraParams['display_limit'] = true;
 	$aExtraParams['truncated'] = true;
 	if (isset($sListId))

From afdd43c5e35eccf7529628714212e8e33704e7c6 Mon Sep 17 00:00:00 2001
From: Guillaume Lajarige <guillaume.lajarige@combodo.com>
Date: Wed, 14 Mar 2018 13:00:08 +0000
Subject: [PATCH 039/202] Advanced search: WIP POC, UI/UX.

SVN:b1162[5425]
---
 .idea/inspectionProfiles/iTop.xml        |  3 ++-
 js/search/search_form_criteria.js        | 18 ++++++++++++++++--
 js/search/search_form_criteria_string.js | 21 ---------------------
 3 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/.idea/inspectionProfiles/iTop.xml b/.idea/inspectionProfiles/iTop.xml
index b7028562f..263082e3a 100644
--- a/.idea/inspectionProfiles/iTop.xml
+++ b/.idea/inspectionProfiles/iTop.xml
@@ -95,8 +95,9 @@
       <option name="FLAG_EXPLICIT_CONVERSION" value="true" />
       <option name="IGNORE_NODESET_TO_BOOLEAN_VIA_STRING" value="true" />
     </inspection_tool>
-    <inspection_tool class="InconsistentLineSeparators" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="IndexZeroUsage" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSLastCommaInArrayLiteral" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSLastCommaInObjectLiteral" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="JSUnresolvedFunction" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
     <inspection_tool class="JSUnresolvedVariable" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
     <inspection_tool class="LossyEncoding" enabled="false" level="WARNING" enabled_by_default="false" />
diff --git a/js/search/search_form_criteria.js b/js/search/search_form_criteria.js
index 7c8eac777..b366734f8 100644
--- a/js/search/search_form_criteria.js
+++ b/js/search/search_form_criteria.js
@@ -178,7 +178,6 @@ $(function()
 			// Update widget
 			this.options.operator = oActiveOpElem.find('.sfc_op_radio').val();
 			this.options.values = aValues;
-			// TODO: Update title
 			this._setTitle();
 
 			// Trigger event to handler
@@ -339,7 +338,7 @@ $(function()
 			if(sTitle === undefined)
 			{
 				// TODO: Make nice label
-				sTitle = this.options.field.label + ': ' + this._getValuesAsText();
+				sTitle = this.options.field.label + ' ' + this.operators[this.options.operator].label + ' ' + this._getValuesAsText();
 			}
 			this.element.find('.sfc_title').text(sTitle);
 		},
@@ -381,9 +380,24 @@ $(function()
 			oOpContentElem.val(this._getValuesAsText());
 
 			// Events
+			// - Focus input on click (radio, label, ...)
 			oOpElem.on('click', ':not(input[type="text"])', function(){
 				oOpContentElem.focus();
 			});
+			// - Apply on "enter" key hit
+			oOpContentElem.on('keyup', function(oEvent){
+				// Check operator's radio if not already
+				if(oOpElem.find('.sfc_op_radio').prop('checked') === false)
+				{
+					oOpElem.find('.sfc_op_radio').prop('checked', true)
+				}
+
+				// Apply if enter key
+				if(oEvent.key === 'Enter')
+				{
+					me._apply();
+				}
+			});
 
 			oOpElem.find('.sfc_op_content').append(oOpContentElem);
 		},
diff --git a/js/search/search_form_criteria_string.js b/js/search/search_form_criteria_string.js
index 7c0e9176d..2a937effb 100644
--- a/js/search/search_form_criteria_string.js
+++ b/js/search/search_form_criteria_string.js
@@ -70,26 +70,5 @@ $(function()
 		//------------------
 
 		// DOM element helpers
-		// _prepareElement: function()
-		// {
-		// 	var me = this;
-		//
-		// 	this._super();
-		//
-		// 	// TODO: Refactor this after UI mockups
-		// 	var oInputElem = $('<input type="text" />');
-		// 	oInputElem.on('change', function(){
-		// 		var sValue = $(this).val();
-		//
-		// 		me.options.values = [{
-		// 			value: sValue,
-		// 			label: sValue,
-		// 		}];
-		// 		me._setTitle();
-		//
-		// 		me.handler.triggerHandler('itop.search.criteria.value_changed');
-		// 	})
-		// 		.appendTo(this.element.find('.sfc_form_group'));
-		// },
 	});
 });

From 7c3de1e976ca02c21cccec417decceb4522a9d08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Wed, 14 Mar 2018 15:46:30 +0000
Subject: [PATCH 040/202] Advanced Search: widget types

SVN:b1162[5426]
---
 core/attributedef.class.inc.php | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/core/attributedef.class.inc.php b/core/attributedef.class.inc.php
index 7cb0421aa..2e5a971af 100644
--- a/core/attributedef.class.inc.php
+++ b/core/attributedef.class.inc.php
@@ -113,17 +113,13 @@ abstract class AttributeDefinition
 {
 	const SEARCH_WIDGET_TYPE_RAW = 'raw';
 	const SEARCH_WIDGET_TYPE_STRING = 'string';
-	const SEARCH_WIDGET_TYPE_LANGUAGE = 'language';
-	const SEARCH_WIDGET_TYPE_INTEGER = 'integer';
-	const SEARCH_WIDGET_TYPE_PERCENT = 'percent';
-	const SEARCH_WIDGET_TYPE_DECIMAL = 'decimal';
-	const SEARCH_WIDGET_TYPE_BOOLEAN = 'boolean';
+	const SEARCH_WIDGET_TYPE_NUMERIC = 'numeric';
 	const SEARCH_WIDGET_TYPE_ENUM = 'enum';
 	const SEARCH_WIDGET_TYPE_EXTERNAL_KEY = 'external_key';
+	const SEARCH_WIDGET_TYPE_HIERARCHICAL_KEY = 'hierarchical_key';
 	const SEARCH_WIDGET_TYPE_EXTERNAL_FIELD = 'external_field';
 	const SEARCH_WIDGET_TYPE_DATE_TIME = 'date_time';
 	const SEARCH_WIDGET_TYPE_DATE = 'date';
-	const SEARCH_WIDGET_TYPE_REDUNDANCY = 'redundancy';
 
 	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
 
@@ -1638,7 +1634,7 @@ class AttributeDBField extends AttributeDBFieldVoid
  */
 class AttributeInteger extends AttributeDBField
 {
-	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_INTEGER;
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_NUMERIC;
 
 	static public function ListExpectedParams()
 	{
@@ -1790,7 +1786,7 @@ class AttributeObjectKey extends AttributeDBFieldVoid
  */
 class AttributePercentage extends AttributeInteger
 {
-	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_PERCENT;
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_NUMERIC;
 
 	public function GetAsHTML($sValue, $oHostObject = null, $bLocalize = true)
 	{
@@ -1831,7 +1827,7 @@ class AttributePercentage extends AttributeInteger
  */
 class AttributeDecimal extends AttributeDBField
 {
-	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_DECIMAL;
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_NUMERIC;
 
 	static public function ListExpectedParams()
 	{
@@ -1931,7 +1927,7 @@ class AttributeDecimal extends AttributeDBField
  */
 class AttributeBoolean extends AttributeInteger
 {
-	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_BOOLEAN;
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
 
 	static public function ListExpectedParams()
 	{
@@ -2329,7 +2325,7 @@ class AttributeClass extends AttributeString
  */
 class AttributeApplicationLanguage extends AttributeString
 {
-	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_LANGUAGE;
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
 
 	static public function ListExpectedParams()
 	{
@@ -4803,6 +4799,8 @@ class AttributeExternalKey extends AttributeDBFieldVoid
  */
 class AttributeHierarchicalKey extends AttributeExternalKey
 {
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_HIERARCHICAL_KEY;
+
 	protected $m_sTargetClass;
 
 	static public function ListExpectedParams()

From 42af530c63d333015f1727fb9a8e403d5f8e4d36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Wed, 14 Mar 2018 16:06:34 +0000
Subject: [PATCH 041/202] Advanced Search: widget types

SVN:b1162[5427]
---
 core/attributedef.class.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/attributedef.class.inc.php b/core/attributedef.class.inc.php
index 2e5a971af..44b1222e9 100644
--- a/core/attributedef.class.inc.php
+++ b/core/attributedef.class.inc.php
@@ -7044,7 +7044,7 @@ class AttributeFriendlyName extends AttributeDefinition
  */
 class AttributeRedundancySettings extends AttributeDBField
 {
-	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_REDUNDANCY;
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
 
 	static public function ListExpectedParams()
 	{

From ed027589403741b0ed164e18c2bbb8a0b0757e29 Mon Sep 17 00:00:00 2001
From: Bruno Da Silva <bruno.dasilva@combodo.com>
Date: Wed, 14 Mar 2018 16:35:35 +0000
Subject: [PATCH 042/202] search widget

- displayBlock "list" aExtraParams exposition in js

SVN:b1162[5429]
---
 application/displayblock.class.inc.php           | 11 ++++++++---
 pages/ajax.searchform.php                        |  2 +-
 .../application/search/searchform.class.inc.php  | 16 +++++++++++++++-
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/application/displayblock.class.inc.php b/application/displayblock.class.inc.php
index 2e10275f7..f268f081b 100644
--- a/application/displayblock.class.inc.php
+++ b/application/displayblock.class.inc.php
@@ -284,17 +284,22 @@ class DisplayBlock
 		}
 
 
-        if ($this->m_sStyle != 'search') // Search form need to extract result list extra data, the simplest way is to expose this configuration
+        if ($this->m_sStyle == 'list') // Search form need to extract result list extra data, the simplest way is to expose this configuration
         {
+
+            $listJsonExtraParams = json_encode(json_encode($aExtraParams));
             $oPage->add_ready_script("
-            $('#$sId').data('sExtraParams', \"$sExtraParams\");
-            $('#$sId').data('bAutoReload', \"$sExtraParams\");
+            $('#$sId').data('sExtraParams', ".$listJsonExtraParams.");
+            $('#$sId').data('bAutoReload', \"".(int) $bAutoReload."\");
             console.debug($('#$sId').data());
             console.debug($('#$sId'));
             console.debug('#$sId');
             
             ");
 
+
+
+
 //            $oPage->add_ready_script("console.debug($('#Menu_UserRequest_OpenRequests').data());");
 
         }
diff --git a/pages/ajax.searchform.php b/pages/ajax.searchform.php
index 741d83917..712e8b1c8 100644
--- a/pages/ajax.searchform.php
+++ b/pages/ajax.searchform.php
@@ -55,7 +55,7 @@ try
 	$oDisplayBlock = new DisplayBlock($oFilter, 'list', false);
 
 	$sListParams = stripslashes(utils::ReadParam('list_params', '{}', false, 'raw_data'));
-	$aListParams = json_decode($sListParams, true);
+	$aListParams = (array) json_decode($sListParams, true);
 
 
 	$aPassFromExtraParamsToListParams = array(
diff --git a/sources/application/search/searchform.class.inc.php b/sources/application/search/searchform.class.inc.php
index 68eaa90c5..8f51a8100 100644
--- a/sources/application/search/searchform.class.inc.php
+++ b/sources/application/search/searchform.class.inc.php
@@ -146,7 +146,8 @@ class SearchForm
 		}
 		$aSearchParams = array(
 			'criterion_outer_selector' => "#fs_{$sSearchFormId}_criterion_outer",
-			'result_list_outer_selector' => "#{$aExtraParams['table_id']}",
+            'result_list_outer_selector' => "#{$aExtraParams['table_id']}",
+            'data_config_list_selector' => null,                                            //this one will be set just bellow, it mean to tell the widget where to find the initial list configuration
 			'endpoint' => utils::GetAbsoluteUrlAppRoot().'pages/ajax.searchform.php',
 			'list_params' => $aListParams,
 			'search' => array(
@@ -156,6 +157,19 @@ class SearchForm
 			),
 		);
 
+		if (isset($aSearchParams['list_params']['table_inner_id']))
+        {
+            $aSearchParams['data_config_list_selector'] = '#'.$aSearchParams['list_params']['table_inner_id'];
+        }
+        elseif (isset($aSearchParams['list_params']['table_id']))
+        {
+            $aSearchParams['data_config_list_selector'] = '#'.$aSearchParams['list_params']['table_id'];
+        }
+        else
+        {
+            $aSearchParams['data_config_list_selector'] = '#'.$aSearchParams['result_list_outer_selector'];
+        }
+
 		$oPage->add_ready_script('$("#fs_'.$sSearchFormId.'").search_form_handler('.json_encode($aSearchParams).');');
 
 		return $sHtml;

From d378658a620b53d1728604e1faf11b8de728c028 Mon Sep 17 00:00:00 2001
From: Guillaume Lajarige <guillaume.lajarige@combodo.com>
Date: Thu, 15 Mar 2018 08:36:45 +0000
Subject: [PATCH 043/202] Advanced search: WIP POC, UI/UX.

SVN:b1162[5430]
---
 application/nicewebpage.class.inc.php  |   1 +
 css/light-grey.css                     |  13 ++-
 css/light-grey.scss                    |  14 ++-
 dictionaries/en.dictionary.itop.ui.php |   1 +
 js/search/search_form_criteria.js      | 127 ++++++++++++++++++++++---
 js/search/search_form_handler.js       |  18 +++-
 6 files changed, 156 insertions(+), 18 deletions(-)

diff --git a/application/nicewebpage.class.inc.php b/application/nicewebpage.class.inc.php
index a9f3b4ed9..3e6b55a66 100644
--- a/application/nicewebpage.class.inc.php
+++ b/application/nicewebpage.class.inc.php
@@ -63,6 +63,7 @@ class NiceWebPage extends WebPage
 	    $this->add_dict_entry('UI:Search:Criteria:Operator:String:EndsWith');
 	    $this->add_dict_entry('UI:Button:Apply');
 	    $this->add_dict_entry('UI:Button:Cancel');
+	    $this->add_dict_entry('UI:Button:Close');
 	    $this->add_dict_entry('UI:Button:More');
 	    $this->add_dict_entry('UI:Button:Less');
 	    $this->add_ready_script(
diff --git a/css/light-grey.css b/css/light-grey.css
index 69c432ddf..8407ed636 100644
--- a/css/light-grey.css
+++ b/css/light-grey.css
@@ -795,12 +795,20 @@ div.HRDrawer {
   display: inline-block;
   margin-right: 5px;
   margin-bottom: 5px;
+  /* Non editable criteria */
+  /* Draft criteria (modifications not applied) */
   /* Top left corner icons */
   /* Special criterion processing */
 }
 .search_form_handler .sf_criterion_area .search_form_criteria.locked {
   background-color: #f1f1f1;
 }
+.search_form_handler .sf_criterion_area .search_form_criteria.draft {
+  border-style: dashed;
+}
+.search_form_handler .sf_criterion_area .search_form_criteria.draft .sfc_title {
+  font-style: italic;
+}
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_close, .search_form_handler .sf_criterion_area .search_form_criteria .sfc_toggle {
   position: absolute;
   top: 7px;
@@ -811,7 +819,7 @@ div.HRDrawer {
 }
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_toggle {
   display: inline-block;
-  right: 20px;
+  right: 23px;
   transition: all 0.4s ease-in-out;
 }
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_toggle.opened {
@@ -905,6 +913,9 @@ div.HRDrawer {
 .search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_raw .sfc_title {
   cursor: initial;
 }
+.search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_raw .sfc_form_group {
+  display: none;
+}
 .search_form_handler .sf_criterion_area .sf_more_criterion .sf_mc_list {
   position: absolute;
   max-height: 420px;
diff --git a/css/light-grey.scss b/css/light-grey.scss
index 95572abb5..e8eeaa1fd 100644
--- a/css/light-grey.scss
+++ b/css/light-grey.scss
@@ -881,9 +881,18 @@ div.HRDrawer {
 			margin-right: 5px;
 			margin-bottom: 5px;
 
+            /* Non editable criteria */
 			&.locked{
 				background-color: $gray-extra-light;
 			}
+            /* Draft criteria (modifications not applied) */
+            &.draft{
+				border-style: dashed;
+
+				.sfc_title{
+					font-style: italic;
+				}
+            }
 
 			/* Top left corner icons */
 			.sfc_close,
@@ -897,7 +906,7 @@ div.HRDrawer {
 			}
 			.sfc_toggle{
 				display: inline-block;
-				right: 20px;
+				right: 23px;
 				transition: all 0.4s ease-in-out;
 
 				&.opened{
@@ -1022,6 +1031,9 @@ div.HRDrawer {
 				.sfc_title{
 					cursor: initial;
 				}
+				.sfc_form_group{
+					display: none;
+				}
 			}
 		}
 
diff --git a/dictionaries/en.dictionary.itop.ui.php b/dictionaries/en.dictionary.itop.ui.php
index 50378c8ce..c0f9ed19a 100644
--- a/dictionaries/en.dictionary.itop.ui.php
+++ b/dictionaries/en.dictionary.itop.ui.php
@@ -367,6 +367,7 @@ Dict::Add('EN US', 'English', 'English', array(
 	'UI:Button:Ok' => 'Ok',
 	'UI:Button:Save' => 'Save',
 	'UI:Button:Cancel' => 'Cancel',
+	'UI:Button:Close' => 'Close',
 	'UI:Button:Apply' => 'Apply',
 	'UI:Button:Back' => ' << Back ',
 	'UI:Button:Restart' => ' |<< Restart ',
diff --git a/js/search/search_form_criteria.js b/js/search/search_form_criteria.js
index b366734f8..cd16e008f 100644
--- a/js/search/search_form_criteria.js
+++ b/js/search/search_form_criteria.js
@@ -130,12 +130,12 @@ $(function()
 			var me = this;
 
 			// Get criteria data
-			this.element.bind('itop.search.criteria.get_data', function(oEvent, oData){
+			this.element.on('itop.search.criteria.get_data', function(oEvent, oData){
 				return me._onGetData(oData);
 			});
 
 			// Get/SetCurrentValues callbacks handler
-			this.element.bind('itop.search.criteria.get_current_values itop.search.criteria.set_current_values', function(oEvent, oData){
+			this.element.on('itop.search.criteria.get_current_values itop.search.criteria.set_current_values', function(oEvent, oData){
 				oEvent.stopPropagation();
 
 				var callback = me.options[oEvent.type+'_callback'];
@@ -154,10 +154,47 @@ $(function()
 					return false;
 				}
 			});
+
+			// Close criteria
+			this.element.on('itop.search.criteria.close', function(){
+				return me._close();
+			});
 		},
+		// - Cinematic
+		//   - Open / Close criteria
+		_open: function()
+		{
+			this._resetOperators();
+			this.element.find('.sfc_form_group, .sfc_toggle').addClass('opened');
+		},
+		_close: function()
+		{
+			this.element.find('.sfc_form_group, .sfc_toggle').removeClass('opened');
+			this._unmarkAsDraft();
+		},
+		_closeAll: function()
+		{
+			this.element.closest('.search_form_handler').find('.search_form_criteria').each(function(){
+				$(this).triggerHandler('itop.search.criteria.close');
+			});
+		},
+		_remove: function()
+		{
+			this.element.remove();
+			this.handler.triggerHandler('itop.search.criteria.removed');
+		},
+		//   - Mark / Unmark criteria as draft (new value not applied)
+		_markAsDraft: function()
+		{
+			this.element.addClass('draft');
+		},
+		_unmarkAsDraft: function()
+		{
+			this.element.removeClass('draft');
+		},
+		//   - Apply / Cancel new value
 		_apply: function()
 		{
-			this._trace('TODO: Apply button (call selected operator callback)');
 			// Find active operator
 			var oActiveOpElem = this.element.find('.sfc_op_radio:checked').closest('.sfc_fg_operator');
 			if(oActiveOpElem.length === 0)
@@ -179,14 +216,14 @@ $(function()
 			this.options.operator = oActiveOpElem.find('.sfc_op_radio').val();
 			this.options.values = aValues;
 			this._setTitle();
+			this._unmarkAsDraft();
 
 			// Trigger event to handler
 			this.handler.triggerHandler('itop.search.criteria.value_changed');
 		},
-		_remove: function()
+		_cancel: function()
 		{
-			this.element.remove();
-			this.handler.triggerHandler('itop.search.criteria.removed');
+			this._close();
 		},
 
 
@@ -198,7 +235,7 @@ $(function()
 		},
 		_onButtonCancel: function()
 		{
-			this._trace('TODO: Cancel button');
+			this._cancel();
 		},
 		_onButtonMore: function()
 		{
@@ -246,11 +283,11 @@ $(function()
 				// First memorize if current criteria is close
 				var bOpen = !me.element.find('.sfc_toggle').hasClass('opened');
 				// Then close every criterion
-				me.handler.find('.sfc_form_group, .sfc_toggle').removeClass('opened');
+				me._closeAll();
 				// Finally open current criteria if necessary
 				if(bOpen === true)
 				{
-					me.element.find('.sfc_form_group, .sfc_toggle').toggleClass('opened');
+					me._open();
 				}
 			});
 
@@ -332,6 +369,36 @@ $(function()
 				me[sCallback]();
 			});
 		},
+		// - Reset all operators but active one
+		_resetOperators: function()
+		{
+			var me = this;
+
+			// Reset all operators
+			this.element.find('.sfc_fg_operator').each(function(){
+				var sCallback = '_reset' + me._toCamelCase($(this).attr('data-operator-code')) + 'Operator';
+				if(me[sCallback] === undefined)
+				{
+					sCallback = '_resetOperator';
+				}
+				me[sCallback]($(this));
+			});
+
+			// Set value on current operator
+			var sCurrentOpCode = this.operators[this.options.operator].code;
+			this.element.find('.sfc_fg_operator[data-operator-code="' + sCurrentOpCode + '"]').each(function(){
+				// Check radio (we don't use .trigger('click'), otherwise the criteria will be seen as draft.
+				$(this).find('.sfc_op_radio').prop('checked', true);
+
+				// Reset values
+				var sCallback = '_set' + me._toCamelCase(sCurrentOpCode) + 'OperatorValues';
+				if(me[sCallback] === undefined)
+				{
+					sCallback = '_setOperatorValues';
+				}
+				me[sCallback]($(this), me.options.values);
+			});
+		},
 		// - Set the title element
 		_setTitle: function(sTitle)
 		{
@@ -342,15 +409,18 @@ $(function()
 			}
 			this.element.find('.sfc_title').text(sTitle);
 		},
+
+		// Operators helpers
 		// - Return a HTML template for operators
 		_getOperatorTemplate: function()
 		{
 			return '<div class="sfc_fg_operator"><label><input type="radio" class="sfc_op_radio" name="operator" /><span class="sfc_op_name"></span><span class="sfc_op_content"></span></label></div>';
 		},
-
-		// Operators helpers
+		// Prepare operator's DOM element
+		// - Base preparation, always called
 		_prepareOperator: function(oOpElem, sOpIdx, oOp)
 		{
+			var me = this;
 			var sInputId = oOp.code + '_' + oOpElem.attr('id');
 
 			// Set radio
@@ -366,11 +436,18 @@ $(function()
 				.attr('data-operator-code', oOp.code);
 
 			// Bind events
-			// - Check radio button on click
+			// - Check radio button on click and mark criteria as draft
 			oOpElem.on('click', function(){
-				oOpElem.find('.sfc_op_radio').prop('checked', true);
+				var bIsChecked = oOpElem.find('.sfc_op_radio').prop('checked');
+
+				if(bIsChecked === false)
+				{
+					oOpElem.find('.sfc_op_radio').prop('checked', true);
+					me._markAsDraft();
+				}
 			});
 		},
+		// - Fallback for operator that has no dedicated callback
 		_prepareDefaultOperator: function(oOpElem, sOpIdx, oOp)
 		{
 			var me = this;
@@ -392,6 +469,8 @@ $(function()
 					oOpElem.find('.sfc_op_radio').prop('checked', true)
 				}
 
+				me._markAsDraft();
+
 				// Apply if enter key
 				if(oEvent.key === 'Enter')
 				{
@@ -409,6 +488,13 @@ $(function()
 		{
 			// Do nothing as only the label is necessary
 		},
+		// Reset operator's state
+		// - Fallback for operator that has no dedicated callback
+		_resetOperator: function(oOpElem)
+		{
+			oOpElem.find('.sfc_op_content input').val('');
+		},
+		// Get operator's values
 		// - Fallback for operators without a specific callback
 		_getOperatorValues: function(oOpElem)
 		{
@@ -421,6 +507,21 @@ $(function()
 
 			return aValues;
 		},
+		// Set operator's values
+		// - Fallback for operators without a specific callback
+		_setOperatorValues: function(oOpElem, aValues)
+		{
+			if(aValues.length === 0)
+			{
+				return false;
+			}
+
+			oOpElem.find('.sfc_op_content input').each(function(){
+				$(this).val(aValues[0].value);
+			});
+
+			return true;
+		},
 
 
 		// Values helpers
diff --git a/js/search/search_form_handler.js b/js/search/search_form_handler.js
index 47b7edcce..7e6998737 100644
--- a/js/search/search_form_handler.js
+++ b/js/search/search_form_handler.js
@@ -11,6 +11,7 @@ $(function()
 		{
 			'criterion_outer_selector': null,
 			'result_list_outer_selector': null,
+			'data_config_list_selector': null,
 			'submit_button_selector': null,
 			'hide_initial_criterion': false, // TODO: What is that?
 			'endpoint': null,
@@ -133,10 +134,10 @@ $(function()
 			});
 
 			// Criteria events
-			this.element.bind('itop.search.criteria.value_changed', function(oEvent, oData){
+			this.element.on('itop.search.criteria.value_changed', function(oEvent, oData){
 				me._onCriteriaValueChanged(oData);
 			});
-			this.element.bind('itop.search.criteria.removed', function(oEvent, oData){
+			this.element.on('itop.search.criteria.removed', function(oEvent, oData){
 				me._onCriteriaRemoved(oData);
 			});
 		},
@@ -268,6 +269,7 @@ $(function()
 			}
 			else
 			{
+				// TODO: Change this so it appears after the search drawer.
 				oResultAreaElem = $('<div></div>').appendTo(this.element);
 			}
 			oResultAreaElem.addClass('sf_results_area');
@@ -404,13 +406,23 @@ $(function()
 		_submit: function()
 		{
 			var me = this;
+
+			// Data
+			// - Regular params
 			var oData = {
 				'params': JSON.stringify({
 					'base_oql': this.options.search.base_oql,
 					'criterion': this.options.search.criterion,
 				}),
-				'list_params': this.elements.results_area.data('sExtraParams'),
 			};
+			// - List params (pass through for the server), merge data_config with list_params if present.
+			var oListParams = {};
+			if(this.options.data_config_list_selector !== null)
+			{
+				// TODO: What ?
+			}
+			$.extend(oListParams, this.options.list_params);
+			oData.list_params = JSON.stringify(oListParams);
 
 			// Show loader
 			this._showLoader();

From 6ef31b7983a7008360a23be8fb0765f7ab75d5ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Thu, 15 Mar 2018 13:33:16 +0000
Subject: [PATCH 044/202] Fix code typos

SVN:b1162[5431]
---
 .../form/field/datetimefield.class.inc.php    | 19 +++++++++++--------
 .../consolesimplefieldrenderer.class.inc.php  | 17 ++++++++---------
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/sources/form/field/datetimefield.class.inc.php b/sources/form/field/datetimefield.class.inc.php
index 76ea5bb60..9edc1ddd0 100644
--- a/sources/form/field/datetimefield.class.inc.php
+++ b/sources/form/field/datetimefield.class.inc.php
@@ -19,9 +19,6 @@
 
 namespace Combodo\iTop\Form\Field;
 
-use \AttributeDatetime;
-use \Combodo\iTop\Form\Field\StringField;
-
 /**
  * A field for Dates and Date & Times, supporting custom formats
  */
@@ -30,7 +27,7 @@ class DateTimeField extends StringField
 	protected $sJSDateTimeFormat;
 	protected $sPHPDateTimeFormat;
 	protected $bDateOnly;
-	
+
 	/**
 	 * Overloaded constructor
 	 *
@@ -42,9 +39,10 @@ class DateTimeField extends StringField
 		parent::__construct($sId, $onFinalizeCallback);
 		$this->bDateOnly = false;
 	}
-	
+
 	/**
 	 * Get the PHP format string
+	 *
 	 * @return string
 	 */
 	public function GetPHPDateTimeFormat()
@@ -55,14 +53,16 @@ class DateTimeField extends StringField
 	/**
 	 *
 	 * @param string $sFormat
+	 *
 	 * @return \Combodo\iTop\Form\Field\DateTimeField
 	 */
 	public function SetPHPDateTimeFormat($sDateTimeFormat)
 	{
 		$this->sPHPDateTimeFormat = $sDateTimeFormat;
+
 		return $this;
 	}
-	
+
 	/**
 	 * @return string
 	 */
@@ -74,23 +74,26 @@ class DateTimeField extends StringField
 	/**
 	 *
 	 * @param string $sFormat
+	 *
 	 * @return \Combodo\iTop\Form\Field\DateTimeField
 	 */
 	public function SetJSDateTimeFormat($sDateTimeFormat)
 	{
 		$this->sDateTimeFormat = $sDateTimeFormat;
+
 		return $this;
 	}
-	
+
 	/**
 	 * Set the DateOnly flag
+	 *
 	 * @return \Combodo\iTop\Form\Field\DateTimeField
 	 */
 	public function SetDateOnly($bDateOnly)
 	{
 		return $this->bDateOnly = $bDateOnly;
-		return $this;
 	}
+
 	/**
 	 * @return bool
 	 */
diff --git a/sources/renderer/console/fieldrenderer/consolesimplefieldrenderer.class.inc.php b/sources/renderer/console/fieldrenderer/consolesimplefieldrenderer.class.inc.php
index b41ab6c31..35f5af2bb 100644
--- a/sources/renderer/console/fieldrenderer/consolesimplefieldrenderer.class.inc.php
+++ b/sources/renderer/console/fieldrenderer/consolesimplefieldrenderer.class.inc.php
@@ -18,16 +18,16 @@
 
 namespace Combodo\iTop\Renderer\Console\FieldRenderer;
 
-use \Dict;
+use AttributeDate;
+use AttributeDateTime;
+use AttributeDuration;
+use Combodo\iTop\Form\Field\TextAreaField;
 use Combodo\iTop\Renderer\FieldRenderer;
 use Combodo\iTop\Renderer\RenderingOutput;
-use Combodo\iTop\Form\Field\TextAreaField;
-use \InlineImage;
-use \UserRights;
-use \AttributeDuration;
-use \DateTimeFormat;
-use \AttributeDateTime;
-use \AttributeDate;
+use DateTimeFormat;
+use Dict;
+use InlineImage;
+use UserRights;
 
 class ConsoleSimpleFieldRenderer extends FieldRenderer
 {
@@ -217,7 +217,6 @@ EOF
 
 		switch ($sFieldClass)
 		{
-			case 'Combodo\\iTop\Form\\Field\\DateTimeField':
 			case 'Combodo\\iTop\\Form\\Field\\DateTimeField':
 				$sDateTimeFormat = $this->oField->GetPHPDateTimeFormat();
 				$oFormat = new DateTimeFormat($sDateTimeFormat);

From e48e4e713972091e07929f8998682a0a55e7202b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Thu, 15 Mar 2018 13:35:35 +0000
Subject: [PATCH 045/202] Advanced Search: Dates between

SVN:b1162[5432]
---
 .../criteriontooql.class.inc.php              | 139 +++++++++++--
 .../criteriontosearchform.class.inc.php       | 194 ++++++++++++++++--
 .../criterionconversionabstract.class.inc.php |   2 +
 .../search/searchform.class.inc.php           |   2 +
 .../search/CriterionConversionTest.php        |  59 ++++++
 test/application/search/SearchFormTest.php    |   7 +-
 6 files changed, 360 insertions(+), 43 deletions(-)

diff --git a/sources/application/search/criterionconversion/criteriontooql.class.inc.php b/sources/application/search/criterionconversion/criteriontooql.class.inc.php
index 1b43e52f6..c4fb75e4c 100644
--- a/sources/application/search/criterionconversion/criteriontooql.class.inc.php
+++ b/sources/application/search/criterionconversion/criteriontooql.class.inc.php
@@ -23,8 +23,11 @@
 namespace Combodo\iTop\Application\Search\CriterionConversion;
 
 
+use AttributeDateTime;
+use AttributeDefinition;
 use Combodo\iTop\Application\Search\CriterionConversionAbstract;
 use Combodo\iTop\Application\Search\SearchForm;
+use DateInterval;
 
 class CriterionToOQL extends CriterionConversionAbstract
 {
@@ -51,6 +54,8 @@ class CriterionToOQL extends CriterionConversionAbstract
 			self::OP_ENDS_WITH => 'EndsWithToOql',
 			self::OP_EMPTY => 'EmptyToOql',
 			self::OP_NOT_EMPTY => 'NotEmptyToOql',
+			self::OP_BETWEEN_DAYS => 'BetweenDaysToOql',
+			self::OP_BETWEEN_HOURS => 'BetweenHoursToOql',
 			self::OP_IN => 'InToOql',
 			self::OP_ALL => 'AllToOql',
 		);
@@ -59,7 +64,7 @@ class CriterionToOQL extends CriterionConversionAbstract
 		{
 			$sFct = $aMappedOperators[$sOperator];
 
-			return self::$sFct($sRef, $sOperator, $aCriteria);
+			return self::$sFct($sRef, $aCriteria);
 		}
 
 		$sValue = self::GetValue(self::GetValues($aCriteria), 0);
@@ -73,6 +78,7 @@ class CriterionToOQL extends CriterionConversionAbstract
 		{
 			return array();
 		}
+
 		return $aCriteria['values'];
 	}
 
@@ -86,10 +92,11 @@ class CriterionToOQL extends CriterionConversionAbstract
 		{
 			return null;
 		}
+
 		return $aValues[$iIndex]['value'];
 	}
 
-	protected static function ContainsToOql($sRef, $sOperator, $aCriteria)
+	protected static function ContainsToOql($sRef, $aCriteria)
 	{
 		$aValues = self::GetValues($aCriteria);
 		$sValue = self::GetValue($aValues, 0);
@@ -97,7 +104,7 @@ class CriterionToOQL extends CriterionConversionAbstract
 		return "({$sRef} LIKE '%{$sValue}%')";
 	}
 
-	protected static function StartsWithToOql($sRef, $sOperator, $aCriteria)
+	protected static function StartsWithToOql($sRef, $aCriteria)
 	{
 		$aValues = self::GetValues($aCriteria);
 		$sValue = self::GetValue($aValues, 0);
@@ -105,7 +112,7 @@ class CriterionToOQL extends CriterionConversionAbstract
 		return "({$sRef} LIKE '{$sValue}%')";
 	}
 
-	protected static function EndsWithToOql($sRef, $sOperator, $aCriteria)
+	protected static function EndsWithToOql($sRef, $aCriteria)
 	{
 		$aValues = self::GetValues($aCriteria);
 		$sValue = self::GetValue($aValues, 0);
@@ -113,25 +120,26 @@ class CriterionToOQL extends CriterionConversionAbstract
 		return "({$sRef} LIKE '%{$sValue}')";
 	}
 
-	protected static function EmptyToOql($sRef, $sOperator, $aCriteria)
+	protected static function EmptyToOql($sRef, $aCriteria)
 	{
 		return "({$sRef} = '')";
 	}
 
-	protected static function NotEmptyToOql($sRef, $sOperator, $aCriteria)
+	protected static function NotEmptyToOql($sRef, $aCriteria)
 	{
 		return "({$sRef} != '')";
 	}
 
-	protected static function InToOql($sRef, $sOperator, $aCriteria)
+	protected static function InToOql($sRef, $aCriteria)
 	{
 		$sAttCode = $aCriteria['code'];
 		$sClass = $aCriteria['class'];
-		$aValues = $aCriteria['values'];
+		$aValues = self::GetValues($aCriteria);
 
 		if (count($aValues) == 0)
 		{
-			return "({$sRef}  = '')";
+			// Ignore when nothing is selected
+			return "1";
 		}
 
 		try
@@ -143,17 +151,21 @@ class CriterionToOQL extends CriterionConversionAbstract
 				$aAllowedValues = SearchForm::GetFieldAllowedValues($oAttDef);
 				if (array_key_exists('values', $aAllowedValues))
 				{
-					$aAllowedValues = $aAllowedValues['values'];
-					// more selected values than remaining so use NOT IN
-					if (count($aValues) > (count($aAllowedValues) / 2))
+					// Can't invert the test if NULL is allowed
+					if (!$oAttDef->IsNullAllowed())
 					{
-						foreach($aValues as $aValue)
+						$aAllowedValues = $aAllowedValues['values'];
+						// more selected values than remaining so use NOT IN
+						if (count($aValues) > (count($aAllowedValues) / 2))
 						{
-							unset($aAllowedValues[$aValue['value']]);
-						}
-						$sInList = implode(',', array_keys($aAllowedValues));
+							foreach($aValues as $aValue)
+							{
+								unset($aAllowedValues[$aValue['value']]);
+							}
+							$sInList = implode("','", array_keys($aAllowedValues));
 
-						return "({$sRef} NOT IN ($sInList))";
+							return "({$sRef} NOT IN ('$sInList'))";
+						}
 					}
 				}
 			}
@@ -166,17 +178,104 @@ class CriterionToOQL extends CriterionConversionAbstract
 		{
 			$aInValues[] = $aValue['value'];
 		}
-		$sInList = implode(',', $aInValues);
+		$sInList = implode("','", $aInValues);
 
 		if (count($aInValues) == 1)
 		{
 			return "({$sRef} = '$sInList')";
 		}
 
-		return "({$sRef} IN ($sInList))";
+		return "({$sRef} IN ('$sInList'))";
 	}
 
-	protected static function AllToOql($sRef, $sOperator, $aCriteria)
+	protected static function BetweenDaysToOql($sRef, $aCriteria)
+	{
+		$aOQL = array();
+
+		$aValues = self::GetValues($aCriteria);
+		if (count($aValues) != 2)
+		{
+			return "1";
+		}
+
+		$oFormat = AttributeDateTime::GetFormat();
+
+		$sStartDate = $aValues[0]['value'];
+		if (!empty($sStartDate))
+		{
+			$oDate = $oFormat->parse($sStartDate);
+			$sStartDate = $oDate->format(AttributeDateTime::GetSQLFormat());
+			$aOQL[] = "({$sRef} >= '$sStartDate')";
+		}
+
+		$sEndDate = $aValues[1]['value'];
+		if (!empty($sEndDate))
+		{
+			$oDate = $oFormat->parse($sEndDate);
+			if ($aCriteria['widget'] == AttributeDefinition::SEARCH_WIDGET_TYPE_DATE_TIME)
+			{
+				$oDate->add(DateInterval::createFromDateString('1 day'));
+				$sEndDate = $oDate->format(AttributeDateTime::GetSQLFormat());
+				$aOQL[] = "({$sRef} < '$sEndDate')";
+			}
+			else
+			{
+				$sEndDate = $oDate->format(AttributeDateTime::GetSQLFormat());
+				$aOQL[] = "({$sRef} <= '$sEndDate')";
+			}
+		}
+
+		$sOQL = implode(' AND ', $aOQL);
+
+		if (empty($sOQL))
+		{
+			$sOQL = "1";
+		}
+
+		return $sOQL;
+	}
+
+	protected static function BetweenHoursToOql($sRef, $aCriteria)
+	{
+		$aOQL = array();
+
+		$aValues = self::GetValues($aCriteria);
+		if (count($aValues) != 2)
+		{
+			return "1";
+		}
+
+		$oFormat = AttributeDateTime::GetFormat();
+
+		$sStartDate = $aValues[0]['value'];
+		if (!empty($sStartDate))
+		{
+			$oDate = $oFormat->parse($sStartDate);
+			$sStartDate = $oDate->format(AttributeDateTime::GetSQLFormat());
+			$aOQL[] = "({$sRef} >= '$sStartDate')";
+		}
+
+		$sEndDate = $aValues[1]['value'];
+		if (!empty($sEndDate))
+		{
+			$oDate = $oFormat->parse($sEndDate);
+			$oDate->add(DateInterval::createFromDateString('1 second'));
+			$sEndDate = $oDate->format(AttributeDateTime::GetSQLFormat());
+			$aOQL[] = "({$sRef} < '$sEndDate')";
+		}
+
+		$sOQL = implode(' AND ', $aOQL);
+
+		if (empty($sOQL))
+		{
+			$sOQL = "1";
+		}
+
+		return $sOQL;
+	}
+
+
+	protected static function AllToOql($sRef, $aCriteria)
 	{
 		return "1";
 	}
diff --git a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
index 5c1d5620a..5389f3d2e 100644
--- a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
+++ b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
@@ -25,8 +25,11 @@
 namespace Combodo\iTop\Application\Search\CriterionConversion;
 
 
+use AttributeDateTime;
 use AttributeDefinition;
 use Combodo\iTop\Application\Search\CriterionConversionAbstract;
+use DateInterval;
+use DateTime;
 
 class CriterionToSearchForm extends CriterionConversionAbstract
 {
@@ -67,12 +70,158 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 
 		// Regroup criterion by variable name
 		usort($aAndCriterion, function ($a, $b) {
-			return strcmp($a['ref'], $b['ref']);
+			$iRefCmp = strcmp($a['ref'], $b['ref']);
+			if ($iRefCmp != 0) return $iRefCmp;
+			$iOpCmp = strcmp($a['operator'], $b['operator']);
+
+			return $iOpCmp;
 		});
 
-		return $aAndCriterion;
+		$aMergeFctByWidget = array(
+			AttributeDefinition::SEARCH_WIDGET_TYPE_DATE => 'MergeDate',
+			AttributeDefinition::SEARCH_WIDGET_TYPE_DATE_TIME => 'MergeDateTime',
+		);
+
+		$aPrevCriterion = null;
+		$aMergedCriterion = array();
+		foreach($aAndCriterion as $aCurrCriterion)
+		{
+			if (!is_null($aPrevCriterion))
+			{
+				if (strcmp($aPrevCriterion['ref'], $aCurrCriterion['ref']) == 0)
+				{
+					// Same attribute, try to merge
+					if (array_key_exists('widget', $aCurrCriterion))
+					{
+						if (array_key_exists($aCurrCriterion['widget'], $aMergeFctByWidget))
+						{
+							$sFct = $aMergeFctByWidget[$aCurrCriterion['widget']];
+							$aPrevCriterion = self::$sFct($aPrevCriterion, $aCurrCriterion, $aMergedCriterion);
+							continue;
+						}
+					}
+				}
+				$aMergedCriterion[] = $aPrevCriterion;
+			}
+
+			$aPrevCriterion = $aCurrCriterion;
+		}
+		if (!is_null($aPrevCriterion))
+		{
+			$aMergedCriterion[] = $aPrevCriterion;
+		}
+
+		return $aMergedCriterion;
 	}
 
+	/**
+	 * @param $aPrevCriterion
+	 * @param $aCurrCriterion
+	 * @param $aMergedCriterion
+	 *
+	 * @return null
+	 * @throws \Exception
+	 */
+	protected static function MergeDate($aPrevCriterion, $aCurrCriterion, &$aMergedCriterion)
+	{
+		$sPrevOperator = $aPrevCriterion['operator'];
+		$sCurrOperator = $aCurrCriterion['operator'];
+		if ((($sPrevOperator != '<') && ($sPrevOperator != '<=')) || (($sCurrOperator != '>') && ($sCurrOperator != '>=')))
+		{
+			$aMergedCriterion[] = $aPrevCriterion;
+
+			return $aCurrCriterion;
+		}
+
+		// Merge into 'between' operation.
+		// The ends of the interval are included
+		$aCurrCriterion['operator'] = 'between_days';
+		$sFormat = AttributeDateTime::GetFormat()->ToMomentJS();
+		$sLastDate = $aPrevCriterion['values'][0]['value'];
+		if ($sPrevOperator == '<')
+		{
+			// previous day to include ends
+			$oDate = new DateTime($sLastDate);
+			$oDate->sub(DateInterval::createFromDateString('1 day'));
+			$sLastDate = $oDate->format($sFormat);
+		}
+
+		$sFirstDate = $aCurrCriterion['values'][0]['value'];
+		if ($sCurrOperator == '>')
+		{
+			// next day to include ends
+			$oDate = new DateTime($sFirstDate);
+			$oDate->add(DateInterval::createFromDateString('1 day'));
+			$sFirstDate = $oDate->format($sFormat);
+		}
+
+		$aCurrCriterion['values'] = array();
+		$aCurrCriterion['values'][] = array('value' => $sFirstDate, 'label' => $sFirstDate);
+		$aCurrCriterion['values'][] = array('value' => $sLastDate, 'label' => $sLastDate);
+
+		$aCurrCriterion['oql'] = "({$aPrevCriterion['oql']} AND {$aCurrCriterion['oql']})";
+
+		$aMergedCriterion[] = $aCurrCriterion;
+
+		return null;
+	}
+
+	protected static function MergeDateTime($aPrevCriterion, $aCurrCriterion, &$aMergedCriterion)
+	{
+		$sPrevOperator = $aPrevCriterion['operator'];
+		$sCurrOperator = $aCurrCriterion['operator'];
+		if ((($sPrevOperator != '<') && ($sPrevOperator != '<=')) || (($sCurrOperator != '>') && ($sCurrOperator != '>=')))
+		{
+			$aMergedCriterion[] = $aPrevCriterion;
+
+			return $aCurrCriterion;
+		}
+
+		// Merge into 'between' operation.
+		// The ends of the interval are included
+		$sLastDate = $aPrevCriterion['values'][0]['value'];
+		$sFirstDate = $aCurrCriterion['values'][0]['value'];
+		$oDate = new DateTime($sLastDate);
+		if ((strpos($sFirstDate, '00:00:00') != false) && (strpos($sLastDate, '00:00:00') != false))
+		{
+			$aCurrCriterion['operator'] = 'between_days';
+			$sInterval = '1 day';
+		}
+		else
+		{
+			$aCurrCriterion['operator'] = 'between_hours';
+			$sInterval = '1 second';
+		}
+
+		if ($sPrevOperator == '<')
+		{
+			// previous day/second to include ends
+			$oDate->sub(DateInterval::createFromDateString($sInterval));
+		}
+		$sLastDate = $oDate->format(AttributeDateTime::GetSQLFormat());
+		$sLastDate = AttributeDateTime::GetFormat()->Format($sLastDate);
+
+		$oDate = new DateTime($sFirstDate);
+		if ($sCurrOperator == '>')
+		{
+			// next day/second to include ends
+			$oDate->add(DateInterval::createFromDateString($sInterval));
+		}
+		$sFirstDate = $oDate->format(AttributeDateTime::GetSQLFormat());
+		$sFirstDate = AttributeDateTime::GetFormat()->Format($sFirstDate);
+
+		$aCurrCriterion['values'] = array();
+		$aCurrCriterion['values'][] = array('value' => $sFirstDate, 'label' => $sFirstDate);
+		$aCurrCriterion['values'][] = array('value' => $sLastDate, 'label' => $sLastDate);
+
+		$aCurrCriterion['oql'] = "({$aPrevCriterion['oql']} AND {$aCurrCriterion['oql']})";
+
+		$aMergedCriterion[] = $aCurrCriterion;
+
+		return null;
+	}
+
+
 	protected static function TextToSearchForm($aCriteria, $aFields)
 	{
 		$sOperator = $aCriteria['operator'];
@@ -115,6 +264,14 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 	protected static function EnumToSearchForm($aCriteria, $aFields)
 	{
 		$sOperator = $aCriteria['operator'];
+		if ($sOperator == '=')
+		{
+			$aCriteria['operator'] = 'IN';
+		}
+		if ($sOperator != 'NOT IN')
+		{
+			return $aCriteria;
+		}
 		$sRef = $aCriteria['ref'];
 		$aValues = $aCriteria['values'];
 		if (array_key_exists($sRef, $aFields))
@@ -126,26 +283,21 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 			}
 		}
 
-		switch (true)
+		if (isset($aAllowedValues))
 		{
-			case ($sOperator == 'NOT IN'):
-				if (isset($aAllowedValues))
-				{
-					foreach($aValues as $aValue)
-					{
-						$sValue = $aValue['value'];
-						unset($aAllowedValues[$sValue]);
-					}
-					$aCriteria['values'] = array();
-					
-					foreach($aAllowedValues as $sValue => $sLabel)
-					{
-						$aValue = array('value' => $sValue, 'label' => $sLabel);
-						$aCriteria['values'][] = $aValue;
-					}
-					$aCriteria['operator'] = 'IN';
-				}
-				break;
+			foreach($aValues as $aValue)
+			{
+				$sValue = $aValue['value'];
+				unset($aAllowedValues[$sValue]);
+			}
+			$aCriteria['values'] = array();
+
+			foreach($aAllowedValues as $sValue => $sLabel)
+			{
+				$aValue = array('value' => $sValue, 'label' => $sLabel);
+				$aCriteria['values'][] = $aValue;
+			}
+			$aCriteria['operator'] = 'IN';
 		}
 
 		return $aCriteria;
diff --git a/sources/application/search/criterionconversionabstract.class.inc.php b/sources/application/search/criterionconversionabstract.class.inc.php
index 469cfd631..e0eb743be 100644
--- a/sources/application/search/criterionconversionabstract.class.inc.php
+++ b/sources/application/search/criterionconversionabstract.class.inc.php
@@ -32,6 +32,8 @@ abstract class CriterionConversionAbstract
 	const OP_EMPTY = 'empty';
 	const OP_NOT_EMPTY = 'not_empty';
 	const OP_IN = 'IN';
+	const OP_BETWEEN_DAYS = 'between_days';
+	const OP_BETWEEN_HOURS = 'between_hours';
 	const OP_ALL = 'all';
 
 }
diff --git a/sources/application/search/searchform.class.inc.php b/sources/application/search/searchform.class.inc.php
index 8f51a8100..6ff64038e 100644
--- a/sources/application/search/searchform.class.inc.php
+++ b/sources/application/search/searchform.class.inc.php
@@ -24,6 +24,7 @@ namespace Combodo\iTop\Application\Search;
 
 
 use ApplicationContext;
+use AttributeDateTime;
 use AttributeDefinition;
 use CMDBObjectSet;
 use Combodo\iTop\Application\Search\CriterionConversion\CriterionToSearchForm;
@@ -149,6 +150,7 @@ class SearchForm
             'result_list_outer_selector' => "#{$aExtraParams['table_id']}",
             'data_config_list_selector' => null,                                            //this one will be set just bellow, it mean to tell the widget where to find the initial list configuration
 			'endpoint' => utils::GetAbsoluteUrlAppRoot().'pages/ajax.searchform.php',
+			'date_format' => AttributeDateTime::GetFormat()->ToMomentJS(),
 			'list_params' => $aListParams,
 			'search' => array(
 				'fields' => $aFields,
diff --git a/test/application/search/CriterionConversionTest.php b/test/application/search/CriterionConversionTest.php
index 239781fa4..876c4cdc9 100644
--- a/test/application/search/CriterionConversionTest.php
+++ b/test/application/search/CriterionConversionTest.php
@@ -30,6 +30,7 @@ namespace Combodo\iTop\Test\UnitTest\Application\Search;
 
 use Combodo\iTop\Application\Search\CriterionConversion\CriterionToOQL;
 use Combodo\iTop\Application\Search\CriterionConversion\CriterionToSearchForm;
+use Combodo\iTop\Application\Search\CriterionParser;
 use Combodo\iTop\Application\Search\SearchForm;
 use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
 
@@ -293,4 +294,62 @@ class CriterionConversionTest extends ItopDataTestCase
 			),
 		);
 	}
+
+	/**
+	 * @dataProvider OqlProvider
+	 * @throws \OQLException
+	 */
+	function testOqlToForlSearchToOql($sOQL)
+	{
+		$oSearchForm = new SearchForm();
+		$oSearch = \DBSearch::FromOQL($sOQL);
+		$aFields = $oSearchForm->GetFields(new \DBObjectSet($oSearch));
+		$aCriterion = $oSearchForm->GetCriterion($oSearch, $aFields);
+		$this->debug($sOQL);
+
+		$aAndCriterion = $aCriterion['or'][0]['and'];
+
+		$aNewCriterion = array();
+		foreach($aAndCriterion as $aCriteria)
+		{
+			if (($aCriteria['widget'] == \AttributeDefinition::SEARCH_WIDGET_TYPE_STRING)
+				|| ($aCriteria['widget'] == \AttributeDefinition::SEARCH_WIDGET_TYPE_DATE_TIME)
+				|| ($aCriteria['widget'] == \AttributeDefinition::SEARCH_WIDGET_TYPE_ENUM))
+			{
+				unset($aCriteria['oql']);
+				$aField = $aFields['zlist'][$aCriteria['ref']];
+				$aCriteria['code'] = $aField['code'];
+				$aCriteria['class'] = $aField['class'];
+			}
+
+			$aNewCriterion[] = $aCriteria;
+		}
+		$this->debug($aNewCriterion);
+
+		$aCriterion['or'][0]['and'] = $aNewCriterion;
+
+		$oSearch->ResetCondition();
+		$oFilter = CriterionParser::Parse($oSearch->ToOQL(), $aCriterion);
+
+		$this->debug($oFilter->ToOQL());
+
+		$this->assertTrue(true);
+	}
+
+	function OqlProvider()
+	{
+		return array(
+			array('OQL' => "SELECT Contact WHERE status = 'active'"),
+			array('OQL' => "SELECT Contact WHERE status = 'active' AND name LIKE 'toto%'"),
+			array('OQL' => "SELECT Contact WHERE status = 'active' AND org_id = 3"),
+			array('OQL' => "SELECT Contact WHERE status IN ('active', 'inactive')"),
+			array('OQL' => "SELECT Contact WHERE status NOT IN ('active')"),
+			array('OQL' => "SELECT UserRequest WHERE DATE_SUB(NOW(), INTERVAL 14 DAY) < start_date"),
+			array('OQL' => "SELECT UserRequest WHERE start_date > '2017-01-01 00:00:00' AND '2018-01-01 00:00:00' >= start_date"),
+			array('OQL' => "SELECT UserRequest WHERE start_date > '2017-01-01 00:00:00' AND status = 'active' AND org_id = 3 AND '2018-01-01 00:00:00' >= start_date"),
+			array('OQL' => "SELECT UserRequest WHERE start_date >= '2017-01-01 00:00:00' AND '2017-01-01 00:00:00' >= start_date"),
+			array('OQL' => "SELECT UserRequest WHERE start_date >= '2017-01-01 00:00:00' AND '2017-01-01 01:00:00' > start_date"),
+			array('OQL' => "SELECT UserRequest WHERE start_date >= '2017-01-01 00:00:00' AND '2017-01-02 00:00:00' > start_date"),
+		);
+	}
 }
diff --git a/test/application/search/SearchFormTest.php b/test/application/search/SearchFormTest.php
index 97e5d5924..054fdd3bb 100644
--- a/test/application/search/SearchFormTest.php
+++ b/test/application/search/SearchFormTest.php
@@ -98,8 +98,11 @@ class SearchFormTest extends ItopDataTestCase
 			array('OQL' => "SELECT Contact WHERE status NOT IN ('active', 'inactive')", 1),
 			array('OQL' => "SELECT Contact WHERE status = 'active' OR name LIKE 'toto%'", 2),
 			array('OQL' => "SELECT UserRequest WHERE DATE_SUB(NOW(), INTERVAL 14 DAY) < start_date", 1),
-			array('OQL' => "SELECT UserRequest WHERE start_date > '2017-01-01' AND '2018-01-01' >= start_date", 1),
-			array('OQL' => "SELECT UserRequest WHERE start_date > '2017-01-01' AND status = 'active' AND org_id = 3 AND '2018-01-01' >= start_date", 1),
+			array('OQL' => "SELECT UserRequest WHERE start_date > '2017-01-01 00:00:00' AND '2018-01-01 00:00:00' >= start_date", 1),
+			array('OQL' => "SELECT UserRequest WHERE start_date > '2017-01-01 00:00:00' AND status = 'active' AND org_id = 3 AND '2018-01-01 00:00:00' >= start_date", 1),
+			array('OQL' => "SELECT UserRequest WHERE start_date >= '2017-01-01 00:00:00' AND '2017-01-01 00:00:00' >= start_date", 1),
+			array('OQL' => "SELECT UserRequest WHERE start_date >= '2017-01-01 00:00:00' AND '2017-01-01 01:00:00' > start_date", 1),
+			array('OQL' => "SELECT UserRequest WHERE start_date >= '2017-01-01 00:00:00' AND '2017-01-02 00:00:00' > start_date", 1),
 		);
 	}
 }

From a03a4af1e65e78caa84de6193933106e2e961cbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Thu, 15 Mar 2018 13:48:38 +0000
Subject: [PATCH 046/202] Advanced Search: warnings and default div removed

SVN:b1162[5433]
---
 sources/application/search/searchform.class.inc.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sources/application/search/searchform.class.inc.php b/sources/application/search/searchform.class.inc.php
index 6ff64038e..4c38f86ad 100644
--- a/sources/application/search/searchform.class.inc.php
+++ b/sources/application/search/searchform.class.inc.php
@@ -138,13 +138,16 @@ class SearchForm
 		if (!isset($aExtraParams['table_id']))
 		{
 			$aExtraParams['table_id'] = "search_form_result_{$sSearchFormId}";
-			$sHtml .= "<div class=\"display_block\" id=\"search_form_result_{$sSearchFormId}\"></div>\n";
 		}
 		$aListParams['table_id'] = $aExtraParams['table_id'];
 		if (array_key_exists('table_inner_id', $aExtraParams))
 		{
 			$aListParams['table_inner_id'] = $aExtraParams['table_inner_id'];
 		}
+		else
+		{
+			$aListParams['table_inner_id'] = uniqid('table_inner_id_');
+		}
 		$aSearchParams = array(
 			'criterion_outer_selector' => "#fs_{$sSearchFormId}_criterion_outer",
             'result_list_outer_selector' => "#{$aExtraParams['table_id']}",

From 87ed90a8258b17e86bbc671fd1688f1249800818 Mon Sep 17 00:00:00 2001
From: Guillaume Lajarige <guillaume.lajarige@combodo.com>
Date: Thu, 15 Mar 2018 13:58:42 +0000
Subject: [PATCH 047/202] Advanced search: WIP POC, UI/UX.

SVN:b1162[5434]
---
 application/nicewebpage.class.inc.php  |   1 +
 css/light-grey.css                     | 101 ++++++----
 css/light-grey.scss                    | 247 +++++++++++++++----------
 dictionaries/en.dictionary.itop.ui.php |   1 +
 js/search/search_form_criteria.js      |  33 +++-
 js/search/search_form_criteria_raw.js  |   2 +
 js/search/search_form_handler.js       |  56 ++++--
 7 files changed, 282 insertions(+), 159 deletions(-)

diff --git a/application/nicewebpage.class.inc.php b/application/nicewebpage.class.inc.php
index 3e6b55a66..f940ac17d 100644
--- a/application/nicewebpage.class.inc.php
+++ b/application/nicewebpage.class.inc.php
@@ -55,6 +55,7 @@ class NiceWebPage extends WebPage
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_raw.js');
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_string.js');
 	    // TODO: Remove
+	    $this->add_dict_entry('UI:Search:Criterion:MoreMenu:AddCriteria');
 	    $this->add_dict_entry('UI:Search:Criteria:Operator:Default:Empty');
 	    $this->add_dict_entry('UI:Search:Criteria:Operator:Default:NotEmpty');
 	    $this->add_dict_entry('UI:Search:Criteria:Operator:Default:Equals');
diff --git a/css/light-grey.css b/css/light-grey.css
index 8407ed636..b4661e15a 100644
--- a/css/light-grey.css
+++ b/css/light-grey.css
@@ -779,10 +779,16 @@ div.HRDrawer {
   /* More criterion */
 }
 .search_form_handler .sf_criterion_area .sf_active_criterion, .search_form_handler .sf_criterion_area .sf_more_criterion {
+  position: relative;
   display: inline-block;
 }
-.search_form_handler .sf_criterion_area .sf_more_criterion, .search_form_handler .sf_criterion_area .search_form_criteria {
-  position: relative;
+.search_form_handler .sf_criterion_area .search_form_criteria.opened .sfc_header, .search_form_handler .sf_criterion_area .sf_more_criterion.opened .sfc_header, .search_form_handler .sf_criterion_area .search_form_criteria.opened .sfm_header, .search_form_handler .sf_criterion_area .sf_more_criterion.opened .sfm_header {
+  border-bottom: none !important;
+  box-shadow: none !important;
+  padding-bottom: 13px;
+  /* Must be equal to .search_form_criteria:margin-bottom + this:padding-bottom */
+}
+.search_form_handler .sf_criterion_area .search_form_criteria > *, .search_form_handler .sf_criterion_area .sf_more_criterion > * {
   padding: 7px 8px;
   vertical-align: top;
   background-color: #d6e8ef;
@@ -791,24 +797,40 @@ div.HRDrawer {
   border-radius: 1px;
   box-shadow: 0 1px 1px rgba(0, 0, 0, 0.15);
 }
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group, .search_form_handler .sf_criterion_area .sf_more_criterion .sfc_form_group, .search_form_handler .sf_criterion_area .search_form_criteria .sfm_content, .search_form_handler .sf_criterion_area .sf_more_criterion .sfm_content {
+  position: absolute;
+  z-index: -1;
+  min-width: 100%;
+  left: 0px;
+  margin-top: -1px;
+}
 .search_form_handler .sf_criterion_area .search_form_criteria {
+  position: relative;
   display: inline-block;
   margin-right: 5px;
   margin-bottom: 5px;
   /* Non editable criteria */
   /* Draft criteria (modifications not applied) */
+  /* Opened criteria (form group displayed) */
   /* Top left corner icons */
   /* Special criterion processing */
 }
 .search_form_handler .sf_criterion_area .search_form_criteria.locked {
   background-color: #f1f1f1;
 }
-.search_form_handler .sf_criterion_area .search_form_criteria.draft {
+.search_form_handler .sf_criterion_area .search_form_criteria.draft .sfc_header, .search_form_handler .sf_criterion_area .search_form_criteria.draft .sfc_form_group {
   border-style: dashed;
 }
 .search_form_handler .sf_criterion_area .search_form_criteria.draft .sfc_title {
   font-style: italic;
 }
+.search_form_handler .sf_criterion_area .search_form_criteria.opened {
+  z-index: 1;
+  /* To be over other criterion */
+}
+.search_form_handler .sf_criterion_area .search_form_criteria.opened .sfc_form_group {
+  display: block;
+}
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_close, .search_form_handler .sf_criterion_area .search_form_criteria .sfc_toggle {
   position: absolute;
   top: 7px;
@@ -832,47 +854,44 @@ div.HRDrawer {
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group {
   /* Form group (operators) is displayed only when the criteria is toggled to opened state */
   display: none;
-}
-.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened {
-  display: block;
-  margin-top: 5px;
   /* Show only first operator in simple mode */
   /* Show all operators in advanced mode */
 }
-.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_operators {
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators {
   font-size: 12px;
 }
-.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_operators .sfc_fg_operator {
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator {
   /* Common operators for most criteria types processing*/
 }
-.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_operators .sfc_fg_operator > label {
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator > label {
   line-height: 20px;
+  white-space: nowrap;
 }
-.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_operators .sfc_fg_operator > label > * {
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator > label > * {
   display: inline-block;
   vertical-align: middle;
 }
-.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_operators .sfc_fg_operator .sfc_op_radio {
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_op_radio {
   width: 12px;
   margin: 0px;
   margin-right: 7px;
 }
-.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_operators .sfc_fg_operator.sfc_fg_operator_equals .sfc_op_name, .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_operators .sfc_fg_operator.sfc_fg_operator_contains .sfc_op_name, .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_operators .sfc_fg_operator.sfc_fg_operator_starts_with .sfc_op_name, .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_operators .sfc_fg_operator.sfc_fg_operator_ends_with .sfc_op_name {
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator.sfc_fg_operator_equals .sfc_op_name, .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator.sfc_fg_operator_contains .sfc_op_name, .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator.sfc_fg_operator_starts_with .sfc_op_name, .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator.sfc_fg_operator_ends_with .sfc_op_name {
   width: 90px;
 }
-.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_operators .sfc_fg_operator.sfc_fg_operator_equals .sfc_op_content input, .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_operators .sfc_fg_operator.sfc_fg_operator_contains .sfc_op_content input, .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_operators .sfc_fg_operator.sfc_fg_operator_starts_with .sfc_op_content input, .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_operators .sfc_fg_operator.sfc_fg_operator_ends_with .sfc_op_content input {
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator.sfc_fg_operator_equals .sfc_op_content input, .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator.sfc_fg_operator_contains .sfc_op_content input, .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator.sfc_fg_operator_starts_with .sfc_op_content input, .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator.sfc_fg_operator_ends_with .sfc_op_content input {
   width: 130px;
 }
-.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_apply, .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_cancel {
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_apply, .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_cancel {
   margin-top: 8px;
   padding: 3px 6px;
   font-size: 11px;
   /* Not bold, so it looks like 10px/bold of more/less buttons */
 }
-.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_apply {
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_apply {
   margin-right: 5px;
 }
-.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_more, .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_less {
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_more, .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_less {
   position: absolute;
   bottom: 4px;
   right: 0px;
@@ -883,31 +902,31 @@ div.HRDrawer {
   border: none;
   background-color: transparent;
 }
-.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_more > span, .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_less > span {
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_more > span, .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_less > span {
   margin-left: 3px;
 }
-.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_operator:not(:first-of-type), .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_operator:first-of-type .sfc_op_radio {
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operator:not(:first-of-type), .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operator:first-of-type .sfc_op_radio {
   display: none;
 }
-.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_less {
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_less {
   display: none;
 }
-.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened .sfc_fg_more {
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_more {
   display: inline-block;
 }
-.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened.advanced .sfc_fg_operator {
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.advanced .sfc_fg_operator {
   margin-bottom: 3px;
 }
-.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened.advanced .sfc_fg_operator:last-of-type {
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.advanced .sfc_fg_operator:last-of-type {
   margin-bottom: 0px;
 }
-.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened.advanced .sfc_fg_operator:not(:first-of-type), .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened.advanced .sfc_fg_operator:first-of-type .sfc_op_radio {
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.advanced .sfc_fg_operator:not(:first-of-type), .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.advanced .sfc_fg_operator:first-of-type .sfc_op_radio {
   display: inherit;
 }
-.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened.advanced .sfc_fg_less {
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.advanced .sfc_fg_less {
   display: inline-block;
 }
-.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.opened.advanced .sfc_fg_more {
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.advanced .sfc_fg_more {
   display: none;
 }
 .search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_raw .sfc_title {
@@ -916,17 +935,27 @@ div.HRDrawer {
 .search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_raw .sfc_form_group {
   display: none;
 }
-.search_form_handler .sf_criterion_area .sf_more_criterion .sf_mc_list {
-  position: absolute;
-  max-height: 420px;
-  margin: 0px;
-  top: 100%;
-  left: 0px;
-  overflow-y: auto;
-  background-color: #d6e8ef;
-  border: 1px solid #1c94c4;
+.search_form_handler .sf_criterion_area .sf_more_criterion.opened {
+  z-index: 2;
+  /* To be over criterion */
 }
-.search_form_handler .sf_criterion_area .sf_more_criterion .sf_mc_list .sf_mc_field {
+.search_form_handler .sf_criterion_area .sf_more_criterion.opened .sfm_content {
+  display: inherit;
+}
+.search_form_handler .sf_criterion_area .sf_more_criterion .sfm_toggler .sfm_tg_title {
+  margin-right: 7px;
+}
+.search_form_handler .sf_criterion_area .sf_more_criterion .sfm_toggler .sfm_tg_icon {
+  color: #1c94c4;
+}
+.search_form_handler .sf_criterion_area .sf_more_criterion .sfm_content {
+  display: none;
+}
+.search_form_handler .sf_criterion_area .sf_more_criterion .sfm_content .sfm_list {
+  max-height: 420px;
+  overflow-y: auto;
+}
+.search_form_handler .sf_criterion_area .sf_more_criterion .sfm_content .sfm_list .sfm_field {
   cursor: pointer;
   white-space: nowrap;
 }
diff --git a/css/light-grey.scss b/css/light-grey.scss
index e8eeaa1fd..a6a745b4e 100644
--- a/css/light-grey.scss
+++ b/css/light-grey.scss
@@ -860,23 +860,44 @@ div.HRDrawer {
 	.sf_criterion_area{
 		/* Common style between criterion and more criterion */
 		.sf_active_criterion,
-		.sf_more_criterion{
+		.sf_more_criterion {
+			position: relative;
 			display: inline-block;
 		}
-		.sf_more_criterion,
-		.search_form_criteria{
-			position: relative;
-			padding: 7px 8px;
-			vertical-align: top;
-			background-color: $box-blue-bg-color;
-			color: $box-blue-color;
-			border: $box-blue-border;
-			border-radius: $box-blue-radius;
-			box-shadow: $box-shadow-regular;
+
+		.search_form_criteria,
+		.sf_more_criterion {
+			&.opened{
+				.sfc_header,
+				.sfm_header{
+					border-bottom: none !important;
+					box-shadow: none !important;
+					padding-bottom: 13px; /* Must be equal to .search_form_criteria:margin-bottom + this:padding-bottom */
+				}
+			}
+
+			> *{
+				padding: 7px 8px;
+				vertical-align: top;
+				background-color: $box-blue-bg-color;
+				color: $box-blue-color;
+				border: $box-blue-border;
+				border-radius: $box-blue-radius;
+				box-shadow: $box-shadow-regular;
+			}
+			.sfc_form_group,
+			.sfm_content{
+				position: absolute;
+				z-index: -1;
+				min-width: 100%;
+				left: 0px;
+				margin-top: -1px;
+			}
 		}
 
 		/* Criteria tags */
 		.search_form_criteria{
+			position: relative;
 			display: inline-block;
 			margin-right: 5px;
 			margin-bottom: 5px;
@@ -887,12 +908,23 @@ div.HRDrawer {
 			}
             /* Draft criteria (modifications not applied) */
             &.draft{
-				border-style: dashed;
+				.sfc_header,
+				.sfc_form_group{
+					border-style: dashed;
+				}
 
 				.sfc_title{
 					font-style: italic;
 				}
             }
+			/* Opened criteria (form group displayed) */
+			&.opened{
+				z-index: 1; /* To be over other criterion */
+
+				.sfc_form_group{
+					display: block;
+				}
+			}
 
 			/* Top left corner icons */
 			.sfc_close,
@@ -922,106 +954,102 @@ div.HRDrawer {
 				/* Form group (operators) is displayed only when the criteria is toggled to opened state */
 				display: none;
 
-				&.opened{
-					display: block;
-					margin-top: 5px;
+				.sfc_fg_operators{
+					font-size: 12px;
 
-					.sfc_fg_operators{
-						font-size: 12px;
+					.sfc_fg_operator{
+						> label{
+							line-height: 20px;
+							white-space: nowrap;
 
-						.sfc_fg_operator{
-							> label{
-								line-height: 20px;
-
-								> *{
-									display: inline-block;
-									vertical-align: middle;
-								}
+							> *{
+								display: inline-block;
+								vertical-align: middle;
 							}
+						}
 
-							.sfc_op_radio{
-								width: 12px;
-								margin: 0px;
-								margin-right: 7px;
+						.sfc_op_radio{
+							width: 12px;
+							margin: 0px;
+							margin-right: 7px;
+						}
+
+						/* Common operators for most criteria types processing*/
+						&.sfc_fg_operator_equals,
+						&.sfc_fg_operator_contains,
+						&.sfc_fg_operator_starts_with,
+						&.sfc_fg_operator_ends_with{
+							.sfc_op_name{
+								width: 90px;
 							}
-
-							/* Common operators for most criteria types processing*/
-							&.sfc_fg_operator_equals,
-							&.sfc_fg_operator_contains,
-							&.sfc_fg_operator_starts_with,
-							&.sfc_fg_operator_ends_with{
-								.sfc_op_name{
-									width: 90px;
-								}
-								.sfc_op_content{
-									input{
-										width: 130px;
-									}
+							.sfc_op_content{
+								input{
+									width: 130px;
 								}
 							}
 						}
 					}
+				}
 
-					.sfc_fg_apply,
-					.sfc_fg_cancel{
-						margin-top: 8px;
-						padding: 3px 6px;
-						font-size: 11px; /* Not bold, so it looks like 10px/bold of more/less buttons */
-					}
-					.sfc_fg_apply{
-						margin-right: 5px;
+				.sfc_fg_apply,
+				.sfc_fg_cancel{
+					margin-top: 8px;
+					padding: 3px 6px;
+					font-size: 11px; /* Not bold, so it looks like 10px/bold of more/less buttons */
+				}
+				.sfc_fg_apply{
+					margin-right: 5px;
+				}
+
+				.sfc_fg_more,
+				.sfc_fg_less{
+					position: absolute;
+					bottom: 4px;
+					right: 0px;
+					cursor: pointer;
+					color: $box-blue-border-color;
+					font-size: 10px;
+					font-weight: bold;
+					border: none;
+					background-color: transparent;
+
+					> span{
+						margin-left: 3px;
 					}
+				}
 
-					.sfc_fg_more,
-					.sfc_fg_less{
-						position: absolute;
-						bottom: 4px;
-						right: 0px;
-						cursor: pointer;
-						color: $box-blue-border-color;
-						font-size: 10px;
-						font-weight: bold;
-						border: none;
-						background-color: transparent;
+				/* Show only first operator in simple mode */
+				.sfc_fg_operator:not(:first-of-type),
+				.sfc_fg_operator:first-of-type .sfc_op_radio{
+					display: none;
+				}
+				.sfc_fg_less{
+					display: none;
+				}
+				.sfc_fg_more{
+					display: inline-block;
+				}
 
-						> span{
-							margin-left: 3px;
+				/* Show all operators in advanced mode */
+				&.advanced{
+
+					.sfc_fg_operator{
+						margin-bottom: 3px;
+
+						&:last-of-type{
+							margin-bottom: 0px;
 						}
 					}
 
-					/* Show only first operator in simple mode */
 					.sfc_fg_operator:not(:first-of-type),
 					.sfc_fg_operator:first-of-type .sfc_op_radio{
-						display: none;
+						display: inherit;
 					}
 					.sfc_fg_less{
-						display: none;
-					}
-					.sfc_fg_more{
 						display: inline-block;
 					}
-
-					/* Show all operators in advanced mode */
-					&.advanced{
-
-						.sfc_fg_operator{
-							margin-bottom: 3px;
-
-							&:last-of-type{
-								margin-bottom: 0px;
-							}
-						}
-
-						.sfc_fg_operator:not(:first-of-type),
-						.sfc_fg_operator:first-of-type .sfc_op_radio{
-							display: inherit;
-						}
-						.sfc_fg_less{
-							display: inline-block;
-						}
-						.sfc_fg_more{
-							display: none;
-						}
+					.sfc_fg_more{
+						display: none;
 					}
 				}
 			}
@@ -1039,19 +1067,34 @@ div.HRDrawer {
 
 		/* More criterion */
 		.sf_more_criterion{
-			.sf_mc_list{
-				position: absolute;
-				max-height: 420px;
-				margin: 0px;
-				top: 100%;
-				left: 0px;
-				overflow-y: auto;
-				background-color: $box-blue-bg-color;
-				border: $box-blue-border;
+			&.opened{
+				z-index: 2; /* To be over criterion */
 
-				.sf_mc_field{
-					cursor: pointer;
-					white-space: nowrap;
+				.sfm_content{
+					display: inherit;
+				}
+			}
+
+			.sfm_toggler{
+				.sfm_tg_title{
+					margin-right: 7px;
+				}
+				.sfm_tg_icon{
+					color: $box-blue-border-color;
+				}
+			}
+
+			.sfm_content{
+				display: none;
+
+				.sfm_list{
+					max-height: 420px;
+					overflow-y: auto;
+
+					.sfm_field{
+						cursor: pointer;
+						white-space: nowrap;
+					}
 				}
 			}
 		}
diff --git a/dictionaries/en.dictionary.itop.ui.php b/dictionaries/en.dictionary.itop.ui.php
index c0f9ed19a..b7a04bb17 100644
--- a/dictionaries/en.dictionary.itop.ui.php
+++ b/dictionaries/en.dictionary.itop.ui.php
@@ -1372,6 +1372,7 @@ When associated with a trigger, each action is given an "order" number, specifyi
 	'UI:UploadNotSupportedInThisMode' => 'The modification of images or files is not supported in this mode.',
 
 	// TODO: Reorganize those entries with other search entries and make entries for other languages.
+	'UI:Search:Criterion:MoreMenu:AddCriteria' => 'Add new criteria',
 	'UI:Search:Criteria:Operator:Default:Empty' => 'Is empty',
 	'UI:Search:Criteria:Operator:Default:NotEmpty' => 'Is not empty',
 	'UI:Search:Criteria:Operator:Default:Equals' => 'Equals:',
diff --git a/js/search/search_form_criteria.js b/js/search/search_form_criteria.js
index cd16e008f..84b9d9173 100644
--- a/js/search/search_form_criteria.js
+++ b/js/search/search_form_criteria.js
@@ -165,11 +165,23 @@ $(function()
 		_open: function()
 		{
 			this._resetOperators();
-			this.element.find('.sfc_form_group, .sfc_toggle').addClass('opened');
+			this.element.addClass('opened');
+
+			// Focus on right input
+			var oOpElemToFocus;
+			if(this.element.find('.sfc_form_group').hasClass('advanced'))
+			{
+				oOpElemToFocus = this.element.find('.sfc_fg_operator .sfc_op_radio:checked').closest('.sfc_fg_operator');
+			}
+			else
+			{
+				oOpElemToFocus = this.element.find('.sfc_fg_operator:first');
+			}
+			oOpElemToFocus.find('.sfc_op_content input:first').trigger('click').trigger('focus');
 		},
 		_close: function()
 		{
-			this.element.find('.sfc_form_group, .sfc_toggle').removeClass('opened');
+			this.element.removeClass('opened');
 			this._unmarkAsDraft();
 		},
 		_closeAll: function()
@@ -273,15 +285,14 @@ $(function()
 
 			// Prepare base DOM structure
 			this.element
-				.append('<div class="sfc_title"></div>')
-				.append('<div class="sfc_form_group"><div class="sfc_fg_operators"></div><div class="sfc_fg_buttons"></div></div>')
-				.append('<span class="sfc_toggle"><a class="fa fa-caret-down" href="#"></a></span>');
+				.append('<div class="sfc_header"><div class="sfc_title"></div><span class="sfc_toggle"><a class="fa fa-caret-down" href="#"></a></span></div>')
+				.append('<div class="sfc_form_group"><div class="sfc_fg_operators"></div><div class="sfc_fg_buttons"></div></div>');
 
 			// Bind events
 			// - Toggler
 			this.element.find('.sfc_toggle, .sfc_title').on('click', function(){
 				// First memorize if current criteria is close
-				var bOpen = !me.element.find('.sfc_toggle').hasClass('opened');
+				var bOpen = !me.element.hasClass('opened');
 				// Then close every criterion
 				me._closeAll();
 				// Finally open current criteria if necessary
@@ -294,14 +305,14 @@ $(function()
 			// Removable / locked decoration
 			if(this.options.is_removable === true)
 			{
-				this.element.append('<span class="sfc_close"><a class="fa fa-times" href="#"></a></span>');
+				this.element.find('.sfc_header').append('<span class="sfc_close"><a class="fa fa-times" href="#"></a></span>');
 				this.element.find('.sfc_close').on('click', function(){
 					me._remove();
 				});
 			}
 			else
 			{
-				this.element.append('<div class="sfc_locked"><span class="fa fa-lock"></span></div>');
+				this.element.find('.sfc_header').append('<span class="sfc_locked"><span class="fa fa-lock"></span></span>');
 			}
 
 			// Form group
@@ -315,8 +326,10 @@ $(function()
 			// Init opened to improve UX (toggle & focus in main operator's input)
 			if(this.options.init_opened === true)
 			{
-				this.element.find('.sfc_toggle').trigger('click');
-				this.element.find('.sfc_fg_operator:first .sfc_op_content input:first').trigger('click').trigger('focus');
+				this._closeAll();
+				this._open();
+				// this.element.find('.sfc_toggle').trigger('click');
+				// this.element.find('.sfc_fg_operator:first .sfc_op_content input:first').trigger('click').trigger('focus');
 			}
 		},
 		// - Prepare the available operators for the criteria
diff --git a/js/search/search_form_criteria_raw.js b/js/search/search_form_criteria_raw.js
index 6a908499d..21185be80 100644
--- a/js/search/search_form_criteria_raw.js
+++ b/js/search/search_form_criteria_raw.js
@@ -56,6 +56,8 @@ $(function()
 			this.element.find('.sfc_toggle').remove();
 			this.element.find('.sfc_toggle, .sfc_title').off('click');
 
+			// Force close as it has no sense either
+			this._close();
 		},
 		_prepareOperators: function()
 		{
diff --git a/js/search/search_form_handler.js b/js/search/search_form_handler.js
index 7e6998737..f45b4cb63 100644
--- a/js/search/search_form_handler.js
+++ b/js/search/search_form_handler.js
@@ -164,6 +164,19 @@ $(function()
 
 			// No need to update base OQL and fields
 		},
+		// - Open / Close more criterion menu
+		_openMoreCriterion: function()
+		{
+			this.elements.more_criterion.addClass('opened');
+		},
+		_closeMoreCriterion: function()
+		{
+			this.elements.more_criterion.removeClass('opened');
+		},
+		_toggleMoreCriterion: function()
+		{
+			this.elements.more_criterion.toggleClass('opened');
+		},
 
 		// DOM helpers
 		// - Prepare criterion area
@@ -186,7 +199,7 @@ $(function()
 			oCriterionAreaElem
 				.html('')
 				.append('<div class="sf_active_criterion"></div>')
-				.append('<div class="sf_more_criterion"><span class="sf_mc_toggler fa fa-plus"></span><ul class="sf_mc_list"></ul></div>');
+				.append('<div class="sf_more_criterion"></div>');
 			this.elements.active_criterion = oCriterionAreaElem.find('.sf_active_criterion');
 			this.elements.more_criterion = oCriterionAreaElem.find('.sf_more_criterion');
 
@@ -216,37 +229,53 @@ $(function()
 		{
 			var me = this;
 
-			// Add fields
+			// Header part
+			var oHeaderElem = $('<div class="sfm_header"></div>')
+				.append('<a class="sfm_toggler" href="#"><span class="sfm_tg_title">' + Dict.S('UI:Search:Criterion:MoreMenu:AddCriteria') + '</span><span class="sfm_tg_icon fa fa-plus"></span></a>')
+				.appendTo(this.elements.more_criterion);
+
+			// Content part
+			var oContentElem = $('<div class="sfm_content"></div>')
+				.appendTo(this.elements.more_criterion);
+			// - Add list
+			var oListElem = $('<ul class="sfm_list"></ul>')
+				.appendTo(oContentElem);
+			// - Add fields
 			// TODO: Find a widget to handle dropdown menu
 			// - From "search" zlist
 			for(var sFieldRef in this.options.search.fields.zlist)
 			{
 				var oField = this.options.search.fields.zlist[sFieldRef];
 				var oFieldElem = $('<li></li>')
-					.addClass('sf_mc_field')
+					.addClass('sfm_field')
 					.attr('data-field-ref', sFieldRef)
 					.text(oField.label);
-				this.elements.more_criterion.find('> .sf_mc_list').append(oFieldElem);
+				oListElem.append(oFieldElem);
 			}
 			// - Others
 			if(this.options.search.fields.others !== undefined)
 			{
-				this.elements.more_criterion.find('> .sf_mc_list').append('<li>==================</li>');
-				this.elements.more_criterion.find('> .sf_mc_list').append('<li>|| TODO: Better separation ||</li>');
-				this.elements.more_criterion.find('> .sf_mc_list').append('<li>==================</li>');
+				oListElem.append('<li>==================</li>');
+				oListElem.append('<li>|| TODO: Better separation ||</li>');
+				oListElem.append('<li>==================</li>');
 				for(var sFieldRef in this.options.search.fields.others)
 				{
 					var oField = this.options.search.fields.others[sFieldRef];
 					var oFieldElem = $('<li></li>')
-						.addClass('sf_mc_field')
+						.addClass('sfm_field')
 						.attr('data-field-ref', sFieldRef)
 						.text(oField.label);
-					this.elements.more_criterion.find('> .sf_mc_list').append(oFieldElem);
+					oListElem.append(oFieldElem);
 				}
 			}
 
 			// Bind events
-			this.elements.more_criterion.find('.sf_mc_field').on('click', function(){
+			// - Open / close menu
+			this.elements.more_criterion.find('.sfm_header').on('click', function(){
+				me._toggleMoreCriterion();
+			});
+			// - Add criteria
+			this.elements.more_criterion.find('.sfm_field').on('click', function(){
 				// Prepare new criterion data (as already opened to increase UX)
 				var oData = {
 					'ref': $(this).attr('data-field-ref'),
@@ -255,6 +284,7 @@ $(function()
 
 				// Add criteria but don't submit form as the user has not specified the value yet.
 				me._addCriteria(oData);
+				me._closeMoreCriterion();
 			});
 		},
 		// - Prepare results area
@@ -419,7 +449,11 @@ $(function()
 			var oListParams = {};
 			if(this.options.data_config_list_selector !== null)
 			{
-				// TODO: What ?
+				var sExtraParams = $(this.options.data_config_list_selector).data('sExtraParams');
+				if(sExtraParams !== undefined)
+				{
+					oListParams = JSON.parse(sExtraParams);
+				}
 			}
 			$.extend(oListParams, this.options.list_params);
 			oData.list_params = JSON.stringify(oListParams);

From b190ba1268f168353c314471b5317ba9d257c664 Mon Sep 17 00:00:00 2001
From: Bruno Da Silva <bruno.dasilva@combodo.com>
Date: Thu, 15 Mar 2018 14:01:04 +0000
Subject: [PATCH 048/202] search widget

temps traces

SVN:b1162[5435]
---
 .idea/inspectionProfiles/profiles_settings.xml | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 .idea/inspectionProfiles/profiles_settings.xml

diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
deleted file mode 100644
index ef816746c..000000000
--- a/.idea/inspectionProfiles/profiles_settings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <settings>
-    <option name="projectProfile" value="iTop" />
-    <option name="PROJECT_PROFILE" value="iTop" />
-    <version value="1.0" />
-  </settings>
-</component>
\ No newline at end of file

From d1a812f04c5b1fbd4aa2f187a003abeac129f15b Mon Sep 17 00:00:00 2001
From: Guillaume Lajarige <guillaume.lajarige@combodo.com>
Date: Thu, 15 Mar 2018 14:38:10 +0000
Subject: [PATCH 049/202] Advanced search: WIP POC, UI/UX.

SVN:b1162[5436]
---
 js/search/search_form_criteria.js        |  6 +++++-
 js/search/search_form_criteria_string.js | 21 +++++++++++++++++++++
 js/search/search_form_handler.js         | 20 +++++++++++++++++++-
 3 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/js/search/search_form_criteria.js b/js/search/search_form_criteria.js
index 84b9d9173..36125ce2c 100644
--- a/js/search/search_form_criteria.js
+++ b/js/search/search_form_criteria.js
@@ -164,6 +164,10 @@ $(function()
 		//   - Open / Close criteria
 		_open: function()
 		{
+			// Inform handler that a criteria is opening
+			this.handler.triggerHandler('itop.search.criteria.opening');
+
+			// Open criteria
 			this._resetOperators();
 			this.element.addClass('opened');
 
@@ -476,7 +480,7 @@ $(function()
 			});
 			// - Apply on "enter" key hit
 			oOpContentElem.on('keyup', function(oEvent){
-				// Check operator's radio if not already
+				// Check operator's radio if not already (typically when focusing in input via "tab" key)
 				if(oOpElem.find('.sfc_op_radio').prop('checked') === false)
 				{
 					oOpElem.find('.sfc_op_radio').prop('checked', true)
diff --git a/js/search/search_form_criteria_string.js b/js/search/search_form_criteria_string.js
index 2a937effb..80fa292eb 100644
--- a/js/search/search_form_criteria_string.js
+++ b/js/search/search_form_criteria_string.js
@@ -70,5 +70,26 @@ $(function()
 		//------------------
 
 		// DOM element helpers
+		// TODO: Remove this function after UX tests
+		_prepareOperators: function()
+		{
+			this._super();
+
+			if(this.options.ref === 'UserRequest.ref')
+			{
+				// Remove starts/ends_with
+				this.element.find('.sfc_fg_operator[data-operator-code*="with"]').remove();
+				// Modify contains with a dropdown
+				this.element.find('.sfc_fg_operator[data-operator-code="contains"] .sfc_op_name').html('<select style="    padding: 2px 0px;"><option>Contains</option><option>Starts with</option><option>Ends with</option></select>');
+				// Remove click event on dropdown
+				this.element.find('.sfc_fg_operator[data-operator-code="contains"] .sfc_op_name').on('click', function(oEvent){
+					oEvent.preventDefault();
+					oEvent.stopPropagation();
+				});
+				this.element.find('.sfc_fg_operator[data-operator-code="contains"] .sfc_op_name select').on('change', function(){
+					$(this).closest('.sfc_fg_operator').find('.sfc_op_content input:first').trigger('focus');
+				});
+			}
+		},
 	});
 });
diff --git a/js/search/search_form_handler.js b/js/search/search_form_handler.js
index f45b4cb63..e95f52ee6 100644
--- a/js/search/search_form_handler.js
+++ b/js/search/search_form_handler.js
@@ -134,6 +134,9 @@ $(function()
 			});
 
 			// Criteria events
+			this.element.on('itop.search.criteria.opening', function(oEvent, oData){
+				me._onCriteriaOpening(oData);
+			});
 			this.element.on('itop.search.criteria.value_changed', function(oEvent, oData){
 				me._onCriteriaValueChanged(oData);
 			});
@@ -168,6 +171,9 @@ $(function()
 		_openMoreCriterion: function()
 		{
 			this.elements.more_criterion.addClass('opened');
+			this.elements.active_criterion.find('.search_form_criteria').each(function(){
+				$(this).triggerHandler('itop.search.criteria.close');
+			});
 		},
 		_closeMoreCriterion: function()
 		{
@@ -175,7 +181,15 @@ $(function()
 		},
 		_toggleMoreCriterion: function()
 		{
-			this.elements.more_criterion.toggleClass('opened');
+			// Calling methods instead of toggling the class so additional processing are done.
+			if(this.elements.more_criterion.hasClass('opened'))
+			{
+				this._closeMoreCriterion();
+			}
+			else
+			{
+				this._openMoreCriterion();
+			}
 		},
 
 		// DOM helpers
@@ -381,6 +395,10 @@ $(function()
 			return 'search_form_criteria' + '_' + (($.itop['search_form_criteria_'+sType] !== undefined) ? sType : 'raw');
 		},
 		// Criteria handlers
+		_onCriteriaOpening: function(oData)
+		{
+			this._closeMoreCriterion();
+		},
 		_onCriteriaValueChanged: function(oData)
 		{
 			this._updateSearch();

From 156cb03069efb7b04785be2386400d5dbb873bbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Thu, 15 Mar 2018 17:34:17 +0000
Subject: [PATCH 050/202] Advanced Search: Links n:n

SVN:b1162[5438]
---
 application/ui.linkswidget.class.inc.php      |   16 +-
 pages/ajax.render.php                         | 3920 ++++++++---------
 pages/ajax.searchform.php                     |   14 +-
 .../search/searchform.class.inc.php           |   45 +-
 4 files changed, 1992 insertions(+), 2003 deletions(-)

diff --git a/application/ui.linkswidget.class.inc.php b/application/ui.linkswidget.class.inc.php
index 41dec06c0..820f8e74e 100644
--- a/application/ui.linkswidget.class.inc.php
+++ b/application/ui.linkswidget.class.inc.php
@@ -387,36 +387,42 @@ EOF
 	 * @param WebPage $oPage
 	 * @param DBObject $oCurrentObj
 	 * @param $sJson
+	 * @param array $aAlreadyLinkedIds
 	 *
 	 * @throws \CoreException
 	 * @throws \DictExceptionMissingString
 	 * @throws \Exception
 	 */
-	public function GetObjectPickerDialog($oPage, $oCurrentObj, $sJson)
+	public function GetObjectPickerDialog($oPage, $oCurrentObj, $sJson, $aAlreadyLinkedIds = array())
 	{
 		$bOpen = MetaModel::GetConfig()->Get('legacy_search_drawer_open');
 		$sHtml = "<div class=\"wizContainer\" style=\"vertical-align:top;\">\n";
 		$oFilter = new DBObjectSearch($this->m_sRemoteClass);
-		$this->SetSearchDefaultFromContext($oCurrentObj, $oFilter);
+		if (!$this->m_bDuplicatesAllowed && count($aAlreadyLinkedIds) > 0)
+		{
+			$oFilter->AddCondition('id', $aAlreadyLinkedIds, 'NOTIN');
+		}
+		//$this->SetSearchDefaultFromContext($oCurrentObj, $oFilter);
 		$oBlock = new DisplayBlock($oFilter, 'search', false);
 		$sHtml .= $oBlock->GetDisplay($oPage, "SearchFormToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}",
 			array(
                 'menu' => false,
 				'open' => $bOpen,
 				'table_id' => "SearchResultsToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}",
+				'table_id2' => 'add_'.$this->m_sAttCode,
 				'table_inner_id' => "ResultsToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}",
 				'selection_mode' => true,
 				'json' => $sJson,
 				'cssCount' => '#count_'.$this->m_sAttCode.$this->m_sNameSuffix
 			));
-		$sHtml .= "<form id=\"ObjectsAddForm_{$this->m_sAttCode}{$this->m_sNameSuffix}\" OnSubmit=\"return oWidget{$this->m_iInputId}.DoAddObjects(this.id);\">\n";
+		$sHtml .= "<div id=\"ObjectsAddForm_{$this->m_sAttCode}{$this->m_sNameSuffix}\">\n";
 		$sHtml .= "<div id=\"SearchResultsToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}\" style=\"vertical-align:top;background: #fff;height:100%;overflow:auto;padding:0;border:0;\">\n";
 		$sHtml .= "<div style=\"background: #fff; border:0; text-align:center; vertical-align:middle;\"><p>".Dict::S('UI:Message:EmptyList:UseSearchForm')."</p></div>\n";
 		$sHtml .= "</div>\n";
 		$sHtml .= "<input type=\"hidden\" id=\"count_{$this->m_sAttCode}{$this->m_sNameSuffix}\" value=\"0\"/>";
-		$sHtml .= "<input type=\"button\" value=\"".Dict::S('UI:Button:Cancel')."\" onClick=\"$('#dlg_{$this->m_sAttCode}{$this->m_sNameSuffix}').dialog('close');\">&nbsp;&nbsp;<input id=\"btn_ok_{$this->m_sAttCode}{$this->m_sNameSuffix}\" disabled=\"disabled\" type=\"submit\" value=\"".Dict::S('UI:Button:Add')."\">";
+		$sHtml .= "<input type=\"button\" value=\"".Dict::S('UI:Button:Cancel')."\" onClick=\"$('#dlg_{$this->m_sAttCode}{$this->m_sNameSuffix}').dialog('close');\">&nbsp;&nbsp;<input id=\"btn_ok_{$this->m_sAttCode}{$this->m_sNameSuffix}\" disabled=\"disabled\" type=\"button\" onclick=\"return oWidget{$this->m_iInputId}.DoAddObjects(this.id);\" value=\"".Dict::S('UI:Button:Add')."\">";
+		$sHtml .= "</div>\n";
 		$sHtml .= "</div>\n";
-		$sHtml .= "</form>\n";
 		$oPage->add($sHtml);
 		$oPage->add_ready_script("$('#dlg_{$this->m_sAttCode}{$this->m_sNameSuffix}').dialog({ width: $(window).width()*0.8, height: $(window).height()*0.8, autoOpen: false, modal: true, resizeStop: oWidget{$this->m_iInputId}.UpdateSizes });");
 		$oPage->add_ready_script("$('#dlg_{$this->m_sAttCode}{$this->m_sNameSuffix}').dialog('option', {title:'".addslashes(Dict::Format('UI:AddObjectsOf_Class_LinkedWith_Class', MetaModel::GetName($this->m_sLinkedClass), MetaModel::GetName($this->m_sClass)))."'});");
diff --git a/pages/ajax.render.php b/pages/ajax.render.php
index d27d54949..78c553b13 100644
--- a/pages/ajax.render.php
+++ b/pages/ajax.render.php
@@ -39,389 +39,225 @@ try
 {
 	require_once(APPROOT.'/application/startup.inc.php');
 	require_once(APPROOT.'/application/user.preferences.class.inc.php');
-	
+
 	require_once(APPROOT.'/application/loginwebpage.class.inc.php');
 	LoginWebPage::DoLoginEx(null /* any portal */, false);
-	
+
 	$oPage = new ajax_page("");
 	$oPage->no_cache();
 
-	
+
 	$operation = utils::ReadParam('operation', '');
 	$sFilter = stripslashes(utils::ReadParam('filter', '', false, 'raw_data'));
 	$sEncoding = utils::ReadParam('encoding', 'serialize');
 	$sClass = utils::ReadParam('class', 'MissingAjaxParam', false, 'class');
 	$sStyle = utils::ReadParam('style', 'list');
 
-	switch($operation)
+	switch ($operation)
 	{
 		case 'datatable':
 		case 'pagination':
-		$oPage->SetContentType('text/html');
-		$extraParams = utils::ReadParam('extra_param', '', false, 'raw_data');
-		$aExtraParams = array();
-		if (is_array($extraParams))
-		{
-			$aExtraParams = $extraParams;
-		}
-		else
-		{
-			$sExtraParams = stripslashes($extraParams);
-			if (!empty($sExtraParams))
+			$oPage->SetContentType('text/html');
+			$extraParams = utils::ReadParam('extra_param', '', false, 'raw_data');
+			$aExtraParams = array();
+			if (is_array($extraParams))
 			{
-				$val = json_decode(str_replace("'", '"', $sExtraParams), true /* associative array */);
-				if ($val !== null)
+				$aExtraParams = $extraParams;
+			}
+			else
+			{
+				$sExtraParams = stripslashes($extraParams);
+				if (!empty($sExtraParams))
 				{
-					$aExtraParams = $val;
+					$val = json_decode(str_replace("'", '"', $sExtraParams), true /* associative array */);
+					if ($val !== null)
+					{
+						$aExtraParams = $val;
+					}
 				}
 			}
-		}
-		if ($sEncoding == 'oql')
-		{
-			$oFilter = DBSearch::FromOQL($sFilter);
-		}
-		else
-		{
-			$oFilter = DBSearch::unserialize($sFilter);
-		}
-		$iStart = utils::ReadParam('start',0);
-		$iEnd = utils::ReadParam('end',1);
-		$iSortCol = utils::ReadParam('sort_col','null');
-		$sSelectMode = utils::ReadParam('select_mode', '');
-		if (!empty($sSelectMode) && ($sSelectMode != 'none'))
-		{
-			// The first column is used for the selection (radio / checkbox) and is not sortable
-			$iSortCol--;
-		}
-		$bDisplayKey = utils::ReadParam('display_key', 'true') == 'true';
-		$aColumns = utils::ReadParam('columns', array(), false, 'raw_data');
-		$aClassAliases = utils::ReadParam('class_aliases', array());
-		$iListId = utils::ReadParam('list_id', 0);
-
-		// Filter the list to removed linked set since we are not able to display them here
-		$aOrderBy = array();
-		$iSortIndex = 0;
-		
-		$aColumnsLoad = array();
-		foreach($aClassAliases as $sAlias => $sClassName)
-		{
-			$aColumnsLoad[$sAlias] = array();
-			foreach($aColumns[$sAlias] as $sAttCode => $aData)
+			if ($sEncoding == 'oql')
 			{
-				if ($aData['checked'] == 'true')
+				$oFilter = DBSearch::FromOQL($sFilter);
+			}
+			else
+			{
+				$oFilter = DBSearch::unserialize($sFilter);
+			}
+			$iStart = utils::ReadParam('start', 0);
+			$iEnd = utils::ReadParam('end', 1);
+			$iSortCol = utils::ReadParam('sort_col', 'null');
+			$sSelectMode = utils::ReadParam('select_mode', '');
+			if (!empty($sSelectMode) && ($sSelectMode != 'none'))
+			{
+				// The first column is used for the selection (radio / checkbox) and is not sortable
+				$iSortCol--;
+			}
+			$bDisplayKey = utils::ReadParam('display_key', 'true') == 'true';
+			$aColumns = utils::ReadParam('columns', array(), false, 'raw_data');
+			$aClassAliases = utils::ReadParam('class_aliases', array());
+			$iListId = utils::ReadParam('list_id', 0);
+
+			// Filter the list to removed linked set since we are not able to display them here
+			$aOrderBy = array();
+			$iSortIndex = 0;
+
+			$aColumnsLoad = array();
+			foreach($aClassAliases as $sAlias => $sClassName)
+			{
+				$aColumnsLoad[$sAlias] = array();
+				foreach($aColumns[$sAlias] as $sAttCode => $aData)
 				{
-					$aColumns[$sAlias][$sAttCode]['checked'] = true;
-					if ($sAttCode == '_key_')
+					if ($aData['checked'] == 'true')
 					{
-						if ($iSortCol == $iSortIndex)
+						$aColumns[$sAlias][$sAttCode]['checked'] = true;
+						if ($sAttCode == '_key_')
 						{
-							if (!MetaModel::HasChildrenClasses($oFilter->GetClass()))
+							if ($iSortCol == $iSortIndex)
 							{
-								$aNameSpec = MetaModel::GetNameSpec($oFilter->GetClass());
-								if ($aNameSpec[0] == '%1$s')
+								if (!MetaModel::HasChildrenClasses($oFilter->GetClass()))
 								{
-									// The name is made of a single column, let's sort according to the sort algorithm for this column
-									$aOrderBy[$sAlias.'.'.$aNameSpec[1][0]] = (utils::ReadParam('sort_order', 'asc') == 'asc');
+									$aNameSpec = MetaModel::GetNameSpec($oFilter->GetClass());
+									if ($aNameSpec[0] == '%1$s')
+									{
+										// The name is made of a single column, let's sort according to the sort algorithm for this column
+										$aOrderBy[$sAlias.'.'.$aNameSpec[1][0]] = (utils::ReadParam('sort_order', 'asc') == 'asc');
+									}
+									else
+									{
+										$aOrderBy[$sAlias.'.'.'friendlyname'] = (utils::ReadParam('sort_order', 'asc') == 'asc');
+									}
 								}
 								else
 								{
 									$aOrderBy[$sAlias.'.'.'friendlyname'] = (utils::ReadParam('sort_order', 'asc') == 'asc');
 								}
 							}
-							else
-							{
-								$aOrderBy[$sAlias.'.'.'friendlyname'] = (utils::ReadParam('sort_order', 'asc') == 'asc');
-							}
-						}
-					}
-					else
-					{
-						$oAttDef = MetaModel::GetAttributeDef($sClassName, $sAttCode);
-						if ($oAttDef instanceof AttributeLinkedSet)
-						{
-							// Removed from the display list
-							unset($aColumns[$sAlias][$sAttCode]);
 						}
 						else
 						{
-							$aColumnsLoad[$sAlias][] = $sAttCode;
-						}
-						if ($iSortCol == $iSortIndex)
-						{
-							if ($oAttDef->IsExternalKey())
+							$oAttDef = MetaModel::GetAttributeDef($sClassName, $sAttCode);
+							if ($oAttDef instanceof AttributeLinkedSet)
 							{
-								$sSortCol = $sAttCode.'_friendlyname';
+								// Removed from the display list
+								unset($aColumns[$sAlias][$sAttCode]);
 							}
 							else
 							{
-								$sSortCol = $sAttCode;
+								$aColumnsLoad[$sAlias][] = $sAttCode;
+							}
+							if ($iSortCol == $iSortIndex)
+							{
+								if ($oAttDef->IsExternalKey())
+								{
+									$sSortCol = $sAttCode.'_friendlyname';
+								}
+								else
+								{
+									$sSortCol = $sAttCode;
+								}
+								$aOrderBy[$sAlias.'.'.$sSortCol] = (utils::ReadParam('sort_order', 'asc') == 'asc');
 							}
-							$aOrderBy[$sAlias.'.'.$sSortCol] = (utils::ReadParam('sort_order', 'asc') == 'asc');
 						}
+						$iSortIndex++;
+					}
+					else
+					{
+						$aColumns[$sAlias][$sAttCode]['checked'] = false;
 					}
-					$iSortIndex++;
-				}
-				else
-				{
-					$aColumns[$sAlias][$sAttCode]['checked'] = false;
 				}
+
 			}
 
-		}
-		
-		// Load only the requested columns
-		$oSet = new DBObjectSet($oFilter, $aOrderBy, $aExtraParams, null, $iEnd-$iStart, $iStart);
-		$oSet->OptimizeColumnLoad($aColumnsLoad);
+			// Load only the requested columns
+			$oSet = new DBObjectSet($oFilter, $aOrderBy, $aExtraParams, null, $iEnd - $iStart, $iStart);
+			$oSet->OptimizeColumnLoad($aColumnsLoad);
 
-		if (isset($aExtraParams['show_obsolete_data']))
-		{
-			$bShowObsoleteData = $aExtraParams['show_obsolete_data'];
-		}
-		else
-		{
-			$bShowObsoleteData = utils::ShowObsoleteData();
-		}
-		$oSet->SetShowObsoleteData($bShowObsoleteData);
-
-		$oDataTable = new DataTable($iListId, $oSet, $oSet->GetSelectedClasses());
-		if ($operation == 'datatable')
-		{
-			// Redraw the whole table
-			$sHtml = $oDataTable->UpdatePager($oPage, $iEnd-$iStart, $iStart); // Set the default page size
-			$sHtml .= $oDataTable->GetHTMLTable($oPage, $aColumns, $sSelectMode, $iEnd-$iStart, $bDisplayKey, $aExtraParams);
-		}
-		else
-		{
-			// redraw just the needed rows
-			$sHtml = $oDataTable->GetAsHTMLTableRows($oPage, $iEnd-$iStart, $aColumns, $sSelectMode, $bDisplayKey, $aExtraParams);
-		}
-		$oPage->add($sHtml);
-		break;
-		
-		case 'datatable_save_settings':
-		$oPage->SetContentType('text/plain');
-		$iPageSize = utils::ReadParam('page_size', 10);
-		$sTableId = utils::ReadParam('table_id', null, false, 'raw_data');
-		$bSaveAsDefaults = (utils::ReadParam('defaults', 'true') == 'true');
-		$aClassAliases = utils::ReadParam('class_aliases', array(), false, 'raw_data');
-		$aColumns = utils::ReadParam('columns', array(), false, 'raw_data');
-		
-		foreach($aColumns as $sAlias => $aList)
-		{
-			foreach($aList as $sAttCode => $aData)
+			if (isset($aExtraParams['show_obsolete_data']))
 			{
-				$aColumns[$sAlias][$sAttCode]['checked'] = ($aData['checked'] == 'true');
-				$aColumns[$sAlias][$sAttCode]['disabled'] = ($aData['disabled'] == 'true');
-				$aColumns[$sAlias][$sAttCode]['sort'] = ($aData['sort']);
-			}
-		}
-		
-		$oSettings = new DataTableSettings($aClassAliases, $sTableId);
-		$oSettings->iDefaultPageSize = $iPageSize;
-		$oSettings->aColumns = $aColumns;
-
-		if ($bSaveAsDefaults)
-		{
-			if ($sTableId != null)
-			{
-				$oCurrSettings = DataTableSettings::GetTableSettings($aClassAliases, $sTableId, true /* bOnlyTable */ );
-				if ($oCurrSettings)
-				{
-					$oCurrSettings->ResetToDefault(false); // Reset this table to the defaults
-				}
-			}
-			$bRet = $oSettings->SaveAsDefault();
-		}
-		else
-		{
-			$bRet = $oSettings->Save();
-		}
-		$oPage->add($bRet ? 'Ok' : 'KO');
-		break;
-		
-		case 'datatable_reset_settings':
-		$oPage->SetContentType('text/plain');
-		$sTableId = utils::ReadParam('table_id', null, false, 'raw_data');
-		$aClassAliases = utils::ReadParam('class_aliases', array(), false, 'raw_data');
-		$bResetAll = (utils::ReadParam('defaults', 'true') == 'true');
-		
-		$oSettings = new DataTableSettings($aClassAliases, $sTableId);
-		$bRet = $oSettings->ResetToDefault($bResetAll);
-		$oPage->add($bRet ? 'Ok' : 'KO');
-		break;
-		
-		// ui.linkswidget
-		case 'addObjects':
-		$oPage->SetContentType('text/html');
-		$sAttCode = utils::ReadParam('sAttCode', '');
-		$iInputId = utils::ReadParam('iInputId', '');
-		$sSuffix = utils::ReadParam('sSuffix', '');
-		$bDuplicates = (utils::ReadParam('bDuplicates', 'false') == 'false') ? false : true;
-		$sJson = utils::ReadParam('json', '', false, 'raw_data');
-		if (!empty($sJson))
-		{
-			$oWizardHelper = WizardHelper::FromJSON($sJson);
-			$oObj = $oWizardHelper->GetTargetObject();
-		}
-		else
-		{
-			// Search form: no current object
-			$oObj = null;
-		}
-		$oWidget = new UILinksWidget($sClass, $sAttCode, $iInputId, $sSuffix, $bDuplicates);
-			$oWidget->GetObjectPickerDialog($oPage, $oObj, $sJson);
-		break;
-		
-		// ui.linkswidget
-		case 'searchObjectsToAdd':
-		$oPage->SetContentType('text/html');
-		$sRemoteClass = utils::ReadParam('sRemoteClass', '', false, 'class');
-		$sAttCode = utils::ReadParam('sAttCode', '');
-		$iInputId = utils::ReadParam('iInputId', '');
-		$sSuffix = utils::ReadParam('sSuffix', '');
-		$bDuplicates = (utils::ReadParam('bDuplicates', 'false') == 'false') ? false : true;
-		$aAlreadyLinked = utils::ReadParam('aAlreadyLinked', array());
-		$oWidget = new UILinksWidget($sClass, $sAttCode, $iInputId, $sSuffix, $bDuplicates);
-		$oWidget->SearchObjectsToAdd($oPage, $sRemoteClass, $aAlreadyLinked);	
-		break;
-		
-		//ui.linksdirectwidget
-		case 'createObject':
-		$oPage->SetContentType('text/html');
-		$sClass = utils::ReadParam('class', '', false, 'class');
-		$sRealClass = utils::ReadParam('real_class', '', false, 'class');
-		$sAttCode = utils::ReadParam('att_code', '');
-		$iInputId = utils::ReadParam('iInputId', '');
-		$oPage->SetContentType('text/html');
-		$oWidget = new UILinksWidgetDirect($sClass, $sAttCode, $iInputId);
-		$oWidget->GetObjectCreationDlg($oPage, $sRealClass);
-		break;
-		
-		// ui.linksdirectwidget
-		case 'getLinksetRow':
-		$oPage->SetContentType('text/html');
-		$sClass = utils::ReadParam('class', '', false, 'class');
-		$sRealClass = utils::ReadParam('real_class', '', false, 'class');
-		$sAttCode = utils::ReadParam('att_code', '');
-		$iInputId = utils::ReadParam('iInputId', '');
-		$iTempId = utils::ReadParam('tempId', '');
-		$aValues = utils::ReadParam('values', array(), false, 'raw_data');
-		$oPage->SetContentType('text/html');
-		$oWidget = new UILinksWidgetDirect($sClass, $sAttCode, $iInputId);
-		$oPage->add($oWidget->GetRow($oPage, $sRealClass, $aValues, -$iTempId));
-		break;
-		
-		// ui.linksdirectwidget
-		case 'selectObjectsToAdd':
-		$oPage->SetContentType('text/html');
-		$sClass = utils::ReadParam('class', '', false, 'class');
-		$sJson = utils::ReadParam('json', '', false, 'raw_data');
-		$oObj = null;
-		if ($sJson != '')
-		{
-			$oWizardHelper = WizardHelper::FromJSON($sJson);
-			$oObj = $oWizardHelper->GetTargetObject();
-		}
-		$sRealClass = utils::ReadParam('real_class', '', false, 'class');
-		$sAttCode = utils::ReadParam('att_code', '');
-		$iInputId = utils::ReadParam('iInputId', '');
-		$iCurrObjectId =  utils::ReadParam('iObjId', 0);
-		$oPage->SetContentType('text/html');
-		$oWidget = new UILinksWidgetDirect($sClass, $sAttCode, $iInputId);
-		$oWidget->GetObjectsSelectionDlg($oPage, $oObj);
-		break;
-			
-		// ui.linksdirectwidget
-		case 'searchObjectsToAdd2':
-		$oPage->SetContentType('text/html');
-		$sClass = utils::ReadParam('class', '', false, 'class');
-		$sRealClass = utils::ReadParam('real_class', '', false, 'class');
-		$sAttCode = utils::ReadParam('att_code', '');
-		$iInputId = utils::ReadParam('iInputId', '');
-		$aAlreadyLinked =  utils::ReadParam('aAlreadyLinked', array());
-		$sJson = utils::ReadParam('json', '', false, 'raw_data');
-		$oObj = null;
-		if ($sJson != '')
-		{
-			$oWizardHelper = WizardHelper::FromJSON($sJson);
-			$oObj = $oWizardHelper->GetTargetObject();
-		}
-		$oWidget = new UILinksWidgetDirect($sClass, $sAttCode, $iInputId);
-		$oWidget->SearchObjectsToAdd($oPage, $sRealClass, $aAlreadyLinked, $oObj);
-		break;
-		
-		// ui.linksdirectwidget
-		case 'doAddObjects2':
-		$oPage->SetContentType('text/html');
-		$oPage->SetContentType('text/html');
-		$sClass = utils::ReadParam('class', '', false, 'class');
-		$sRealClass = utils::ReadParam('real_class', '', false, 'class');
-		$sAttCode = utils::ReadParam('att_code', '');
-		$iInputId = utils::ReadParam('iInputId', '');
-		$iCurrObjectId =  utils::ReadParam('iObjId', 0);
-		$sFilter = utils::ReadParam('filter', '', false, 'raw_data');
-		if ($sFilter != '')
-		{
-			$oFullSetFilter = DBObjectSearch::unserialize($sFilter);
-		}
-		else
-		{
-			$oLinksetDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
-			$valuesDef = $oLinksetDef->GetValuesDef();				
-			if ($valuesDef === null)
-			{
-				$oFullSetFilter = new DBObjectSearch($oLinksetDef->GetLinkedClass());
+				$bShowObsoleteData = $aExtraParams['show_obsolete_data'];
 			}
 			else
 			{
-				if (!$valuesDef instanceof ValueSetObjects)
+				$bShowObsoleteData = utils::ShowObsoleteData();
+			}
+			$oSet->SetShowObsoleteData($bShowObsoleteData);
+
+			$oDataTable = new DataTable($iListId, $oSet, $oSet->GetSelectedClasses());
+			if ($operation == 'datatable')
+			{
+				// Redraw the whole table
+				$sHtml = $oDataTable->UpdatePager($oPage, $iEnd - $iStart, $iStart); // Set the default page size
+				$sHtml .= $oDataTable->GetHTMLTable($oPage, $aColumns, $sSelectMode, $iEnd - $iStart, $bDisplayKey, $aExtraParams);
+			}
+			else
+			{
+				// redraw just the needed rows
+				$sHtml = $oDataTable->GetAsHTMLTableRows($oPage, $iEnd - $iStart, $aColumns, $sSelectMode, $bDisplayKey, $aExtraParams);
+			}
+			$oPage->add($sHtml);
+			break;
+
+		case 'datatable_save_settings':
+			$oPage->SetContentType('text/plain');
+			$iPageSize = utils::ReadParam('page_size', 10);
+			$sTableId = utils::ReadParam('table_id', null, false, 'raw_data');
+			$bSaveAsDefaults = (utils::ReadParam('defaults', 'true') == 'true');
+			$aClassAliases = utils::ReadParam('class_aliases', array(), false, 'raw_data');
+			$aColumns = utils::ReadParam('columns', array(), false, 'raw_data');
+
+			foreach($aColumns as $sAlias => $aList)
+			{
+				foreach($aList as $sAttCode => $aData)
 				{
-					throw new Exception('Error: only ValueSetObjects are supported for "allowed_values" in AttributeLinkedSet ('.$this->sClass.'/'.$this->sAttCode.').');
+					$aColumns[$sAlias][$sAttCode]['checked'] = ($aData['checked'] == 'true');
+					$aColumns[$sAlias][$sAttCode]['disabled'] = ($aData['disabled'] == 'true');
+					$aColumns[$sAlias][$sAttCode]['sort'] = ($aData['sort']);
 				}
-				$oFullSetFilter = DBObjectSearch::FromOQL($valuesDef->GetFilterExpression());
-			}		
-		}
-		$oWidget = new UILinksWidgetDirect($sClass, $sAttCode, $iInputId);
-		$oWidget->DoAddObjects($oPage, $oFullSetFilter);	
-		break;
-		
-		////////////////////////////////////////////////////////////
-		
-		// ui.extkeywidget
-		case 'searchObjectsToSelect':
-		$oPage->SetContentType('text/html');
-		$sTargetClass = utils::ReadParam('sTargetClass', '', false, 'class');
-		$iInputId = utils::ReadParam('iInputId', '');
-		$sRemoteClass = utils::ReadParam('sRemoteClass', '', false, 'class');
-		$sFilter = utils::ReadParam('sFilter', '', false, 'raw_data');
-		$sJson = utils::ReadParam('json', '', false, 'raw_data');
-		$sAttCode = utils::ReadParam('sAttCode', '');
-		$bSearchMode = (utils::ReadParam('bSearchMode', 'false') == 'true');
-		if (!empty($sJson))
-		{
-			$oWizardHelper = WizardHelper::FromJSON($sJson);
-			$oObj = $oWizardHelper->GetTargetObject();
-		}
-		else
-		{
-			// Search form: no current object
-			$oObj = null;
-		}
-		$oWidget = new UIExtKeyWidget($sTargetClass, $iInputId, $sAttCode, $bSearchMode);
-		$oWidget->SearchObjectsToSelect($oPage, $sFilter, $sRemoteClass, $oObj);	
-		break;
-	
-		// ui.extkeywidget: autocomplete
-		case 'ac_extkey':
-		$oPage->SetContentType('text/plain');
-		$sTargetClass = utils::ReadParam('sTargetClass', '', false, 'class');
-		$iInputId = utils::ReadParam('iInputId', '');
-		$sFilter = utils::ReadParam('sFilter', '', false, 'raw_data');
-		$sJson = utils::ReadParam('json', '', false, 'raw_data');
-		$sContains = utils::ReadParam('q', '', false, 'raw_data');
-		$bSearchMode = (utils::ReadParam('bSearchMode', 'false') == 'true');
-		if ($sContains !='')
-		{
+			}
+
+			$oSettings = new DataTableSettings($aClassAliases, $sTableId);
+			$oSettings->iDefaultPageSize = $iPageSize;
+			$oSettings->aColumns = $aColumns;
+
+			if ($bSaveAsDefaults)
+			{
+				if ($sTableId != null)
+				{
+					$oCurrSettings = DataTableSettings::GetTableSettings($aClassAliases, $sTableId, true /* bOnlyTable */);
+					if ($oCurrSettings)
+					{
+						$oCurrSettings->ResetToDefault(false); // Reset this table to the defaults
+					}
+				}
+				$bRet = $oSettings->SaveAsDefault();
+			}
+			else
+			{
+				$bRet = $oSettings->Save();
+			}
+			$oPage->add($bRet ? 'Ok' : 'KO');
+			break;
+
+		case 'datatable_reset_settings':
+			$oPage->SetContentType('text/plain');
+			$sTableId = utils::ReadParam('table_id', null, false, 'raw_data');
+			$aClassAliases = utils::ReadParam('class_aliases', array(), false, 'raw_data');
+			$bResetAll = (utils::ReadParam('defaults', 'true') == 'true');
+
+			$oSettings = new DataTableSettings($aClassAliases, $sTableId);
+			$bRet = $oSettings->ResetToDefault($bResetAll);
+			$oPage->add($bRet ? 'Ok' : 'KO');
+			break;
+
+		// ui.linkswidget
+		case 'addObjects':
+			$oPage->SetContentType('text/html');
+			$sAttCode = utils::ReadParam('sAttCode', '');
+			$iInputId = utils::ReadParam('iInputId', '');
+			$sSuffix = utils::ReadParam('sSuffix', '');
+			$bDuplicates = (utils::ReadParam('bDuplicates', 'false') == 'false') ? false : true;
+			$sJson = utils::ReadParam('json', '', false, 'raw_data');
 			if (!empty($sJson))
 			{
 				$oWizardHelper = WizardHelper::FromJSON($sJson);
@@ -432,721 +268,884 @@ try
 				// Search form: no current object
 				$oObj = null;
 			}
-			$oWidget = new UIExtKeyWidget($sTargetClass, $iInputId, '', $bSearchMode);
-			$oWidget->AutoComplete($oPage, $sFilter, $oObj, $sContains);
-		}
-		break;
-	
+			$oWidget = new UILinksWidget($sClass, $sAttCode, $iInputId, $sSuffix, $bDuplicates);
+			$aAlreadyLinked = utils::ReadParam('aAlreadyLinked', array());
+			$oWidget->GetObjectPickerDialog($oPage, $oObj, $sJson, $aAlreadyLinked);
+			break;
+
+		// ui.linkswidget
+		case 'searchObjectsToAdd':
+			$oPage->SetContentType('text/html');
+			$sRemoteClass = utils::ReadParam('sRemoteClass', '', false, 'class');
+			$sAttCode = utils::ReadParam('sAttCode', '');
+			$iInputId = utils::ReadParam('iInputId', '');
+			$sSuffix = utils::ReadParam('sSuffix', '');
+			$bDuplicates = (utils::ReadParam('bDuplicates', 'false') == 'false') ? false : true;
+			$aAlreadyLinked = utils::ReadParam('aAlreadyLinked', array());
+			$oWidget = new UILinksWidget($sClass, $sAttCode, $iInputId, $sSuffix, $bDuplicates);
+			$oWidget->SearchObjectsToAdd($oPage, $sRemoteClass, $aAlreadyLinked);
+			break;
+
+		//ui.linksdirectwidget
+		case 'createObject':
+			$oPage->SetContentType('text/html');
+			$sClass = utils::ReadParam('class', '', false, 'class');
+			$sRealClass = utils::ReadParam('real_class', '', false, 'class');
+			$sAttCode = utils::ReadParam('att_code', '');
+			$iInputId = utils::ReadParam('iInputId', '');
+			$oPage->SetContentType('text/html');
+			$oWidget = new UILinksWidgetDirect($sClass, $sAttCode, $iInputId);
+			$oWidget->GetObjectCreationDlg($oPage, $sRealClass);
+			break;
+
+		// ui.linksdirectwidget
+		case 'getLinksetRow':
+			$oPage->SetContentType('text/html');
+			$sClass = utils::ReadParam('class', '', false, 'class');
+			$sRealClass = utils::ReadParam('real_class', '', false, 'class');
+			$sAttCode = utils::ReadParam('att_code', '');
+			$iInputId = utils::ReadParam('iInputId', '');
+			$iTempId = utils::ReadParam('tempId', '');
+			$aValues = utils::ReadParam('values', array(), false, 'raw_data');
+			$oPage->SetContentType('text/html');
+			$oWidget = new UILinksWidgetDirect($sClass, $sAttCode, $iInputId);
+			$oPage->add($oWidget->GetRow($oPage, $sRealClass, $aValues, -$iTempId));
+			break;
+
+		// ui.linksdirectwidget
+		case 'selectObjectsToAdd':
+			$oPage->SetContentType('text/html');
+			$sClass = utils::ReadParam('class', '', false, 'class');
+			$sJson = utils::ReadParam('json', '', false, 'raw_data');
+			$oObj = null;
+			if ($sJson != '')
+			{
+				$oWizardHelper = WizardHelper::FromJSON($sJson);
+				$oObj = $oWizardHelper->GetTargetObject();
+			}
+			$sRealClass = utils::ReadParam('real_class', '', false, 'class');
+			$sAttCode = utils::ReadParam('att_code', '');
+			$iInputId = utils::ReadParam('iInputId', '');
+			$iCurrObjectId = utils::ReadParam('iObjId', 0);
+			$oPage->SetContentType('text/html');
+			$oWidget = new UILinksWidgetDirect($sClass, $sAttCode, $iInputId);
+			$oWidget->GetObjectsSelectionDlg($oPage, $oObj);
+			break;
+
+		// ui.linksdirectwidget
+		case 'searchObjectsToAdd2':
+			$oPage->SetContentType('text/html');
+			$sClass = utils::ReadParam('class', '', false, 'class');
+			$sRealClass = utils::ReadParam('real_class', '', false, 'class');
+			$sAttCode = utils::ReadParam('att_code', '');
+			$iInputId = utils::ReadParam('iInputId', '');
+			$aAlreadyLinked = utils::ReadParam('aAlreadyLinked', array());
+			$sJson = utils::ReadParam('json', '', false, 'raw_data');
+			$oObj = null;
+			if ($sJson != '')
+			{
+				$oWizardHelper = WizardHelper::FromJSON($sJson);
+				$oObj = $oWizardHelper->GetTargetObject();
+			}
+			$oWidget = new UILinksWidgetDirect($sClass, $sAttCode, $iInputId);
+			$oWidget->SearchObjectsToAdd($oPage, $sRealClass, $aAlreadyLinked, $oObj);
+			break;
+
+		// ui.linksdirectwidget
+		case 'doAddObjects2':
+			$oPage->SetContentType('text/html');
+			$oPage->SetContentType('text/html');
+			$sClass = utils::ReadParam('class', '', false, 'class');
+			$sRealClass = utils::ReadParam('real_class', '', false, 'class');
+			$sAttCode = utils::ReadParam('att_code', '');
+			$iInputId = utils::ReadParam('iInputId', '');
+			$iCurrObjectId = utils::ReadParam('iObjId', 0);
+			$sFilter = utils::ReadParam('filter', '', false, 'raw_data');
+			if ($sFilter != '')
+			{
+				$oFullSetFilter = DBObjectSearch::unserialize($sFilter);
+			}
+			else
+			{
+				$oLinksetDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
+				$valuesDef = $oLinksetDef->GetValuesDef();
+				if ($valuesDef === null)
+				{
+					$oFullSetFilter = new DBObjectSearch($oLinksetDef->GetLinkedClass());
+				}
+				else
+				{
+					if (!$valuesDef instanceof ValueSetObjects)
+					{
+						throw new Exception('Error: only ValueSetObjects are supported for "allowed_values" in AttributeLinkedSet ('.$this->sClass.'/'.$this->sAttCode.').');
+					}
+					$oFullSetFilter = DBObjectSearch::FromOQL($valuesDef->GetFilterExpression());
+				}
+			}
+			$oWidget = new UILinksWidgetDirect($sClass, $sAttCode, $iInputId);
+			$oWidget->DoAddObjects($oPage, $oFullSetFilter);
+			break;
+
+		////////////////////////////////////////////////////////////
+
+		// ui.extkeywidget
+		case 'searchObjectsToSelect':
+			$oPage->SetContentType('text/html');
+			$sTargetClass = utils::ReadParam('sTargetClass', '', false, 'class');
+			$iInputId = utils::ReadParam('iInputId', '');
+			$sRemoteClass = utils::ReadParam('sRemoteClass', '', false, 'class');
+			$sFilter = utils::ReadParam('sFilter', '', false, 'raw_data');
+			$sJson = utils::ReadParam('json', '', false, 'raw_data');
+			$sAttCode = utils::ReadParam('sAttCode', '');
+			$bSearchMode = (utils::ReadParam('bSearchMode', 'false') == 'true');
+			if (!empty($sJson))
+			{
+				$oWizardHelper = WizardHelper::FromJSON($sJson);
+				$oObj = $oWizardHelper->GetTargetObject();
+			}
+			else
+			{
+				// Search form: no current object
+				$oObj = null;
+			}
+			$oWidget = new UIExtKeyWidget($sTargetClass, $iInputId, $sAttCode, $bSearchMode);
+			$oWidget->SearchObjectsToSelect($oPage, $sFilter, $sRemoteClass, $oObj);
+			break;
+
+		// ui.extkeywidget: autocomplete
+		case 'ac_extkey':
+			$oPage->SetContentType('text/plain');
+			$sTargetClass = utils::ReadParam('sTargetClass', '', false, 'class');
+			$iInputId = utils::ReadParam('iInputId', '');
+			$sFilter = utils::ReadParam('sFilter', '', false, 'raw_data');
+			$sJson = utils::ReadParam('json', '', false, 'raw_data');
+			$sContains = utils::ReadParam('q', '', false, 'raw_data');
+			$bSearchMode = (utils::ReadParam('bSearchMode', 'false') == 'true');
+			if ($sContains != '')
+			{
+				if (!empty($sJson))
+				{
+					$oWizardHelper = WizardHelper::FromJSON($sJson);
+					$oObj = $oWizardHelper->GetTargetObject();
+				}
+				else
+				{
+					// Search form: no current object
+					$oObj = null;
+				}
+				$oWidget = new UIExtKeyWidget($sTargetClass, $iInputId, '', $bSearchMode);
+				$oWidget->AutoComplete($oPage, $sFilter, $oObj, $sContains);
+			}
+			break;
+
 		// ui.extkeywidget
 		case 'objectSearchForm':
-		$oPage->SetContentType('text/html');
-		$sTargetClass = utils::ReadParam('sTargetClass', '', false, 'class');
-		$iInputId = utils::ReadParam('iInputId', '');
-		$sTitle = utils::ReadParam('sTitle', '', false, 'raw_data');
-		$sAttCode = utils::ReadParam('sAttCode', '');
-		$bSearchMode = (utils::ReadParam('bSearchMode', 'false') == 'true');
-		$oWidget = new UIExtKeyWidget($sTargetClass, $iInputId, $sAttCode, $bSearchMode);
-		$sJson = utils::ReadParam('json', '', false, 'raw_data');
-		if (!empty($sJson))
-		{
-			$oWizardHelper = WizardHelper::FromJSON($sJson);
-			$oObj = $oWizardHelper->GetTargetObject();
-		}
-		else
-		{
-			// Search form: no current object
-			$oObj = null;
-		}
-		$oWidget->GetSearchDialog($oPage, $sTitle, $oObj);
-		break;
+			$oPage->SetContentType('text/html');
+			$sTargetClass = utils::ReadParam('sTargetClass', '', false, 'class');
+			$iInputId = utils::ReadParam('iInputId', '');
+			$sTitle = utils::ReadParam('sTitle', '', false, 'raw_data');
+			$sAttCode = utils::ReadParam('sAttCode', '');
+			$bSearchMode = (utils::ReadParam('bSearchMode', 'false') == 'true');
+			$oWidget = new UIExtKeyWidget($sTargetClass, $iInputId, $sAttCode, $bSearchMode);
+			$sJson = utils::ReadParam('json', '', false, 'raw_data');
+			if (!empty($sJson))
+			{
+				$oWizardHelper = WizardHelper::FromJSON($sJson);
+				$oObj = $oWizardHelper->GetTargetObject();
+			}
+			else
+			{
+				// Search form: no current object
+				$oObj = null;
+			}
+			$oWidget->GetSearchDialog($oPage, $sTitle, $oObj);
+			break;
 
 		// ui.extkeywidget
 		case 'objectCreationForm':
-		$oPage->SetContentType('text/html');
-		// Retrieving parameters
-		$sTargetClass = utils::ReadParam('sTargetClass', '', false, 'class');
-        $iInputId = utils::ReadParam('iInputId', '');
-        $sAttCode = utils::ReadParam('sAttCode', '');
-        $sJson = utils::ReadParam('json', '', false, 'raw_data');
-		// Building form, if target class is abstract we ask the user for the desired leaf class
-        $oWidget = new UIExtKeyWidget($sTargetClass, $iInputId, $sAttCode, false);
-        if(MetaModel::IsAbstract($sTargetClass))
-        {
-            $oWidget->GetClassSelectionForm($oPage);
-        }
-        else
-        {
-            if (!empty($sJson))
-            {
-                $oWizardHelper = WizardHelper::FromJSON($sJson);
-                $oObj = $oWizardHelper->GetTargetObject();
-            }
-            else
-            {
-                // Search form: no current object
-                $oObj = null;
-            }
-            $oWidget->GetObjectCreationForm($oPage, $oObj);
-        }
-		break;
-		
+			$oPage->SetContentType('text/html');
+			// Retrieving parameters
+			$sTargetClass = utils::ReadParam('sTargetClass', '', false, 'class');
+			$iInputId = utils::ReadParam('iInputId', '');
+			$sAttCode = utils::ReadParam('sAttCode', '');
+			$sJson = utils::ReadParam('json', '', false, 'raw_data');
+			// Building form, if target class is abstract we ask the user for the desired leaf class
+			$oWidget = new UIExtKeyWidget($sTargetClass, $iInputId, $sAttCode, false);
+			if (MetaModel::IsAbstract($sTargetClass))
+			{
+				$oWidget->GetClassSelectionForm($oPage);
+			}
+			else
+			{
+				if (!empty($sJson))
+				{
+					$oWizardHelper = WizardHelper::FromJSON($sJson);
+					$oObj = $oWizardHelper->GetTargetObject();
+				}
+				else
+				{
+					// Search form: no current object
+					$oObj = null;
+				}
+				$oWidget->GetObjectCreationForm($oPage, $oObj);
+			}
+			break;
+
 		// ui.extkeywidget
 		case 'doCreateObject':
-		$oPage->SetContentType('application/json');
-		$sTargetClass = utils::ReadParam('sTargetClass', '', false, 'class');
-		$iInputId = utils::ReadParam('iInputId', '');
-		$sFormPrefix = utils::ReadParam('sFormPrefix', '');
-		$sAttCode = utils::ReadParam('sAttCode', '');
-		$oWidget = new UIExtKeyWidget($sTargetClass, $iInputId, $sAttCode, false);
-		$aResult = $oWidget->DoCreateObject($oPage);
-		echo json_encode($aResult);
-		break;
-		
+			$oPage->SetContentType('application/json');
+			$sTargetClass = utils::ReadParam('sTargetClass', '', false, 'class');
+			$iInputId = utils::ReadParam('iInputId', '');
+			$sFormPrefix = utils::ReadParam('sFormPrefix', '');
+			$sAttCode = utils::ReadParam('sAttCode', '');
+			$oWidget = new UIExtKeyWidget($sTargetClass, $iInputId, $sAttCode, false);
+			$aResult = $oWidget->DoCreateObject($oPage);
+			echo json_encode($aResult);
+			break;
+
 		// ui.extkeywidget
 		case 'getObjectName':
-		$oPage->SetContentType('application/json');
-		$sTargetClass = utils::ReadParam('sTargetClass', '', false, 'class');
-		$iInputId = utils::ReadParam('iInputId', '');
-		$iObjectId = utils::ReadParam('iObjectId', '');
-		$bSearchMode = (utils::ReadParam('bSearchMode', 'false') == 'true');
-		$oWidget = new UIExtKeyWidget($sTargetClass, $iInputId, '', $bSearchMode);
-		$sName = $oWidget->GetObjectName($iObjectId);
-		echo json_encode(array('name' => $sName));	
-		break;
-		
+			$oPage->SetContentType('application/json');
+			$sTargetClass = utils::ReadParam('sTargetClass', '', false, 'class');
+			$iInputId = utils::ReadParam('iInputId', '');
+			$iObjectId = utils::ReadParam('iObjectId', '');
+			$bSearchMode = (utils::ReadParam('bSearchMode', 'false') == 'true');
+			$oWidget = new UIExtKeyWidget($sTargetClass, $iInputId, '', $bSearchMode);
+			$sName = $oWidget->GetObjectName($iObjectId);
+			echo json_encode(array('name' => $sName));
+			break;
+
 		// ui.extkeywidget
 		case 'displayHierarchy':
-		$oPage->SetContentType('text/html');
-		$sTargetClass = utils::ReadParam('sTargetClass', '', false, 'class');
-		$sInputId = utils::ReadParam('sInputId', '');
-		$sFilter = utils::ReadParam('sFilter', '', false, 'raw_data');
-		$sJson = utils::ReadParam('json', '', false, 'raw_data');
-		$currValue = utils::ReadParam('value', '');
-		$bSearchMode = (utils::ReadParam('bSearchMode', 'false') == 'true');
-		if (!empty($sJson))
-		{
-			$oWizardHelper = WizardHelper::FromJSON($sJson);
-			$oObj = $oWizardHelper->GetTargetObject();
-		}
-		else
-		{
-			// Search form: no current object
-			$oObj = null;
-		}
-		$oWidget = new UIExtKeyWidget($sTargetClass, $sInputId, '', $bSearchMode);
-		$oWidget->DisplayHierarchy($oPage, $sFilter, $currValue, $oObj);
-		break;
-		
+			$oPage->SetContentType('text/html');
+			$sTargetClass = utils::ReadParam('sTargetClass', '', false, 'class');
+			$sInputId = utils::ReadParam('sInputId', '');
+			$sFilter = utils::ReadParam('sFilter', '', false, 'raw_data');
+			$sJson = utils::ReadParam('json', '', false, 'raw_data');
+			$currValue = utils::ReadParam('value', '');
+			$bSearchMode = (utils::ReadParam('bSearchMode', 'false') == 'true');
+			if (!empty($sJson))
+			{
+				$oWizardHelper = WizardHelper::FromJSON($sJson);
+				$oObj = $oWizardHelper->GetTargetObject();
+			}
+			else
+			{
+				// Search form: no current object
+				$oObj = null;
+			}
+			$oWidget = new UIExtKeyWidget($sTargetClass, $sInputId, '', $bSearchMode);
+			$oWidget->DisplayHierarchy($oPage, $sFilter, $currValue, $oObj);
+			break;
+
 		////////////////////////////////////////////////////
-		
+
 		// ui.linkswidget
 		case 'doAddObjects':
-		$oPage->SetContentType('text/html');
-		$sAttCode = utils::ReadParam('sAttCode', '');
-		$iInputId = utils::ReadParam('iInputId', '');
-		$sSuffix = utils::ReadParam('sSuffix', '');
-		$sRemoteClass = utils::ReadParam('sRemoteClass', $sClass, false, 'class');
-		$bDuplicates = (utils::ReadParam('bDuplicates', 'false') == 'false') ? false : true;
-		$sJson = utils::ReadParam('json', '', false, 'raw_data');
-		$iMaxAddedId = utils::ReadParam('max_added_id');
-		$oWizardHelper = WizardHelper::FromJSON($sJson);
-		$oObj = $oWizardHelper->GetTargetObject();
-		$oWidget = new UILinksWidget($sClass, $sAttCode, $iInputId, $sSuffix, $bDuplicates);
-		if ($sFilter != '')
-		{
-			$oFullSetFilter = DBObjectSearch::unserialize($sFilter);
-		}
-		else
-		{
-			$oFullSetFilter = new DBObjectSearch($sRemoteClass);		
-		}
-		$oWidget->DoAddObjects($oPage, $iMaxAddedId, $oFullSetFilter, $oObj);
-		break;
-			
-		////////////////////////////////////////////////////////////
-		
-		case 'wizard_helper_preview':
-		$oPage->SetContentType('text/html');
-		$sJson = utils::ReadParam('json_obj', '', false, 'raw_data');
-		$oWizardHelper = WizardHelper::FromJSON($sJson);
-		$oObj = $oWizardHelper->GetTargetObject();
-		$oObj->DisplayBareProperties($oPage); 
-		break;
-		
-		case 'wizard_helper':
-		$oPage->SetContentType('text/html');
-		$sJson = utils::ReadParam('json_obj', '', false, 'raw_data');
-		$oWizardHelper = WizardHelper::FromJSON($sJson);
-		$oObj = $oWizardHelper->GetTargetObject(); 
-		$sClass = $oWizardHelper->GetTargetClass();
-		foreach($oWizardHelper->GetFieldsForDefaultValue() as $sAttCode)
-		{
-			$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
-			$defaultValue = $oAttDef->GetDefaultValue($oObj);
-			$oWizardHelper->SetDefaultValue($sAttCode, $defaultValue);
-			$oObj->Set($sAttCode, $defaultValue);
-		}
-		$sFormPrefix = $oWizardHelper->GetFormPrefix();
-		$aExpectedAttributes = ($oWizardHelper->GetStimulus() === null) ? array() : $oObj->GetTransitionAttributes($oWizardHelper->GetStimulus(), $oWizardHelper->GetInitialState());
-		foreach($oWizardHelper->GetFieldsForAllowedValues() as $sAttCode)
-		{
-			$sId = $oWizardHelper->GetIdForField($sAttCode);
-			if ($sId != '')
+			$oPage->SetContentType('text/html');
+			$sAttCode = utils::ReadParam('sAttCode', '');
+			$iInputId = utils::ReadParam('iInputId', '');
+			$sSuffix = utils::ReadParam('sSuffix', '');
+			$sRemoteClass = utils::ReadParam('sRemoteClass', $sClass, false, 'class');
+			$bDuplicates = (utils::ReadParam('bDuplicates', 'false') == 'false') ? false : true;
+			$sJson = utils::ReadParam('json', '', false, 'raw_data');
+			$iMaxAddedId = utils::ReadParam('max_added_id');
+			$oWizardHelper = WizardHelper::FromJSON($sJson);
+			$oObj = $oWizardHelper->GetTargetObject();
+			$oWidget = new UILinksWidget($sClass, $sAttCode, $iInputId, $sSuffix, $bDuplicates);
+			if ($sFilter != '')
 			{
-                if(array_key_exists($sAttCode, $aExpectedAttributes))
-                {
-                    $iFlags = $aExpectedAttributes[$sAttCode];
-                }
-                elseif ($oObj->IsNew())
+				$oFullSetFilter = DBObjectSearch::unserialize($sFilter);
+			}
+			else
+			{
+				$oFullSetFilter = new DBObjectSearch($sRemoteClass);
+			}
+			$oWidget->DoAddObjects($oPage, $iMaxAddedId, $oFullSetFilter, $oObj);
+			break;
+
+		////////////////////////////////////////////////////////////
+
+		case 'wizard_helper_preview':
+			$oPage->SetContentType('text/html');
+			$sJson = utils::ReadParam('json_obj', '', false, 'raw_data');
+			$oWizardHelper = WizardHelper::FromJSON($sJson);
+			$oObj = $oWizardHelper->GetTargetObject();
+			$oObj->DisplayBareProperties($oPage);
+			break;
+
+		case 'wizard_helper':
+			$oPage->SetContentType('text/html');
+			$sJson = utils::ReadParam('json_obj', '', false, 'raw_data');
+			$oWizardHelper = WizardHelper::FromJSON($sJson);
+			$oObj = $oWizardHelper->GetTargetObject();
+			$sClass = $oWizardHelper->GetTargetClass();
+			foreach($oWizardHelper->GetFieldsForDefaultValue() as $sAttCode)
+			{
+				$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
+				$defaultValue = $oAttDef->GetDefaultValue($oObj);
+				$oWizardHelper->SetDefaultValue($sAttCode, $defaultValue);
+				$oObj->Set($sAttCode, $defaultValue);
+			}
+			$sFormPrefix = $oWizardHelper->GetFormPrefix();
+			$aExpectedAttributes = ($oWizardHelper->GetStimulus() === null) ? array() : $oObj->GetTransitionAttributes($oWizardHelper->GetStimulus(), $oWizardHelper->GetInitialState());
+			foreach($oWizardHelper->GetFieldsForAllowedValues() as $sAttCode)
+			{
+				$sId = $oWizardHelper->GetIdForField($sAttCode);
+				if ($sId != '')
 				{
-					$iFlags = $oObj->GetInitialStateAttributeFlags($sAttCode);
-				}
-				else
-				{
-					$iFlags = $oObj->GetAttributeFlags($sAttCode);
-				}
-				if ($iFlags & OPT_ATT_READONLY)
-				{
-					$sHTMLValue = "<span id=\"field_{$sId}\">".$oObj->GetAsHTML($sAttCode);
-					$oWizardHelper->SetAllowedValuesHtml($sAttCode, $sHTMLValue);
-				}
-				else
-				{
-					// It may happen that the field we'd like to update does not
-					// exist in the form. For example, if the field should be hidden/read-only
-					// in the current state of the object
-					$value = $oObj->Get($sAttCode);
-					$displayValue = $oObj->GetEditValue($sAttCode);
-					$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
-					if (!$oAttDef->IsWritable())
+					if (array_key_exists($sAttCode, $aExpectedAttributes))
 					{
-						// Even non-writable fields (like AttributeExternal) can be refreshed 
-						$sHTMLValue = $oObj->GetAsHTML($sAttCode);
+						$iFlags = $aExpectedAttributes[$sAttCode];
+					}
+					elseif ($oObj->IsNew())
+					{
+						$iFlags = $oObj->GetInitialStateAttributeFlags($sAttCode);
 					}
 					else
 					{
-						$iFlags = MetaModel::GetAttributeFlags($sClass, $oObj->GetState(), $sAttCode);
-						$sHTMLValue = cmdbAbstractObject::GetFormElementForField($oPage, $sClass, $sAttCode, $oAttDef, $value, $displayValue, $sId, '', $iFlags, array('this' => $oObj, 'formPrefix' => $sFormPrefix), false);
-						// Make sure that we immediately validate the field when we reload it
-						$oPage->add_ready_script("$('#$sId').trigger('validate');");
+						$iFlags = $oObj->GetAttributeFlags($sAttCode);
+					}
+					if ($iFlags & OPT_ATT_READONLY)
+					{
+						$sHTMLValue = "<span id=\"field_{$sId}\">".$oObj->GetAsHTML($sAttCode);
+						$oWizardHelper->SetAllowedValuesHtml($sAttCode, $sHTMLValue);
+					}
+					else
+					{
+						// It may happen that the field we'd like to update does not
+						// exist in the form. For example, if the field should be hidden/read-only
+						// in the current state of the object
+						$value = $oObj->Get($sAttCode);
+						$displayValue = $oObj->GetEditValue($sAttCode);
+						$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
+						if (!$oAttDef->IsWritable())
+						{
+							// Even non-writable fields (like AttributeExternal) can be refreshed
+							$sHTMLValue = $oObj->GetAsHTML($sAttCode);
+						}
+						else
+						{
+							$iFlags = MetaModel::GetAttributeFlags($sClass, $oObj->GetState(), $sAttCode);
+							$sHTMLValue = cmdbAbstractObject::GetFormElementForField($oPage, $sClass, $sAttCode, $oAttDef, $value, $displayValue, $sId, '', $iFlags, array('this' => $oObj, 'formPrefix' => $sFormPrefix), false);
+							// Make sure that we immediately validate the field when we reload it
+							$oPage->add_ready_script("$('#$sId').trigger('validate');");
+						}
+						$oWizardHelper->SetAllowedValuesHtml($sAttCode, $sHTMLValue);
 					}
-					$oWizardHelper->SetAllowedValuesHtml($sAttCode, $sHTMLValue);
 				}
 			}
-		}
-		$oPage->add_script("oWizardHelper{$sFormPrefix}.m_oData=".$oWizardHelper->ToJSON().";\noWizardHelper{$sFormPrefix}.UpdateFields();\n");
-		break;
-		
+			$oPage->add_script("oWizardHelper{$sFormPrefix}.m_oData=".$oWizardHelper->ToJSON().";\noWizardHelper{$sFormPrefix}.UpdateFields();\n");
+			break;
+
 		case 'obj_creation_form':
-		$oPage->SetContentType('text/html');
-		$sJson = utils::ReadParam('json_obj', '', false, 'raw_data');
-		$oWizardHelper = WizardHelper::FromJSON($sJson);
-		$oObj = $oWizardHelper->GetTargetObject(); 
-		$sClass = $oWizardHelper->GetTargetClass();
-		$sTargetState = utils::ReadParam('target_state', '');
-		$iTransactionId = utils::ReadParam('transaction_id', '');
-		$oObj->Set(MetaModel::GetStateAttributeCode($sClass), $sTargetState);
-		cmdbAbstractObject::DisplayCreationForm($oPage, $sClass, $oObj, array(), array('action' => utils::GetAbsoluteUrlAppRoot().'pages/UI.php', 'transaction_id' => $iTransactionId)); 
-		break;
-		
+			$oPage->SetContentType('text/html');
+			$sJson = utils::ReadParam('json_obj', '', false, 'raw_data');
+			$oWizardHelper = WizardHelper::FromJSON($sJson);
+			$oObj = $oWizardHelper->GetTargetObject();
+			$sClass = $oWizardHelper->GetTargetClass();
+			$sTargetState = utils::ReadParam('target_state', '');
+			$iTransactionId = utils::ReadParam('transaction_id', '');
+			$oObj->Set(MetaModel::GetStateAttributeCode($sClass), $sTargetState);
+			cmdbAbstractObject::DisplayCreationForm($oPage, $sClass, $oObj, array(), array('action' => utils::GetAbsoluteUrlAppRoot().'pages/UI.php', 'transaction_id' => $iTransactionId));
+			break;
+
 		// DisplayBlock
 		case 'ajax':
-		$oPage->SetContentType('text/html');
-		if ($sFilter != "")
-		{
-			$sExtraParams = stripslashes(utils::ReadParam('extra_params', '', false, 'raw_data'));
-			$aExtraParams = array();
-			if (!empty($sExtraParams))
+			$oPage->SetContentType('text/html');
+			if ($sFilter != "")
 			{
-				$aExtraParams = json_decode(str_replace("'", '"', $sExtraParams), true /* associative array */);
-			}
-			// Restore the app context from the ExtraParams
-			$oAppContext = new ApplicationContext(false); // false => don't read the context yet !
-			$aContext = array();
-			foreach($oAppContext->GetNames() as $sName)
-			{
-				$sParamName = 'c['.$sName.']';
-				if (isset($aExtraParams[$sParamName]))
+				$sExtraParams = stripslashes(utils::ReadParam('extra_params', '', false, 'raw_data'));
+				$aExtraParams = array();
+				if (!empty($sExtraParams))
 				{
-					$aContext[$sName] = $aExtraParams[$sParamName];
+					$aExtraParams = json_decode(str_replace("'", '"', $sExtraParams), true /* associative array */);
 				}
-			}
-			$_REQUEST['c'] = $aContext;
-			if ($sEncoding == 'oql')
-			{
-				$oFilter = DBSearch::FromOQL($sFilter);
+				// Restore the app context from the ExtraParams
+				$oAppContext = new ApplicationContext(false); // false => don't read the context yet !
+				$aContext = array();
+				foreach($oAppContext->GetNames() as $sName)
+				{
+					$sParamName = 'c['.$sName.']';
+					if (isset($aExtraParams[$sParamName]))
+					{
+						$aContext[$sName] = $aExtraParams[$sParamName];
+					}
+				}
+				$_REQUEST['c'] = $aContext;
+				if ($sEncoding == 'oql')
+				{
+					$oFilter = DBSearch::FromOQL($sFilter);
+				}
+				else
+				{
+					$oFilter = DBSearch::unserialize($sFilter);
+				}
+				$oDisplayBlock = new DisplayBlock($oFilter, $sStyle, false);
+				$aExtraParams['display_limit'] = true;
+				$aExtraParams['truncated'] = true;
+				$oDisplayBlock->RenderContent($oPage, $aExtraParams);
 			}
 			else
 			{
-				$oFilter = DBSearch::unserialize($sFilter);
+				$oPage->p("Invalid query (empty filter).");
 			}
-			$oDisplayBlock = new DisplayBlock($oFilter, $sStyle, false);
-			$aExtraParams['display_limit'] = true;
-			$aExtraParams['truncated'] = true;
-			$oDisplayBlock->RenderContent($oPage, $aExtraParams);
-		}
-		else
-		{
-			$oPage->p("Invalid query (empty filter).");
-		}
-		break;
-		
-		case 'displayCSVHistory':
-		$oPage->SetContentType('text/html');
-		$bShowAll = (utils::ReadParam('showall', 'false') == 'true');
-		BulkChange::DisplayImportHistory($oPage, true, $bShowAll);
-		break;
-		
-		case 'details':
-		$oPage->SetContentType('text/html');
-		$key = utils::ReadParam('id', 0);
-		$oFilter = new DBObjectSearch($sClass);
-		$oFilter->AddCondition('id', $key, '=');
-		$oDisplayBlock = new DisplayBlock($oFilter, 'details', false);
-		$oDisplayBlock->RenderContent($oPage);
-		break;
-		
-		case 'pie_chart':
-		$oPage->SetContentType('application/json');
-		$sGroupBy = utils::ReadParam('group_by', '');
-		if ($sFilter != '')
-		{
-			if ($sEncoding == 'oql')
-			{
-				$oFilter = DBSearch::FromOQL($sFilter);
-			}
-			else
-			{
-				$oFilter = DBSearch::unserialize($sFilter);
-			}
-			$oDisplayBlock = new DisplayBlock($oFilter, 'pie_chart_ajax', false);
-			$oDisplayBlock->RenderContent($oPage, array('group_by' => $sGroupBy));
-		}
-		else
-		{
-		
-			$oPage->add("<chart>\n<chart_type>3d pie</chart_type><!-- empty filter '$sFilter' --></chart>\n.");
-		}
-		break;
-		
-		case 'chart':
-		// Workaround for IE8 + IIS + HTTPS
-		// See TRAC #363, fix described here: http://forums.codecharge.com/posts.php?post_id=97771
-		$oPage->add_header("Expires: Fri, 17 Jul 1970 05:00:00 GMT");
-		$oPage->add_header("Cache-Control: cache, must-revalidate");
-		$oPage->add_header("Pragma: public");
+			break;
+
+		case 'displayCSVHistory':
+			$oPage->SetContentType('text/html');
+			$bShowAll = (utils::ReadParam('showall', 'false') == 'true');
+			BulkChange::DisplayImportHistory($oPage, true, $bShowAll);
+			break;
+
+		case 'details':
+			$oPage->SetContentType('text/html');
+			$key = utils::ReadParam('id', 0);
+			$oFilter = new DBObjectSearch($sClass);
+			$oFilter->AddCondition('id', $key, '=');
+			$oDisplayBlock = new DisplayBlock($oFilter, 'details', false);
+			$oDisplayBlock->RenderContent($oPage);
+			break;
+
+		case 'pie_chart':
+			$oPage->SetContentType('application/json');
+			$sGroupBy = utils::ReadParam('group_by', '');
+			if ($sFilter != '')
+			{
+				if ($sEncoding == 'oql')
+				{
+					$oFilter = DBSearch::FromOQL($sFilter);
+				}
+				else
+				{
+					$oFilter = DBSearch::unserialize($sFilter);
+				}
+				$oDisplayBlock = new DisplayBlock($oFilter, 'pie_chart_ajax', false);
+				$oDisplayBlock->RenderContent($oPage, array('group_by' => $sGroupBy));
+			}
+			else
+			{
+
+				$oPage->add("<chart>\n<chart_type>3d pie</chart_type><!-- empty filter '$sFilter' --></chart>\n.");
+			}
+			break;
+
+		case 'chart':
+			// Workaround for IE8 + IIS + HTTPS
+			// See TRAC #363, fix described here: http://forums.codecharge.com/posts.php?post_id=97771
+			$oPage->add_header("Expires: Fri, 17 Jul 1970 05:00:00 GMT");
+			$oPage->add_header("Cache-Control: cache, must-revalidate");
+			$oPage->add_header("Pragma: public");
+
+			$aParams = utils::ReadParam('params', array(), false, 'raw_data');
+			if ($sFilter != '')
+			{
+				$oFilter = DBSearch::unserialize($sFilter);
+				$oDisplayBlock = new DisplayBlock($oFilter, 'chart_ajax', false);
+				$oDisplayBlock->RenderContent($oPage, $aParams);
+			}
+			else
+			{
+
+				$oPage->add("<chart>\n<chart_type>3d pie</chart_type><!-- empty filter '$sFilter' --></chart>\n.");
+			}
+			break;
 
-		$aParams = utils::ReadParam('params', array(), false, 'raw_data');
-		if ($sFilter != '')
-		{
-			$oFilter = DBSearch::unserialize($sFilter);
-			$oDisplayBlock = new DisplayBlock($oFilter, 'chart_ajax', false);
-			$oDisplayBlock->RenderContent($oPage, $aParams);
-		}
-		else
-		{
-		
-			$oPage->add("<chart>\n<chart_type>3d pie</chart_type><!-- empty filter '$sFilter' --></chart>\n.");
-		}
-		break;
-	
 		case 'modal_details':
-		$oPage->SetContentType('text/html');
-		$key = utils::ReadParam('id', 0);
-		$oFilter = new DBObjectSearch($sClass);
-		$oFilter->AddCondition('id', $key, '=');
-		$oPage->Add("<p style=\"width:100%; margin-top:-5px;padding:3px; background-color:#33f; color:#fff;\">Object Details</p>\n");
-		$oDisplayBlock = new DisplayBlock($oFilter, 'details', false);
-		$oDisplayBlock->RenderContent($oPage);
-		$oPage->Add("<input type=\"button\" class=\"jqmClose\" value=\" Close \" />\n");
-		break;
+			$oPage->SetContentType('text/html');
+			$key = utils::ReadParam('id', 0);
+			$oFilter = new DBObjectSearch($sClass);
+			$oFilter->AddCondition('id', $key, '=');
+			$oPage->Add("<p style=\"width:100%; margin-top:-5px;padding:3px; background-color:#33f; color:#fff;\">Object Details</p>\n");
+			$oDisplayBlock = new DisplayBlock($oFilter, 'details', false);
+			$oDisplayBlock->RenderContent($oPage);
+			$oPage->Add("<input type=\"button\" class=\"jqmClose\" value=\" Close \" />\n");
+			break;
 
 		case 'link':
-		$oPage->SetContentType('text/html');
-		$sClass = utils::ReadParam('sclass', 'logInfra', false, 'class');
-		$sAttCode = utils::ReadParam('attCode', 'name');
-		//$sOrg = utils::ReadParam('org_id', '');
-		$sName = utils::ReadParam('q', '');
-		$iMaxCount = utils::ReadParam('max', 30);
-		$iCount = 0;
-		$oFilter = new DBObjectSearch($sClass);
-		$oFilter->AddCondition($sAttCode, $sName, 'Begins with');
-		//$oFilter->AddCondition('org_id', $sOrg, '=');
-		$oSet = new CMDBObjectSet($oFilter, array($sAttCode => true));
-		while( ($iCount < $iMaxCount) && ($oObj = $oSet->fetch()) )
-		{
-			$oPage->add($oObj->GetAsHTML($sAttCode)."|".$oObj->GetKey()."\n");
-			$iCount++;
-		}
-		break;
-	
+			$oPage->SetContentType('text/html');
+			$sClass = utils::ReadParam('sclass', 'logInfra', false, 'class');
+			$sAttCode = utils::ReadParam('attCode', 'name');
+			//$sOrg = utils::ReadParam('org_id', '');
+			$sName = utils::ReadParam('q', '');
+			$iMaxCount = utils::ReadParam('max', 30);
+			$iCount = 0;
+			$oFilter = new DBObjectSearch($sClass);
+			$oFilter->AddCondition($sAttCode, $sName, 'Begins with');
+			//$oFilter->AddCondition('org_id', $sOrg, '=');
+			$oSet = new CMDBObjectSet($oFilter, array($sAttCode => true));
+			while (($iCount < $iMaxCount) && ($oObj = $oSet->fetch()))
+			{
+				$oPage->add($oObj->GetAsHTML($sAttCode)."|".$oObj->GetKey()."\n");
+				$iCount++;
+			}
+			break;
+
 		case 'combo_options':
-		$oPage->SetContentType('text/html');
-		$oFilter = DBSearch::FromOQL($sFilter);
-		$oSet = new CMDBObjectSet($oFilter);
-		while( $oObj = $oSet->fetch())
-		{
-			$oPage->add('<option title="Here is more information..." value="'.$oObj->GetKey().'">'.$oObj->GetName().'</option>');
-		}
-		break;
-		
+			$oPage->SetContentType('text/html');
+			$oFilter = DBSearch::FromOQL($sFilter);
+			$oSet = new CMDBObjectSet($oFilter);
+			while ($oObj = $oSet->fetch())
+			{
+				$oPage->add('<option title="Here is more information..." value="'.$oObj->GetKey().'">'.$oObj->GetName().'</option>');
+			}
+			break;
+
 		case 'display_document':
-		$id = utils::ReadParam('id', '');
-		$sField = utils::ReadParam('field', '');
-		if (!empty($sClass) && ($sClass != 'InlineImage') && !empty($id) && !empty($sField))
-		{
-			ormDocument::DownloadDocument($oPage, $sClass, $id, $sField, 'inline');
-		}
-		break;
-		
+			$id = utils::ReadParam('id', '');
+			$sField = utils::ReadParam('field', '');
+			if (!empty($sClass) && ($sClass != 'InlineImage') && !empty($id) && !empty($sField))
+			{
+				ormDocument::DownloadDocument($oPage, $sClass, $id, $sField, 'inline');
+			}
+			break;
+
 		case 'search_form':
-		$oPage->SetContentType('text/html');
-		$sClass = utils::ReadParam('className', '', false, 'class');
-		$sRootClass = utils::ReadParam('baseClass', '', false, 'class');
-		$currentId = utils::ReadParam('currentId', '');
-		$sTableId = utils::ReadParam('_table_id_', null, false, 'raw_data');
-		$sAction = utils::ReadParam('action', '');
-		$oFilter = new DBObjectSearch($sClass);
-		$oSet = new CMDBObjectSet($oFilter); 
-		$sHtml = cmdbAbstractObject::GetSearchForm($oPage, $oSet, array('currentId' => $currentId, 'baseClass' => $sRootClass, 'action' => $sAction, 'table_id' => $sTableId));
-		$oPage->add($sHtml);
-		break;
-		
+			$oPage->SetContentType('text/html');
+			$sClass = utils::ReadParam('className', '', false, 'class');
+			$sRootClass = utils::ReadParam('baseClass', '', false, 'class');
+			$currentId = utils::ReadParam('currentId', '');
+			$sTableId = utils::ReadParam('_table_id_', null, false, 'raw_data');
+			$sAction = utils::ReadParam('action', '');
+			$oFilter = new DBObjectSearch($sClass);
+			$oSet = new CMDBObjectSet($oFilter);
+			$sHtml = cmdbAbstractObject::GetSearchForm($oPage, $oSet, array('currentId' => $currentId, 'baseClass' => $sRootClass, 'action' => $sAction, 'table_id' => $sTableId));
+			$oPage->add($sHtml);
+			break;
+
 		case 'set_pref':
-		$sCode = utils::ReadPostedParam('code', '');
-		$sValue = utils::ReadPostedParam('value', '', 'raw_data');
-		appUserPreferences::SetPref($sCode, $sValue);
-		break;
-	
+			$sCode = utils::ReadPostedParam('code', '');
+			$sValue = utils::ReadPostedParam('value', '', 'raw_data');
+			appUserPreferences::SetPref($sCode, $sValue);
+			break;
+
 		case 'erase_all_pref':
-		// Can be useful in case a user got some corrupted prefs...
-		appUserPreferences::ClearPreferences();
-		break;
+			// Can be useful in case a user got some corrupted prefs...
+			appUserPreferences::ClearPreferences();
+			break;
 
 		case 'on_form_cancel':
-		// Called when a creation/modification form is cancelled by the end-user
-		// Let's take this opportunity to inform the plug-ins so that they can perform some cleanup
-		$iTransactionId = utils::ReadParam('transaction_id', 0);
-		$sTempId = session_id().'_'.$iTransactionId;
-		InlineImage::OnFormCancel($sTempId);
-		foreach (MetaModel::EnumPlugins('iApplicationUIExtension') as $oExtensionInstance)
-		{
-			$oExtensionInstance->OnFormCancel($sTempId);
-		}
-		$sObjClass = utils::ReadParam('obj_class', '', false, 'class');
-		$iObjKey = (int)utils::ReadParam('obj_key', 0, false, 'integer');
-		$sToken = utils::ReadParam('token', 0, false, 'raw_data');
-		if (($sObjClass != '') && ($iObjKey != 0) && ($sToken != ''))
-		{
-			$bReleaseLock = iTopOwnershipLock::ReleaseLock($sObjClass, $iObjKey, $sToken);
-		}
-		break;
+			// Called when a creation/modification form is cancelled by the end-user
+			// Let's take this opportunity to inform the plug-ins so that they can perform some cleanup
+			$iTransactionId = utils::ReadParam('transaction_id', 0);
+			$sTempId = session_id().'_'.$iTransactionId;
+			InlineImage::OnFormCancel($sTempId);
+			foreach(MetaModel::EnumPlugins('iApplicationUIExtension') as $oExtensionInstance)
+			{
+				$oExtensionInstance->OnFormCancel($sTempId);
+			}
+			$sObjClass = utils::ReadParam('obj_class', '', false, 'class');
+			$iObjKey = (int)utils::ReadParam('obj_key', 0, false, 'integer');
+			$sToken = utils::ReadParam('token', 0, false, 'raw_data');
+			if (($sObjClass != '') && ($iObjKey != 0) && ($sToken != ''))
+			{
+				$bReleaseLock = iTopOwnershipLock::ReleaseLock($sObjClass, $iObjKey, $sToken);
+			}
+			break;
 
 		case 'reload_dashboard':
-		$oPage->SetContentType('text/html');
-		$sDashboardId = utils::ReadParam('dashboard_id', '', false, 'raw_data');
-		$aExtraParams = utils::ReadParam('extra_params', '', false, 'raw_data');
-		ApplicationMenu::LoadAdditionalMenus();
-		$idx = ApplicationMenu::GetMenuIndexById($sDashboardId);
-		$oMenu = ApplicationMenu::GetMenuNode($idx);
-		$oDashboard = $oMenu->GetDashboard();
-		$oDashboard->Render($oPage, false, $aExtraParams);
-		$oPage->add_ready_script("$('.dashboard_contents table.listResults').tableHover(); $('.dashboard_contents table.listResults').tablesorter( { widgets: ['myZebra', 'truncatedList']} );");
-		break;
-		
+			$oPage->SetContentType('text/html');
+			$sDashboardId = utils::ReadParam('dashboard_id', '', false, 'raw_data');
+			$aExtraParams = utils::ReadParam('extra_params', '', false, 'raw_data');
+			ApplicationMenu::LoadAdditionalMenus();
+			$idx = ApplicationMenu::GetMenuIndexById($sDashboardId);
+			$oMenu = ApplicationMenu::GetMenuNode($idx);
+			$oDashboard = $oMenu->GetDashboard();
+			$oDashboard->Render($oPage, false, $aExtraParams);
+			$oPage->add_ready_script("$('.dashboard_contents table.listResults').tableHover(); $('.dashboard_contents table.listResults').tablesorter( { widgets: ['myZebra', 'truncatedList']} );");
+			break;
+
 		case 'dashboard_editor':
-		$sId = utils::ReadParam('id', '', false, 'raw_data');
-		ApplicationMenu::LoadAdditionalMenus();
-		$idx = ApplicationMenu::GetMenuIndexById($sId);
-		$oMenu = ApplicationMenu::GetMenuNode($idx);
-		$oMenu->RenderEditor($oPage);
-		break;
-		
+			$sId = utils::ReadParam('id', '', false, 'raw_data');
+			ApplicationMenu::LoadAdditionalMenus();
+			$idx = ApplicationMenu::GetMenuIndexById($sId);
+			$oMenu = ApplicationMenu::GetMenuNode($idx);
+			$oMenu->RenderEditor($oPage);
+			break;
+
 		case 'new_dashlet':
-		require_once(APPROOT.'application/forms.class.inc.php');
-		require_once(APPROOT.'application/dashlet.class.inc.php');
-		$sDashletClass = utils::ReadParam('dashlet_class', '');
-		$sDashletId =  utils::ReadParam('dashlet_id', '', false, 'raw_data');
-		if (is_subclass_of($sDashletClass, 'Dashlet'))
-		{
-			$oDashlet = new $sDashletClass(new ModelReflectionRuntime(), $sDashletId);
-			$offset = $oPage->start_capture();
-			$oDashlet->DoRender($oPage, true /* bEditMode */, false /* bEnclosingDiv */);
-			$sHtml = addslashes($oPage->end_capture($offset));
-			$sHtml = str_replace("\n", '', $sHtml);
-			$sHtml = str_replace("\r", '', $sHtml);
-			$oPage->add_script("$('#dashlet_$sDashletId').html('$sHtml');"); // in ajax web page add_script has the same effect as add_ready_script
-																			// but is executed BEFORE all 'ready_scripts'
-			$oForm = $oDashlet->GetForm(); // Rebuild the form since the values/content changed
-			$oForm->SetSubmitParams(utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php', array('operation' => 'update_dashlet_property'));
-			$sHtml = addslashes($oForm->RenderAsPropertySheet($oPage, true /* bReturnHtml */, '.itop-dashboard'));
-			$sHtml = str_replace("\n", '', $sHtml);
-			$sHtml = str_replace("\r", '', $sHtml);
-			$oPage->add_script("$('#dashlet_properties_$sDashletId').html('$sHtml')"); // in ajax web page add_script has the same effect as add_ready_script																	   // but is executed BEFORE all 'ready_scripts'
-		}
-		break;
-			
-		case 'update_dashlet_property':
-		require_once(APPROOT.'application/forms.class.inc.php');
-		require_once(APPROOT.'application/dashlet.class.inc.php');
-		$aParams = utils::ReadParam('params', '', false, 'raw_data');
-		$sDashletClass = $aParams['attr_dashlet_class'];
-		$sDashletId = $aParams['attr_dashlet_id'];
-		$aUpdatedProperties = $aParams['updated']; // Code of the changed properties as an array: 'attr_xxx', 'attr_xxy', etc...
-		$aPreviousValues = $aParams['previous_values']; // hash array: 'attr_xxx' => 'old_value'
-		if (is_subclass_of($sDashletClass, 'Dashlet'))
-		{
-			$oDashlet = new $sDashletClass(new ModelReflectionRuntime(), $sDashletId);
-			$oForm = $oDashlet->GetForm();
-			$aValues = $oForm->ReadParams(); // hash array: 'xxx' => 'new_value'
-			
-			$aCurrentValues = $aValues;
-			$aUpdatedDecoded = array();
-			foreach($aUpdatedProperties as $sProp)
-			{
-				$sDecodedProp = str_replace('attr_', '', $sProp); // Remove the attr_ prefix
-				$aCurrentValues[$sDecodedProp] = $aPreviousValues[$sProp]; // Set the previous value
-				$aUpdatedDecoded[] = $sDecodedProp;
-			}
-			
-			$oDashlet->FromParams($aCurrentValues);
-			$sPrevClass = get_class($oDashlet);
-			$oDashlet = $oDashlet->Update($aValues, $aUpdatedDecoded);
-			$sNewClass = get_class($oDashlet);
-			if ($sNewClass != $sPrevClass)
-			{
-				$oPage->add_ready_script("$('#dashlet_$sDashletId').dashlet('option', {dashlet_class: '$sNewClass'});");
-			}
-			if ($oDashlet->IsRedrawNeeded())
+			require_once(APPROOT.'application/forms.class.inc.php');
+			require_once(APPROOT.'application/dashlet.class.inc.php');
+			$sDashletClass = utils::ReadParam('dashlet_class', '');
+			$sDashletId = utils::ReadParam('dashlet_id', '', false, 'raw_data');
+			if (is_subclass_of($sDashletClass, 'Dashlet'))
 			{
+				$oDashlet = new $sDashletClass(new ModelReflectionRuntime(), $sDashletId);
 				$offset = $oPage->start_capture();
 				$oDashlet->DoRender($oPage, true /* bEditMode */, false /* bEnclosingDiv */);
 				$sHtml = addslashes($oPage->end_capture($offset));
 				$sHtml = str_replace("\n", '', $sHtml);
 				$sHtml = str_replace("\r", '', $sHtml);
-				
 				$oPage->add_script("$('#dashlet_$sDashletId').html('$sHtml');"); // in ajax web page add_script has the same effect as add_ready_script
-																				// but is executed BEFORE all 'ready_scripts'
-			}
-			if ($oDashlet->IsFormRedrawNeeded())
-			{
+				// but is executed BEFORE all 'ready_scripts'
 				$oForm = $oDashlet->GetForm(); // Rebuild the form since the values/content changed
 				$oForm->SetSubmitParams(utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php', array('operation' => 'update_dashlet_property'));
 				$sHtml = addslashes($oForm->RenderAsPropertySheet($oPage, true /* bReturnHtml */, '.itop-dashboard'));
 				$sHtml = str_replace("\n", '', $sHtml);
 				$sHtml = str_replace("\r", '', $sHtml);
 				$oPage->add_script("$('#dashlet_properties_$sDashletId').html('$sHtml')"); // in ajax web page add_script has the same effect as add_ready_script																	   // but is executed BEFORE all 'ready_scripts'
-																						   // but is executed BEFORE all 'ready_scripts'
 			}
-		}
-		break;
-		
+			break;
+
+		case 'update_dashlet_property':
+			require_once(APPROOT.'application/forms.class.inc.php');
+			require_once(APPROOT.'application/dashlet.class.inc.php');
+			$aParams = utils::ReadParam('params', '', false, 'raw_data');
+			$sDashletClass = $aParams['attr_dashlet_class'];
+			$sDashletId = $aParams['attr_dashlet_id'];
+			$aUpdatedProperties = $aParams['updated']; // Code of the changed properties as an array: 'attr_xxx', 'attr_xxy', etc...
+			$aPreviousValues = $aParams['previous_values']; // hash array: 'attr_xxx' => 'old_value'
+			if (is_subclass_of($sDashletClass, 'Dashlet'))
+			{
+				$oDashlet = new $sDashletClass(new ModelReflectionRuntime(), $sDashletId);
+				$oForm = $oDashlet->GetForm();
+				$aValues = $oForm->ReadParams(); // hash array: 'xxx' => 'new_value'
+
+				$aCurrentValues = $aValues;
+				$aUpdatedDecoded = array();
+				foreach($aUpdatedProperties as $sProp)
+				{
+					$sDecodedProp = str_replace('attr_', '', $sProp); // Remove the attr_ prefix
+					$aCurrentValues[$sDecodedProp] = $aPreviousValues[$sProp]; // Set the previous value
+					$aUpdatedDecoded[] = $sDecodedProp;
+				}
+
+				$oDashlet->FromParams($aCurrentValues);
+				$sPrevClass = get_class($oDashlet);
+				$oDashlet = $oDashlet->Update($aValues, $aUpdatedDecoded);
+				$sNewClass = get_class($oDashlet);
+				if ($sNewClass != $sPrevClass)
+				{
+					$oPage->add_ready_script("$('#dashlet_$sDashletId').dashlet('option', {dashlet_class: '$sNewClass'});");
+				}
+				if ($oDashlet->IsRedrawNeeded())
+				{
+					$offset = $oPage->start_capture();
+					$oDashlet->DoRender($oPage, true /* bEditMode */, false /* bEnclosingDiv */);
+					$sHtml = addslashes($oPage->end_capture($offset));
+					$sHtml = str_replace("\n", '', $sHtml);
+					$sHtml = str_replace("\r", '', $sHtml);
+
+					$oPage->add_script("$('#dashlet_$sDashletId').html('$sHtml');"); // in ajax web page add_script has the same effect as add_ready_script
+					// but is executed BEFORE all 'ready_scripts'
+				}
+				if ($oDashlet->IsFormRedrawNeeded())
+				{
+					$oForm = $oDashlet->GetForm(); // Rebuild the form since the values/content changed
+					$oForm->SetSubmitParams(utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php', array('operation' => 'update_dashlet_property'));
+					$sHtml = addslashes($oForm->RenderAsPropertySheet($oPage, true /* bReturnHtml */, '.itop-dashboard'));
+					$sHtml = str_replace("\n", '', $sHtml);
+					$sHtml = str_replace("\r", '', $sHtml);
+					$oPage->add_script("$('#dashlet_properties_$sDashletId').html('$sHtml')"); // in ajax web page add_script has the same effect as add_ready_script																	   // but is executed BEFORE all 'ready_scripts'
+					// but is executed BEFORE all 'ready_scripts'
+				}
+			}
+			break;
+
 		case 'save_dashboard':
-		$sDashboardId = utils::ReadParam('dashboard_id', '', false, 'raw_data');
-		$aParams = array();
-		$aParams['layout_class'] = utils::ReadParam('layout_class', '');
-		$aParams['title'] = utils::ReadParam('title', '', false, 'raw_data');
-		$aParams['auto_reload'] = utils::ReadParam('auto_reload', false);
-		$aParams['auto_reload_sec'] = utils::ReadParam('auto_reload_sec', 300);
-		$aParams['cells'] = utils::ReadParam('cells', array(), false, 'raw_data');
-		$oDashboard = new RuntimeDashboard($sDashboardId);
-		$oDashboard->FromParams($aParams);
-		$oDashboard->Save();
-		// trigger a reload of the current page since the dashboard just changed
-		$oPage->add_ready_script(
-<<<EOF
+			$sDashboardId = utils::ReadParam('dashboard_id', '', false, 'raw_data');
+			$aParams = array();
+			$aParams['layout_class'] = utils::ReadParam('layout_class', '');
+			$aParams['title'] = utils::ReadParam('title', '', false, 'raw_data');
+			$aParams['auto_reload'] = utils::ReadParam('auto_reload', false);
+			$aParams['auto_reload_sec'] = utils::ReadParam('auto_reload_sec', 300);
+			$aParams['cells'] = utils::ReadParam('cells', array(), false, 'raw_data');
+			$oDashboard = new RuntimeDashboard($sDashboardId);
+			$oDashboard->FromParams($aParams);
+			$oDashboard->Save();
+			// trigger a reload of the current page since the dashboard just changed
+			$oPage->add_ready_script(
+				<<<EOF
 	var sLocation = new String(window.location.href);
 	var sNewLocation = sLocation.replace('&edit=1', '');
 	sNewLocation = sLocation.replace(/#(.?)$/, ''); // Strips everything after the hash, since IF the URL does not change AND contains a hash, then Chrome does not reload the page
 	window.location.href = sNewLocation;
 EOF
-		);
-		$oPage->add_ready_script("sLocation = new String(window.location.href); window.location.href=sLocation.replace('&edit=1', '');"); // reloads the page, doing a GET even if we arrived via a POST
-		break;
+			);
+			$oPage->add_ready_script("sLocation = new String(window.location.href); window.location.href=sLocation.replace('&edit=1', '');"); // reloads the page, doing a GET even if we arrived via a POST
+			break;
 
 		case 'revert_dashboard':
-		$sDashboardId = utils::ReadParam('dashboard_id', '', false, 'raw_data');
-		$oDashboard = new RuntimeDashboard($sDashboardId);
-		$oDashboard->Revert();
-		
-		// trigger a reload of the current page since the dashboard just changed
-		$oPage->add_ready_script("window.location.href=window.location.href;"); // reloads the page, doing a GET even if we arrived via a POST
-		break;
-		
+			$sDashboardId = utils::ReadParam('dashboard_id', '', false, 'raw_data');
+			$oDashboard = new RuntimeDashboard($sDashboardId);
+			$oDashboard->Revert();
+
+			// trigger a reload of the current page since the dashboard just changed
+			$oPage->add_ready_script("window.location.href=window.location.href;"); // reloads the page, doing a GET even if we arrived via a POST
+			break;
+
 		case 'render_dashboard':
-		$sDashboardId = utils::ReadParam('dashboard_id', '', false, 'raw_data');
-		$aParams = array();
-		$aParams['layout_class'] = utils::ReadParam('layout_class', '');
-		$aParams['title'] = utils::ReadParam('title', '', false, 'raw_data');
-		$aParams['cells'] = utils::ReadParam('cells', array(), false, 'raw_data');
-		$aParams['auto_reload'] = utils::ReadParam('auto_reload', false);
-		$aParams['auto_reload_sec'] = utils::ReadParam('auto_reload_sec', 300);
-		$oDashboard = new RuntimeDashboard($sDashboardId);
-		$oDashboard->FromParams($aParams);
-		$oDashboard->Render($oPage, true /* bEditMode */);
-		break;
-		
+			$sDashboardId = utils::ReadParam('dashboard_id', '', false, 'raw_data');
+			$aParams = array();
+			$aParams['layout_class'] = utils::ReadParam('layout_class', '');
+			$aParams['title'] = utils::ReadParam('title', '', false, 'raw_data');
+			$aParams['cells'] = utils::ReadParam('cells', array(), false, 'raw_data');
+			$aParams['auto_reload'] = utils::ReadParam('auto_reload', false);
+			$aParams['auto_reload_sec'] = utils::ReadParam('auto_reload_sec', 300);
+			$oDashboard = new RuntimeDashboard($sDashboardId);
+			$oDashboard->FromParams($aParams);
+			$oDashboard->Render($oPage, true /* bEditMode */);
+			break;
+
 		case 'dashlet_creation_dlg':
-		$sOQL = utils::ReadParam('oql', '', false, 'raw_data');
-		RuntimeDashboard::GetDashletCreationDlgFromOQL($oPage, $sOQL);
-		break;
+			$sOQL = utils::ReadParam('oql', '', false, 'raw_data');
+			RuntimeDashboard::GetDashletCreationDlgFromOQL($oPage, $sOQL);
+			break;
 
 		case 'add_dashlet':
-		$oForm = RuntimeDashboard::GetDashletCreationForm();
-		$aValues = $oForm->ReadParams();
-		
-		$sDashletClass = $aValues['dashlet_class'];
-		$sMenuId = $aValues['menu_id'];
-		
-		if (is_subclass_of($sDashletClass, 'Dashlet'))
-		{
-			$oDashlet = new $sDashletClass(new ModelReflectionRuntime(), 0);
-			$oDashlet->FromParams($aValues);
+			$oForm = RuntimeDashboard::GetDashletCreationForm();
+			$aValues = $oForm->ReadParams();
 
+			$sDashletClass = $aValues['dashlet_class'];
+			$sMenuId = $aValues['menu_id'];
+
+			if (is_subclass_of($sDashletClass, 'Dashlet'))
+			{
+				$oDashlet = new $sDashletClass(new ModelReflectionRuntime(), 0);
+				$oDashlet->FromParams($aValues);
+
+				ApplicationMenu::LoadAdditionalMenus();
+				$index = ApplicationMenu::GetMenuIndexById($sMenuId);
+				$oMenu = ApplicationMenu::GetMenuNode($index);
+				$oMenu->AddDashlet($oDashlet);
+				// navigate to the dashboard page
+				if ($aValues['open_editor'])
+				{
+					$oPage->add_ready_script("window.location.href='".addslashes(utils::GetAbsoluteUrlAppRoot().'pages/UI.php?c[menu]='.urlencode($sMenuId))."&edit=1';"); // reloads the page, doing a GET even if we arrived via a POST
+				}
+			}
+			break;
+
+		case 'shortcut_list_dlg':
+			$sOQL = utils::ReadParam('oql', '', false, 'raw_data');
+			$sTableSettings = utils::ReadParam('table_settings', '', false, 'raw_data');
+			ShortcutOQL::GetCreationDlgFromOQL($oPage, $sOQL, $sTableSettings);
+			break;
+
+		case 'shortcut_list_create':
+			$oForm = ShortcutOQL::GetCreationForm();
+			$aValues = $oForm->ReadParams();
+
+			$oAppContext = new ApplicationContext();
+			$aContext = $oAppContext->GetAsHash();
+			$sContext = serialize($aContext);
+
+			$oShortcut = MetaModel::NewObject("ShortcutOQL");
+			$oShortcut->Set('user_id', UserRights::GetUserId());
+			$oShortcut->Set("context", $sContext);
+			$oShortcut->Set("name", $aValues['name']);
+			$oShortcut->Set("oql", $aValues['oql']);
+			$iAutoReload = (int)$aValues['auto_reload_sec'];
+			if (($aValues['auto_reload']) && ($iAutoReload > 0))
+			{
+				$oShortcut->Set("auto_reload_sec", max(MetaModel::GetConfig()->Get('min_reload_interval'), $iAutoReload));
+				$oShortcut->Set("auto_reload", 'custom');
+			}
+			utils::PushArchiveMode(false);
+			$iId = $oShortcut->DBInsertNoReload();
+			utils::PopArchiveMode();
+
+			$oShortcut->CloneTableSettings($aValues['table_settings']);
+
+			// Add the menu node in the right place
+			//
+			// Mmmm... already done because the newly created menu is read from the DB
+			//         as soon as we invoke DisplayMenu
+
+			// Refresh the menu pane
+			$aExtraParams = array();
+			ApplicationMenu::DisplayMenu($oPage, $aExtraParams);
+			break;
+
+		case 'shortcut_rename_dlg':
+			$oSearch = new DBObjectSearch('Shortcut');
+			$aShortcuts = utils::ReadMultipleSelection($oSearch);
+			$iShortcut = $aShortcuts[0];
+			$oShortcut = MetaModel::GetObject('Shortcut', $iShortcut);
+			$oShortcut->StartRenameDialog($oPage);
+			break;
+
+		case 'shortcut_rename_go':
+			$iShortcut = utils::ReadParam('id', 0);
+			$oShortcut = MetaModel::GetObject('Shortcut', $iShortcut);
+
+			$sName = utils::ReadParam('attr_name', '', false, 'raw_data');
+			if (strlen($sName) > 0)
+			{
+				$oShortcut->Set('name', $sName);
+				utils::PushArchiveMode(false);
+				$oShortcut->DBUpdate();
+				utils::PopArchiveMode();
+				$oPage->add_ready_script('window.location.reload();');
+			}
+
+			break;
+
+		case 'shortcut_delete_go':
+			$oSearch = new DBObjectSearch('Shortcut');
+			$oSearch->AddCondition('user_id', UserRights::GetUserId(), '=');
+			$aShortcuts = utils::ReadMultipleSelection($oSearch);
+			foreach($aShortcuts as $iShortcut)
+			{
+				$oShortcut = MetaModel::GetObject('Shortcut', $iShortcut);
+				utils::PushArchiveMode(false);
+				$oShortcut->DBDelete();
+				utils::PopArchiveMode();
+				$oPage->add_ready_script('window.location.reload();');
+			}
+			break;
+
+		case 'export_dashboard':
+			$sMenuId = utils::ReadParam('id', '', false, 'raw_data');
 			ApplicationMenu::LoadAdditionalMenus();
 			$index = ApplicationMenu::GetMenuIndexById($sMenuId);
 			$oMenu = ApplicationMenu::GetMenuNode($index);
-			$oMenu->AddDashlet($oDashlet);
-			// navigate to the dashboard page
-			if ($aValues['open_editor'])
-			{
-				$oPage->add_ready_script("window.location.href='".addslashes(utils::GetAbsoluteUrlAppRoot().'pages/UI.php?c[menu]='.urlencode($sMenuId))."&edit=1';"); // reloads the page, doing a GET even if we arrived via a POST
-			}
-		}
-		break;
-		
-		case 'shortcut_list_dlg':
-		$sOQL = utils::ReadParam('oql', '', false, 'raw_data');
-		$sTableSettings = utils::ReadParam('table_settings', '', false, 'raw_data');
-		ShortcutOQL::GetCreationDlgFromOQL($oPage, $sOQL, $sTableSettings);
-		break;
-		
-		case 'shortcut_list_create':
-		$oForm = ShortcutOQL::GetCreationForm();
-		$aValues = $oForm->ReadParams();
-
-		$oAppContext = new ApplicationContext();
-		$aContext = $oAppContext->GetAsHash();
-		$sContext = serialize($aContext);
-		
-		$oShortcut = MetaModel::NewObject("ShortcutOQL");
-		$oShortcut->Set('user_id', UserRights::GetUserId());
-		$oShortcut->Set("context", $sContext);
-		$oShortcut->Set("name", $aValues['name']);
-		$oShortcut->Set("oql", $aValues['oql']);
-		$iAutoReload = (int)$aValues['auto_reload_sec'];
-		if (($aValues['auto_reload']) && ($iAutoReload > 0))
-		{
-			$oShortcut->Set("auto_reload_sec", max(MetaModel::GetConfig()->Get('min_reload_interval'), $iAutoReload));
-			$oShortcut->Set("auto_reload", 'custom');
-		}
-		utils::PushArchiveMode(false);
-		$iId = $oShortcut->DBInsertNoReload();
-		utils::PopArchiveMode();
-
-		$oShortcut->CloneTableSettings($aValues['table_settings']);
-
-		// Add the menu node in the right place
-		//
-		// Mmmm... already done because the newly created menu is read from the DB
-		//         as soon as we invoke DisplayMenu 
-
-		// Refresh the menu pane
-		$aExtraParams = array();
-		ApplicationMenu::DisplayMenu($oPage, $aExtraParams);
-		break;
-
-		case 'shortcut_rename_dlg':
-		$oSearch = new DBObjectSearch('Shortcut');
-		$aShortcuts = utils::ReadMultipleSelection($oSearch);
-		$iShortcut = $aShortcuts[0];
-		$oShortcut = MetaModel::GetObject('Shortcut', $iShortcut);
-		$oShortcut->StartRenameDialog($oPage);
-		break;
-
-		case 'shortcut_rename_go':
-		$iShortcut = utils::ReadParam('id', 0);
-		$oShortcut = MetaModel::GetObject('Shortcut', $iShortcut);
-
-		$sName = utils::ReadParam('attr_name', '', false, 'raw_data');
-		if (strlen($sName) > 0)
-		{
-			$oShortcut->Set('name', $sName);
-			utils::PushArchiveMode(false);
-			$oShortcut->DBUpdate();
-			utils::PopArchiveMode();
-			$oPage->add_ready_script('window.location.reload();');
-		}
-		
-		break;
-
-		case 'shortcut_delete_go':
-		$oSearch = new DBObjectSearch('Shortcut');
-		$oSearch->AddCondition('user_id', UserRights::GetUserId(), '=');
-		$aShortcuts = utils::ReadMultipleSelection($oSearch);
-		foreach ($aShortcuts as $iShortcut)
-		{
-			$oShortcut = MetaModel::GetObject('Shortcut', $iShortcut);
-			utils::PushArchiveMode(false);
-			$oShortcut->DBDelete();
-			utils::PopArchiveMode();
-			$oPage->add_ready_script('window.location.reload();');
-		}
-		break;
-
-		case 'export_dashboard':
-		$sMenuId = utils::ReadParam('id', '', false, 'raw_data');
-		ApplicationMenu::LoadAdditionalMenus();
-		$index = ApplicationMenu::GetMenuIndexById($sMenuId);
-		$oMenu = ApplicationMenu::GetMenuNode($index);
-		if ($oMenu instanceof DashboardMenuNode)
-		{
-			$oDashboard = $oMenu->GetDashboard();
-
-			$oPage->TrashUnexpectedOutput();
-			$oPage->SetContentType('text/xml');
-			$oPage->SetContentDisposition('attachment', $oMenu->GetLabel().'.xml');
-			$oPage->add($oDashboard->ToXml());
-		}
-		break;
-		
-		case 'import_dashboard':
-		$sMenuId = utils::ReadParam('id', '', false, 'raw_data');
-		ApplicationMenu::LoadAdditionalMenus();
-		$index = ApplicationMenu::GetMenuIndexById($sMenuId);
-		$oMenu = ApplicationMenu::GetMenuNode($index);
-		$aResult = array('error' => '');
-		try
-		{
 			if ($oMenu instanceof DashboardMenuNode)
 			{
-				$oDoc = utils::ReadPostedDocument('dashboard_upload_file');
 				$oDashboard = $oMenu->GetDashboard();
-				$oDashboard->FromXml($oDoc->GetData());
-				$oDashboard->Save();
-			}
-			else
-			{
-				$aResult['error'] = 'Dashboard id="'.$sMenuId.'" not found.';
-			}
-		}
-		catch(DOMException $e)
-		{
-			$aResult = array('error' => Dict::S('UI:Error:InvalidDashboardFile'));
-		}
-		catch(Exception $e)
-		{
-			$aResult = array('error' => $e->getMessage());
-		}
-		$oPage->add(json_encode($aResult));
-		break;
-		
-		case 'about_box':
-		$oPage->SetContentType('text/html');
 
-		$sDialogTitle = addslashes(Dict::S('UI:About:Title'));
-		$oPage->add_ready_script(
-<<<EOF
+				$oPage->TrashUnexpectedOutput();
+				$oPage->SetContentType('text/xml');
+				$oPage->SetContentDisposition('attachment', $oMenu->GetLabel().'.xml');
+				$oPage->add($oDashboard->ToXml());
+			}
+			break;
+
+		case 'import_dashboard':
+			$sMenuId = utils::ReadParam('id', '', false, 'raw_data');
+			ApplicationMenu::LoadAdditionalMenus();
+			$index = ApplicationMenu::GetMenuIndexById($sMenuId);
+			$oMenu = ApplicationMenu::GetMenuNode($index);
+			$aResult = array('error' => '');
+			try
+			{
+				if ($oMenu instanceof DashboardMenuNode)
+				{
+					$oDoc = utils::ReadPostedDocument('dashboard_upload_file');
+					$oDashboard = $oMenu->GetDashboard();
+					$oDashboard->FromXml($oDoc->GetData());
+					$oDashboard->Save();
+				}
+				else
+				{
+					$aResult['error'] = 'Dashboard id="'.$sMenuId.'" not found.';
+				}
+			} catch (DOMException $e)
+			{
+				$aResult = array('error' => Dict::S('UI:Error:InvalidDashboardFile'));
+			} catch (Exception $e)
+			{
+				$aResult = array('error' => $e->getMessage());
+			}
+			$oPage->add(json_encode($aResult));
+			break;
+
+		case 'about_box':
+			$oPage->SetContentType('text/html');
+
+			$sDialogTitle = addslashes(Dict::S('UI:About:Title'));
+			$oPage->add_ready_script(
+				<<<EOF
 $('#about_box').dialog({
 	width: 700,
 	modal: true,
@@ -1159,341 +1158,343 @@ $("#collapse_support_details").click(function() {
 });
 $('#support_details').toggle();
 EOF
-		);
-		$sVersionString = Dict::Format('UI:iTopVersion:Long', ITOP_APPLICATION, ITOP_VERSION, ITOP_REVISION, ITOP_BUILD_DATE);
-		$sMySQLVersion = CMDBSource::GetDBVersion();
-		$sPHPVersion = phpversion();
-		$sOSVersion = PHP_OS;
-		$sWebServerVersion = $_SERVER["SERVER_SOFTWARE"];
-		$sModules = implode(', ', get_loaded_extensions());
+			);
+			$sVersionString = Dict::Format('UI:iTopVersion:Long', ITOP_APPLICATION, ITOP_VERSION, ITOP_REVISION, ITOP_BUILD_DATE);
+			$sMySQLVersion = CMDBSource::GetDBVersion();
+			$sPHPVersion = phpversion();
+			$sOSVersion = PHP_OS;
+			$sWebServerVersion = $_SERVER["SERVER_SOFTWARE"];
+			$sModules = implode(', ', get_loaded_extensions());
 
-		// Get the datamodel directory
-		$oFilter = DBObjectSearch::FromOQL('SELECT ModuleInstallation WHERE name="datamodel"');
-		$oSet = new DBObjectSet($oFilter, array('installed' => false)); // Most recent first
-		$oLastInstall = $oSet->Fetch();
-		$sLastInstallDate = $oLastInstall->Get('installed');
-		$sDataModelVersion = $oLastInstall->Get('version');
-		$aDataModelInfo = json_decode($oLastInstall->Get('comment'), true);
-		$sDataModelSourceDir = $aDataModelInfo['source_dir'];
+			// Get the datamodel directory
+			$oFilter = DBObjectSearch::FromOQL('SELECT ModuleInstallation WHERE name="datamodel"');
+			$oSet = new DBObjectSet($oFilter, array('installed' => false)); // Most recent first
+			$oLastInstall = $oSet->Fetch();
+			$sLastInstallDate = $oLastInstall->Get('installed');
+			$sDataModelVersion = $oLastInstall->Get('version');
+			$aDataModelInfo = json_decode($oLastInstall->Get('comment'), true);
+			$sDataModelSourceDir = $aDataModelInfo['source_dir'];
 
-		require_once(APPROOT.'setup/runtimeenv.class.inc.php');
-		$sCurrEnv = utils::GetCurrentEnvironment();
-		$oRuntimeEnv = new RunTimeEnvironment($sCurrEnv);
-		$aSearchDirs = array(APPROOT.$sDataModelSourceDir);
-		if (file_exists(APPROOT.'extensions'))
-		{
-			$aSearchDirs[] = APPROOT.'extensions';
-		}
-		$sExtraDir = APPROOT.'data/'.$sCurrEnv.'-modules/';
-		if (file_exists($sExtraDir))
-		{
-			$aSearchDirs[] = $sExtraDir;
-		}
-		$aAvailableModules = $oRuntimeEnv->AnalyzeInstallation(MetaModel::GetConfig(), $aSearchDirs);
-
-		require_once(APPROOT.'setup/setuputils.class.inc.php');
-		$aLicenses = SetupUtils::GetLicenses($sCurrEnv);
-
-		$aItopSettings = array('cron_max_execution_time', 'timezone');
-		$aPHPSettings = array('memory_limit', 'max_execution_time', 'upload_max_filesize', 'post_max_size');
-		$aMySQLSettings = array('max_allowed_packet', 'key_buffer_size', 'query_cache_size');
-		$aMySQLStatuses = array('Key_read_requests', 'Key_reads');
-
-		if (extension_loaded('suhosin'))
-		{
-			$aPHPSettings[] = 'suhosin.post.max_vars';
-			$aPHPSettings[] = 'suhosin.get.max_value_length';
-		}
-
-		$aMySQLVars = array();
-		foreach (CMDBSource::QueryToArray('SHOW VARIABLES') as $aRow)
-		{
-			$aMySQLVars[$aRow['Variable_name']] = $aRow['Value'];
-		}
-
-		$aMySQLStats = array();
-		foreach (CMDBSource::QueryToArray('SHOW GLOBAL STATUS') as $aRow)
-		{
-			$aMySQLStats[$aRow['Variable_name']] = $aRow['Value'];
-		}
-
-		// Display
-		//
-		$oPage->add("<div id=\"about_box\">");
-		$oPage->add('<div style="margin-left: 120px;">');
-		$oPage->add('<table>');
-		$oPage->add('<tr>');
-		$oPage->add('<td><a href="http://www.combodo.com" title="www.combodo.com" target="_blank" style="background: none;"><img src="../images/logo-combodo.png?itopversion='.ITOP_VERSION.'" style="float: right;"/></a></td>');
-		$oPage->add('<td style="padding-left: 20px;">');
-		$oPage->add($sVersionString.'<br/>');
-		$oPage->add(Dict::S('UI:About:DataModel').': '.$sDataModelVersion.'<br/>');
-		$oPage->add('MySQL: '.$sMySQLVersion.'<br/>');
-		$oPage->add('PHP: '.$sPHPVersion.'<br/>');
-		$oPage->add('</td>');
-		$oPage->add('</tr>');
-		$oPage->add('</table>');
-		$oPage->add("</div>");
-
-		$oPage->add("<div>");
-		$oPage->add('<fieldset>');
-		$oPage->add('<legend>'.Dict::S('UI:About:Licenses').'</legend>');
-		$oPage->add('<ul style="margin: 0; font-size: smaller; max-height: 15em; overflow: auto;">');
-		$index = 0;
-		foreach($aLicenses as $oLicense)
-		{
-			$oPage->add('<li><b>'.$oLicense->product.'</b>, &copy; '.$oLicense->author.' is licensed under the <b>'.$oLicense->license_type.' license</b>. (<a id="toggle_'.$index.'" class="CollapsibleLabel" style="cursor:pointer;">Details</a>)');
-			$oPage->add('<div id="license_'.$index.'" class="license_text" style="display:none;overflow:auto;max-height:10em;font-size:small;border:1px #696969 solid;margin-bottom:1em; margin-top:0.5em;padding:0.5em;">'.$oLicense->text.'</div>');
-			$oPage->add_ready_script('$("#toggle_'.$index.'").click( function() { $("#license_'.$index.'").slideToggle("normal"); } );');
-			$index++;
-		}
-		$oPage->add('</ul>');
-		$oPage->add('</fieldset>');
-		$oPage->add("</div>");
-
-		$oPage->add('<fieldset>');
-		$oPage->add('<legend>'.Dict::S('UI:About:InstallationOptions').'</legend>');
-		$oPage->add("<div style=\"max-height: 150px; overflow: auto; font-size: smaller;\">");
-		$oPage->add('<ul style="margin: 0;">');
-		
-		require_once(APPROOT.'setup/extensionsmap.class.inc.php');
-		$oExtensionsMap = new iTopExtensionsMap();
-		$oExtensionsMap->LoadChoicesFromDatabase(MetaModel::GetConfig());
-		$aChoices = $oExtensionsMap->GetChoices();
-		foreach ($aChoices as $oExtension)
-		{
-			switch($oExtension->sSource)
+			require_once(APPROOT.'setup/runtimeenv.class.inc.php');
+			$sCurrEnv = utils::GetCurrentEnvironment();
+			$oRuntimeEnv = new RunTimeEnvironment($sCurrEnv);
+			$aSearchDirs = array(APPROOT.$sDataModelSourceDir);
+			if (file_exists(APPROOT.'extensions'))
 			{
-				case iTopExtension::SOURCE_REMOTE:
-				$sSource = ' <span class="extension-source">'.Dict::S('UI:About:RemoteExtensionSource').'</span>';
-				break;
-				
-				case iTopExtension::SOURCE_MANUAL:
-				$sSource = ' <span class="extension-source">'.Dict::S('UI:About:ManualExtensionSource').'</span>';
-				break;
-				
-				default:
-				$sSource = '';
+				$aSearchDirs[] = APPROOT.'extensions';
 			}
-			$oPage->add('<li title="'.Dict::Format('UI:About:Extension_Version', $oExtension->sInstalledVersion).'">'.$oExtension->sLabel.$sSource.'</li>');
-		}
-		$oPage->add('</ul>');
-		$oPage->add("</div>");
-		$oPage->add('</fieldset>');
-
-
-		// MUST NOT be localized, as the information given here will be sent to the support
-		$oPage->add("<a id=\"collapse_support_details\" class=\"CollapsibleLabel\" href=\"#\">".Dict::S('UI:About:Support')."</a></br>\n");
-		$oPage->add("<div id=\"support_details\">");
-		$oPage->add('<textarea readonly style="width: 660px; height: 150px; font-size: smaller;">');
-		$oPage->add("===== begin =====\n");
-		$oPage->add('iTopVersion: '.ITOP_VERSION."\n");
-		$oPage->add('iTopBuild: '.ITOP_REVISION."\n");
-		$oPage->add('iTopBuildDate: '.ITOP_BUILD_DATE."\n");
-		$oPage->add('DataModelVersion: '.$sDataModelVersion."\n");
-		$oPage->add('MySQLVersion: '.$sMySQLVersion."\n");
-		$oPage->add('PHPVersion: '. $sPHPVersion."\n");
-		$oPage->add('OSVersion: '.$sOSVersion."\n");
-		$oPage->add('WebServerVersion: '.$sWebServerVersion."\n");
-		$oPage->add('PHPModules: '.$sModules."\n");
-		foreach ($aItopSettings as $siTopVar)
-		{
-			$oPage->add('ItopSetting/'.$siTopVar.': '.MetaModel::GetConfig()->Get($siTopVar)."\n");
-		}
-		foreach ($aPHPSettings as $sPHPVar)
-		{
-			$oPage->add('PHPSetting/'.$sPHPVar.': '.ini_get($sPHPVar)."\n");
-		}
-		foreach ($aMySQLSettings as $sMySQLVar)
-		{
-			$oPage->add('MySQLSetting/'.$sMySQLVar.': '.$aMySQLVars[$sMySQLVar]."\n");
-		}
-		foreach ($aMySQLStatuses as $sMySQLStatus)
-		{
-			$oPage->add('MySQLStatus/'.$sMySQLStatus.': '.$aMySQLStats[$sMySQLStatus]."\n");
-		}
-
-		$oPage->add('InstallDate: '.$sLastInstallDate."\n");
-		$oPage->add('InstallPath: '.APPROOT."\n");
-		$oPage->add("---- Installation choices ----\n");
-		foreach ($aChoices as $oExtension)
-		{
-			switch($oExtension->sSource)
+			$sExtraDir = APPROOT.'data/'.$sCurrEnv.'-modules/';
+			if (file_exists($sExtraDir))
 			{
-				case iTopExtension::SOURCE_REMOTE:
-				$sSource = ' ('.Dict::S('UI:About:RemoteExtensionSource').')';
-				break;
-					
-				case iTopExtension::SOURCE_MANUAL:
-				$sSource = ' ('.Dict::S('UI:About:ManualExtensionSource').')';
-				break;
-					
-				default:
-				$sSource = '';
+				$aSearchDirs[] = $sExtraDir;
 			}
-			$oPage->add('InstalledExtension/'.$oExtension->sCode.'/'.$oExtension->sVersion.$sSource."\n");
-		}
-		$oPage->add("---- Actual modules installed ----\n");
-		foreach ($aAvailableModules as $sModuleId => $aModuleData)
-		{
-			if ($sModuleId == '_Root_') continue;
-			if ($aModuleData['version_db'] == '') continue;
-			$oPage->add('InstalledModule/'.$sModuleId.': '.$aModuleData['version_db']."\n");
-		}
+			$aAvailableModules = $oRuntimeEnv->AnalyzeInstallation(MetaModel::GetConfig(), $aSearchDirs);
 
-		$oPage->add('===== end =====');
-		$oPage->add('</textarea>');
-		$oPage->add("</div>");
+			require_once(APPROOT.'setup/setuputils.class.inc.php');
+			$aLicenses = SetupUtils::GetLicenses($sCurrEnv);
+
+			$aItopSettings = array('cron_max_execution_time', 'timezone');
+			$aPHPSettings = array('memory_limit', 'max_execution_time', 'upload_max_filesize', 'post_max_size');
+			$aMySQLSettings = array('max_allowed_packet', 'key_buffer_size', 'query_cache_size');
+			$aMySQLStatuses = array('Key_read_requests', 'Key_reads');
+
+			if (extension_loaded('suhosin'))
+			{
+				$aPHPSettings[] = 'suhosin.post.max_vars';
+				$aPHPSettings[] = 'suhosin.get.max_value_length';
+			}
+
+			$aMySQLVars = array();
+			foreach(CMDBSource::QueryToArray('SHOW VARIABLES') as $aRow)
+			{
+				$aMySQLVars[$aRow['Variable_name']] = $aRow['Value'];
+			}
+
+			$aMySQLStats = array();
+			foreach(CMDBSource::QueryToArray('SHOW GLOBAL STATUS') as $aRow)
+			{
+				$aMySQLStats[$aRow['Variable_name']] = $aRow['Value'];
+			}
+
+			// Display
+			//
+			$oPage->add("<div id=\"about_box\">");
+			$oPage->add('<div style="margin-left: 120px;">');
+			$oPage->add('<table>');
+			$oPage->add('<tr>');
+			$oPage->add('<td><a href="http://www.combodo.com" title="www.combodo.com" target="_blank" style="background: none;"><img src="../images/logo-combodo.png?itopversion='.ITOP_VERSION.'" style="float: right;"/></a></td>');
+			$oPage->add('<td style="padding-left: 20px;">');
+			$oPage->add($sVersionString.'<br/>');
+			$oPage->add(Dict::S('UI:About:DataModel').': '.$sDataModelVersion.'<br/>');
+			$oPage->add('MySQL: '.$sMySQLVersion.'<br/>');
+			$oPage->add('PHP: '.$sPHPVersion.'<br/>');
+			$oPage->add('</td>');
+			$oPage->add('</tr>');
+			$oPage->add('</table>');
+			$oPage->add("</div>");
+
+			$oPage->add("<div>");
+			$oPage->add('<fieldset>');
+			$oPage->add('<legend>'.Dict::S('UI:About:Licenses').'</legend>');
+			$oPage->add('<ul style="margin: 0; font-size: smaller; max-height: 15em; overflow: auto;">');
+			$index = 0;
+			foreach($aLicenses as $oLicense)
+			{
+				$oPage->add('<li><b>'.$oLicense->product.'</b>, &copy; '.$oLicense->author.' is licensed under the <b>'.$oLicense->license_type.' license</b>. (<a id="toggle_'.$index.'" class="CollapsibleLabel" style="cursor:pointer;">Details</a>)');
+				$oPage->add('<div id="license_'.$index.'" class="license_text" style="display:none;overflow:auto;max-height:10em;font-size:small;border:1px #696969 solid;margin-bottom:1em; margin-top:0.5em;padding:0.5em;">'.$oLicense->text.'</div>');
+				$oPage->add_ready_script('$("#toggle_'.$index.'").click( function() { $("#license_'.$index.'").slideToggle("normal"); } );');
+				$index++;
+			}
+			$oPage->add('</ul>');
+			$oPage->add('</fieldset>');
+			$oPage->add("</div>");
+
+			$oPage->add('<fieldset>');
+			$oPage->add('<legend>'.Dict::S('UI:About:InstallationOptions').'</legend>');
+			$oPage->add("<div style=\"max-height: 150px; overflow: auto; font-size: smaller;\">");
+			$oPage->add('<ul style="margin: 0;">');
+
+			require_once(APPROOT.'setup/extensionsmap.class.inc.php');
+			$oExtensionsMap = new iTopExtensionsMap();
+			$oExtensionsMap->LoadChoicesFromDatabase(MetaModel::GetConfig());
+			$aChoices = $oExtensionsMap->GetChoices();
+			foreach($aChoices as $oExtension)
+			{
+				switch ($oExtension->sSource)
+				{
+					case iTopExtension::SOURCE_REMOTE:
+						$sSource = ' <span class="extension-source">'.Dict::S('UI:About:RemoteExtensionSource').'</span>';
+						break;
+
+					case iTopExtension::SOURCE_MANUAL:
+						$sSource = ' <span class="extension-source">'.Dict::S('UI:About:ManualExtensionSource').'</span>';
+						break;
+
+					default:
+						$sSource = '';
+				}
+				$oPage->add('<li title="'.Dict::Format('UI:About:Extension_Version', $oExtension->sInstalledVersion).'">'.$oExtension->sLabel.$sSource.'</li>');
+			}
+			$oPage->add('</ul>');
+			$oPage->add("</div>");
+			$oPage->add('</fieldset>');
+
+
+			// MUST NOT be localized, as the information given here will be sent to the support
+			$oPage->add("<a id=\"collapse_support_details\" class=\"CollapsibleLabel\" href=\"#\">".Dict::S('UI:About:Support')."</a></br>\n");
+			$oPage->add("<div id=\"support_details\">");
+			$oPage->add('<textarea readonly style="width: 660px; height: 150px; font-size: smaller;">');
+			$oPage->add("===== begin =====\n");
+			$oPage->add('iTopVersion: '.ITOP_VERSION."\n");
+			$oPage->add('iTopBuild: '.ITOP_REVISION."\n");
+			$oPage->add('iTopBuildDate: '.ITOP_BUILD_DATE."\n");
+			$oPage->add('DataModelVersion: '.$sDataModelVersion."\n");
+			$oPage->add('MySQLVersion: '.$sMySQLVersion."\n");
+			$oPage->add('PHPVersion: '.$sPHPVersion."\n");
+			$oPage->add('OSVersion: '.$sOSVersion."\n");
+			$oPage->add('WebServerVersion: '.$sWebServerVersion."\n");
+			$oPage->add('PHPModules: '.$sModules."\n");
+			foreach($aItopSettings as $siTopVar)
+			{
+				$oPage->add('ItopSetting/'.$siTopVar.': '.MetaModel::GetConfig()->Get($siTopVar)."\n");
+			}
+			foreach($aPHPSettings as $sPHPVar)
+			{
+				$oPage->add('PHPSetting/'.$sPHPVar.': '.ini_get($sPHPVar)."\n");
+			}
+			foreach($aMySQLSettings as $sMySQLVar)
+			{
+				$oPage->add('MySQLSetting/'.$sMySQLVar.': '.$aMySQLVars[$sMySQLVar]."\n");
+			}
+			foreach($aMySQLStatuses as $sMySQLStatus)
+			{
+				$oPage->add('MySQLStatus/'.$sMySQLStatus.': '.$aMySQLStats[$sMySQLStatus]."\n");
+			}
+
+			$oPage->add('InstallDate: '.$sLastInstallDate."\n");
+			$oPage->add('InstallPath: '.APPROOT."\n");
+			$oPage->add("---- Installation choices ----\n");
+			foreach($aChoices as $oExtension)
+			{
+				switch ($oExtension->sSource)
+				{
+					case iTopExtension::SOURCE_REMOTE:
+						$sSource = ' ('.Dict::S('UI:About:RemoteExtensionSource').')';
+						break;
+
+					case iTopExtension::SOURCE_MANUAL:
+						$sSource = ' ('.Dict::S('UI:About:ManualExtensionSource').')';
+						break;
+
+					default:
+						$sSource = '';
+				}
+				$oPage->add('InstalledExtension/'.$oExtension->sCode.'/'.$oExtension->sVersion.$sSource."\n");
+			}
+			$oPage->add("---- Actual modules installed ----\n");
+			foreach($aAvailableModules as $sModuleId => $aModuleData)
+			{
+				if ($sModuleId == '_Root_') continue;
+				if ($aModuleData['version_db'] == '') continue;
+				$oPage->add('InstalledModule/'.$sModuleId.': '.$aModuleData['version_db']."\n");
+			}
+
+			$oPage->add('===== end =====');
+			$oPage->add('</textarea>');
+			$oPage->add("</div>");
+
+			$oPage->add("</div>");
+			break;
 
-		$oPage->add("</div>");
-		break;
-		
 		case 'history':
-		$oPage->SetContentType('text/html');
-		$id = (int)utils::ReadParam('id', 0);
-		$iStart = (int)utils::ReadParam('start', 0);
-		$iCount = (int)utils::ReadParam('count', MetaModel::GetConfig()->Get('max_history_length', '50'));
-		$oObj = MetaModel::GetObject($sClass, $id);
-		$oObj->DisplayBareHistory($oPage, false, $iCount, $iStart);
-		$oPage->add_ready_script("$('#history table.listResults').tableHover(); $('#history table.listResults').tablesorter( { widgets: ['myZebra', 'truncatedList']} );");
-		break;
+			$oPage->SetContentType('text/html');
+			$id = (int)utils::ReadParam('id', 0);
+			$iStart = (int)utils::ReadParam('start', 0);
+			$iCount = (int)utils::ReadParam('count', MetaModel::GetConfig()->Get('max_history_length', '50'));
+			$oObj = MetaModel::GetObject($sClass, $id);
+			$oObj->DisplayBareHistory($oPage, false, $iCount, $iStart);
+			$oPage->add_ready_script("$('#history table.listResults').tableHover(); $('#history table.listResults').tablesorter( { widgets: ['myZebra', 'truncatedList']} );");
+			break;
 
 		case 'history_from_filter':
-		$oPage->SetContentType('text/html');
-		$oHistoryFilter = DBSearch::unserialize($sFilter);
-		$iStart = (int)utils::ReadParam('start', 0);
-		$iCount = (int)utils::ReadParam('count', MetaModel::GetConfig()->Get('max_history_length', '50'));
-		$oBlock = new HistoryBlock($oHistoryFilter, 'table', false);
-		$oBlock->SetLimit($iCount, $iStart);
-		$oBlock->Display($oPage, 'history');
-		$oPage->add_ready_script("$('#history table.listResults').tableHover(); $('#history table.listResults').tablesorter( { widgets: ['myZebra', 'truncatedList']} );");
-		break;
+			$oPage->SetContentType('text/html');
+			$oHistoryFilter = DBSearch::unserialize($sFilter);
+			$iStart = (int)utils::ReadParam('start', 0);
+			$iCount = (int)utils::ReadParam('count', MetaModel::GetConfig()->Get('max_history_length', '50'));
+			$oBlock = new HistoryBlock($oHistoryFilter, 'table', false);
+			$oBlock->SetLimit($iCount, $iStart);
+			$oBlock->Display($oPage, 'history');
+			$oPage->add_ready_script("$('#history table.listResults').tableHover(); $('#history table.listResults').tablesorter( { widgets: ['myZebra', 'truncatedList']} );");
+			break;
 
 		case 'full_text_search':
-		$aFullTextNeedles = utils::ReadParam('needles', array(), false, 'raw_data');
-		$sFullText = trim(implode(' ', $aFullTextNeedles));
-		$sClassName = utils::ReadParam('class', '');
-		$iCount = utils::ReadParam('count', 0);
-		$iCurrentPos = utils::ReadParam('position', 0);
-		$iTune = utils::ReadParam('tune', 0);
-		if (empty($sFullText))
-		{
-			$oPage->p(Dict::S('UI:Search:NoSearch'));
-			break;
-		}
-
-		// Search in full text mode in all the classes
-		$aMatches = array();
-
-		// Build the ordered list of classes to search into
-		//
-		if (empty($sClassName))
-		{
-			$aSearchClasses = MetaModel::GetClasses('searchable');					
-		}
-		else
-		{
-			// Search is limited to a given class and its subclasses
-			$aSearchClasses = MetaModel::EnumChildClasses($sClassName, ENUM_CHILD_CLASSES_ALL);
-		}
-		// Skip abstract classes, since we search in all the child classes anyway
-		foreach($aSearchClasses as $idx => $sClass)
-		{
-			if (MetaModel::IsAbstract($sClass))
+			$aFullTextNeedles = utils::ReadParam('needles', array(), false, 'raw_data');
+			$sFullText = trim(implode(' ', $aFullTextNeedles));
+			$sClassName = utils::ReadParam('class', '');
+			$iCount = utils::ReadParam('count', 0);
+			$iCurrentPos = utils::ReadParam('position', 0);
+			$iTune = utils::ReadParam('tune', 0);
+			if (empty($sFullText))
 			{
-				unset($aSearchClasses[$idx]);
+				$oPage->p(Dict::S('UI:Search:NoSearch'));
+				break;
 			}
-		}
 
-		$sMaxChunkDuration = MetaModel::GetConfig()->Get('full_text_chunk_duration');
-		$aAccelerators = MetaModel::GetConfig()->Get('full_text_accelerators');
+			// Search in full text mode in all the classes
+			$aMatches = array();
 
-		foreach (array_reverse($aAccelerators) as $sClass => $aRestriction)
-		{
-			$bSkip = false;
-			$iPos = array_search($sClass, $aSearchClasses);
-			if ($iPos !== false)
+			// Build the ordered list of classes to search into
+			//
+			if (empty($sClassName))
 			{
-				unset($aSearchClasses[$iPos]);
+				$aSearchClasses = MetaModel::GetClasses('searchable');
 			}
 			else
 			{
-				$bSkip = true;
+				// Search is limited to a given class and its subclasses
+				$aSearchClasses = MetaModel::EnumChildClasses($sClassName, ENUM_CHILD_CLASSES_ALL);
 			}
-			$bSkip |= array_key_exists('skip', $aRestriction) ? $aRestriction['skip'] : false ;
-			if (!in_array($sClass, $aSearchClasses))
-			if ($sClass == $sClassName)
+			// Skip abstract classes, since we search in all the child classes anyway
+			foreach($aSearchClasses as $idx => $sClass)
 			{
-				// Class explicitely requested, do NOT skip it
-				// beware: there may not be a 'query' defined for a skipped class !
-				$bSkip = false;
-			}
-			if (!$bSkip)
-			{
-				// NOT skipped, add the class to the list of classes to search into
-				if (array_key_exists('query', $aRestriction))
+				if (MetaModel::IsAbstract($sClass))
 				{
-					array_unshift($aSearchClasses, $aRestriction['query']);
+					unset($aSearchClasses[$idx]);
+				}
+			}
+
+			$sMaxChunkDuration = MetaModel::GetConfig()->Get('full_text_chunk_duration');
+			$aAccelerators = MetaModel::GetConfig()->Get('full_text_accelerators');
+
+			foreach(array_reverse($aAccelerators) as $sClass => $aRestriction)
+			{
+				$bSkip = false;
+				$iPos = array_search($sClass, $aSearchClasses);
+				if ($iPos !== false)
+				{
+					unset($aSearchClasses[$iPos]);
 				}
 				else
 				{
-					// No accelerator query
-					array_unshift($aSearchClasses, $sClassName);
+					$bSkip = true;
 				}
-			}
-		}
-
-		$aSearchClasses = array_values($aSearchClasses); // renumbers the array starting from zero, removing the missing indexes
-		$fStarted = microtime(true);
-		$iFoundInThisRound = 0;
-		for($iPos = $iCurrentPos; $iPos < count($aSearchClasses) ; $iPos++)
-		{
-			if ($iFoundInThisRound && (microtime(true) - $fStarted >= $sMaxChunkDuration))
-			{
-				break;
-			}
-
-			$sClassSpec = $aSearchClasses[$iPos];
-			if (substr($sClassSpec, 0, 7) == 'SELECT ')
-			{
-				$oFilter = DBObjectSearch::FromOQL($sClassSpec);
-				$sClassName = $oFilter->GetClass();
-				$sNeedleFormat = isset($aAccelerators[$sClassName]['needle']) ? $aAccelerators[$sClassName]['needle'] : '%$needle$%';
-				$sNeedle = str_replace('$needle$', $sFullText, $sNeedleFormat);
-				$aParams = array('needle' => $sNeedle);
-			}
-			else
-			{
-				$sClassName = $sClassSpec;
-				$oFilter = new DBObjectSearch($sClassName);
-				$aParams = array();
-
-				foreach($aFullTextNeedles as $sSearchText)
+				$bSkip |= array_key_exists('skip', $aRestriction) ? $aRestriction['skip'] : false;
+				if (!in_array($sClass, $aSearchClasses))
 				{
-					$oFilter->AddCondition_FullText($sSearchText);
+					if ($sClass == $sClassName)
+					{
+						// Class explicitely requested, do NOT skip it
+						// beware: there may not be a 'query' defined for a skipped class !
+						$bSkip = false;
+					}
+				}
+				if (!$bSkip)
+				{
+					// NOT skipped, add the class to the list of classes to search into
+					if (array_key_exists('query', $aRestriction))
+					{
+						array_unshift($aSearchClasses, $aRestriction['query']);
+					}
+					else
+					{
+						// No accelerator query
+						array_unshift($aSearchClasses, $sClassName);
+					}
 				}
 			}
-			$oFilter->SetShowObsoleteData(utils::ShowObsoleteData());
-			// Skip abstract classes
-			if (MetaModel::IsAbstract($sClassName)) continue;
 
-			if ($iTune > 0)
+			$aSearchClasses = array_values($aSearchClasses); // renumbers the array starting from zero, removing the missing indexes
+			$fStarted = microtime(true);
+			$iFoundInThisRound = 0;
+			for($iPos = $iCurrentPos; $iPos < count($aSearchClasses); $iPos++)
 			{
-				$fStartedClass = microtime(true);
-			}
-			$oSet = new DBObjectSet($oFilter, array(), $aParams);
-			if (array_key_exists($sClassName, $aAccelerators) && array_key_exists('attributes', $aAccelerators[$sClassName]))
-			{
-				$oSet->OptimizeColumnLoad(array($oFilter->GetClassAlias() => $aAccelerators[$sClassName]['attributes']));
-			}
+				if ($iFoundInThisRound && (microtime(true) - $fStarted >= $sMaxChunkDuration))
+				{
+					break;
+				}
 
-			$sFullTextJS = addslashes($sFullText);
-			$bEnableEnlarge =  array_key_exists($sClassName, $aAccelerators) && array_key_exists('query', $aAccelerators[$sClassName]);
-			if (array_key_exists($sClassName, $aAccelerators) && array_key_exists('enable_enlarge', $aAccelerators[$sClassName]))
-			{
-				$bEnableEnlarge &= $aAccelerators[$sClassName]['enable_enlarge'];
-			}
-			$sEnlargeTheSearch =
-<<<EOF
+				$sClassSpec = $aSearchClasses[$iPos];
+				if (substr($sClassSpec, 0, 7) == 'SELECT ')
+				{
+					$oFilter = DBObjectSearch::FromOQL($sClassSpec);
+					$sClassName = $oFilter->GetClass();
+					$sNeedleFormat = isset($aAccelerators[$sClassName]['needle']) ? $aAccelerators[$sClassName]['needle'] : '%$needle$%';
+					$sNeedle = str_replace('$needle$', $sFullText, $sNeedleFormat);
+					$aParams = array('needle' => $sNeedle);
+				}
+				else
+				{
+					$sClassName = $sClassSpec;
+					$oFilter = new DBObjectSearch($sClassName);
+					$aParams = array();
+
+					foreach($aFullTextNeedles as $sSearchText)
+					{
+						$oFilter->AddCondition_FullText($sSearchText);
+					}
+				}
+				$oFilter->SetShowObsoleteData(utils::ShowObsoleteData());
+				// Skip abstract classes
+				if (MetaModel::IsAbstract($sClassName)) continue;
+
+				if ($iTune > 0)
+				{
+					$fStartedClass = microtime(true);
+				}
+				$oSet = new DBObjectSet($oFilter, array(), $aParams);
+				if (array_key_exists($sClassName, $aAccelerators) && array_key_exists('attributes', $aAccelerators[$sClassName]))
+				{
+					$oSet->OptimizeColumnLoad(array($oFilter->GetClassAlias() => $aAccelerators[$sClassName]['attributes']));
+				}
+
+				$sFullTextJS = addslashes($sFullText);
+				$bEnableEnlarge = array_key_exists($sClassName, $aAccelerators) && array_key_exists('query', $aAccelerators[$sClassName]);
+				if (array_key_exists($sClassName, $aAccelerators) && array_key_exists('enable_enlarge', $aAccelerators[$sClassName]))
+				{
+					$bEnableEnlarge &= $aAccelerators[$sClassName]['enable_enlarge'];
+				}
+				$sEnlargeTheSearch =
+					<<<EOF
 			$('.search-class-$sClassName button').attr('disabled', 'disabled');
 
 			$('.search-class-$sClassName h2').append('&nbsp;<img id="indicator" src="../images/indicator.gif">');
@@ -1501,92 +1502,94 @@ EOF
 			$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php', oParams, function(data) {
 				$('.search-class-$sClassName').html(data);
 			});
-EOF
-			;
+EOF;
 
-			
-			$sEnlargeButton = '';
-			if ($bEnableEnlarge)
-			{
-				$sEnlargeButton = "&nbsp;<button onclick=\"".htmlentities($sEnlargeTheSearch, ENT_QUOTES, 'UTF-8')."\">".Dict::S('UI:Search:Enlarge')."</button>";
-			}
-			if ($oSet->Count() > 0)
-			{
-				$aLeafs = array();
-				while($oObj = $oSet->Fetch())
+
+				$sEnlargeButton = '';
+				if ($bEnableEnlarge)
 				{
-					if (get_class($oObj) == $sClassName)
+					$sEnlargeButton = "&nbsp;<button onclick=\"".htmlentities($sEnlargeTheSearch, ENT_QUOTES, 'UTF-8')."\">".Dict::S('UI:Search:Enlarge')."</button>";
+				}
+				if ($oSet->Count() > 0)
+				{
+					$aLeafs = array();
+					while ($oObj = $oSet->Fetch())
 					{
-						$aLeafs[] = $oObj->GetKey();
-						$iFoundInThisRound ++; 
+						if (get_class($oObj) == $sClassName)
+						{
+							$aLeafs[] = $oObj->GetKey();
+							$iFoundInThisRound++;
+						}
+					}
+					$oLeafsFilter = new DBObjectSearch($sClassName);
+					if (count($aLeafs) > 0)
+					{
+						$iCount += count($aLeafs);
+						$oPage->add("<div class=\"search-class-result search-class-$sClassName\">\n");
+						$oPage->add("<div class=\"page_header\">\n");
+						if (array_key_exists($sClassName, $aAccelerators))
+						{
+							$oPage->add("<h2>".MetaModel::GetClassIcon($sClassName)."&nbsp;<span class=\"hilite\">".Dict::Format('UI:Search:Count_ObjectsOf_Class_Found', count($aLeafs), Metamodel::GetName($sClassName)).$sEnlargeButton."</h2>\n");
+						}
+						else
+						{
+							$oPage->add("<h2>".MetaModel::GetClassIcon($sClassName)."&nbsp;<span class=\"hilite\">".Dict::Format('UI:Search:Count_ObjectsOf_Class_Found', count($aLeafs), Metamodel::GetName($sClassName))."</h2>\n");
+						}
+						$oPage->add("</div>\n");
+						$oLeafsFilter->AddCondition('id', $aLeafs, 'IN');
+						$oBlock = new DisplayBlock($oLeafsFilter, 'list', false);
+						$sBlockId = 'global_search_'.$sClassName;
+						$oPage->add('<div id="'.$sBlockId.'">');
+						$oBlock->RenderContent($oPage, array('table_id' => $sBlockId, 'currentId' => $sBlockId));
+						$oPage->add("</div>\n");
+						$oPage->add("</div>\n");
+						$oPage->p('&nbsp;'); // Some space ?
 					}
 				}
-				$oLeafsFilter = new DBObjectSearch($sClassName);
-				if (count($aLeafs) > 0)
+				else
 				{
-					$iCount += count($aLeafs);
-					$oPage->add("<div class=\"search-class-result search-class-$sClassName\">\n");
-					$oPage->add("<div class=\"page_header\">\n");
 					if (array_key_exists($sClassName, $aAccelerators))
 					{
-						$oPage->add("<h2>".MetaModel::GetClassIcon($sClassName)."&nbsp;<span class=\"hilite\">".Dict::Format('UI:Search:Count_ObjectsOf_Class_Found', count($aLeafs), Metamodel::GetName($sClassName)).$sEnlargeButton."</h2>\n");
+						$oPage->add("<div class=\"search-class-result search-class-$sClassName\">\n");
+						$oPage->add("<div class=\"page_header\">\n");
+						$oPage->add("<h2>".MetaModel::GetClassIcon($sClassName)."&nbsp;<span class=\"hilite\">".Dict::Format('UI:Search:Count_ObjectsOf_Class_Found', 0, Metamodel::GetName($sClassName)).$sEnlargeButton."</h2>\n");
+						$oPage->add("</div>\n");
+						$oPage->add("</div>\n");
+						$oPage->p('&nbsp;'); // Some space ?
 					}
-					else
-					{
-						$oPage->add("<h2>".MetaModel::GetClassIcon($sClassName)."&nbsp;<span class=\"hilite\">".Dict::Format('UI:Search:Count_ObjectsOf_Class_Found', count($aLeafs), Metamodel::GetName($sClassName))."</h2>\n");
-					}
-					$oPage->add("</div>\n");
-					$oLeafsFilter->AddCondition('id', $aLeafs, 'IN');
-					$oBlock = new DisplayBlock($oLeafsFilter, 'list', false);
-					$sBlockId = 'global_search_'.$sClassName;
-					$oPage->add('<div id="'.$sBlockId.'">');
-					$oBlock->RenderContent($oPage, array('table_id' => $sBlockId, 'currentId' => $sBlockId));
-					$oPage->add("</div>\n");
-					$oPage->add("</div>\n");
-					$oPage->p('&nbsp;'); // Some space ?
+				}
+				if ($iTune > 0)
+				{
+					$fDurationClass = microtime(true) - $fStartedClass;
+					$oPage->add_script("oTimeStatistics.$sClassName = $fDurationClass;");
 				}
 			}
-			else if (array_key_exists($sClassName, $aAccelerators))
+			if ($iPos < count($aSearchClasses))
 			{
-				$oPage->add("<div class=\"search-class-result search-class-$sClassName\">\n");
-				$oPage->add("<div class=\"page_header\">\n");
-				$oPage->add("<h2>".MetaModel::GetClassIcon($sClassName)."&nbsp;<span class=\"hilite\">".Dict::Format('UI:Search:Count_ObjectsOf_Class_Found', 0, Metamodel::GetName($sClassName)).$sEnlargeButton."</h2>\n");
-				$oPage->add("</div>\n");
-				$oPage->add("</div>\n");
-				$oPage->p('&nbsp;'); // Some space ?
-			}
-			if ($iTune > 0)
-			{
-				$fDurationClass = microtime(true) - $fStartedClass;
-				$oPage->add_script("oTimeStatistics.$sClassName = $fDurationClass;");
-			}
-		}
-		if ($iPos < count($aSearchClasses))
-		{
-			$sJSNeedle = json_encode($aFullTextNeedles);
-			$oPage->add_ready_script(
-<<<EOF
+				$sJSNeedle = json_encode($aFullTextNeedles);
+				$oPage->add_ready_script(
+					<<<EOF
 				var oParams = {operation: 'full_text_search', position: $iPos, needles: $sJSNeedle, count: $iCount, tune: $iTune};
 				$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php', oParams, function(data) {
 					$('#full_text_results').append(data);
 				});
 EOF
-			);
-		}
-		else
-		{
-			// We're done
-			$oPage->add_ready_script(
-<<<EOF
+				);
+			}
+			else
+			{
+				// We're done
+				$oPage->add_ready_script(
+					<<<EOF
 $('#full_text_indicator').hide();
 $('#full_text_progress,#full_text_progress_placeholder').hide(500);
 EOF
-			);
+				);
 
-			if ($iTune > 0)
-			{
-				$oPage->add_ready_script(
-<<<EOF
+				if ($iTune > 0)
+				{
+					$oPage->add_ready_script(
+						<<<EOF
 				var sRes = '<h4>Search statistics (tune = 1)</h4><table>';
 				sRes += '<thead><tr><th>Class</th><th>Time</th></tr></thead>';
 				sRes += '<tbody>';
@@ -1604,80 +1607,80 @@ EOF
 				sRes += '</table>';
 				$('#full_text_results').append(sRes);
 EOF
-				);
-			}
+					);
+				}
 
-			if ($iCount == 0)
-			{
-				$sFullTextSummary = addslashes(Dict::S('UI:Search:NoObjectFound'));
-				$oPage->add_ready_script("$('#full_text_results').append('<div id=\"no_object_found\">$sFullTextSummary</div>');");
-			}
-		}
-		break;
-
-		case 'full_text_search_enlarge':
-		$sFullText = trim(utils::ReadParam('text', '', false, 'raw_data'));
-		$sClass = trim(utils::ReadParam('class', ''));
-		$iTune = utils::ReadParam('tune', 0);
-
-		if (preg_match('/^"(.*)"$/', $sFullText, $aMatches))
-		{
-			// The text is surrounded by double-quotes, remove the quotes and treat it as one single expression
-			$aFullTextNeedles = array($aMatches[1]);
-		}
-		else
-		{
-			// Split the text on the blanks and treat this as a search for <word1> AND <word2> AND <word3>
-			$aFullTextNeedles = explode(' ', $sFullText);
-		}
-
-		$oFilter = new DBObjectSearch($sClass);
-		foreach($aFullTextNeedles as $sSearchText)
-		{
-			$oFilter->AddCondition_FullText($sSearchText);
-		}
-		$oFilter->SetShowObsoleteData(utils::ShowObsoleteData());
-		$oSet = new DBObjectSet($oFilter);
-		$oPage->add("<div class=\"page_header\">\n");
-		$oPage->add("<h2>".MetaModel::GetClassIcon($sClass)."&nbsp;<span class=\"hilite\">".Dict::Format('UI:Search:Count_ObjectsOf_Class_Found', $oSet->Count(), Metamodel::GetName($sClass))."</h2>\n");
-		$oPage->add("</div>\n");
-		if ($oSet->Count() > 0)
-		{
-			$aLeafs = array();
-			while($oObj = $oSet->Fetch())
-			{
-				if (get_class($oObj) == $sClass)
+				if ($iCount == 0)
 				{
-					$aLeafs[] = $oObj->GetKey();
+					$sFullTextSummary = addslashes(Dict::S('UI:Search:NoObjectFound'));
+					$oPage->add_ready_script("$('#full_text_results').append('<div id=\"no_object_found\">$sFullTextSummary</div>');");
 				}
 			}
-			$oLeafsFilter = new DBObjectSearch($sClass);
-			if (count($aLeafs) > 0)
+			break;
+
+		case 'full_text_search_enlarge':
+			$sFullText = trim(utils::ReadParam('text', '', false, 'raw_data'));
+			$sClass = trim(utils::ReadParam('class', ''));
+			$iTune = utils::ReadParam('tune', 0);
+
+			if (preg_match('/^"(.*)"$/', $sFullText, $aMatches))
 			{
-				$oLeafsFilter->AddCondition('id', $aLeafs, 'IN');
-				$oBlock = new DisplayBlock($oLeafsFilter, 'list', false);
-				$sBlockId = 'global_search_'.$sClass;
-				$oPage->add('<div id="'.$sBlockId.'">');
-				$oBlock->RenderContent($oPage, array('table_id' => $sBlockId, 'currentId' => $sBlockId));
-				$oPage->add('</div>');
-				$oPage->P('&nbsp;'); // Some space ?
-				// Hide "no object found"
-				$oPage->add_ready_script('$("#no_object_found").hide();');
+				// The text is surrounded by double-quotes, remove the quotes and treat it as one single expression
+				$aFullTextNeedles = array($aMatches[1]);
 			}
-		}
-		$oPage->add_ready_script(
-<<<EOF
+			else
+			{
+				// Split the text on the blanks and treat this as a search for <word1> AND <word2> AND <word3>
+				$aFullTextNeedles = explode(' ', $sFullText);
+			}
+
+			$oFilter = new DBObjectSearch($sClass);
+			foreach($aFullTextNeedles as $sSearchText)
+			{
+				$oFilter->AddCondition_FullText($sSearchText);
+			}
+			$oFilter->SetShowObsoleteData(utils::ShowObsoleteData());
+			$oSet = new DBObjectSet($oFilter);
+			$oPage->add("<div class=\"page_header\">\n");
+			$oPage->add("<h2>".MetaModel::GetClassIcon($sClass)."&nbsp;<span class=\"hilite\">".Dict::Format('UI:Search:Count_ObjectsOf_Class_Found', $oSet->Count(), Metamodel::GetName($sClass))."</h2>\n");
+			$oPage->add("</div>\n");
+			if ($oSet->Count() > 0)
+			{
+				$aLeafs = array();
+				while ($oObj = $oSet->Fetch())
+				{
+					if (get_class($oObj) == $sClass)
+					{
+						$aLeafs[] = $oObj->GetKey();
+					}
+				}
+				$oLeafsFilter = new DBObjectSearch($sClass);
+				if (count($aLeafs) > 0)
+				{
+					$oLeafsFilter->AddCondition('id', $aLeafs, 'IN');
+					$oBlock = new DisplayBlock($oLeafsFilter, 'list', false);
+					$sBlockId = 'global_search_'.$sClass;
+					$oPage->add('<div id="'.$sBlockId.'">');
+					$oBlock->RenderContent($oPage, array('table_id' => $sBlockId, 'currentId' => $sBlockId));
+					$oPage->add('</div>');
+					$oPage->P('&nbsp;'); // Some space ?
+					// Hide "no object found"
+					$oPage->add_ready_script('$("#no_object_found").hide();');
+				}
+			}
+			$oPage->add_ready_script(
+				<<<EOF
 $('#full_text_indicator').hide();
 $('#full_text_progress,#full_text_progress_placeholder').hide(500);
 EOF
-		);
-		break;
+			);
+			break;
 
 		case 'xlsx_export_dialog':
-		$sFilter = utils::ReadParam('filter', '', false, 'raw_data');
-		$oPage->SetContentType('text/html');
-		$oPage->add(
-<<<EOF
+			$sFilter = utils::ReadParam('filter', '', false, 'raw_data');
+			$oPage->SetContentType('text/html');
+			$oPage->add(
+				<<<EOF
 <style>
  .ui-progressbar {
 	position: relative;
@@ -1719,595 +1722,596 @@ EOF
 }
 </style>				
 EOF
-		);
-		$oPage->add('<div id="XlsxExportDlg">');
-		$oPage->add('<div class="export-options">');
-		$oPage->add('<p><input type="checkbox" id="export-advanced-mode"/>&nbsp;<label for="export-advanced-mode">'.Dict::S('UI:CSVImport:AdvancedMode').'</label></p>');
-		$oPage->add('<p style="font-size:10pt;margin-left:2em;margin-top:-0.5em;padding-bottom:1em;">'.Dict::S('UI:CSVImport:AdvancedMode+').'</p>');
-		$oPage->add('<p><input type="checkbox" id="export-auto-download" checked="checked"/>&nbsp;<label for="export-auto-download">'.Dict::S('ExcelExport:AutoDownload').'</label></p>');
-		$oPage->add('</div>');
-		$oPage->add('<div class="progress"><p class="status-message">'.Dict::S('ExcelExport:PreparingExport').'</p><div class="progress-bar"><div class="progress-label"></div></div></div>');
-		$oPage->add('<div class="statistics"><div class="stats-toggle closed">'.Dict::S('ExcelExport:Statistics').'<div class="stats-data"></div></div></div>');
-		$oPage->add('</div>');
-		$aLabels = array(
-			'dialog_title' => Dict::S('ExcelExporter:ExportDialogTitle'),
-			'cancel_button' => Dict::S('UI:Button:Cancel'),
-			'export_button' => Dict::S('ExcelExporter:ExportButton'),
-			'download_button' => Dict::Format('ExcelExporter:DownloadButton', 'export.xlsx'), //TODO: better name for the file (based on the class of the filter??)
- 		);
-		$sJSLabels = json_encode($aLabels);
-		$sFilter = addslashes($sFilter);
-		$sJSPageUrl = addslashes(utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php');
-		$oPage->add_ready_script("$('#XlsxExportDlg').xlsxexporter({filter: '$sFilter', labels: $sJSLabels, ajax_page_url: '$sJSPageUrl'});");
-		break;
-		
+			);
+			$oPage->add('<div id="XlsxExportDlg">');
+			$oPage->add('<div class="export-options">');
+			$oPage->add('<p><input type="checkbox" id="export-advanced-mode"/>&nbsp;<label for="export-advanced-mode">'.Dict::S('UI:CSVImport:AdvancedMode').'</label></p>');
+			$oPage->add('<p style="font-size:10pt;margin-left:2em;margin-top:-0.5em;padding-bottom:1em;">'.Dict::S('UI:CSVImport:AdvancedMode+').'</p>');
+			$oPage->add('<p><input type="checkbox" id="export-auto-download" checked="checked"/>&nbsp;<label for="export-auto-download">'.Dict::S('ExcelExport:AutoDownload').'</label></p>');
+			$oPage->add('</div>');
+			$oPage->add('<div class="progress"><p class="status-message">'.Dict::S('ExcelExport:PreparingExport').'</p><div class="progress-bar"><div class="progress-label"></div></div></div>');
+			$oPage->add('<div class="statistics"><div class="stats-toggle closed">'.Dict::S('ExcelExport:Statistics').'<div class="stats-data"></div></div></div>');
+			$oPage->add('</div>');
+			$aLabels = array(
+				'dialog_title' => Dict::S('ExcelExporter:ExportDialogTitle'),
+				'cancel_button' => Dict::S('UI:Button:Cancel'),
+				'export_button' => Dict::S('ExcelExporter:ExportButton'),
+				'download_button' => Dict::Format('ExcelExporter:DownloadButton', 'export.xlsx'), //TODO: better name for the file (based on the class of the filter??)
+			);
+			$sJSLabels = json_encode($aLabels);
+			$sFilter = addslashes($sFilter);
+			$sJSPageUrl = addslashes(utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php');
+			$oPage->add_ready_script("$('#XlsxExportDlg').xlsxexporter({filter: '$sFilter', labels: $sJSLabels, ajax_page_url: '$sJSPageUrl'});");
+			break;
+
 		case 'xlsx_start':
-		$sFilter = utils::ReadParam('filter', '', false, 'raw_data');
-		$bAdvanced = (utils::ReadParam('advanced', 'false') == 'true');
-		$oSearch = DBObjectSearch::unserialize($sFilter);
-		
-		$oExcelExporter = new ExcelExporter();
-		$oExcelExporter->SetObjectList($oSearch);
-		//$oExcelExporter->SetChunkSize(10); //Only for testing
-		$oExcelExporter->SetAdvancedMode($bAdvanced);
-		$sToken = $oExcelExporter->SaveState();
-		$oPage->add(json_encode(array('status' => 'ok', 'token' => $sToken)));
-		break;
-		
+			$sFilter = utils::ReadParam('filter', '', false, 'raw_data');
+			$bAdvanced = (utils::ReadParam('advanced', 'false') == 'true');
+			$oSearch = DBObjectSearch::unserialize($sFilter);
+
+			$oExcelExporter = new ExcelExporter();
+			$oExcelExporter->SetObjectList($oSearch);
+			//$oExcelExporter->SetChunkSize(10); //Only for testing
+			$oExcelExporter->SetAdvancedMode($bAdvanced);
+			$sToken = $oExcelExporter->SaveState();
+			$oPage->add(json_encode(array('status' => 'ok', 'token' => $sToken)));
+			break;
+
 		case 'xlsx_run':
-		$sMemoryLimit = MetaModel::GetConfig()->Get('xlsx_exporter_memory_limit');
-		ini_set('memory_limit', $sMemoryLimit);
-		ini_set('max_execution_time', max(300, ini_get('max_execution_time'))); // At least 5 minutes
-					
-		$sToken = utils::ReadParam('token', '', false, 'raw_data');
-		$oExcelExporter = new ExcelExporter($sToken);
-		$aStatus = $oExcelExporter->Run();
-		$aResults = array('status' => $aStatus['code'], 'percentage' =>  $aStatus['percentage'], 'message' =>  $aStatus['message']);
-		if ($aStatus['code'] == 'done')
-		{
-			$aResults['statistics'] = $oExcelExporter->GetStatistics('html');
-		}
-		$oPage->add(json_encode($aResults));
-		break;
-		
+			$sMemoryLimit = MetaModel::GetConfig()->Get('xlsx_exporter_memory_limit');
+			ini_set('memory_limit', $sMemoryLimit);
+			ini_set('max_execution_time', max(300, ini_get('max_execution_time'))); // At least 5 minutes
+
+			$sToken = utils::ReadParam('token', '', false, 'raw_data');
+			$oExcelExporter = new ExcelExporter($sToken);
+			$aStatus = $oExcelExporter->Run();
+			$aResults = array('status' => $aStatus['code'], 'percentage' => $aStatus['percentage'], 'message' => $aStatus['message']);
+			if ($aStatus['code'] == 'done')
+			{
+				$aResults['statistics'] = $oExcelExporter->GetStatistics('html');
+			}
+			$oPage->add(json_encode($aResults));
+			break;
+
 		case 'xlsx_download':
-		$sToken = utils::ReadParam('token', '', false, 'raw_data');
-		$oPage->SetContentType('application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
-		$oPage->SetContentDisposition('attachment', 'export.xlsx');
-		$sFileContent = ExcelExporter::GetExcelFileFromToken($sToken);
-		$oPage->add($sFileContent);
-		ExcelExporter::CleanupFromToken($sToken);
-		break;
-		
+			$sToken = utils::ReadParam('token', '', false, 'raw_data');
+			$oPage->SetContentType('application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
+			$oPage->SetContentDisposition('attachment', 'export.xlsx');
+			$sFileContent = ExcelExporter::GetExcelFileFromToken($sToken);
+			$oPage->add($sFileContent);
+			ExcelExporter::CleanupFromToken($sToken);
+			break;
+
 		case 'xlsx_abort':
-		// Stop & cleanup an export...
-		$sToken = utils::ReadParam('token', '', false, 'raw_data');
-		ExcelExporter::CleanupFromToken($sToken);
-		break;
+			// Stop & cleanup an export...
+			$sToken = utils::ReadParam('token', '', false, 'raw_data');
+			ExcelExporter::CleanupFromToken($sToken);
+			break;
 
 		case 'relation_pdf':
 		case 'relation_attachment':
-		require_once(APPROOT.'core/simplegraph.class.inc.php');
-		require_once(APPROOT.'core/relationgraph.class.inc.php');
-		require_once(APPROOT.'core/displayablegraph.class.inc.php');
-		$sRelation = utils::ReadParam('relation', 'impacts');
-		$sDirection = utils::ReadParam('direction', 'down');
-		
-		$iGroupingThreshold = utils::ReadParam('g', 5, false, 'integer');
-		$sPageFormat = utils::ReadParam('p', 'A4');
-		$sPageOrientation = utils::ReadParam('o', 'L');
-		$sTitle = utils::ReadParam('title', '', false, 'raw_data');
-		$sPositions = utils::ReadParam('positions', null, false, 'raw_data');
-		$aExcludedClasses = utils::ReadParam('excluded_classes', array(), false, 'raw_data');
-		$bIncludeList = (bool)utils::ReadParam('include_list', false);
-		$sComments = utils::ReadParam('comments', '', false, 'raw_data');
-		$aContexts = utils::ReadParam('contexts', array(), false, 'raw_data');
-		$sContextKey = utils::ReadParam('context_key', '', false, 'raw_data');
-		$aPositions = null;
-		if ($sPositions != null)
-		{
-			$aPositions = json_decode($sPositions, true);
-		}
-		
-		// Get the list of source objects
-		$aSources = utils::ReadParam('sources', array(), false, 'raw_data');
-		$aSourceObjects = array();
-		foreach($aSources as $sClass => $aIDs)
-		{
-			$oSearch = new DBObjectSearch($sClass);
-			$oSearch->AddCondition('id', $aIDs, 'IN');
-			$oSet = new DBObjectSet($oSearch);
-			while($oObj = $oSet->Fetch())
-			{
-				$aSourceObjects[] = $oObj;
-			}
-		}
-		$sSourceClass = '*';
-		if (count($aSourceObjects) == 1)
-		{
-			$sSourceClass = get_class($aSourceObjects[0]);
-		}
-		
-		// Get the list of excluded objects
-		$aExcluded = utils::ReadParam('excluded', array(), false, 'raw_data');
-		$aExcludedObjects = array();
-		foreach($aExcluded as $sClass => $aIDs)
-		{
-			$oSearch = new DBObjectSearch($sClass);
-			$oSearch->AddCondition('id', $aIDs, 'IN');
-			$oSet = new DBObjectSet($oSearch);
-			while($oObj = $oSet->Fetch())
-			{
-				$aExcludedObjects[] = $oObj;
-			}
-		}
-		
-		$iMaxRecursionDepth = MetaModel::GetConfig()->Get('relations_max_depth', 20);
-		if ($sDirection == 'up')
-		{
-			$oRelGraph = MetaModel::GetRelatedObjectsUp($sRelation, $aSourceObjects, $iMaxRecursionDepth, true, $aContexts);
-		}
-		else
-		{
-			$oRelGraph = MetaModel::GetRelatedObjectsDown($sRelation, $aSourceObjects, $iMaxRecursionDepth, true, $aExcludedObjects, $aContexts);
-		}
-		
-		// Remove excluded classes from the graph
-		if (count($aExcludedClasses) > 0)
-		{
-			$oIterator = new RelationTypeIterator($oRelGraph, 'Node');
-			foreach($oIterator as $oNode)
-			{
-				$oObj = $oNode->GetProperty('object');
-				if ($oObj && in_array(get_class($oObj), $aExcludedClasses))
-				{
-					$oRelGraph->FilterNode($oNode);
-				}
-			}
-		}
-		
-		$oPage = new PDFPage($sTitle, $sPageFormat, $sPageOrientation);
-		$oPage->SetContentDisposition('attachment', $sTitle.'.pdf');
-		
-		$oGraph = DisplayableGraph::FromRelationGraph($oRelGraph, $iGroupingThreshold, ($sDirection == 'down'));
-		$oGraph->InitFromGraphviz();
-		if ($aPositions != null)
-		{
-			$oGraph->UpdatePositions($aPositions);
-		}
+			require_once(APPROOT.'core/simplegraph.class.inc.php');
+			require_once(APPROOT.'core/relationgraph.class.inc.php');
+			require_once(APPROOT.'core/displayablegraph.class.inc.php');
+			$sRelation = utils::ReadParam('relation', 'impacts');
+			$sDirection = utils::ReadParam('direction', 'down');
 
-		$aGroups = array();
-		$oIterator = new RelationTypeIterator($oGraph, 'Node');
-		foreach($oIterator as $oNode)
-		{
-			if ($oNode instanceof DisplayableGroupNode)
+			$iGroupingThreshold = utils::ReadParam('g', 5, false, 'integer');
+			$sPageFormat = utils::ReadParam('p', 'A4');
+			$sPageOrientation = utils::ReadParam('o', 'L');
+			$sTitle = utils::ReadParam('title', '', false, 'raw_data');
+			$sPositions = utils::ReadParam('positions', null, false, 'raw_data');
+			$aExcludedClasses = utils::ReadParam('excluded_classes', array(), false, 'raw_data');
+			$bIncludeList = (bool)utils::ReadParam('include_list', false);
+			$sComments = utils::ReadParam('comments', '', false, 'raw_data');
+			$aContexts = utils::ReadParam('contexts', array(), false, 'raw_data');
+			$sContextKey = utils::ReadParam('context_key', '', false, 'raw_data');
+			$aPositions = null;
+			if ($sPositions != null)
 			{
-				$aGroups[$oNode->GetProperty('group_index')] = $oNode->GetObjects();
+				$aPositions = json_decode($sPositions, true);
 			}
-		}
-		// First page is the graph
-		$oGraph->RenderAsPDF($oPage, $sComments, $sContextKey);
 
-		if ($bIncludeList)
-		{
-			// Then the lists of objects (one table per finalclass)
-			$aResults = array();
-			$oIterator = new RelationTypeIterator($oRelGraph, 'Node');
-			foreach($oIterator as $oNode)
-			{
-				$oObj = $oNode->GetProperty('object'); // Some nodes (Redundancy Nodes and Group) do not contain an object
-				if ($oObj)
-				{
-					$sObjClass  = get_class($oObj);
-					if (!array_key_exists($sObjClass, $aResults))
-					{
-						$aResults[$sObjClass] = array();
-					}
-					$aResults[$sObjClass][] = $oObj;
-				}
-			}
-			
-			$oPage->get_tcpdf()->AddPage();
-			$oPage->get_tcpdf()->SetFont('dejavusans', '', 10, '', true); // Reset the font size to its default
-			$oPage->add('<div class="page_header"><h1>'.Dict::S('UI:RelationshipList').'</h1></div>');
-			$iLoopTimeLimit = MetaModel::GetConfig()->Get('max_execution_time_per_loop');
-			foreach($aResults as $sListClass => $aObjects)
-			{
-				set_time_limit($iLoopTimeLimit*count($aObjects));
-				$oSet = CMDBObjectSet::FromArray($sListClass, $aObjects);
-				$oSet->SetShowObsoleteData(utils::ShowObsoleteData());
-				$sHtml = "<div class=\"page_header\">\n";
-				$sHtml .= "<table class=\"section\"><tr><td>".MetaModel::GetClassIcon($sListClass, true, 'width: 24px; height: 24px;')." ".Dict::Format('UI:Search:Count_ObjectsOf_Class_Found', $oSet->Count(), Metamodel::GetName($sListClass))."</td></tr></table>\n";
-				$sHtml .= "</div>\n";
-				$oPage->add($sHtml);
-				cmdbAbstractObject::DisplaySet($oPage, $oSet, array('table_id' => $sSourceClass.'_'.$sRelation.'_'.$sDirection.'_'.$sListClass));
-				$oPage->p(''); // Some space
-			}
-			
-			// Then the content of the groups (one table per group)
-			if (count($aGroups) > 0)
-			{
-				$oPage->get_tcpdf()->AddPage();
-				$oPage->add('<div class="page_header"><h1>'.Dict::S('UI:RelationGroups').'</h1></div>');
-				foreach($aGroups as $idx => $aObjects)
-				{
-					set_time_limit($iLoopTimeLimit*count($aObjects));
-					$sListClass = get_class(current($aObjects));
-					$oSet = CMDBObjectSet::FromArray($sListClass, $aObjects);
-					$sHtml = "<div class=\"page_header\">\n";
-					$sHtml .= "<table class=\"section\"><tr><td>".MetaModel::GetClassIcon($sListClass, true, 'width: 24px; height: 24px;')." ".Dict::Format('UI:RelationGroupNumber_N', (1+$idx))."</td></tr></table>\n";
-					$sHtml .= "</div>\n";
-					$oPage->add($sHtml);
-					cmdbAbstractObject::DisplaySet($oPage, $oSet);
-					$oPage->p(''); // Some space
-				}
-			}
-		}
-		if ($operation == 'relation_attachment')
-		{
-			$sObjClass = utils::ReadParam('obj_class', '', false, 'class');
-			$iObjKey = (int)utils::ReadParam('obj_key', 0, false, 'integer');
-				
-			// Save the generated PDF as an attachment
-			$sPDF = $oPage->get_pdf();
-			$oPage = new ajax_page('');
-			$oAttachment = new Attachment();
-			$oAttachment->Set('item_class', $sObjClass);
-			$oAttachment->Set('item_id', $iObjKey);
-			$oDoc = new ormDocument($sPDF, 'application/pdf', $sTitle.'.pdf');
-			$oAttachment->Set('contents', $oDoc);
-			$iAttachmentId = $oAttachment->DBInsert();
-			$aRet = array(
-				'status' => 'ok',
-				'att_id' => $iAttachmentId,
-			);
-			$oPage->add(json_encode($aRet));
-		}
-		break;
-		
-		case 'relation_json':
-		require_once(APPROOT.'core/simplegraph.class.inc.php');
-		require_once(APPROOT.'core/relationgraph.class.inc.php');
-		require_once(APPROOT.'core/displayablegraph.class.inc.php');
-		$sRelation = utils::ReadParam('relation', 'impacts');
-		$sDirection = utils::ReadParam('direction', 'down');
-		$iGroupingThreshold = utils::ReadParam('g', 5);
-		$sPositions = utils::ReadParam('positions', null, false, 'raw_data');
-		$aExcludedClasses = utils::ReadParam('excluded_classes', array(), false, 'raw_data');
-		$aContexts = utils::ReadParam('contexts', array(), false, 'raw_data');
-		$sContextKey = utils::ReadParam('context_key', array(), false, 'raw_data');
-		$aPositions = null;
-		if ($sPositions != null)
-		{
-			$aPositions = json_decode($sPositions, true);
-		}
-		
 			// Get the list of source objects
-		$aSources = utils::ReadParam('sources', array(), false, 'raw_data');
-		$aSourceObjects = array();
-		foreach($aSources as $sClass => $aIDs)
-		{
-			$oSearch = new DBObjectSearch($sClass);
-			$oSearch->AddCondition('id', $aIDs, 'IN');
-			$oSet = new DBObjectSet($oSearch);
-			while($oObj = $oSet->Fetch())
+			$aSources = utils::ReadParam('sources', array(), false, 'raw_data');
+			$aSourceObjects = array();
+			foreach($aSources as $sClass => $aIDs)
 			{
-				$aSourceObjects[] = $oObj;
-			}
-		}
-		
-		// Get the list of excluded objects
-		$aExcluded = utils::ReadParam('excluded', array(), false, 'raw_data');
-		$aExcludedObjects = array();
-		foreach($aExcluded as $sClass => $aIDs)
-		{
-			$oSearch = new DBObjectSearch($sClass);
-			$oSearch->AddCondition('id', $aIDs, 'IN');
-			$oSet = new DBObjectSet($oSearch);
-			while($oObj = $oSet->Fetch())
-			{
-				$aExcludedObjects[] = $oObj;
-			}
-		}
-		
-		// Compute the graph
-		$iMaxRecursionDepth = MetaModel::GetConfig()->Get('relations_max_depth', 20);
-		if ($sDirection == 'up')
-		{
-			$oRelGraph = MetaModel::GetRelatedObjectsUp($sRelation, $aSourceObjects, $iMaxRecursionDepth, true, $aContexts);
-		}
-		else
-		{
-			$oRelGraph = MetaModel::GetRelatedObjectsDown($sRelation, $aSourceObjects, $iMaxRecursionDepth, true, $aExcludedObjects, $aContexts);
-		}
-		
-		// Remove excluded classes from the graph
-		if (count($aExcludedClasses) > 0)
-		{
-			$oIterator = new RelationTypeIterator($oRelGraph, 'Node');
-			foreach($oIterator as $oNode)
-			{
-				$oObj = $oNode->GetProperty('object');
-				if ($oObj && in_array(get_class($oObj), $aExcludedClasses))
+				$oSearch = new DBObjectSearch($sClass);
+				$oSearch->AddCondition('id', $aIDs, 'IN');
+				$oSet = new DBObjectSet($oSearch);
+				while ($oObj = $oSet->Fetch())
 				{
-					$oRelGraph->FilterNode($oNode);
+					$aSourceObjects[] = $oObj;
 				}
 			}
-		}
-		
-		$oGraph = DisplayableGraph::FromRelationGraph($oRelGraph, $iGroupingThreshold, ($sDirection == 'down'));
-		$oGraph->InitFromGraphviz();
-		if ($aPositions != null)
-		{
-			$oGraph->UpdatePositions($aPositions);
-		}
-		$oPage->add($oGraph->GetAsJSON($sContextKey));
-		$oPage->SetContentType('application/json');
-		break;
-		
-		case 'relation_groups':
-		$aGroups = utils::ReadParam('groups');
-		$iBlock = 1; // Zero is not a valid blockid
-		foreach($aGroups as $idx => $aDefinition)
-		{
-			$sListClass = $aDefinition['class'];
-			$oSearch = new DBObjectSearch($sListClass);
-			$oSearch->AddCondition('id', $aDefinition['keys'], 'IN');
-			$oSearch->SetShowObsoleteData(utils::ShowObsoleteData());
-			$oPage->add("<h1>".Dict::Format('UI:RelationGroupNumber_N', (1+$idx))."</h1>\n");
-			$oPage->add("<div id=\"relation_group_$idx\" class=\"page_header\">\n");
-			$oPage->add("<h2>".MetaModel::GetClassIcon($sListClass)."&nbsp;<span class=\"hilite\">".Dict::Format('UI:Search:Count_ObjectsOf_Class_Found', count($aDefinition['keys']), Metamodel::GetName($sListClass))."</h2>\n");
-			$oPage->add("</div>\n");
-			$oBlock = new DisplayBlock($oSearch, 'list');
-			$oBlock->Display($oPage, 'group_'.$iBlock++);
-			$oPage->p('&nbsp;'); // Some space ?
-		}
-		break;
+			$sSourceClass = '*';
+			if (count($aSourceObjects) == 1)
+			{
+				$sSourceClass = get_class($aSourceObjects[0]);
+			}
 
-		case 'relation_lists':
-		$aLists = utils::ReadParam('lists');
-		$iBlock = 1; // Zero is not a valid blockid
-		foreach($aLists as $sListClass => $aKeys)
-		{
-			$oSearch = new DBObjectSearch($sListClass);
-			$oSearch->AddCondition('id', $aKeys, 'IN');
-			$oSearch->SetShowObsoleteData(utils::ShowObsoleteData());
-			$oPage->add("<div class=\"page_header\">\n");
-			$oPage->add("<h2>".MetaModel::GetClassIcon($sListClass)."&nbsp;<span class=\"hilite\">".Dict::Format('UI:Search:Count_ObjectsOf_Class_Found', count($aKeys), Metamodel::GetName($sListClass))."</h2>\n");
-			$oPage->add("</div>\n");
-			$oBlock = new DisplayBlock($oSearch, 'list');
-			$oBlock->Display($oPage, 'list_'.$iBlock++, array('table_id' => 'ImpactAnalysis_'.$sListClass));
-			$oPage->p('&nbsp;'); // Some space ?
-		}
-		break;
-					
-		case 'ticket_impact':
-		require_once(APPROOT.'core/simplegraph.class.inc.php');
-		require_once(APPROOT.'core/relationgraph.class.inc.php');
-		require_once(APPROOT.'core/displayablegraph.class.inc.php');
-		$sRelation = utils::ReadParam('relation', 'impacts');
-		$sDirection = utils::ReadParam('direction', 'down');
-		$iGroupingThreshold = utils::ReadParam('g', 5);
-		$sClass = utils::ReadParam('class', '', false, 'class');
-		$sAttCode = utils::ReadParam('attcode', 'functionalcis_list');
-		$sImpactAttCode = utils::ReadParam('impact_attcode', 'impact_code');
-		$sImpactAttCodeValue = utils::ReadParam('impact_attcode_value', 'manual');
-		$iId = (int)utils::ReadParam('id', 0, false, 'integer');
-		
-		// Get the list of source objects
-		$oTicket = MetaModel::GetObject($sClass, $iId);
-		$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
-		$sExtKeyToRemote = $oAttDef->GetExtKeyToRemote();
-		$oExtKeyToRemote = MetaModel::GetAttributeDef($oAttDef->GetLinkedClass(), $sExtKeyToRemote);
-		$sRemoteClass = $oExtKeyToRemote->GetTargetClass();
-		$oSet = $oTicket->Get($sAttCode);
-		$aSourceObjects = array();
-		$aExcludedObjects = array();
-		while($oLnk = $oSet->Fetch())
-		{
-			if ($oLnk->Get($sImpactAttCode) == 'manual')
+			// Get the list of excluded objects
+			$aExcluded = utils::ReadParam('excluded', array(), false, 'raw_data');
+			$aExcludedObjects = array();
+			foreach($aExcluded as $sClass => $aIDs)
 			{
-				$aSourceObjects[] = MetaModel::GetObject($sRemoteClass, $oLnk->Get($sExtKeyToRemote));
-			}
-			if ($oLnk->Get($sImpactAttCode) == 'not_impacted')
-			{
-				$aExcludedObjects[] = MetaModel::GetObject($sRemoteClass, $oLnk->Get($sExtKeyToRemote));
-			}
-		}
-		
-		// Compute the graph
-		$iMaxRecursionDepth = MetaModel::GetConfig()->Get('relations_max_depth', 20);
-		if ($sDirection == 'up')
-		{
-			$oRelGraph = MetaModel::GetRelatedObjectsUp($sRelation, $aSourceObjects, $iMaxRecursionDepth);
-		}
-		else
-		{
-			$oRelGraph = MetaModel::GetRelatedObjectsDown($sRelation, $aSourceObjects, $iMaxRecursionDepth, $aExcludedObjects);
-		}
-		
-		$aResults = $oRelGraph->GetObjectsByClass();
-		$oGraph = DisplayableGraph::FromRelationGraph($oRelGraph, $iGroupingThreshold, ($sDirection == 'down'));
-		
-		$sContextKey = 'itop-tickets/relation_context/'.$sClass.'/'.$sRelation.'/'.$sDirection;		
-		$oAppContext = new ApplicationContext();
-		$oGraph->Display($oPage, $aResults, $sRelation, $oAppContext, $aExcludedObjects, $sClass, $iId, $sContextKey, array('this' => $oTicket));		
-		break;
-		
-		case 'export_build':
-		register_shutdown_function(function()
-		{
-			$aErr = error_get_last();
-			if (($aErr !== null) && ($aErr['type'] & (E_ERROR | E_PARSE | E_CORE_ERROR | E_COMPILE_ERROR | E_USER_ERROR)))
-			{
-				ob_end_clean();
-				echo json_encode(array('code' => 'error', 'percentage' => 100, 'message' => Dict::Format('UI:Error_Details', $aErr['message'])));
-			}
-		});
-		try
-		{
-			$token = utils::ReadParam('token', null);
-			$aResult = array('code' => 'error', 'percentage' => 100, 'message' => "Export not found for token: '$token'"); // Fallback error, just in case
-			$data = '';
-			if ($token === null)
-			{
-				$sFormat = utils::ReadParam('format', '');
-				$sExpression = utils::ReadParam('expression', null, false, 'raw_data');
-				$iQueryId = utils::ReadParam('query', null);
-				if ($sExpression === null)
+				$oSearch = new DBObjectSearch($sClass);
+				$oSearch->AddCondition('id', $aIDs, 'IN');
+				$oSet = new DBObjectSet($oSearch);
+				while ($oObj = $oSet->Fetch())
 				{
-					$oQuerySearch = DBObjectSearch::FromOQL('SELECT QueryOQL WHERE id = :query_id', array('query_id' => $iQueryId));
-					$oQuerySearch->UpdateContextFromUser();
-					$oQueries = new DBObjectSet($oQuerySearch);
-					if ($oQueries->Count() > 0)
-					{
-						$oQuery = $oQueries->Fetch();
-						$sExpression = $oQuery->Get('oql');
-					}
-					else
-					{
-						$aResult = array('code' => 'error', 'percentage' => 100, 'message' => "Invalid query phrasebook identifier: '$iQueryId'");
-					}
+					$aExcludedObjects[] = $oObj;
 				}
-				if($sExpression !== null)
-				{ 
-					$oSearch = DBObjectSearch::FromOQL($sExpression);
-					$oSearch->UpdateContextFromUser();
-					$oExporter = BulkExport::FindExporter($sFormat, $oSearch);
-					$oExporter->SetObjectList($oSearch);
-					$oExporter->SetFormat($sFormat);
-					$oExporter->SetChunkSize(EXPORTER_DEFAULT_CHUNK_SIZE);
-					$oExporter->ReadParameters();
-				}
-				
-				// First pass, generate the headers
-				$data .= $oExporter->GetHeader();
+			}
+
+			$iMaxRecursionDepth = MetaModel::GetConfig()->Get('relations_max_depth', 20);
+			if ($sDirection == 'up')
+			{
+				$oRelGraph = MetaModel::GetRelatedObjectsUp($sRelation, $aSourceObjects, $iMaxRecursionDepth, true, $aContexts);
 			}
 			else
 			{
-				$oExporter = BulkExport::FindExporterFromToken($token);
+				$oRelGraph = MetaModel::GetRelatedObjectsDown($sRelation, $aSourceObjects, $iMaxRecursionDepth, true, $aExcludedObjects, $aContexts);
 			}
-			
-			if ($oExporter)
+
+			// Remove excluded classes from the graph
+			if (count($aExcludedClasses) > 0)
 			{
-				$data .= $oExporter->GetNextChunk($aResult);
-				if ($aResult['code'] != 'done')
+				$oIterator = new RelationTypeIterator($oRelGraph, 'Node');
+				foreach($oIterator as $oNode)
 				{
-					$oExporter->AppendToTmpFile($data);
-					$aResult['token'] = $oExporter->SaveState();
-				}
-				else
-				{
-					// Last pass
-					$data .= $oExporter->GetFooter();
-					$oExporter->AppendToTmpFile($data);
-					$aResult['token'] = $oExporter->SaveState();
-					if (substr($oExporter->GetMimeType(), 0, 5) == 'text/')
+					$oObj = $oNode->GetProperty('object');
+					if ($oObj && in_array(get_class($oObj), $aExcludedClasses))
 					{
-						// Result must be encoded in UTF-8 to be passed as part of a JSON structure
-						$sCharset = $oExporter->GetCharacterSet();
-						if (strtoupper($sCharset) != 'UTF-8')
+						$oRelGraph->FilterNode($oNode);
+					}
+				}
+			}
+
+			$oPage = new PDFPage($sTitle, $sPageFormat, $sPageOrientation);
+			$oPage->SetContentDisposition('attachment', $sTitle.'.pdf');
+
+			$oGraph = DisplayableGraph::FromRelationGraph($oRelGraph, $iGroupingThreshold, ($sDirection == 'down'));
+			$oGraph->InitFromGraphviz();
+			if ($aPositions != null)
+			{
+				$oGraph->UpdatePositions($aPositions);
+			}
+
+			$aGroups = array();
+			$oIterator = new RelationTypeIterator($oGraph, 'Node');
+			foreach($oIterator as $oNode)
+			{
+				if ($oNode instanceof DisplayableGroupNode)
+				{
+					$aGroups[$oNode->GetProperty('group_index')] = $oNode->GetObjects();
+				}
+			}
+			// First page is the graph
+			$oGraph->RenderAsPDF($oPage, $sComments, $sContextKey);
+
+			if ($bIncludeList)
+			{
+				// Then the lists of objects (one table per finalclass)
+				$aResults = array();
+				$oIterator = new RelationTypeIterator($oRelGraph, 'Node');
+				foreach($oIterator as $oNode)
+				{
+					$oObj = $oNode->GetProperty('object'); // Some nodes (Redundancy Nodes and Group) do not contain an object
+					if ($oObj)
+					{
+						$sObjClass = get_class($oObj);
+						if (!array_key_exists($sObjClass, $aResults))
 						{
-							$aResult['text_result'] = iconv($sCharset, 'UTF-8', file_get_contents($oExporter->GetTmpFilePath()));
+							$aResults[$sObjClass] = array();
+						}
+						$aResults[$sObjClass][] = $oObj;
+					}
+				}
+
+				$oPage->get_tcpdf()->AddPage();
+				$oPage->get_tcpdf()->SetFont('dejavusans', '', 10, '', true); // Reset the font size to its default
+				$oPage->add('<div class="page_header"><h1>'.Dict::S('UI:RelationshipList').'</h1></div>');
+				$iLoopTimeLimit = MetaModel::GetConfig()->Get('max_execution_time_per_loop');
+				foreach($aResults as $sListClass => $aObjects)
+				{
+					set_time_limit($iLoopTimeLimit * count($aObjects));
+					$oSet = CMDBObjectSet::FromArray($sListClass, $aObjects);
+					$oSet->SetShowObsoleteData(utils::ShowObsoleteData());
+					$sHtml = "<div class=\"page_header\">\n";
+					$sHtml .= "<table class=\"section\"><tr><td>".MetaModel::GetClassIcon($sListClass, true, 'width: 24px; height: 24px;')." ".Dict::Format('UI:Search:Count_ObjectsOf_Class_Found', $oSet->Count(),
+							Metamodel::GetName($sListClass))."</td></tr></table>\n";
+					$sHtml .= "</div>\n";
+					$oPage->add($sHtml);
+					cmdbAbstractObject::DisplaySet($oPage, $oSet, array('table_id' => $sSourceClass.'_'.$sRelation.'_'.$sDirection.'_'.$sListClass));
+					$oPage->p(''); // Some space
+				}
+
+				// Then the content of the groups (one table per group)
+				if (count($aGroups) > 0)
+				{
+					$oPage->get_tcpdf()->AddPage();
+					$oPage->add('<div class="page_header"><h1>'.Dict::S('UI:RelationGroups').'</h1></div>');
+					foreach($aGroups as $idx => $aObjects)
+					{
+						set_time_limit($iLoopTimeLimit * count($aObjects));
+						$sListClass = get_class(current($aObjects));
+						$oSet = CMDBObjectSet::FromArray($sListClass, $aObjects);
+						$sHtml = "<div class=\"page_header\">\n";
+						$sHtml .= "<table class=\"section\"><tr><td>".MetaModel::GetClassIcon($sListClass, true, 'width: 24px; height: 24px;')." ".Dict::Format('UI:RelationGroupNumber_N', (1 + $idx))."</td></tr></table>\n";
+						$sHtml .= "</div>\n";
+						$oPage->add($sHtml);
+						cmdbAbstractObject::DisplaySet($oPage, $oSet);
+						$oPage->p(''); // Some space
+					}
+				}
+			}
+			if ($operation == 'relation_attachment')
+			{
+				$sObjClass = utils::ReadParam('obj_class', '', false, 'class');
+				$iObjKey = (int)utils::ReadParam('obj_key', 0, false, 'integer');
+
+				// Save the generated PDF as an attachment
+				$sPDF = $oPage->get_pdf();
+				$oPage = new ajax_page('');
+				$oAttachment = new Attachment();
+				$oAttachment->Set('item_class', $sObjClass);
+				$oAttachment->Set('item_id', $iObjKey);
+				$oDoc = new ormDocument($sPDF, 'application/pdf', $sTitle.'.pdf');
+				$oAttachment->Set('contents', $oDoc);
+				$iAttachmentId = $oAttachment->DBInsert();
+				$aRet = array(
+					'status' => 'ok',
+					'att_id' => $iAttachmentId,
+				);
+				$oPage->add(json_encode($aRet));
+			}
+			break;
+
+		case 'relation_json':
+			require_once(APPROOT.'core/simplegraph.class.inc.php');
+			require_once(APPROOT.'core/relationgraph.class.inc.php');
+			require_once(APPROOT.'core/displayablegraph.class.inc.php');
+			$sRelation = utils::ReadParam('relation', 'impacts');
+			$sDirection = utils::ReadParam('direction', 'down');
+			$iGroupingThreshold = utils::ReadParam('g', 5);
+			$sPositions = utils::ReadParam('positions', null, false, 'raw_data');
+			$aExcludedClasses = utils::ReadParam('excluded_classes', array(), false, 'raw_data');
+			$aContexts = utils::ReadParam('contexts', array(), false, 'raw_data');
+			$sContextKey = utils::ReadParam('context_key', array(), false, 'raw_data');
+			$aPositions = null;
+			if ($sPositions != null)
+			{
+				$aPositions = json_decode($sPositions, true);
+			}
+
+			// Get the list of source objects
+			$aSources = utils::ReadParam('sources', array(), false, 'raw_data');
+			$aSourceObjects = array();
+			foreach($aSources as $sClass => $aIDs)
+			{
+				$oSearch = new DBObjectSearch($sClass);
+				$oSearch->AddCondition('id', $aIDs, 'IN');
+				$oSet = new DBObjectSet($oSearch);
+				while ($oObj = $oSet->Fetch())
+				{
+					$aSourceObjects[] = $oObj;
+				}
+			}
+
+			// Get the list of excluded objects
+			$aExcluded = utils::ReadParam('excluded', array(), false, 'raw_data');
+			$aExcludedObjects = array();
+			foreach($aExcluded as $sClass => $aIDs)
+			{
+				$oSearch = new DBObjectSearch($sClass);
+				$oSearch->AddCondition('id', $aIDs, 'IN');
+				$oSet = new DBObjectSet($oSearch);
+				while ($oObj = $oSet->Fetch())
+				{
+					$aExcludedObjects[] = $oObj;
+				}
+			}
+
+			// Compute the graph
+			$iMaxRecursionDepth = MetaModel::GetConfig()->Get('relations_max_depth', 20);
+			if ($sDirection == 'up')
+			{
+				$oRelGraph = MetaModel::GetRelatedObjectsUp($sRelation, $aSourceObjects, $iMaxRecursionDepth, true, $aContexts);
+			}
+			else
+			{
+				$oRelGraph = MetaModel::GetRelatedObjectsDown($sRelation, $aSourceObjects, $iMaxRecursionDepth, true, $aExcludedObjects, $aContexts);
+			}
+
+			// Remove excluded classes from the graph
+			if (count($aExcludedClasses) > 0)
+			{
+				$oIterator = new RelationTypeIterator($oRelGraph, 'Node');
+				foreach($oIterator as $oNode)
+				{
+					$oObj = $oNode->GetProperty('object');
+					if ($oObj && in_array(get_class($oObj), $aExcludedClasses))
+					{
+						$oRelGraph->FilterNode($oNode);
+					}
+				}
+			}
+
+			$oGraph = DisplayableGraph::FromRelationGraph($oRelGraph, $iGroupingThreshold, ($sDirection == 'down'));
+			$oGraph->InitFromGraphviz();
+			if ($aPositions != null)
+			{
+				$oGraph->UpdatePositions($aPositions);
+			}
+			$oPage->add($oGraph->GetAsJSON($sContextKey));
+			$oPage->SetContentType('application/json');
+			break;
+
+		case 'relation_groups':
+			$aGroups = utils::ReadParam('groups');
+			$iBlock = 1; // Zero is not a valid blockid
+			foreach($aGroups as $idx => $aDefinition)
+			{
+				$sListClass = $aDefinition['class'];
+				$oSearch = new DBObjectSearch($sListClass);
+				$oSearch->AddCondition('id', $aDefinition['keys'], 'IN');
+				$oSearch->SetShowObsoleteData(utils::ShowObsoleteData());
+				$oPage->add("<h1>".Dict::Format('UI:RelationGroupNumber_N', (1 + $idx))."</h1>\n");
+				$oPage->add("<div id=\"relation_group_$idx\" class=\"page_header\">\n");
+				$oPage->add("<h2>".MetaModel::GetClassIcon($sListClass)."&nbsp;<span class=\"hilite\">".Dict::Format('UI:Search:Count_ObjectsOf_Class_Found', count($aDefinition['keys']), Metamodel::GetName($sListClass))."</h2>\n");
+				$oPage->add("</div>\n");
+				$oBlock = new DisplayBlock($oSearch, 'list');
+				$oBlock->Display($oPage, 'group_'.$iBlock++);
+				$oPage->p('&nbsp;'); // Some space ?
+			}
+			break;
+
+		case 'relation_lists':
+			$aLists = utils::ReadParam('lists');
+			$iBlock = 1; // Zero is not a valid blockid
+			foreach($aLists as $sListClass => $aKeys)
+			{
+				$oSearch = new DBObjectSearch($sListClass);
+				$oSearch->AddCondition('id', $aKeys, 'IN');
+				$oSearch->SetShowObsoleteData(utils::ShowObsoleteData());
+				$oPage->add("<div class=\"page_header\">\n");
+				$oPage->add("<h2>".MetaModel::GetClassIcon($sListClass)."&nbsp;<span class=\"hilite\">".Dict::Format('UI:Search:Count_ObjectsOf_Class_Found', count($aKeys), Metamodel::GetName($sListClass))."</h2>\n");
+				$oPage->add("</div>\n");
+				$oBlock = new DisplayBlock($oSearch, 'list');
+				$oBlock->Display($oPage, 'list_'.$iBlock++, array('table_id' => 'ImpactAnalysis_'.$sListClass));
+				$oPage->p('&nbsp;'); // Some space ?
+			}
+			break;
+
+		case 'ticket_impact':
+			require_once(APPROOT.'core/simplegraph.class.inc.php');
+			require_once(APPROOT.'core/relationgraph.class.inc.php');
+			require_once(APPROOT.'core/displayablegraph.class.inc.php');
+			$sRelation = utils::ReadParam('relation', 'impacts');
+			$sDirection = utils::ReadParam('direction', 'down');
+			$iGroupingThreshold = utils::ReadParam('g', 5);
+			$sClass = utils::ReadParam('class', '', false, 'class');
+			$sAttCode = utils::ReadParam('attcode', 'functionalcis_list');
+			$sImpactAttCode = utils::ReadParam('impact_attcode', 'impact_code');
+			$sImpactAttCodeValue = utils::ReadParam('impact_attcode_value', 'manual');
+			$iId = (int)utils::ReadParam('id', 0, false, 'integer');
+
+			// Get the list of source objects
+			$oTicket = MetaModel::GetObject($sClass, $iId);
+			$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
+			$sExtKeyToRemote = $oAttDef->GetExtKeyToRemote();
+			$oExtKeyToRemote = MetaModel::GetAttributeDef($oAttDef->GetLinkedClass(), $sExtKeyToRemote);
+			$sRemoteClass = $oExtKeyToRemote->GetTargetClass();
+			$oSet = $oTicket->Get($sAttCode);
+			$aSourceObjects = array();
+			$aExcludedObjects = array();
+			while ($oLnk = $oSet->Fetch())
+			{
+				if ($oLnk->Get($sImpactAttCode) == 'manual')
+				{
+					$aSourceObjects[] = MetaModel::GetObject($sRemoteClass, $oLnk->Get($sExtKeyToRemote));
+				}
+				if ($oLnk->Get($sImpactAttCode) == 'not_impacted')
+				{
+					$aExcludedObjects[] = MetaModel::GetObject($sRemoteClass, $oLnk->Get($sExtKeyToRemote));
+				}
+			}
+
+			// Compute the graph
+			$iMaxRecursionDepth = MetaModel::GetConfig()->Get('relations_max_depth', 20);
+			if ($sDirection == 'up')
+			{
+				$oRelGraph = MetaModel::GetRelatedObjectsUp($sRelation, $aSourceObjects, $iMaxRecursionDepth);
+			}
+			else
+			{
+				$oRelGraph = MetaModel::GetRelatedObjectsDown($sRelation, $aSourceObjects, $iMaxRecursionDepth, $aExcludedObjects);
+			}
+
+			$aResults = $oRelGraph->GetObjectsByClass();
+			$oGraph = DisplayableGraph::FromRelationGraph($oRelGraph, $iGroupingThreshold, ($sDirection == 'down'));
+
+			$sContextKey = 'itop-tickets/relation_context/'.$sClass.'/'.$sRelation.'/'.$sDirection;
+			$oAppContext = new ApplicationContext();
+			$oGraph->Display($oPage, $aResults, $sRelation, $oAppContext, $aExcludedObjects, $sClass, $iId, $sContextKey, array('this' => $oTicket));
+			break;
+
+		case 'export_build':
+			register_shutdown_function(function () {
+				$aErr = error_get_last();
+				if (($aErr !== null) && ($aErr['type'] & (E_ERROR | E_PARSE | E_CORE_ERROR | E_COMPILE_ERROR | E_USER_ERROR)))
+				{
+					ob_end_clean();
+					echo json_encode(array('code' => 'error', 'percentage' => 100, 'message' => Dict::Format('UI:Error_Details', $aErr['message'])));
+				}
+			});
+			try
+			{
+				$token = utils::ReadParam('token', null);
+				$aResult = array('code' => 'error', 'percentage' => 100, 'message' => "Export not found for token: '$token'"); // Fallback error, just in case
+				$data = '';
+				if ($token === null)
+				{
+					$sFormat = utils::ReadParam('format', '');
+					$sExpression = utils::ReadParam('expression', null, false, 'raw_data');
+					$iQueryId = utils::ReadParam('query', null);
+					if ($sExpression === null)
+					{
+						$oQuerySearch = DBObjectSearch::FromOQL('SELECT QueryOQL WHERE id = :query_id', array('query_id' => $iQueryId));
+						$oQuerySearch->UpdateContextFromUser();
+						$oQueries = new DBObjectSet($oQuerySearch);
+						if ($oQueries->Count() > 0)
+						{
+							$oQuery = $oQueries->Fetch();
+							$sExpression = $oQuery->Get('oql');
 						}
 						else
 						{
-							$aResult['text_result'] = file_get_contents($oExporter->GetTmpFilePath());
+							$aResult = array('code' => 'error', 'percentage' => 100, 'message' => "Invalid query phrasebook identifier: '$iQueryId'");
 						}
-						$aResult['mime_type'] = $oExporter->GetMimeType();
 					}
-					$aResult['message'] = Dict::Format('Core:BulkExport:ClickHereToDownload_FileName', $oExporter->GetDownloadFileName());
+					if ($sExpression !== null)
+					{
+						$oSearch = DBObjectSearch::FromOQL($sExpression);
+						$oSearch->UpdateContextFromUser();
+						$oExporter = BulkExport::FindExporter($sFormat, $oSearch);
+						$oExporter->SetObjectList($oSearch);
+						$oExporter->SetFormat($sFormat);
+						$oExporter->SetChunkSize(EXPORTER_DEFAULT_CHUNK_SIZE);
+						$oExporter->ReadParameters();
+					}
+
+					// First pass, generate the headers
+					$data .= $oExporter->GetHeader();
 				}
+				else
+				{
+					$oExporter = BulkExport::FindExporterFromToken($token);
+				}
+
+				if ($oExporter)
+				{
+					$data .= $oExporter->GetNextChunk($aResult);
+					if ($aResult['code'] != 'done')
+					{
+						$oExporter->AppendToTmpFile($data);
+						$aResult['token'] = $oExporter->SaveState();
+					}
+					else
+					{
+						// Last pass
+						$data .= $oExporter->GetFooter();
+						$oExporter->AppendToTmpFile($data);
+						$aResult['token'] = $oExporter->SaveState();
+						if (substr($oExporter->GetMimeType(), 0, 5) == 'text/')
+						{
+							// Result must be encoded in UTF-8 to be passed as part of a JSON structure
+							$sCharset = $oExporter->GetCharacterSet();
+							if (strtoupper($sCharset) != 'UTF-8')
+							{
+								$aResult['text_result'] = iconv($sCharset, 'UTF-8', file_get_contents($oExporter->GetTmpFilePath()));
+							}
+							else
+							{
+								$aResult['text_result'] = file_get_contents($oExporter->GetTmpFilePath());
+							}
+							$aResult['mime_type'] = $oExporter->GetMimeType();
+						}
+						$aResult['message'] = Dict::Format('Core:BulkExport:ClickHereToDownload_FileName', $oExporter->GetDownloadFileName());
+					}
+				}
+				$oPage->add(json_encode($aResult));
+			} catch (BulkExportException $e)
+			{
+				$aResult = array('code' => 'error', 'percentage' => 100, 'message' => $e->GetLocalizedMessage());
+				$oPage->add(json_encode($aResult));
+			} catch (Exception $e)
+			{
+				$aResult = array('code' => 'error', 'percentage' => 100, 'message' => $e->getMessage());
+				$oPage->add(json_encode($aResult));
 			}
-			$oPage->add(json_encode($aResult));
-		}
-		catch(BulkExportException $e)
-		{
-			$aResult = array('code' => 'error', 'percentage' => 100, 'message' => $e->GetLocalizedMessage());
-			$oPage->add(json_encode($aResult));
-		}
-		catch(Exception $e)
-		{
-			$aResult = array('code' => 'error', 'percentage' => 100, 'message' => $e->getMessage());
-			$oPage->add(json_encode($aResult));
-		}
-		break;
-		
+			break;
+
 		case 'export_download':
-		$token = utils::ReadParam('token', null);
-		if ($token !== null)
-		{
-			$oExporter = BulkExport::FindExporterFromToken($token);
-			if ($oExporter)
+			$token = utils::ReadParam('token', null);
+			if ($token !== null)
 			{
-				$sMimeType = $oExporter->GetMimeType();
-				if (substr($sMimeType, 0, 5) == 'text/')
+				$oExporter = BulkExport::FindExporterFromToken($token);
+				if ($oExporter)
 				{
-					$sMimeType .= ';charset='.strtolower($oExporter->GetCharacterSet());
+					$sMimeType = $oExporter->GetMimeType();
+					if (substr($sMimeType, 0, 5) == 'text/')
+					{
+						$sMimeType .= ';charset='.strtolower($oExporter->GetCharacterSet());
+					}
+					$oPage->SetContentType($sMimeType);
+					$oPage->SetContentDisposition('attachment', $oExporter->GetDownloadFileName());
+					$oPage->add(file_get_contents($oExporter->GetTmpFilePath()));
 				}
-				$oPage->SetContentType($sMimeType);
-				$oPage->SetContentDisposition('attachment', $oExporter->GetDownloadFileName());
-				$oPage->add(file_get_contents($oExporter->GetTmpFilePath()));
 			}
-		}
-		break;
-		
+			break;
+
 		case 'export_cancel':
-		$token = utils::ReadParam('token', null);
-		if ($token !== null)
-		{
-			$oExporter = BulkExport::FindExporterFromToken($token);
-			if ($oExporter)
+			$token = utils::ReadParam('token', null);
+			if ($token !== null)
 			{
-				$oExporter->Cleanup();
-			}
-		}
-		$aResult = array('code' => 'error', 'percentage' => 100, 'message' => Dict::S('Core:BulkExport:ExportCancelledByUser'));
-		$oPage->add(json_encode($aResult));
-		break;
-		
-		case 'extend_lock':
-		$sObjClass = utils::ReadParam('obj_class', '', false, 'class');
-		$iObjKey = (int)utils::ReadParam('obj_key', 0, false, 'integer');
-		$sToken = utils::ReadParam('token', 0, false, 'raw_data');
-		$aResult = iTopOwnershipLock::ExtendLock($sObjClass, $iObjKey, $sToken);
-		if (!$aResult['status'])
-		{
-			if ($aResult['operation'] == 'lost')
-			{
-				$sName =  $aResult['owner']->GetName();
-				if ($aResult['owner']->Get('contactid') != 0)
+				$oExporter = BulkExport::FindExporterFromToken($token);
+				if ($oExporter)
 				{
-					$sName .= ' ('.$aResult['owner']->Get('contactid_friendlyname').')';
+					$oExporter->Cleanup();
 				}
-				$aResult['message'] = Dict::Format('UI:CurrentObjectIsLockedBy_User', $sName);
-				$aResult['popup_message'] = Dict::Format('UI:CurrentObjectIsLockedBy_User_Explanation',  $sName);
 			}
-			else if ($aResult['operation'] == 'expired')
+			$aResult = array('code' => 'error', 'percentage' => 100, 'message' => Dict::S('Core:BulkExport:ExportCancelledByUser'));
+			$oPage->add(json_encode($aResult));
+			break;
+
+		case 'extend_lock':
+			$sObjClass = utils::ReadParam('obj_class', '', false, 'class');
+			$iObjKey = (int)utils::ReadParam('obj_key', 0, false, 'integer');
+			$sToken = utils::ReadParam('token', 0, false, 'raw_data');
+			$aResult = iTopOwnershipLock::ExtendLock($sObjClass, $iObjKey, $sToken);
+			if (!$aResult['status'])
 			{
-				$aResult['message'] = Dict::S('UI:CurrentObjectLockExpired');
-				$aResult['popup_message'] = Dict::S('UI:CurrentObjectLockExpired_Explanation');
+				if ($aResult['operation'] == 'lost')
+				{
+					$sName = $aResult['owner']->GetName();
+					if ($aResult['owner']->Get('contactid') != 0)
+					{
+						$sName .= ' ('.$aResult['owner']->Get('contactid_friendlyname').')';
+					}
+					$aResult['message'] = Dict::Format('UI:CurrentObjectIsLockedBy_User', $sName);
+					$aResult['popup_message'] = Dict::Format('UI:CurrentObjectIsLockedBy_User_Explanation', $sName);
+				}
+				else
+				{
+					if ($aResult['operation'] == 'expired')
+					{
+						$aResult['message'] = Dict::S('UI:CurrentObjectLockExpired');
+						$aResult['popup_message'] = Dict::S('UI:CurrentObjectLockExpired_Explanation');
+					}
+				}
 			}
-		}
-		$oPage->add(json_encode($aResult));
-		break;
-		
+			$oPage->add(json_encode($aResult));
+			break;
+
 		case 'watchdog':
-		$oPage->add('ok'); // Better for debugging...
-		break;
-		
+			$oPage->add('ok'); // Better for debugging...
+			break;
+
 		case 'cke_img_upload':
 			// Image uploaded via CKEditor
 			$aResult = array(
-			'uploaded' => 0,
-			'fileName' => '',
-			'url' => '',
-			'icon' => '',
-			'msg' => '',
-			'att_id' => 0,
-			'preview' => 'false',
+				'uploaded' => 0,
+				'fileName' => '',
+				'url' => '',
+				'icon' => '',
+				'msg' => '',
+				'att_id' => 0,
+				'preview' => 'false',
 			);
-		
+
 			$sObjClass = stripslashes(utils::ReadParam('obj_class', '', false, 'class'));
 			$sTempId = utils::ReadParam('temp_id', '');
 			if (empty($sObjClass))
@@ -2333,9 +2337,9 @@ EOF
 						$oAttachment->Set('item_class', $sObjClass);
 						$oAttachment->SetDefaultOrgId();
 						$oAttachment->Set('contents', $oDoc);
-						$oAttachment->Set('secret', sprintf ('%06x', mt_rand(0, 0xFFFFFF))); // something not easy to guess
+						$oAttachment->Set('secret', sprintf('%06x', mt_rand(0, 0xFFFFFF))); // something not easy to guess
 						$iAttId = $oAttachment->DBInsert();
-			
+
 						$aResult['uploaded'] = 1;
 						$aResult['msg'] = htmlentities($oDoc->GetFileName(), ENT_QUOTES, 'UTF-8');
 						$aResult['fileName'] = $oDoc->GetFileName();
@@ -2350,15 +2354,14 @@ EOF
 					{
 						$aResult['error'] = $oDoc->GetFileName().' is not a valid image format.';
 					}
-				}
-				catch (FileUploadException $e)
+				} catch (FileUploadException $e)
 				{
 					$aResult['error'] = $e->GetMessage();
 				}
 			}
 			$oPage->add(json_encode($aResult));
 			break;
-			
+
 		case 'cke_upload_and_browse':
 			$sTempId = utils::ReadParam('temp_id');
 			$sObjClass = utils::ReadParam('obj_class', '', false, 'class');
@@ -2375,32 +2378,31 @@ EOF
 					$oAttachment->Set('item_class', $sObjClass);
 					$oAttachment->SetDefaultOrgId();
 					$oAttachment->Set('contents', $oDoc);
-					$oAttachment->Set('secret', sprintf ('%06x', mt_rand(0, 0xFFFFFF))); // something not easy to guess
+					$oAttachment->Set('secret', sprintf('%06x', mt_rand(0, 0xFFFFFF))); // something not easy to guess
 					$iAttId = $oAttachment->DBInsert();
-						
+
 				}
-			}
-			catch (FileUploadException $e)
+			} catch (FileUploadException $e)
 			{
 				// fail silently ??
-			}		
+			}
 		// Fall though !! => browse
-		
+
 		case 'cke_browse':
 			$oPage = new NiceWebPage(Dict::S('UI:BrowseInlineImages'));
 			$oPage->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/magnific-popup.css');
 			$oPage->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.magnific-popup.min.js');
 			$sImgUrl = utils::GetAbsoluteUrlAppRoot().INLINEIMAGE_DOWNLOAD_URL;
-			
+
 			$sTempId = utils::ReadParam('temp_id');
 			$sClass = utils::ReadParam('obj_class', '', false, 'class');
 			$iObjectId = utils::ReadParam('obj_key', 0, false, 'integer');
 			$sCKEditorFuncNum = utils::ReadParam('CKEditorFuncNum', '');
-			
+
 			$sPostUrl = utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php?CKEditorFuncNum='.$sCKEditorFuncNum;
-			
+
 			$oPage->add_style(
-<<<EOF
+				<<<EOF
 body {
 	overflow: auto;
 }
@@ -2413,7 +2415,7 @@ EOF
 			$sInsertBtnLabel = Dict::S('UI:Button:Insert');
 			$sNoInlineImage = Dict::S('UI:NoInlineImage');
 			$oPage->add(
-<<<EOF
+				<<<EOF
 <div>
 	<fieldset>
 		<legend>$sUploadLegend</legend>
@@ -2428,9 +2430,9 @@ EOF
 </div>
 EOF
 			);
-				
+
 			$oPage->add_script(
-<<<EOF
+				<<<EOF
         // Helper function to get parameters from the query string.
         function getUrlParam( paramName ) {
             var reParam = new RegExp( '(?:[\?&]|&)' + paramName + '=([^&]+)', 'i' );
@@ -2463,7 +2465,7 @@ EOF
 EOF
 			);
 			$oPage->add_ready_script(
-<<<EOF
+				<<<EOF
 $('#upload_button').on('change', function() {
 	$('#upload_status').html('<img src="../images/indicator.gif">'); 
 	$('#upload_form').submit();
@@ -2475,14 +2477,14 @@ EOF
 			$sOQL = "SELECT InlineImage WHERE ((temp_id = :temp_id) OR (item_class = :obj_class AND item_id = :obj_id))";
 			$oSet = new DBObjectSet(DBObjectSearch::FromOQL($sOQL), array(), array('temp_id' => $sTempId, 'obj_class' => $sClass, 'obj_id' => $iObjectId));
 			$oPage->add("<div><fieldset><legend>$sAvailableImagesLegend</legend>");
-				
+
 			if ($oSet->Count() == 0)
 			{
 				$oPage->add("<p style=\"text-align:center\">$sNoInlineImage</p>");
 			}
 			else
 			{
-				while($oAttachment = $oSet->Fetch())
+				while ($oAttachment = $oSet->Fetch())
 				{
 					$oDoc = $oAttachment->Get('contents');
 					if ($oDoc->GetMainMimeType() == 'image')
@@ -2495,8 +2497,8 @@ EOF
 				}
 			}
 			$oPage->add("</fieldset></div>");
-			break;		
-	
+			break;
+
 		case 'custom_fields_update':
 			$oPage->SetContentType('application/json');
 			$sAttCode = utils::ReadParam('attcode', '');
@@ -2518,8 +2520,7 @@ EOF
 				$aRenderRes = $oRenderer->Render($aRequestedFields);
 
 				$aResult['form']['updated_fields'] = $aRenderRes;
-			}
-			catch (Exception $e)
+			} catch (Exception $e)
 			{
 				$aResult['error'] = $e->getMessage();
 			}
@@ -2527,12 +2528,11 @@ EOF
 			break;
 
 		default:
-		$oPage->p("Invalid query.");
+			$oPage->p("Invalid query.");
 	}
 
 	$oPage->output();
-}
-catch (Exception $e)
+} catch (Exception $e)
 {
 	// note: transform to cope with XSS attacks
 	echo htmlentities($e->GetMessage(), ENT_QUOTES, 'utf-8');
diff --git a/pages/ajax.searchform.php b/pages/ajax.searchform.php
index 712e8b1c8..92ea6071f 100644
--- a/pages/ajax.searchform.php
+++ b/pages/ajax.searchform.php
@@ -57,19 +57,9 @@ try
 	$sListParams = stripslashes(utils::ReadParam('list_params', '{}', false, 'raw_data'));
 	$aListParams = (array) json_decode($sListParams, true);
 
-
-	$aPassFromExtraParamsToListParams = array(
-        'currentId',
-        'selection_mode',
-        'selection_type',// In case of single selection, the root of the HTML identifiers used is suffixed with "_results" (at least in the external keys)
-        'cssCount',
-    );
-	foreach ($aPassFromExtraParamsToListParams as $passThroughKey)
+	foreach($aListParams as $key => $value)
     {
-        if (array_key_exists($passThroughKey, $aListParams))
-        {
-            $aExtraParams[$passThroughKey] = $aListParams[$passThroughKey];
-        }
+	    $aExtraParams[$key] = $value;
     }
 
     if (array_key_exists('table_inner_id', $aListParams))
diff --git a/sources/application/search/searchform.class.inc.php b/sources/application/search/searchform.class.inc.php
index 4c38f86ad..c4380e2a9 100644
--- a/sources/application/search/searchform.class.inc.php
+++ b/sources/application/search/searchform.class.inc.php
@@ -61,11 +61,15 @@ class SearchForm
 		$sClassName = $oSet->GetFilter()->GetClass();
 		$aListParams = array();
 
+		foreach($aExtraParams as $key => $value)
+		{
+			$aListParams[$key] = $value;
+		}
+
 		// Simple search form
 		if (isset($aExtraParams['currentId']))
 		{
 			$sSearchFormId = $aExtraParams['currentId'];
-			$aListParams['currentId'] = $aExtraParams['currentId'];
 		}
 		else
 		{
@@ -83,23 +87,13 @@ class SearchForm
 		{
 			$sRootClass = $sClassName;
 		}
-		if (array_key_exists('selection_mode', $aExtraParams))
-		{
-			$aListParams['selection_mode'] = $aExtraParams['selection_mode'];
-		}
-		if (array_key_exists('selection_type', $aExtraParams))
-		{
-			$aListParams['selection_type'] = $aExtraParams['selection_type'];
-		}
+
 		$sJson = stripslashes(utils::ReadParam('json', '', false, 'raw_data'));
 		if (!empty($sJson))
 		{
 			$aListParams['json'] = json_decode($sJson, true);
 		}
-		if (array_key_exists('cssCount', $aExtraParams))
-		{
-			$aListParams['cssCount'] = $aExtraParams['cssCount'];
-		}
+
 
 		$aSubClasses = MetaModel::GetSubclasses($sRootClass);
 		if (count($aSubClasses) > 0)
@@ -139,15 +133,14 @@ class SearchForm
 		{
 			$aExtraParams['table_id'] = "search_form_result_{$sSearchFormId}";
 		}
-		$aListParams['table_id'] = $aExtraParams['table_id'];
-		if (array_key_exists('table_inner_id', $aExtraParams))
-		{
-			$aListParams['table_inner_id'] = $aExtraParams['table_inner_id'];
-		}
-		else
+		if (!array_key_exists('table_inner_id', $aExtraParams))
 		{
 			$aListParams['table_inner_id'] = uniqid('table_inner_id_');
 		}
+		if (array_key_exists('table_id2', $aExtraParams))
+		{
+			$aListParams['table_id'] = $aExtraParams['table_id2'];
+		}
 		$aSearchParams = array(
 			'criterion_outer_selector' => "#fs_{$sSearchFormId}_criterion_outer",
             'result_list_outer_selector' => "#{$aExtraParams['table_id']}",
@@ -162,13 +155,13 @@ class SearchForm
 			),
 		);
 
-		if (isset($aSearchParams['list_params']['table_inner_id']))
-        {
-            $aSearchParams['data_config_list_selector'] = '#'.$aSearchParams['list_params']['table_inner_id'];
-        }
-        elseif (isset($aSearchParams['list_params']['table_id']))
-        {
-            $aSearchParams['data_config_list_selector'] = '#'.$aSearchParams['list_params']['table_id'];
+		if (isset($aSearchParams['list_params']['table_id']))
+		{
+			$aSearchParams['data_config_list_selector'] = '#'.$aSearchParams['list_params']['table_id'];
+		}
+		elseif (isset($aSearchParams['list_params']['table_inner_id']))
+		{
+			$aSearchParams['data_config_list_selector'] = '#'.$aSearchParams['list_params']['table_inner_id'];
         }
         else
         {

From a1c6e32e2805dcad62879a021543acf6edb2d415 Mon Sep 17 00:00:00 2001
From: Guillaume Lajarige <guillaume.lajarige@combodo.com>
Date: Fri, 16 Mar 2018 08:08:24 +0000
Subject: [PATCH 051/202] Advanced search: WIP POC, UI/UX.

SVN:b1162[5439]
---
 application/displayblock.class.inc.php        | 13 +--
 core/displayablegraph.class.inc.php           |  2 +-
 css/css-variables.scss                        |  4 +-
 css/light-grey.css                            | 94 ++++++++++--------
 css/light-grey.scss                           | 95 ++++++++++++-------
 dictionaries/en.dictionary.itop.ui.php        |  1 +
 js/search/search_form_criteria.js             | 16 +++-
 js/search/search_form_criteria_string.js      |  4 +-
 js/search/search_form_handler.js              | 35 ++++++-
 js/utils.js                                   |  2 +-
 .../search/searchform.class.inc.php           |  5 +-
 11 files changed, 172 insertions(+), 99 deletions(-)

diff --git a/application/displayblock.class.inc.php b/application/displayblock.class.inc.php
index f268f081b..cccf13273 100644
--- a/application/displayblock.class.inc.php
+++ b/application/displayblock.class.inc.php
@@ -933,21 +933,10 @@ class DisplayBlock
 			case 'search':
 			if (!$oPage->IsPrintableVersion())
 			{
-				$sStyle = (isset($aExtraParams['open']) && ($aExtraParams['open'] == 'true')) ? 'SearchDrawer' : 'SearchDrawer DrawerClosed';
-				$sHtml .= "<div id=\"ds_$sId\" class=\"$sStyle\">\n";
-				$oPage->add_ready_script(
-<<<EOF
-		$("#dh_$sId").click( function() {
-			$("#ds_$sId").slideToggle('normal', function() { $("#ds_$sId").parent().resize(); FixSearchFormsDisposition();  $("#dh_$sId").trigger('toggle_complete'); } );
-			$("#dh_$sId").toggleClass('open');
-		});
-EOF
-				);
+				$sHtml .= "<div id=\"ds_$sId\" class=\"search_box\">\n";
 				$aExtraParams['currentId'] = $sId;
 				$sHtml .= cmdbAbstractObject::GetSearchForm($oPage, $this->m_oSet, $aExtraParams);
 		 		$sHtml .= "</div>\n";
-		 		$sHtml .= "<div class=\"HRDrawer\"></div>\n";
-		 		$sHtml .= "<div id=\"dh_$sId\" class=\"DrawerHandle\">".Dict::S('UI:SearchToggle')."</div>\n";
 		 	}
 			break;
 			
diff --git a/core/displayablegraph.class.inc.php b/core/displayablegraph.class.inc.php
index 1d09070f6..ab1a31e6e 100644
--- a/core/displayablegraph.class.inc.php
+++ b/core/displayablegraph.class.inc.php
@@ -1439,7 +1439,7 @@ class DisplayableGraph extends SimpleGraph
 			$aExcludedByClass[get_class($oObj)][] = $oObj->GetKey();
 		}
 		$oP->add("<div class=\"not-printable\">\n");
-		$oP->add("<div id=\"ds_flash\" class=\"SearchDrawer\" style=\"display:none;\">\n");
+		$oP->add("<div id=\"ds_flash\" class=\"search_box\" style=\"display:none;\">\n");
 		if (!$oP->IsPrintableVersion())
 		{
 			$oP->add_ready_script(
diff --git a/css/css-variables.scss b/css/css-variables.scss
index 962c33cb7..f8973d783 100644
--- a/css/css-variables.scss
+++ b/css/css-variables.scss
@@ -28,8 +28,8 @@ $box-radius: 0px;
 $box-shadow-regular: 0 1px 1px rgba(0, 0, 0, 0.15);
 // - Boxes
 $box-blue-color: #2D2D2D;
-$box-blue-bg-color: #d6e8ef;
-$box-blue-border-color: #1c94c4;
+$box-blue-bg-color: #f0f3f5;
+$box-blue-border-color: #3f7294;
 $box-blue-border: 1px solid $box-blue-border-color;
 $box-blue-radius: 1px;
 
diff --git a/css/light-grey.css b/css/light-grey.css
index b4661e15a..6acfcd7b7 100644
--- a/css/light-grey.css
+++ b/css/light-grey.css
@@ -704,35 +704,6 @@ input.dp-applied {
  }
  }
  }*/
-.DrawerClosed {
-  display: none;
-}
-.DrawerHandle {
-  margin: 0;
-  padding: 5px;
-  background: url(../images/drawer-handle.gif) bottom no-repeat transparent;
-  color: #fff;
-  cursor: pointer;
-  text-align: center;
-  /* center the block */
-  width: 100px;
-  margin-left: auto;
-  margin-right: auto;
-  margin-top: 0;
-  margin-bottom: 0;
-  display: block;
-  font-size: 12px;
-}
-div.HRDrawer {
-  height: 5px;
-  width: 100%;
-  margin: 0;
-  background-color: #1c94c4;
-  margin-top: 10px;
-  padding: 0;
-  border: 0;
-  display: block;
-}
 .mini_tabs a {
   text-decoration: none;
   font-weight: bold;
@@ -759,10 +730,18 @@ div.HRDrawer {
 }
 /* Search forms v2 */
 /* TODO: Remove comment before final commit */
+.search_box {
+  box-sizing: border-box;
+  /* Sizing reset */
+}
+.search_box * {
+  box-sizing: border-box;
+}
 .search_form_handler {
   position: relative;
   z-index: 10;
   font-size: 12px;
+  border: 1px solid #3f7294;
   /* Sizing reset */
   /* Hyperlink reset */
 }
@@ -773,7 +752,30 @@ div.HRDrawer {
   color: inherit;
   text-decoration: none;
 }
+.search_form_handler.opened .sf_title .sft_toggler {
+  transform: rotateX(180deg);
+}
+.search_form_handler.opened .sf_criterion_area {
+  /*display: inherit;*/
+}
+.search_form_handler .sf_title {
+  padding: 8px 10px;
+  margin: 0;
+  color: #fff;
+  background-color: #3f7294;
+  /* Pictogram */
+}
+.search_form_handler .sf_title > span {
+  margin-right: 10px;
+}
+.search_form_handler .sf_title .sft_toggler {
+  transition: all 0.4s ease-in-out;
+}
 .search_form_handler .sf_criterion_area {
+  /*display: none;*/
+  padding: 8px 8px 3px 8px;
+  /* padding-bottom must equals to padding-top - .search_form_criteria:margin-bottom */
+  background-color: #fff;
   /* Common style between criterion and more criterion */
   /* Criteria tags */
   /* More criterion */
@@ -782,6 +784,13 @@ div.HRDrawer {
   position: relative;
   display: inline-block;
 }
+.search_form_handler .sf_criterion_area .search_form_criteria, .search_form_handler .sf_criterion_area .sf_more_criterion {
+  margin-bottom: 5px;
+}
+.search_form_handler .sf_criterion_area .search_form_criteria.opened, .search_form_handler .sf_criterion_area .sf_more_criterion.opened {
+  margin-bottom: 0px;
+  /* To compensate the .sfc/.sfm_header:padding-bottom: 13px */
+}
 .search_form_handler .sf_criterion_area .search_form_criteria.opened .sfc_header, .search_form_handler .sf_criterion_area .sf_more_criterion.opened .sfc_header, .search_form_handler .sf_criterion_area .search_form_criteria.opened .sfm_header, .search_form_handler .sf_criterion_area .sf_more_criterion.opened .sfm_header {
   border-bottom: none !important;
   box-shadow: none !important;
@@ -791,9 +800,9 @@ div.HRDrawer {
 .search_form_handler .sf_criterion_area .search_form_criteria > *, .search_form_handler .sf_criterion_area .sf_more_criterion > * {
   padding: 7px 8px;
   vertical-align: top;
-  background-color: #d6e8ef;
+  background-color: #f0f3f5;
   color: #2d2d2d;
-  border: 1px solid #1c94c4;
+  border: 1px solid #3f7294;
   border-radius: 1px;
   box-shadow: 0 1px 1px rgba(0, 0, 0, 0.15);
 }
@@ -808,7 +817,6 @@ div.HRDrawer {
   position: relative;
   display: inline-block;
   margin-right: 5px;
-  margin-bottom: 5px;
   /* Non editable criteria */
   /* Draft criteria (modifications not applied) */
   /* Opened criteria (form group displayed) */
@@ -828,13 +836,20 @@ div.HRDrawer {
   z-index: 1;
   /* To be over other criterion */
 }
+.search_form_handler .sf_criterion_area .search_form_criteria.opened .sfc_toggle {
+  transform: rotateX(-180deg);
+}
 .search_form_handler .sf_criterion_area .search_form_criteria.opened .sfc_form_group {
   display: block;
 }
+.search_form_handler .sf_criterion_area .search_form_criteria.opened_left .sfc_form_group {
+  left: auto;
+  right: 0px;
+}
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_close, .search_form_handler .sf_criterion_area .search_form_criteria .sfc_toggle {
   position: absolute;
   top: 7px;
-  color: #1c94c4;
+  color: #3f7294;
 }
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_close {
   right: 7px;
@@ -842,10 +857,7 @@ div.HRDrawer {
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_toggle {
   display: inline-block;
   right: 23px;
-  transition: all 0.4s ease-in-out;
-}
-.search_form_handler .sf_criterion_area .search_form_criteria .sfc_toggle.opened {
-  transform: rotateZ(-180deg);
+  transition: all 0.3s ease-in-out;
 }
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_title {
   padding-right: 35px;
@@ -896,7 +908,7 @@ div.HRDrawer {
   bottom: 4px;
   right: 0px;
   cursor: pointer;
-  color: #1c94c4;
+  color: #3f7294;
   font-size: 10px;
   font-weight: bold;
   border: none;
@@ -942,11 +954,15 @@ div.HRDrawer {
 .search_form_handler .sf_criterion_area .sf_more_criterion.opened .sfm_content {
   display: inherit;
 }
+.search_form_handler .sf_criterion_area .sf_more_criterion.opened_left .sfm_content {
+  left: auto;
+  right: 0px;
+}
 .search_form_handler .sf_criterion_area .sf_more_criterion .sfm_toggler .sfm_tg_title {
   margin-right: 7px;
 }
 .search_form_handler .sf_criterion_area .sf_more_criterion .sfm_toggler .sfm_tg_icon {
-  color: #1c94c4;
+  color: #3f7294;
 }
 .search_form_handler .sf_criterion_area .sf_more_criterion .sfm_content {
   display: none;
diff --git a/css/light-grey.scss b/css/light-grey.scss
index a6a745b4e..80a7f6b18 100644
--- a/css/light-grey.scss
+++ b/css/light-grey.scss
@@ -786,36 +786,6 @@ input.dp-applied {
 		}
 	}
 }*/
-.DrawerClosed {
-	display: none;
-}
-.DrawerHandle {
-	margin: 0;
-	padding: 5px;
-	background: url(../images/drawer-handle.gif) bottom no-repeat transparent;
-	color: #fff;
-	cursor: pointer;
-	text-align: center;
-	/* center the block */
-	width: 100px;
-	margin-left: auto;
-	margin-right: auto;
-	margin-top: 0;
-	margin-bottom: 0;
-	display: block;
-	font-size: 12px;
-}
-
-div.HRDrawer {
-	height: 5px;
-	width: 100%;
-	margin: 0;
-	background-color:  $complement-color;
-	margin-top: 10px;
-	padding: 0;
-	border: 0;
-	display: block;
-}
 .mini_tabs a {
 	text-decoration: none;
 	font-weight:bold;
@@ -842,10 +812,19 @@ div.HRDrawer {
 }
 /* Search forms v2 */
 /* TODO: Remove comment before final commit */
+.search_box{
+	box-sizing: border-box;
+
+	/* Sizing reset */
+	*{
+		box-sizing: border-box;
+	}
+}
 .search_form_handler{
 	position: relative;
 	z-index: 10;
 	font-size: 12px;
+	border: 1px solid $box-blue-border-color;
 
 	/* Sizing reset */
 	*{
@@ -857,7 +836,37 @@ div.HRDrawer {
 		text-decoration: none;
 	}
 
+	&.opened{
+		.sf_title{
+			.sft_toggler{
+				transform: rotateX(180deg);
+			}
+		}
+		.sf_criterion_area{
+			/*display: inherit;*/
+		}
+	}
+
+	.sf_title{
+		padding: 8px 10px;
+		margin: 0;
+		color: #ffffff;
+		background-color: $box-blue-border-color;
+
+		/* Pictogram */
+		> span{
+			margin-right: 10px;
+		}
+
+		.sft_toggler{
+			transition: all 0.4s ease-in-out;
+		}
+	}
 	.sf_criterion_area{
+		/*display: none;*/
+		padding: 8px 8px 3px 8px; /* padding-bottom must equals to padding-top - .search_form_criteria:margin-bottom */
+		background-color: $white;
+
 		/* Common style between criterion and more criterion */
 		.sf_active_criterion,
 		.sf_more_criterion {
@@ -867,7 +876,11 @@ div.HRDrawer {
 
 		.search_form_criteria,
 		.sf_more_criterion {
+			margin-bottom: 5px;
+
 			&.opened{
+				margin-bottom: 0px; /* To compensate the .sfc/.sfm_header:padding-bottom: 13px */
+
 				.sfc_header,
 				.sfm_header{
 					border-bottom: none !important;
@@ -900,7 +913,6 @@ div.HRDrawer {
 			position: relative;
 			display: inline-block;
 			margin-right: 5px;
-			margin-bottom: 5px;
 
             /* Non editable criteria */
 			&.locked{
@@ -921,10 +933,19 @@ div.HRDrawer {
 			&.opened{
 				z-index: 1; /* To be over other criterion */
 
+				.sfc_toggle{
+					transform: rotateX(-180deg);
+				}
 				.sfc_form_group{
 					display: block;
 				}
 			}
+			&.opened_left{
+				.sfc_form_group{
+					left: auto;
+					right: 0px;
+				}
+			}
 
 			/* Top left corner icons */
 			.sfc_close,
@@ -939,11 +960,7 @@ div.HRDrawer {
 			.sfc_toggle{
 				display: inline-block;
 				right: 23px;
-				transition: all 0.4s ease-in-out;
-
-				&.opened{
-					transform: rotateZ(-180deg);
-				}
+				transition: all 0.3s ease-in-out;
 			}
 
 			.sfc_title{
@@ -1074,6 +1091,12 @@ div.HRDrawer {
 					display: inherit;
 				}
 			}
+			&.opened_left{
+				.sfm_content{
+					left: auto;
+					right: 0px;
+				}
+			}
 
 			.sfm_toggler{
 				.sfm_tg_title{
diff --git a/dictionaries/en.dictionary.itop.ui.php b/dictionaries/en.dictionary.itop.ui.php
index b7a04bb17..c770374b8 100644
--- a/dictionaries/en.dictionary.itop.ui.php
+++ b/dictionaries/en.dictionary.itop.ui.php
@@ -1372,6 +1372,7 @@ When associated with a trigger, each action is given an "order" number, specifyi
 	'UI:UploadNotSupportedInThisMode' => 'The modification of images or files is not supported in this mode.',
 
 	// TODO: Reorganize those entries with other search entries and make entries for other languages.
+	'UI:Search:Toggle' => 'Minimize / Expand',
 	'UI:Search:Criterion:MoreMenu:AddCriteria' => 'Add new criteria',
 	'UI:Search:Criteria:Operator:Default:Empty' => 'Is empty',
 	'UI:Search:Criteria:Operator:Default:NotEmpty' => 'Is not empty',
diff --git a/js/search/search_form_criteria.js b/js/search/search_form_criteria.js
index 36125ce2c..3a25a1456 100644
--- a/js/search/search_form_criteria.js
+++ b/js/search/search_form_criteria.js
@@ -169,7 +169,16 @@ $(function()
 
 			// Open criteria
 			this._resetOperators();
+			// - Open it first
 			this.element.addClass('opened');
+			// - Then only check if more menu is to close to the right side (otherwise we might not have the right element's position)
+			var iPageWidth = $(document).width();
+			var iFormWidth = this.element.find('.sfc_form_group').outerWidth();
+			var iFormLeftPos = this.element.find('.sfc_form_group').offset().left;
+			if( (iFormWidth + iFormLeftPos) > (iPageWidth - 10 /* Security margin */) )
+			{
+				this.element.addClass('opened_left');
+			}
 
 			// Focus on right input
 			var oOpElemToFocus;
@@ -185,6 +194,7 @@ $(function()
 		},
 		_close: function()
 		{
+			this.element.removeClass('opened_left');
 			this.element.removeClass('opened');
 			this._unmarkAsDraft();
 		},
@@ -294,7 +304,8 @@ $(function()
 
 			// Bind events
 			// - Toggler
-			this.element.find('.sfc_toggle, .sfc_title').on('click', function(){
+			this.element.find('.sfc_toggle, .sfc_title').on('click', function(oEvent){
+				oEvent.preventDefault();
 				// First memorize if current criteria is close
 				var bOpen = !me.element.hasClass('opened');
 				// Then close every criterion
@@ -310,7 +321,8 @@ $(function()
 			if(this.options.is_removable === true)
 			{
 				this.element.find('.sfc_header').append('<span class="sfc_close"><a class="fa fa-times" href="#"></a></span>');
-				this.element.find('.sfc_close').on('click', function(){
+				this.element.find('.sfc_close').on('click', function(oEvent){
+					oEvent.preventDefault();
 					me._remove();
 				});
 			}
diff --git a/js/search/search_form_criteria_string.js b/js/search/search_form_criteria_string.js
index 80fa292eb..76f55026e 100644
--- a/js/search/search_form_criteria_string.js
+++ b/js/search/search_form_criteria_string.js
@@ -80,7 +80,9 @@ $(function()
 				// Remove starts/ends_with
 				this.element.find('.sfc_fg_operator[data-operator-code*="with"]').remove();
 				// Modify contains with a dropdown
-				this.element.find('.sfc_fg_operator[data-operator-code="contains"] .sfc_op_name').html('<select style="    padding: 2px 0px;"><option>Contains</option><option>Starts with</option><option>Ends with</option></select>');
+				this.element.find('.sfc_fg_operator[data-operator-code="contains"] .sfc_op_name')
+					.html('<select style="    padding: 1px 0px;"><option>Contains</option><option>Starts with</option><option>Ends with</option></select>')
+					.css('margin-right', '5px');
 				// Remove click event on dropdown
 				this.element.find('.sfc_fg_operator[data-operator-code="contains"] .sfc_op_name').on('click', function(oEvent){
 					oEvent.preventDefault();
diff --git a/js/search/search_form_handler.js b/js/search/search_form_handler.js
index e95f52ee6..6ffbd0240 100644
--- a/js/search/search_form_handler.js
+++ b/js/search/search_form_handler.js
@@ -84,6 +84,7 @@ $(function()
 			this.element.addClass('search_form_handler');
 
 			// Prepare DOM elements
+			this._prepareFormArea();
 			this._prepareCriterionArea();
 			this._prepareResultsArea();
 
@@ -170,13 +171,26 @@ $(function()
 		// - Open / Close more criterion menu
 		_openMoreCriterion: function()
 		{
-			this.elements.more_criterion.addClass('opened');
+			// Close all criterion
 			this.elements.active_criterion.find('.search_form_criteria').each(function(){
 				$(this).triggerHandler('itop.search.criteria.close');
 			});
+
+			// Open more criterion menu
+			// - Open it first
+			this.elements.more_criterion.addClass('opened');
+			// - Then only check if more menu is to close to the right side (otherwise we might not have the right element's position)
+			var iPageWidth = $(document).width();
+			var iMenuWidth = this.elements.more_criterion.find('.sfm_content').outerWidth();
+			var iMenuLeftPos = this.elements.more_criterion.find('.sfm_content').offset().left;
+			if( (iMenuWidth + iMenuLeftPos) > (iPageWidth - 10 /* Security margin */) )
+			{
+				this.elements.more_criterion.addClass('opened_left');
+			}
 		},
 		_closeMoreCriterion: function()
 		{
+			this.elements.more_criterion.removeClass('opened_left');
 			this.elements.more_criterion.removeClass('opened');
 		},
 		_toggleMoreCriterion: function()
@@ -193,6 +207,19 @@ $(function()
 		},
 
 		// DOM helpers
+		// - Prepare form area
+		_prepareFormArea: function()
+		{
+			var me = this;
+
+			// TODO: UX Improvment
+			// Note: Would be better to toggle by clicking on the whole title, but we have an issue with <select> on abstract classes.
+			this.element.find('.sft_toggler').on('click', function(oEvent){
+				oEvent.preventDefault();
+				me.element.find('.sf_criterion_area').slideToggle('fast');
+				me.element.toggleClass('opened');
+			});
+		},
 		// - Prepare criterion area
 		_prepareCriterionArea: function()
 		{
@@ -285,11 +312,13 @@ $(function()
 
 			// Bind events
 			// - Open / close menu
-			this.elements.more_criterion.find('.sfm_header').on('click', function(){
+			this.elements.more_criterion.find('.sfm_header').on('click', function(oEvent){
+				oEvent.preventDefault();
 				me._toggleMoreCriterion();
 			});
 			// - Add criteria
-			this.elements.more_criterion.find('.sfm_field').on('click', function(){
+			this.elements.more_criterion.find('.sfm_field').on('click', function(oEvent){
+				oEvent.preventDefault();
 				// Prepare new criterion data (as already opened to increase UX)
 				var oData = {
 					'ref': $(this).attr('data-field-ref'),
diff --git a/js/utils.js b/js/utils.js
index 71770afdf..957b429db 100644
--- a/js/utils.js
+++ b/js/utils.js
@@ -252,7 +252,7 @@ function ReloadSearchForm(divId, sClassName, sBaseClass, sContext)
 function FixSearchFormsDisposition()
 {
 	// Fix search forms
-	$('.SearchDrawer').each(function() {
+	$('.search_box').each(function() {
 		var colWidth = 0;
 		var labelWidth = 0;
 		$('label:visible', $(this)).each( function() {
diff --git a/sources/application/search/searchform.class.inc.php b/sources/application/search/searchform.class.inc.php
index c4380e2a9..69fcddc62 100644
--- a/sources/application/search/searchform.class.inc.php
+++ b/sources/application/search/searchform.class.inc.php
@@ -115,8 +115,9 @@ class SearchForm
 			$sClassesCombo = MetaModel::GetName($sClassName);
 		}
 		$sAction = (isset($aExtraParams['action'])) ? $aExtraParams['action'] : utils::GetAbsoluteUrlAppRoot().'pages/UI.php';
-		$sHtml .= "<form id=\"fs_{$sSearchFormId}\" action=\"{$sAction}\">\n"; // Don't use $_SERVER['SCRIPT_NAME'] since the form may be called asynchronously (from ajax.php)
-		$sHtml .= "<h2>".Dict::Format('UI:SearchFor_Class_Objects', $sClassesCombo)."</h2>\n";
+		$sStyle = (isset($aExtraParams['open']) && ($aExtraParams['open'] == 'true')) ? 'opened' : '';
+		$sHtml .= "<form id=\"fs_{$sSearchFormId}\" action=\"{$sAction}\" class=\"{$sStyle}\">\n"; // Don't use $_SERVER['SCRIPT_NAME'] since the form may be called asynchronously (from ajax.php)
+		$sHtml .= "<h2 class=\"sf_title\"><span class=\"sft_picto fa fa-search\"></span>" . Dict::Format('UI:SearchFor_Class_Objects', $sClassesCombo) . "<a class=\"sft_toggler fa fa-caret-down pull-right\" href=\"#\" title=\"" . Dict::S('UI:Search:Toggle') . "\"></a></h2>\n";
 		$sHtml .= "<div id=\"fs_{$sSearchFormId}_criterion_outer\">\n";
 		$sHtml .= "</div>\n";
 

From f60d0b10e0960bb4a7d19d2c5f655bfdecd2ebee Mon Sep 17 00:00:00 2001
From: Guillaume Lajarige <guillaume.lajarige@combodo.com>
Date: Fri, 16 Mar 2018 08:59:29 +0000
Subject: [PATCH 052/202] Advanced search: WIP POC, UI/UX.

SVN:b1162[5440]
---
 js/search/search_form_criteria.js |  9 +++++----
 js/search/search_form_handler.js  | 15 +++++++++++++--
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/js/search/search_form_criteria.js b/js/search/search_form_criteria.js
index 3a25a1456..1836908c0 100644
--- a/js/search/search_form_criteria.js
+++ b/js/search/search_form_criteria.js
@@ -172,10 +172,11 @@ $(function()
 			// - Open it first
 			this.element.addClass('opened');
 			// - Then only check if more menu is to close to the right side (otherwise we might not have the right element's position)
-			var iPageWidth = $(document).width();
-			var iFormWidth = this.element.find('.sfc_form_group').outerWidth();
-			var iFormLeftPos = this.element.find('.sfc_form_group').offset().left;
-			if( (iFormWidth + iFormLeftPos) > (iPageWidth - 10 /* Security margin */) )
+			var iFormWidth = this.element.closest('.search_form_handler').outerWidth();
+			var iFormLeftPos = this.element.closest('.search_form_handler').offset().left;
+			var iContentWidth = this.element.find('.sfc_form_group').outerWidth();
+			var iContentLeftPos = this.element.find('.sfc_form_group').offset().left;
+			if( (iContentWidth + iContentLeftPos) > (iFormWidth + iFormLeftPos - 10 /* Security margin */) )
 			{
 				this.element.addClass('opened_left');
 			}
diff --git a/js/search/search_form_handler.js b/js/search/search_form_handler.js
index 6ffbd0240..4bc726047 100644
--- a/js/search/search_form_handler.js
+++ b/js/search/search_form_handler.js
@@ -133,6 +133,10 @@ $(function()
 			this.element.on('submit', function(oEvent){
 				oEvent.preventDefault();
 			});
+			// - Submit the search form
+			this.element.on('itop.search.form.submit', function(oEvent, oData){
+				me._onSubmit();
+			});
 
 			// Criteria events
 			this.element.on('itop.search.criteria.opening', function(oEvent, oData){
@@ -180,10 +184,11 @@ $(function()
 			// - Open it first
 			this.elements.more_criterion.addClass('opened');
 			// - Then only check if more menu is to close to the right side (otherwise we might not have the right element's position)
-			var iPageWidth = $(document).width();
+			var iFormWidth = this.element.outerWidth();
+			var iFormLeftPos = this.element.offset().left;
 			var iMenuWidth = this.elements.more_criterion.find('.sfm_content').outerWidth();
 			var iMenuLeftPos = this.elements.more_criterion.find('.sfm_content').offset().left;
-			if( (iMenuWidth + iMenuLeftPos) > (iPageWidth - 10 /* Security margin */) )
+			if( (iMenuWidth + iMenuLeftPos) > (iFormWidth + iFormLeftPos - 10 /* Security margin */) )
 			{
 				this.elements.more_criterion.addClass('opened_left');
 			}
@@ -480,6 +485,12 @@ $(function()
 
 
 		// Submit handlers
+		// - External event callback
+		_onSubmit: function()
+		{
+			this._submit();
+		},
+		// - Do the submit
 		_submit: function()
 		{
 			var me = this;

From d734cdaf48aa277ccf309beda41af91510949803 Mon Sep 17 00:00:00 2001
From: Guillaume Lajarige <guillaume.lajarige@combodo.com>
Date: Fri, 16 Mar 2018 09:44:34 +0000
Subject: [PATCH 053/202] Advanced search: WIP POC, UI/UX.

SVN:b1162[5441]
---
 css/light-grey.css                            |  5 +++++
 css/light-grey.scss                           |  5 +++++
 js/search/search_form_handler.js              | 21 +++++++++++++------
 .../search/searchform.class.inc.php           |  2 +-
 4 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/css/light-grey.css b/css/light-grey.css
index 6acfcd7b7..98857d7c9 100644
--- a/css/light-grey.css
+++ b/css/light-grey.css
@@ -768,7 +768,12 @@ input.dp-applied {
 .search_form_handler .sf_title > span {
   margin-right: 10px;
 }
+.search_form_handler .sf_title .sft_refresh {
+  font-size: 10pt;
+  line-height: 13pt;
+}
 .search_form_handler .sf_title .sft_toggler {
+  margin-left: 0.7em;
   transition: all 0.4s ease-in-out;
 }
 .search_form_handler .sf_criterion_area {
diff --git a/css/light-grey.scss b/css/light-grey.scss
index 80a7f6b18..23d8f3b82 100644
--- a/css/light-grey.scss
+++ b/css/light-grey.scss
@@ -858,7 +858,12 @@ input.dp-applied {
 			margin-right: 10px;
 		}
 
+		.sft_refresh{
+			font-size: 10pt;
+			line-height: 13pt;
+		}
 		.sft_toggler{
+			margin-left: 0.7em;
 			transition: all 0.4s ease-in-out;
 		}
 	}
diff --git a/js/search/search_form_handler.js b/js/search/search_form_handler.js
index 4bc726047..89ff6f999 100644
--- a/js/search/search_form_handler.js
+++ b/js/search/search_form_handler.js
@@ -217,6 +217,10 @@ $(function()
 		{
 			var me = this;
 
+			this.element.find('.sft_refresh').on('click', function(oEvent){
+				oEvent.preventDefault();
+				me._submit();
+			});
 			// TODO: UX Improvment
 			// Note: Would be better to toggle by clicking on the whole title, but we have an issue with <select> on abstract classes.
 			this.element.find('.sft_toggler').on('click', function(oEvent){
@@ -347,8 +351,15 @@ $(function()
 			}
 			else
 			{
-				// TODO: Change this so it appears after the search drawer.
-				oResultAreaElem = $('<div></div>').appendTo(this.element);
+				// Reusing previously created DOM element
+				if(this.element.closest('.display_block').next('.sf_results_area').length > 0)
+				{
+					oResultAreaElem = this.element.closest('.display_block').next('.sf_results_area');
+				}
+				else
+				{
+					oResultAreaElem = $('<div></div>').insertAfter(this.element.closest('.display_block'));
+				}
 			}
 			oResultAreaElem.addClass('sf_results_area');
 
@@ -551,14 +562,12 @@ $(function()
 		// - Show loader
 		_showLoader: function()
 		{
-			// TODO: Show loader
-			this._trace('Show loader');
+			this.elements.results_area.block();
 		},
 		// - Hide loader
 		_hideLoader: function()
 		{
-			// TODO: Hide loader
-			this._trace('Hide loader');
+			this.elements.results_area.unblock();
 		},
 		// - Converts a snake_case string to CamelCase
 		_toCamelCase: function(sString)
diff --git a/sources/application/search/searchform.class.inc.php b/sources/application/search/searchform.class.inc.php
index 69fcddc62..96f8c903f 100644
--- a/sources/application/search/searchform.class.inc.php
+++ b/sources/application/search/searchform.class.inc.php
@@ -117,7 +117,7 @@ class SearchForm
 		$sAction = (isset($aExtraParams['action'])) ? $aExtraParams['action'] : utils::GetAbsoluteUrlAppRoot().'pages/UI.php';
 		$sStyle = (isset($aExtraParams['open']) && ($aExtraParams['open'] == 'true')) ? 'opened' : '';
 		$sHtml .= "<form id=\"fs_{$sSearchFormId}\" action=\"{$sAction}\" class=\"{$sStyle}\">\n"; // Don't use $_SERVER['SCRIPT_NAME'] since the form may be called asynchronously (from ajax.php)
-		$sHtml .= "<h2 class=\"sf_title\"><span class=\"sft_picto fa fa-search\"></span>" . Dict::Format('UI:SearchFor_Class_Objects', $sClassesCombo) . "<a class=\"sft_toggler fa fa-caret-down pull-right\" href=\"#\" title=\"" . Dict::S('UI:Search:Toggle') . "\"></a></h2>\n";
+		$sHtml .= "<h2 class=\"sf_title\"><span class=\"sft_picto fa fa-search\"></span>" . Dict::Format('UI:SearchFor_Class_Objects', $sClassesCombo) . "<a class=\"sft_toggler fa fa-caret-down pull-right\" href=\"#\" title=\"" . Dict::S('UI:Search:Toggle') . "\"></a><a class=\"sft_refresh fa fa-refresh pull-right\" href=\"#\" title=\"" . Dict::S('UI:Button:Refresh') . "\"></a></h2>\n";
 		$sHtml .= "<div id=\"fs_{$sSearchFormId}_criterion_outer\">\n";
 		$sHtml .= "</div>\n";
 

From bf02e04ae55aa2413b3314888dfff19150a31b8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Fri, 16 Mar 2018 10:59:33 +0000
Subject: [PATCH 054/202] Advanced Search: Links n:n

SVN:b1162[5446]
---
 application/ui.linkswidget.class.inc.php      | 10 ++---
 js/linkswidget.js                             | 33 +++++++++-----
 pages/ajax.searchform.php                     |  4 +-
 .../criteriontosearchform.class.inc.php       | 45 ++++++++++++++-----
 .../search/searchform.class.inc.php           |  4 +-
 5 files changed, 64 insertions(+), 32 deletions(-)

diff --git a/application/ui.linkswidget.class.inc.php b/application/ui.linkswidget.class.inc.php
index 820f8e74e..7ba5745c8 100644
--- a/application/ui.linkswidget.class.inc.php
+++ b/application/ui.linkswidget.class.inc.php
@@ -402,11 +402,10 @@ EOF
 		{
 			$oFilter->AddCondition('id', $aAlreadyLinkedIds, 'NOTIN');
 		}
-		//$this->SetSearchDefaultFromContext($oCurrentObj, $oFilter);
+		$this->SetSearchDefaultFromContext($oCurrentObj, $oFilter);
 		$oBlock = new DisplayBlock($oFilter, 'search', false);
 		$sHtml .= $oBlock->GetDisplay($oPage, "SearchFormToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}",
 			array(
-                'menu' => false,
 				'open' => $bOpen,
 				'table_id' => "SearchResultsToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}",
 				'table_id2' => 'add_'.$this->m_sAttCode,
@@ -415,14 +414,14 @@ EOF
 				'json' => $sJson,
 				'cssCount' => '#count_'.$this->m_sAttCode.$this->m_sNameSuffix
 			));
-		$sHtml .= "<div id=\"ObjectsAddForm_{$this->m_sAttCode}{$this->m_sNameSuffix}\">\n";
+		$sHtml .= "<form id=\"ObjectsAddForm_{$this->m_sAttCode}{$this->m_sNameSuffix}\">\n";
 		$sHtml .= "<div id=\"SearchResultsToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}\" style=\"vertical-align:top;background: #fff;height:100%;overflow:auto;padding:0;border:0;\">\n";
 		$sHtml .= "<div style=\"background: #fff; border:0; text-align:center; vertical-align:middle;\"><p>".Dict::S('UI:Message:EmptyList:UseSearchForm')."</p></div>\n";
 		$sHtml .= "</div>\n";
 		$sHtml .= "<input type=\"hidden\" id=\"count_{$this->m_sAttCode}{$this->m_sNameSuffix}\" value=\"0\"/>";
 		$sHtml .= "<input type=\"button\" value=\"".Dict::S('UI:Button:Cancel')."\" onClick=\"$('#dlg_{$this->m_sAttCode}{$this->m_sNameSuffix}').dialog('close');\">&nbsp;&nbsp;<input id=\"btn_ok_{$this->m_sAttCode}{$this->m_sNameSuffix}\" disabled=\"disabled\" type=\"button\" onclick=\"return oWidget{$this->m_iInputId}.DoAddObjects(this.id);\" value=\"".Dict::S('UI:Button:Add')."\">";
 		$sHtml .= "</div>\n";
-		$sHtml .= "</div>\n";
+		$sHtml .= "</form>\n";
 		$oPage->add($sHtml);
 		$oPage->add_ready_script("$('#dlg_{$this->m_sAttCode}{$this->m_sNameSuffix}').dialog({ width: $(window).width()*0.8, height: $(window).height()*0.8, autoOpen: false, modal: true, resizeStop: oWidget{$this->m_iInputId}.UpdateSizes });");
 		$oPage->add_ready_script("$('#dlg_{$this->m_sAttCode}{$this->m_sNameSuffix}').dialog('option', {title:'".addslashes(Dict::Format('UI:AddObjectsOf_Class_LinkedWith_Class', MetaModel::GetName($this->m_sLinkedClass), MetaModel::GetName($this->m_sClass)))."'});");
@@ -436,7 +435,7 @@ EOF
 	 * @param string $sRemoteClass Name of the "remote" class to perform the search on, must be a derived class of m_sRemoteClass
 	 * @param Array $aAlreadyLinkedIds List of IDs of objects of "remote" class already linked, to be filtered out of the search
 	 */
-	public function SearchObjectsToAdd(WebPage $oP, $sRemoteClass = '', $aAlreadyLinkedIds = array())
+	public function SearchObjectsToAdd(WebPage $oP, $sRemoteClass = '', $aAlreadyLinkedIds = array(), $oCurrentObj = null)
 	{
 		if ($sRemoteClass != '')
 		{
@@ -452,6 +451,7 @@ EOF
 		{
 			$oFilter->AddCondition('id', $aAlreadyLinkedIds, 'NOTIN');
 		}
+		$this->SetSearchDefaultFromContext($oCurrentObj, $oFilter);
 		$oBlock = new DisplayBlock($oFilter, 'list', false);
 		$oBlock->Display($oP, "ResultsToAdd_{$this->m_sAttCode}", array('menu' => false, 'cssCount'=> '#count_'.$this->m_sAttCode.$this->m_sNameSuffix , 'selection_mode' => true, 'table_id' => 'add_'.$this->m_sAttCode)); // Don't display the 'Actions' menu on the results
 	}
diff --git a/js/linkswidget.js b/js/linkswidget.js
index 4eb277aaa..c84121ad2 100644
--- a/js/linkswidget.js
+++ b/js/linkswidget.js
@@ -101,17 +101,28 @@ function LinksWidget(id, sClass, sAttCode, iInputId, sSuffix, bDuplicates, oWizH
 				   operation: 'addObjects',
 				   json: me.oWizardHelper.ToJSON()
 				 };
-		$.post( GetAbsoluteUrlAppRoot()+'pages/ajax.render.php', theMap, 
-				function(data)
-				{
-					$('#dlg_'+me.id).html(data);
-					$('#dlg_'+me.id).dialog('open');
-					me.UpdateSizes(null, null);
-					me.SearchObjectsToAdd();
-					$('#'+me.id+'_indicatorAdd').html('');
-				},
-				'html'
-			);
+
+		// Gather the already linked target objects
+		theMap.aAlreadyLinked = [];
+		$('#linkedset_'+me.id+' .selection:input').each(function (i) {
+			var iRemote = $(this).attr('data-remote-id');
+			theMap.aAlreadyLinked.push(iRemote);
+		});
+
+		$.ajax({
+				"url": GetAbsoluteUrlAppRoot()+'pages/ajax.render.php',
+				"method": "POST",
+				"data": theMap,
+				"dataType": "html"
+			})
+			.done(function (data) {
+				$('#dlg_'+me.id).html(data);
+				$('#dlg_'+me.id).dialog('open');
+				me.UpdateSizes(null, null);
+				me.SearchObjectsToAdd();
+				$('#'+me.id+'_indicatorAdd').html('');
+			})
+		;
 	};
 	
 	this.SearchObjectsToAdd = function()
diff --git a/pages/ajax.searchform.php b/pages/ajax.searchform.php
index 92ea6071f..113f21f66 100644
--- a/pages/ajax.searchform.php
+++ b/pages/ajax.searchform.php
@@ -40,7 +40,7 @@ try
 		throw new SecurityException('You must be logged in');
 	}
 
-	$sParams = stripslashes(utils::ReadParam('params', '', false, 'raw_data'));
+	$sParams = utils::ReadParam('params', '', false, 'raw_data');
 	if (!$sParams)
 	{
 		throw new AjaxSearchException("Invalid query (empty filter)", 400);
@@ -54,7 +54,7 @@ try
 	$oFilter = CriterionParser::Parse($aParams['base_oql'], $aParams['criterion']);
 	$oDisplayBlock = new DisplayBlock($oFilter, 'list', false);
 
-	$sListParams = stripslashes(utils::ReadParam('list_params', '{}', false, 'raw_data'));
+	$sListParams = utils::ReadParam('list_params', '{}', false, 'raw_data');
 	$aListParams = (array) json_decode($sListParams, true);
 
 	foreach($aListParams as $key => $value)
diff --git a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
index 5389f3d2e..24ce40b57 100644
--- a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
+++ b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
@@ -68,13 +68,30 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 			}
 		}
 
-		// Regroup criterion by variable name
+		// Regroup criterion by variable name (no ref first)
 		usort($aAndCriterion, function ($a, $b) {
-			$iRefCmp = strcmp($a['ref'], $b['ref']);
-			if ($iRefCmp != 0) return $iRefCmp;
-			$iOpCmp = strcmp($a['operator'], $b['operator']);
+			if (array_key_exists('ref', $a) || array_key_exists('ref', $b))
+			{
+				if (array_key_exists('ref', $a) && array_key_exists('ref', $b))
+				{
+					$iRefCmp = strcmp($a['ref'], $b['ref']);
+					if ($iRefCmp != 0) return $iRefCmp;
 
-			return $iOpCmp;
+					return strcmp($a['operator'], $b['operator']);
+				}
+				if (array_key_exists('ref', $a))
+				{
+					return 1;
+				}
+
+				return -1;
+			}
+			if (array_key_exists('oql', $a) && array_key_exists('oql', $b))
+			{
+				return strcmp($a['oql'], $b['oql']);
+			}
+
+			return 0;
 		});
 
 		$aMergeFctByWidget = array(
@@ -88,16 +105,20 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 		{
 			if (!is_null($aPrevCriterion))
 			{
-				if (strcmp($aPrevCriterion['ref'], $aCurrCriterion['ref']) == 0)
+				if (array_key_exists('ref', $aPrevCriterion))
 				{
-					// Same attribute, try to merge
-					if (array_key_exists('widget', $aCurrCriterion))
+					// If previous has ref, the current has ref as the array is sorted with all without ref first
+					if (strcmp($aPrevCriterion['ref'], $aCurrCriterion['ref']) == 0)
 					{
-						if (array_key_exists($aCurrCriterion['widget'], $aMergeFctByWidget))
+						// Same attribute, try to merge
+						if (array_key_exists('widget', $aCurrCriterion))
 						{
-							$sFct = $aMergeFctByWidget[$aCurrCriterion['widget']];
-							$aPrevCriterion = self::$sFct($aPrevCriterion, $aCurrCriterion, $aMergedCriterion);
-							continue;
+							if (array_key_exists($aCurrCriterion['widget'], $aMergeFctByWidget))
+							{
+								$sFct = $aMergeFctByWidget[$aCurrCriterion['widget']];
+								$aPrevCriterion = self::$sFct($aPrevCriterion, $aCurrCriterion, $aMergedCriterion);
+								continue;
+							}
 						}
 					}
 				}
diff --git a/sources/application/search/searchform.class.inc.php b/sources/application/search/searchform.class.inc.php
index 96f8c903f..a62a3ddd2 100644
--- a/sources/application/search/searchform.class.inc.php
+++ b/sources/application/search/searchform.class.inc.php
@@ -88,7 +88,7 @@ class SearchForm
 			$sRootClass = $sClassName;
 		}
 
-		$sJson = stripslashes(utils::ReadParam('json', '', false, 'raw_data'));
+		$sJson = utils::ReadParam('json', '', false, 'raw_data');
 		if (!empty($sJson))
 		{
 			$aListParams['json'] = json_decode($sJson, true);
@@ -119,7 +119,7 @@ class SearchForm
 		$sHtml .= "<form id=\"fs_{$sSearchFormId}\" action=\"{$sAction}\" class=\"{$sStyle}\">\n"; // Don't use $_SERVER['SCRIPT_NAME'] since the form may be called asynchronously (from ajax.php)
 		$sHtml .= "<h2 class=\"sf_title\"><span class=\"sft_picto fa fa-search\"></span>" . Dict::Format('UI:SearchFor_Class_Objects', $sClassesCombo) . "<a class=\"sft_toggler fa fa-caret-down pull-right\" href=\"#\" title=\"" . Dict::S('UI:Search:Toggle') . "\"></a><a class=\"sft_refresh fa fa-refresh pull-right\" href=\"#\" title=\"" . Dict::S('UI:Button:Refresh') . "\"></a></h2>\n";
 		$sHtml .= "<div id=\"fs_{$sSearchFormId}_criterion_outer\">\n";
-		$sHtml .= "</div>\n";
+		$sHtml .= "</div>\n</form>\n";
 
 		$aFields = $this->GetFields($oSet);
 		$oSearch = $oSet->GetFilter();

From bb31cedcbac1f64cc71195b507a5f7ba6e52c66d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Fri, 16 Mar 2018 11:24:58 +0000
Subject: [PATCH 055/202] Advanced Search: Links n:n

SVN:b1162[5447]
---
 application/ui.linkswidget.class.inc.php |  4 +++-
 pages/ajax.searchform.php                | 10 +++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/application/ui.linkswidget.class.inc.php b/application/ui.linkswidget.class.inc.php
index 7ba5745c8..059d027ec 100644
--- a/application/ui.linkswidget.class.inc.php
+++ b/application/ui.linkswidget.class.inc.php
@@ -403,6 +403,7 @@ EOF
 			$oFilter->AddCondition('id', $aAlreadyLinkedIds, 'NOTIN');
 		}
 		$this->SetSearchDefaultFromContext($oCurrentObj, $oFilter);
+
 		$oBlock = new DisplayBlock($oFilter, 'search', false);
 		$sHtml .= $oBlock->GetDisplay($oPage, "SearchFormToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}",
 			array(
@@ -412,7 +413,8 @@ EOF
 				'table_inner_id' => "ResultsToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}",
 				'selection_mode' => true,
 				'json' => $sJson,
-				'cssCount' => '#count_'.$this->m_sAttCode.$this->m_sNameSuffix
+				'cssCount' => '#count_'.$this->m_sAttCode.$this->m_sNameSuffix,
+				'query_params' => json_encode($oFilter->GetInternalParams()),
 			));
 		$sHtml .= "<form id=\"ObjectsAddForm_{$this->m_sAttCode}{$this->m_sNameSuffix}\">\n";
 		$sHtml .= "<div id=\"SearchResultsToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}\" style=\"vertical-align:top;background: #fff;height:100%;overflow:auto;padding:0;border:0;\">\n";
diff --git a/pages/ajax.searchform.php b/pages/ajax.searchform.php
index 113f21f66..71faad1fa 100644
--- a/pages/ajax.searchform.php
+++ b/pages/ajax.searchform.php
@@ -73,7 +73,15 @@ try
 		$sJson = json_encode($aJson);
 		$oWizardHelper = WizardHelper::FromJSON($sJson);
 		$oObj = $oWizardHelper->GetTargetObject();
-		$aExtraParams['query_params'] = array('this' => $oObj);
+		if (array_key_exists('query_params', $aExtraParams))
+		{
+			$aExtraParams['query_params'] = json_decode($aExtraParams['query_params'], true);
+			$aExtraParams['query_params']['this'] = $oObj;
+		}
+		else
+		{
+			$aExtraParams['query_params'] = array('this' => $oObj);
+		}
 
 
 //        // Current extkey value, so we can display event if it is not available anymore (eg. archived).

From 102b2d76f4029150a8f7c504935028435c32249a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Fri, 16 Mar 2018 13:13:54 +0000
Subject: [PATCH 056/202] Advanced Search: Links n:n

SVN:b1162[5448]
---
 application/ui.linkswidget.class.inc.php | 2 +-
 pages/ajax.searchform.php                | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/application/ui.linkswidget.class.inc.php b/application/ui.linkswidget.class.inc.php
index 059d027ec..2dd95233f 100644
--- a/application/ui.linkswidget.class.inc.php
+++ b/application/ui.linkswidget.class.inc.php
@@ -414,7 +414,7 @@ EOF
 				'selection_mode' => true,
 				'json' => $sJson,
 				'cssCount' => '#count_'.$this->m_sAttCode.$this->m_sNameSuffix,
-				'query_params' => json_encode($oFilter->GetInternalParams()),
+				'query_params' => $oFilter->GetInternalParams(),
 			));
 		$sHtml .= "<form id=\"ObjectsAddForm_{$this->m_sAttCode}{$this->m_sNameSuffix}\">\n";
 		$sHtml .= "<div id=\"SearchResultsToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}\" style=\"vertical-align:top;background: #fff;height:100%;overflow:auto;padding:0;border:0;\">\n";
diff --git a/pages/ajax.searchform.php b/pages/ajax.searchform.php
index 71faad1fa..0933fda06 100644
--- a/pages/ajax.searchform.php
+++ b/pages/ajax.searchform.php
@@ -75,7 +75,6 @@ try
 		$oObj = $oWizardHelper->GetTargetObject();
 		if (array_key_exists('query_params', $aExtraParams))
 		{
-			$aExtraParams['query_params'] = json_decode($aExtraParams['query_params'], true);
 			$aExtraParams['query_params']['this'] = $oObj;
 		}
 		else

From d423d741b2d41c325c385d87e4f88d2ebf0fc82f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Fri, 16 Mar 2018 13:21:11 +0000
Subject: [PATCH 057/202] Advanced Search: Links n:n

SVN:b1162[5449]
---
 js/linkswidget.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/js/linkswidget.js b/js/linkswidget.js
index c84121ad2..543a0d775 100644
--- a/js/linkswidget.js
+++ b/js/linkswidget.js
@@ -127,6 +127,10 @@ function LinksWidget(id, sClass, sAttCode, iInputId, sSuffix, bDuplicates, oWizH
 	
 	this.SearchObjectsToAdd = function()
 	{
+		$("#fs_SearchFormToAdd_"+me.id).trigger('itop.search.form.submit');
+
+		return false; // Don't submit the form, stay in the current page !
+
 		var theMap = { sAttCode: me.sAttCode,
 					   iInputId: me.iInputId,
 					   sSuffix: me.sSuffix,

From 272e8eac4f9e4d64a78f3467201bf122d6beb47c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Fri, 16 Mar 2018 14:21:40 +0000
Subject: [PATCH 058/202] Advanced Search: Links n:1

SVN:b1162[5450]
---
 .../ui.linksdirectwidget.class.inc.php        | 46 +++++++++++++++----
 application/ui.linkswidget.class.inc.php      |  6 ++-
 pages/ajax.render.php                         |  3 +-
 .../search/searchform.class.inc.php           | 23 ++++------
 4 files changed, 52 insertions(+), 26 deletions(-)

diff --git a/application/ui.linksdirectwidget.class.inc.php b/application/ui.linksdirectwidget.class.inc.php
index 499f6695f..d41916813 100644
--- a/application/ui.linksdirectwidget.class.inc.php
+++ b/application/ui.linksdirectwidget.class.inc.php
@@ -278,14 +278,19 @@ class UILinksWidgetDirect
 	/**
 	 * @param WebPage $oPage
 	 * @param DBObject $oCurrentObj
-	 * @throws Exception
+	 * @param $aAlreadyLinked
+	 *
+	 * @throws \CoreException
+	 * @throws \DictExceptionMissingString
+	 * @throws \Exception
+	 * @throws \OQLException
 	 */
-	public function GetObjectsSelectionDlg($oPage, $oCurrentObj)
+	public function GetObjectsSelectionDlg($oPage, $oCurrentObj, $aAlreadyLinked)
 	{
 		$sHtml = "<div class=\"wizContainer\" style=\"vertical-align:top;\">\n";
-		
-		$oLinksetDef = MetaModel::GetAttributeDef($this->sClass, $this->sAttCode);
-		$valuesDef = $oLinksetDef->GetValuesDef();				
+
+		$oLinkSetDef = MetaModel::GetAttributeDef($this->sClass, $this->sAttCode);
+		$valuesDef = $oLinkSetDef->GetValuesDef();
 		if ($valuesDef === null)
 		{
 			$oFilter = new DBObjectSearch($this->sLinkedClass);
@@ -302,12 +307,35 @@ class UILinksWidgetDirect
 		{
 			$this->SetSearchDefaultFromContext($oCurrentObj, $oFilter);
 		}
+		if (($oCurrentObj != null) && MetaModel::IsSameFamilyBranch($this->sLinkedClass, $this->sClass))
+		{
+			// Prevent linking to self if the linked object is of the same family
+			// and already present in the database
+			if (!$oCurrentObj->IsNew())
+			{
+				$oFilter->AddCondition('id', $oCurrentObj->GetKey(), '!=');
+			}
+		}
+		if (count($aAlreadyLinked) > 0)
+		{
+			$oFilter->AddCondition('id', $aAlreadyLinked, 'NOTIN');
+		}
+		if ($oCurrentObj != null)
+		{
+			$aArgs = array_merge($oCurrentObj->ToArgs('this'), $oFilter->GetInternalParams());
+			$oFilter->SetInternalParams($aArgs);
+		}
 		$bOpen = MetaModel::GetConfig()->Get('legacy_search_drawer_open');
 		$oBlock = new DisplayBlock($oFilter, 'search', false);
 		$sHtml .= $oBlock->GetDisplay($oPage, "SearchFormToAdd_{$this->sInputid}",
 			array(
 			    'open' => $bOpen,
-                'table_id' => "SearchResultsToAdd_{$this->sInputid}")
+				'table_id' => "SearchResultsToAdd_{$this->sInputid}",
+				'table_id2' => "add_{$this->sInputid}",
+				'table_inner_id' => "ResultsToAdd_{$this->sInputid}",
+				'cssCount' => "#count_{$this->sInputid}",
+				'query_params' => $oFilter->GetInternalParams(),
+			)
         );
 		$sHtml .= "<form id=\"ObjectsAddForm_{$this->sInputid}\">\n";
 		$sHtml .= "<div id=\"SearchResultsToAdd_{$this->sInputid}\" style=\"vertical-align:top;background: #fff;height:100%;overflow:auto;padding:0;border:0;\">\n";
@@ -334,8 +362,8 @@ class UILinksWidgetDirect
 		{
 			$sRemoteClass = $this->sLinkedClass;
 		}
-		$oLinksetDef = MetaModel::GetAttributeDef($this->sClass, $this->sAttCode);
-		$valuesDef = $oLinksetDef->GetValuesDef();				
+		$oLinkSetDef = MetaModel::GetAttributeDef($this->sClass, $this->sAttCode);
+		$valuesDef = $oLinkSetDef->GetValuesDef();
 		if ($valuesDef === null)
 		{
 			$oFilter = new DBObjectSearch($sRemoteClass);
@@ -352,7 +380,7 @@ class UILinksWidgetDirect
 		if (($oCurrentObj != null) && MetaModel::IsSameFamilyBranch($sRemoteClass, $this->sClass))
 		{
 			// Prevent linking to self if the linked object is of the same family
-			// and laready present in the database
+			// and already present in the database
 			if (!$oCurrentObj->IsNew())
 			{
 				$oFilter->AddCondition('id', $oCurrentObj->GetKey(), '!=');
diff --git a/application/ui.linkswidget.class.inc.php b/application/ui.linkswidget.class.inc.php
index 2dd95233f..ce0ac1daa 100644
--- a/application/ui.linkswidget.class.inc.php
+++ b/application/ui.linkswidget.class.inc.php
@@ -402,8 +402,10 @@ EOF
 		{
 			$oFilter->AddCondition('id', $aAlreadyLinkedIds, 'NOTIN');
 		}
-		$this->SetSearchDefaultFromContext($oCurrentObj, $oFilter);
-
+		if ($oCurrentObj != null)
+		{
+			$this->SetSearchDefaultFromContext($oCurrentObj, $oFilter);
+		}
 		$oBlock = new DisplayBlock($oFilter, 'search', false);
 		$sHtml .= $oBlock->GetDisplay($oPage, "SearchFormToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}",
 			array(
diff --git a/pages/ajax.render.php b/pages/ajax.render.php
index 78c553b13..4a246c570 100644
--- a/pages/ajax.render.php
+++ b/pages/ajax.render.php
@@ -316,6 +316,7 @@ try
 		case 'selectObjectsToAdd':
 			$oPage->SetContentType('text/html');
 			$sClass = utils::ReadParam('class', '', false, 'class');
+			$aAlreadyLinked = utils::ReadParam('aAlreadyLinked', array());
 			$sJson = utils::ReadParam('json', '', false, 'raw_data');
 			$oObj = null;
 			if ($sJson != '')
@@ -329,7 +330,7 @@ try
 			$iCurrObjectId = utils::ReadParam('iObjId', 0);
 			$oPage->SetContentType('text/html');
 			$oWidget = new UILinksWidgetDirect($sClass, $sAttCode, $iInputId);
-			$oWidget->GetObjectsSelectionDlg($oPage, $oObj);
+			$oWidget->GetObjectsSelectionDlg($oPage, $oObj, $aAlreadyLinked);
 			break;
 
 		// ui.linksdirectwidget
diff --git a/sources/application/search/searchform.class.inc.php b/sources/application/search/searchform.class.inc.php
index a62a3ddd2..bff97eb51 100644
--- a/sources/application/search/searchform.class.inc.php
+++ b/sources/application/search/searchform.class.inc.php
@@ -129,6 +129,14 @@ class SearchForm
 		$oBaseSearch->ResetCondition();
 		$sBaseOQL = str_replace(' WHERE 1', '', $oBaseSearch->ToOQL());
 
+		if (isset($aExtraParams['table_inner_id']))
+		{
+			$sDataConfigListSelector = $aExtraParams['table_inner_id'];
+		}
+		else
+		{
+			$sDataConfigListSelector = $aExtraParams['table_id'];
+		}
 
 		if (!isset($aExtraParams['table_id']))
 		{
@@ -145,7 +153,7 @@ class SearchForm
 		$aSearchParams = array(
 			'criterion_outer_selector' => "#fs_{$sSearchFormId}_criterion_outer",
             'result_list_outer_selector' => "#{$aExtraParams['table_id']}",
-            'data_config_list_selector' => null,                                            //this one will be set just bellow, it mean to tell the widget where to find the initial list configuration
+			'data_config_list_selector' => "#{$sDataConfigListSelector}",
 			'endpoint' => utils::GetAbsoluteUrlAppRoot().'pages/ajax.searchform.php',
 			'date_format' => AttributeDateTime::GetFormat()->ToMomentJS(),
 			'list_params' => $aListParams,
@@ -156,19 +164,6 @@ class SearchForm
 			),
 		);
 
-		if (isset($aSearchParams['list_params']['table_id']))
-		{
-			$aSearchParams['data_config_list_selector'] = '#'.$aSearchParams['list_params']['table_id'];
-		}
-		elseif (isset($aSearchParams['list_params']['table_inner_id']))
-		{
-			$aSearchParams['data_config_list_selector'] = '#'.$aSearchParams['list_params']['table_inner_id'];
-        }
-        else
-        {
-            $aSearchParams['data_config_list_selector'] = '#'.$aSearchParams['result_list_outer_selector'];
-        }
-
 		$oPage->add_ready_script('$("#fs_'.$sSearchFormId.'").search_form_handler('.json_encode($aSearchParams).');');
 
 		return $sHtml;

From 187f7e591e848031de883b1a02e86a193883124d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Fri, 16 Mar 2018 14:35:25 +0000
Subject: [PATCH 059/202] Advanced Search: Links n:n

SVN:b1162[5451]
---
 application/ui.linkswidget.class.inc.php | 1 +
 js/linkswidget.js                        | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/application/ui.linkswidget.class.inc.php b/application/ui.linkswidget.class.inc.php
index ce0ac1daa..48d0d22ce 100644
--- a/application/ui.linkswidget.class.inc.php
+++ b/application/ui.linkswidget.class.inc.php
@@ -410,6 +410,7 @@ EOF
 		$sHtml .= $oBlock->GetDisplay($oPage, "SearchFormToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}",
 			array(
 				'open' => $bOpen,
+				'menu' => false,
 				'table_id' => "SearchResultsToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}",
 				'table_id2' => 'add_'.$this->m_sAttCode,
 				'table_inner_id' => "ResultsToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}",
diff --git a/js/linkswidget.js b/js/linkswidget.js
index 543a0d775..d26d20a31 100644
--- a/js/linkswidget.js
+++ b/js/linkswidget.js
@@ -127,6 +127,13 @@ function LinksWidget(id, sClass, sAttCode, iInputId, sSuffix, bDuplicates, oWizH
 	
 	this.SearchObjectsToAdd = function()
 	{
+		$('#count_'+me.id).change(function () {
+			var c = this.value;
+			me.UpdateButtons(c);
+		});
+		FixSearchFormsDisposition();
+		me.UpdateSizes(null, null);
+
 		$("#fs_SearchFormToAdd_"+me.id).trigger('itop.search.form.submit');
 
 		return false; // Don't submit the form, stay in the current page !

From 52f56e1bb0461f799c11d52c4b72777da3924eac Mon Sep 17 00:00:00 2001
From: Guillaume Lajarige <guillaume.lajarige@combodo.com>
Date: Fri, 16 Mar 2018 15:12:25 +0000
Subject: [PATCH 060/202] Advanced search: WIP POC, UI/UX.

SVN:b1162[5452]
---
 css/light-grey.css                |  9 ++++-
 css/light-grey.scss               | 11 +++++-
 js/search/search_form_criteria.js |  7 +++-
 js/search/search_form_handler.js  | 61 ++++++++++++++++++++++++-------
 4 files changed, 68 insertions(+), 20 deletions(-)

diff --git a/css/light-grey.css b/css/light-grey.css
index 98857d7c9..1c38b0722 100644
--- a/css/light-grey.css
+++ b/css/light-grey.css
@@ -765,16 +765,21 @@ input.dp-applied {
   background-color: #3f7294;
   /* Pictogram */
 }
-.search_form_handler .sf_title > span {
+.search_form_handler .sf_title .sft_picto {
   margin-right: 10px;
 }
+.search_form_handler .sf_title .sft_refresh, .search_form_handler .sf_title .sft_toggler {
+  transition: color 0.2s ease-in-out, transform 0.4s ease-in-out;
+}
+.search_form_handler .sf_title .sft_refresh:hover, .search_form_handler .sf_title .sft_toggler:hover {
+  color: #f1f1f1;
+}
 .search_form_handler .sf_title .sft_refresh {
   font-size: 10pt;
   line-height: 13pt;
 }
 .search_form_handler .sf_title .sft_toggler {
   margin-left: 0.7em;
-  transition: all 0.4s ease-in-out;
 }
 .search_form_handler .sf_criterion_area {
   /*display: none;*/
diff --git a/css/light-grey.scss b/css/light-grey.scss
index 23d8f3b82..c44e020f1 100644
--- a/css/light-grey.scss
+++ b/css/light-grey.scss
@@ -854,17 +854,24 @@ input.dp-applied {
 		background-color: $box-blue-border-color;
 
 		/* Pictogram */
-		> span{
+		.sft_picto{
 			margin-right: 10px;
 		}
 
+		.sft_refresh,
+		.sft_toggler{
+			transition: color 0.2s ease-in-out, transform 0.4s ease-in-out;
+
+			&:hover{
+				color: $gray-extra-light;
+			}
+		}
 		.sft_refresh{
 			font-size: 10pt;
 			line-height: 13pt;
 		}
 		.sft_toggler{
 			margin-left: 0.7em;
-			transition: all 0.4s ease-in-out;
 		}
 	}
 	.sf_criterion_area{
diff --git a/js/search/search_form_criteria.js b/js/search/search_form_criteria.js
index 1836908c0..209b07fed 100644
--- a/js/search/search_form_criteria.js
+++ b/js/search/search_form_criteria.js
@@ -304,9 +304,12 @@ $(function()
 				.append('<div class="sfc_form_group"><div class="sfc_fg_operators"></div><div class="sfc_fg_buttons"></div></div>');
 
 			// Bind events
+			// Note: No event to handle criteria closing when clicking outside of it as it is already handle by the form handler.
 			// - Toggler
 			this.element.find('.sfc_toggle, .sfc_title').on('click', function(oEvent){
+				// Prevent anchor
 				oEvent.preventDefault();
+
 				// First memorize if current criteria is close
 				var bOpen = !me.element.hasClass('opened');
 				// Then close every criterion
@@ -323,7 +326,9 @@ $(function()
 			{
 				this.element.find('.sfc_header').append('<span class="sfc_close"><a class="fa fa-times" href="#"></a></span>');
 				this.element.find('.sfc_close').on('click', function(oEvent){
+					// Prevent anchor
 					oEvent.preventDefault();
+
 					me._remove();
 				});
 			}
@@ -345,8 +350,6 @@ $(function()
 			{
 				this._closeAll();
 				this._open();
-				// this.element.find('.sfc_toggle').trigger('click');
-				// this.element.find('.sfc_fg_operator:first .sfc_op_content input:first').trigger('click').trigger('focus');
 			}
 		},
 		// - Prepare the available operators for the criteria
diff --git a/js/search/search_form_handler.js b/js/search/search_form_handler.js
index 89ff6f999..cf62d9e95 100644
--- a/js/search/search_form_handler.js
+++ b/js/search/search_form_handler.js
@@ -139,9 +139,6 @@ $(function()
 			});
 
 			// Criteria events
-			this.element.on('itop.search.criteria.opening', function(oEvent, oData){
-				me._onCriteriaOpening(oData);
-			});
 			this.element.on('itop.search.criteria.value_changed', function(oEvent, oData){
 				me._onCriteriaValueChanged(oData);
 			});
@@ -175,11 +172,6 @@ $(function()
 		// - Open / Close more criterion menu
 		_openMoreCriterion: function()
 		{
-			// Close all criterion
-			this.elements.active_criterion.find('.search_form_criteria').each(function(){
-				$(this).triggerHandler('itop.search.criteria.close');
-			});
-
 			// Open more criterion menu
 			// - Open it first
 			this.elements.more_criterion.addClass('opened');
@@ -210,6 +202,13 @@ $(function()
 				this._openMoreCriterion();
 			}
 		},
+		// - Close all criterion
+		_closeAllCriterion: function()
+		{
+			this.elements.active_criterion.find('.search_form_criteria').each(function(){
+				$(this).triggerHandler('itop.search.criteria.close');
+			});
+		},
 
 		// DOM helpers
 		// - Prepare form area
@@ -217,14 +216,21 @@ $(function()
 		{
 			var me = this;
 
+			// Events
+			// - Refresh icon
 			this.element.find('.sft_refresh').on('click', function(oEvent){
+				// Prevent anchor
 				oEvent.preventDefault();
+
 				me._submit();
 			});
+			// - Toggle icon
 			// TODO: UX Improvment
 			// Note: Would be better to toggle by clicking on the whole title, but we have an issue with <select> on abstract classes.
 			this.element.find('.sft_toggler').on('click', function(oEvent){
+				// Prevent anchor
 				oEvent.preventDefault();
+
 				me.element.find('.sf_criterion_area').slideToggle('fast');
 				me.element.toggleClass('opened');
 			});
@@ -320,14 +326,46 @@ $(function()
 			}
 
 			// Bind events
-			// - Open / close menu
+			// - Close menu on click anywhere else
+			// - Intercept click to avoid propagation (mostly used for closing it when clicking outside of it)
+			$('body').on('click', function(oEvent){
+				// Prevent propagation to parents and therefore multiple attempts to close it
+				oEvent.stopPropagation();
+
+				// If not more menu, close all criterion
+				if($(oEvent.target).closest('.sf_more_criterion').length > 0)
+				{
+					me._closeAllCriterion();
+				}
+				else
+				{
+					// If criteria, close more menu & all criterion but me
+					if($(oEvent.target).closest('.search_form_criteria').length > 0)
+					{
+						me._closeMoreCriterion();
+						// All criterion but me is already handle by the criterion, no callback needed.
+					}
+					// If not criteria, close more menu & all criterion
+					else
+					{
+						me._closeMoreCriterion();
+						me._closeAllCriterion();
+					}
+				}
+			});
 			this.elements.more_criterion.find('.sfm_header').on('click', function(oEvent){
+				// Prevent anchor
 				oEvent.preventDefault();
+
 				me._toggleMoreCriterion();
 			});
 			// - Add criteria
 			this.elements.more_criterion.find('.sfm_field').on('click', function(oEvent){
+				// Prevent anchor
 				oEvent.preventDefault();
+				// Prevent propagation to not close the opening criteria
+				oEvent.stopPropagation();
+
 				// Prepare new criterion data (as already opened to increase UX)
 				var oData = {
 					'ref': $(this).attr('data-field-ref'),
@@ -336,7 +374,6 @@ $(function()
 
 				// Add criteria but don't submit form as the user has not specified the value yet.
 				me._addCriteria(oData);
-				me._closeMoreCriterion();
 			});
 		},
 		// - Prepare results area
@@ -440,10 +477,6 @@ $(function()
 			return 'search_form_criteria' + '_' + (($.itop['search_form_criteria_'+sType] !== undefined) ? sType : 'raw');
 		},
 		// Criteria handlers
-		_onCriteriaOpening: function(oData)
-		{
-			this._closeMoreCriterion();
-		},
 		_onCriteriaValueChanged: function(oData)
 		{
 			this._updateSearch();

From f8f6e201b9dbbdf4f81debe554d7ab4f2f02b61e Mon Sep 17 00:00:00 2001
From: Denis Flaven <denis.flaven@combodo.com>
Date: Fri, 16 Mar 2018 17:44:55 +0000
Subject: [PATCH 061/202] Advanced Search WIP: new mechanism for passing the
 dictionary to the client side. Hopefully faster than before thanks to the
 browser's cache.

SVN:b1162[5453]
---
 application/nicewebpage.class.inc.php |  1 +
 application/webpage.class.inc.php     | 82 ++++++++++++++++-----------
 core/dict.class.inc.php               | 20 +++++++
 js/utils.js                           | 55 ++++++++++++++++++
 pages/ajax.render.php                 |  9 +++
 5 files changed, 135 insertions(+), 32 deletions(-)

diff --git a/application/nicewebpage.class.inc.php b/application/nicewebpage.class.inc.php
index f940ac17d..4dc6d0c13 100644
--- a/application/nicewebpage.class.inc.php
+++ b/application/nicewebpage.class.inc.php
@@ -41,6 +41,7 @@ class NiceWebPage extends WebPage
 		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery-migrate-1.4.1.min.js'); // Needed since many other plugins still rely on oldies like $.browser
 		$this->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/ui-lightness/jquery-ui-1.11.4.custom.css');
 		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery-ui-1.11.4.custom.min.js');
+		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/utils.js');
 		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/hovertip.js');
 		// table sorting
 		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.tablesorter.js');
diff --git a/application/webpage.class.inc.php b/application/webpage.class.inc.php
index e0c01d997..018d57251 100644
--- a/application/webpage.class.inc.php
+++ b/application/webpage.class.inc.php
@@ -58,6 +58,7 @@ class WebPage implements Page
     protected $s_deferred_content;
     protected $a_scripts;
     protected $a_dict_entries;
+    protected $a_dict_entries_prefixes;
     protected $a_styles;
     protected $a_include_scripts;
     protected $a_include_stylesheets;
@@ -80,6 +81,7 @@ class WebPage implements Page
         $this->s_deferred_content = '';
         $this->a_scripts = array();
         $this->a_dict_entries = array();
+        $this->a_dict_entries_prefixes = array();
         $this->a_styles = array();
         $this->a_linked_scripts = array();
         $this->a_linked_stylesheets = array();
@@ -243,10 +245,39 @@ class WebPage implements Page
 	/**
 	 * Add a dictionary entry for the Javascript side
 	 */
-    public function add_dict_entry($s_entryId)
-    {
-        $this->a_dict_entries[$s_entryId] = Dict::S($s_entryId);
-    }
+	    public function add_dict_entry($s_entryId)
+	    {
+	    	$this->a_dict_entries[] = $s_entryId;
+	    }
+	    
+	    /**
+	     * Add a set of dictionary entries (based on the given prefix) for the Javascript side
+	     */
+	    public function add_dict_entries($s_entriesPrefix)
+	    {
+	    	$this->a_dict_entries_prefixes[] = $s_entriesPrefix;
+	    }
+	    
+	    protected function get_dict_signature()
+	    {
+	    	return str_replace('_', '', Dict::GetUserLanguage()).'-'.md5(implode(',', $this->a_dict_entries).'|'.implode(',', $this->a_dict_entries_prefixes));
+	    }
+	    
+	    protected function get_dict_file_content()
+	    {
+	    	$aEntries = array();
+	    	foreach($this->a_dict_entries as $sCode)
+	    	{
+	    		$aEntries[$sCode] = Dict::S($sCode);
+	    	}
+	    	foreach($this->a_dict_entries_prefixes as $sPrefix)
+	    	{
+	    		$aEntries = array_merge($aEntries, Dict::ExportEntries($sPrefix));
+	    	}
+	    	$sJSFile = 'var aDictEntries = '.json_encode($aEntries);
+	    	
+	    	return $sJSFile;
+	    }
     
 
 	/**
@@ -501,6 +532,9 @@ class WebPage implements Page
 		echo "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0, shrink-to-fit=no\" />";
         echo "<title>".htmlentities($this->s_title, ENT_QUOTES, 'UTF-8')."</title>\n";
         echo $this->get_base_tag();
+        
+        $this->output_dict_entries();
+        
         foreach($this->a_linked_scripts as $s_script)
         {
         	// Make sure that the URL to the script contains the application's version number
@@ -524,7 +558,6 @@ class WebPage implements Page
             }
             echo "</script>\n";
         }
-        $this->output_dict_entries();
         foreach($this->a_linked_stylesheets as $a_stylesheet)
         {
 			if (strpos($a_stylesheet['link'], '?') === false)
@@ -778,36 +811,21 @@ class WebPage implements Page
 
 	protected function output_dict_entries($bReturnOutput = false)
 	{
-		$sHtml = '';
-		if (count($this->a_dict_entries)>0)
+		if ((count($this->a_dict_entries) > 0) || (count($this->a_dict_entries_prefixes) > 0))
 		{
-			$sHtml .= "<script type=\"text/javascript\">\n";
-			$sHtml .= "var Dict = {};\n";
-			$sHtml .= "Dict._entries = {};\n";
-			$sHtml .= "Dict.S = function(sEntry) {\n";
-			$sHtml .= "   if (sEntry in Dict._entries)\n";
-			$sHtml .= "   {\n";
-			$sHtml .= "      return Dict._entries[sEntry];\n";
-			$sHtml .= "   }\n";
-			$sHtml .= "   else\n";
-			$sHtml .= "   {\n";
-			$sHtml .= "      return sEntry;\n";
-			$sHtml .= "   }\n";
-			$sHtml .= "};\n";
-			foreach($this->a_dict_entries as $s_entry => $s_value)
+			if (class_exists('Dict'))
 			{
-				$sHtml .= "Dict._entries['$s_entry'] = '".addslashes($s_value)."';\n";
+				// The dictionary may not be available for example during the setup...
+				// Create a specific dictionary file and load it as a JS script
+				$sSignature = $this->get_dict_signature();
+				$sJSFileName = utils::GetCachePath().$sSignature.'.js';
+				if (!file_exists($sJSFileName) && is_writable(utils::GetCachePath()))
+				{
+					file_put_contents($sJSFileName, $this->get_dict_file_content());
+				}
+				// Load the dictionary as the first javascript file, so that other JS file benefit from the translations
+				array_unshift($this->a_linked_scripts, utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php/?operation=dict&s='.$sSignature);
 			}
-			$sHtml .= "</script>\n";
-		}
-		
-		if ($bReturnOutput)
-		{
-			return $sHtml;
-		}
-		else
-		{
-			echo $sHtml;
 		}
 	}
 }
diff --git a/core/dict.class.inc.php b/core/dict.class.inc.php
index 6d68757a5..e3a2a9c8e 100644
--- a/core/dict.class.inc.php
+++ b/core/dict.class.inc.php
@@ -357,5 +357,25 @@ class Dict
 		// No need to actually load the strings since it's only used to know the list of languages
 		// at setup time !!
 	}
+	
+	/**
+	 * Export all the dictionary entries - of the given language - whose code matches the given prefix
+	 * @param string $sStartingWith
+	 * @return string[]
+	 */
+	public static function ExportEntries($sStartingWith)
+	{
+		self::InitLangIfNeeded(self::GetUserLanguage());
+		$aEntries = array();
+		$iLength = strlen($sStartingWith);
+		foreach(self::$m_aData[self::GetUserLanguage()] as $sCode => $sEntry)
+		{
+			if (substr($sCode, 0, $iLength) == $sStartingWith)
+			{
+				$aEntries[$sCode] = $sEntry;
+			}
+		}
+		return $aEntries;
+	}
 }
 ?>
diff --git a/js/utils.js b/js/utils.js
index 957b429db..b6bd92c03 100644
--- a/js/utils.js
+++ b/js/utils.js
@@ -694,4 +694,59 @@ function DisplayHistory(sSelector, sFilter, iCount, iStart)
 			$(sSelector).html(data).unblock();
 		}
 	);
+}
+
+// Very simple equivalent to format: placeholders are %1$s %2$d ...
+function Format()
+{
+	var args = [];
+	var str = '';
+	if (arguments[0] instanceof Array)
+	{
+		str = arguments[0][0].toString();
+		args = arguments[0];
+	}
+	else
+	{
+	    str = arguments[0].toString();
+	    if (arguments.length > 1)
+	    {
+	        var t = typeof arguments[1];
+        	args = ("string" === t || "number" === t) ? Array.prototype.slice.call(arguments) : arguments[1];
+	    }
+	}
+    var key;
+    for (key in args)
+    {
+        str = str.replace(new RegExp("\\%" + key + "\\$.", "gi"), args[key]);
+    }
+    
+    return str;
+}
+
+var Dict = {};
+if (aDictEntries == undefined)
+{
+	Dict._entries = {}; // Entries have not been loaded (we are in the setup ?)
+}
+else
+{
+	Dict._entries = aDictEntries; // Entries were loaded asynchronously via their own js files	
+}
+Dict.S = function(sEntry)
+{
+	if (sEntry in Dict._entries)
+	{
+		return Dict._entries[sEntry];
+	}
+	else
+	{
+		return sEntry;
+	}
+};
+Dict.Format = function()
+{
+	var args = Array.from(arguments);
+	args[0] = Dict.S(arguments[0]);
+	return Format(args);
 }
\ No newline at end of file
diff --git a/pages/ajax.render.php b/pages/ajax.render.php
index 4a246c570..598630070 100644
--- a/pages/ajax.render.php
+++ b/pages/ajax.render.php
@@ -2528,6 +2528,15 @@ EOF
 			$oPage->add(json_encode($aResult));
 			break;
 
+		case 'dict':
+			$sSignature = Utils::ReadParam('s', ''); // Sanitization prevents / and ..
+			$oPage = new ajax_page(""); // New page to cleanup the no_cache done above
+			$oPage->SetContentType('text/javascript');
+			$oPage->add_header('Cache-control: public, max-age=86400'); // Cache for 24 hours
+			$oPage->add_header("Pragma: cache"); // Reset the value set .... where ?
+			$oPage->add(file_get_contents(Utils::GetCachePath().$sSignature.'.js'));
+			break;
+			
 		default:
 			$oPage->p("Invalid query.");
 	}

From 8f858c2ddf2e6ce1f198c852f1b29df12f97a2d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Mon, 19 Mar 2018 09:57:31 +0000
Subject: [PATCH 062/202] Advanced Search: Labels on raw expressions

SVN:b1162[5454]
---
 core/oql/expression.class.inc.php | 41 +++++--------------------------
 1 file changed, 6 insertions(+), 35 deletions(-)

diff --git a/core/oql/expression.class.inc.php b/core/oql/expression.class.inc.php
index cea3be642..faefb0e25 100644
--- a/core/oql/expression.class.inc.php
+++ b/core/oql/expression.class.inc.php
@@ -47,7 +47,10 @@ abstract class Expression
 	 *
 	 * @return array parameters for the search form
 	 */
-	abstract public function Display($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null);
+	public function Display($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
+	{
+		return $this->Render($aArgs, $bRetrofitParams);
+	}
 
 	/**
 	 * Recursively browse the expression tree
@@ -159,6 +162,7 @@ abstract class Expression
 		return array(
 			'widget' => AttributeDefinition::SEARCH_WIDGET_TYPE,
 			'oql' => $this->Render($aArgs, $bRetrofitParams),
+			'label' => $this->Display($oSearch, $aArgs, $bRetrofitParams, $oAttDef),
 			'source' => get_class($this),
 		);
 	}
@@ -202,11 +206,6 @@ class SQLExpression extends Expression
 		return false;
 	}
 
-	public function Display($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
-	{
-		return $this->Render($aArgs, $bRetrofitParams);
-	}
-
 	// recursive rendering
 	public function Render(&$aArgs = null, $bRetrofitParams = false)
 	{
@@ -504,6 +503,7 @@ class BinaryExpression extends Expression
 			$aCriteria['operator'] = $this->GetOperator();
 		}
 		$aCriteria['oql'] = $this->Render($aArgs, $bRetrofitParams);
+		$aCriteria['label'] = $this->Display($oSearch, $aArgs, $bRetrofitParams, $oAttDef);
 
 		return $aCriteria;
 	}
@@ -530,11 +530,6 @@ class UnaryExpression extends Expression
 		return $this->m_value;
 	}
 
-	public function Display($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
-	{
-		return $this->Render($aArgs, $bRetrofitParams);
-	}
-
 	// recursive rendering
 	public function Render(&$aArgs = null, $bRetrofitParams = false)
 	{
@@ -1149,11 +1144,6 @@ class ListExpression extends Expression
 		return $this->m_aExpressions;
 	}
 
-	public function Display($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
-	{
-		return $this->Render($aArgs, $bRetrofitParams);
-	}
-
 	// recursive rendering
 	public function Render(&$aArgs = null, $bRetrofitParams = false)
 	{
@@ -1299,11 +1289,6 @@ class FunctionExpression extends Expression
 		return $this->m_aArgs;
 	}
 
-	public function Display($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
-	{
-		return $this->Render($aArgs, $bRetrofitParams);
-	}
-
 	// recursive rendering
 	public function Render(&$aArgs = null, $bRetrofitParams = false)
 	{
@@ -1502,11 +1487,6 @@ class IntervalExpression extends Expression
 		return $this->m_sUnit;
 	}
 
-	public function Display($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
-	{
-		return $this->Render($aArgs, $bRetrofitParams);
-	}
-
 	// recursive rendering
 	public function Render(&$aArgs = null, $bRetrofitParams = false)
 	{
@@ -1586,11 +1566,6 @@ class CharConcatExpression extends Expression
 		return $this->m_aExpressions;
 	}
 
-	public function Display($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
-	{
-		return $this->Render($aArgs, $bRetrofitParams);
-	}
-
 	// recursive rendering
 	public function Render(&$aArgs = null, $bRetrofitParams = false)
 	{
@@ -1703,10 +1678,6 @@ class CharConcatWSExpression extends CharConcatExpression
 		parent::__construct($aExpressions);
 	}
 
-	public function Display($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
-	{
-		return $this->Render($aArgs, $bRetrofitParams);
-	}
 	// recursive rendering
 	public function Render(&$aArgs = null, $bRetrofitParams = false)
 	{

From e628c68f09c8e79921b77b384775599b46b7dabf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Mon, 19 Mar 2018 09:58:46 +0000
Subject: [PATCH 063/202] Advanced Search: Search on Details pages

SVN:b1162[5455]
---
 application/cmdbabstract.class.inc.php | 184 +++++++++++++------------
 1 file changed, 95 insertions(+), 89 deletions(-)

diff --git a/application/cmdbabstract.class.inc.php b/application/cmdbabstract.class.inc.php
index 798dec7bf..4e6a00e74 100644
--- a/application/cmdbabstract.class.inc.php
+++ b/application/cmdbabstract.class.inc.php
@@ -609,7 +609,7 @@ EOF
 	function GetBareProperties(WebPage $oPage, $bEditMode = false, $sPrefix, $aExtraParams = array())
 	{
 		$sHtml = '';
-		$oAppContext = new ApplicationContext();	
+		$oAppContext = new ApplicationContext();
 		$sStateAttCode = MetaModel::GetStateAttributeCode(get_class($this));
 		$aDetails = array();
 		$sClass = get_class($this);
@@ -625,28 +625,28 @@ EOF
 		$aFieldsComments = (isset($aExtraParams['fieldsComments'])) ? $aExtraParams['fieldsComments'] : array();
 		$aExtraFlags = (isset($aExtraParams['fieldsFlags'])) ? $aExtraParams['fieldsFlags'] : array();
 		$bFieldComments = (count($aFieldsComments) > 0);
-		
-		foreach($aDetailsStruct as $sTab => $aCols )
+
+		foreach($aDetailsStruct as $sTab => $aCols)
 		{
 			$aDetails[$sTab] = array();
-            $aTableStyles[] = 'vertical-align:top';
-            $aTableClasses = array();
+			$aTableStyles[] = 'vertical-align:top';
+			$aTableClasses = array();
 			$aColStyles[] = 'vertical-align:top';
 			$aColClasses = array();
 
-            ksort($aCols);
+			ksort($aCols);
 			$iColCount = count($aCols);
-			if($iColCount > 1)
-            {
-	            $aTableClasses[] = 'n-cols-details';
-	            $aTableClasses[] = $iColCount.'-cols-details';
+			if ($iColCount > 1)
+			{
+				$aTableClasses[] = 'n-cols-details';
+				$aTableClasses[] = $iColCount.'-cols-details';
 
-	            $aColStyles[] = 'width:'.floor(100/$iColCount).'%';
-            }
-            else
-            {
-	            $aTableClasses[] = 'one-col-details';
-            }
+				$aColStyles[] = 'width:'.floor(100 / $iColCount).'%';
+			}
+			else
+			{
+				$aTableClasses[] = 'one-col-details';
+			}
 
 			$oPage->SetCurrentTab(Dict::S($sTab));
 			$oPage->add('<table style="'.implode('; ', $aTableStyles).'" class="'.implode(' ', $aTableClasses).'" data-mode="'.$sEditMode.'"><tr>');
@@ -659,7 +659,7 @@ EOF
 				$aDetails[$sTab][$sColIndex] = array();
 				foreach($aFieldsets as $sFieldsetName => $aFields)
 				{
-				    if (!empty($sFieldsetName) && ($sFieldsetName[0] != '_'))
+					if (!empty($sFieldsetName) && ($sFieldsetName[0] != '_'))
 					{
 						$sLabel = $sFieldsetName;
 					}
@@ -688,90 +688,93 @@ EOF
 						{
 
 
-						$sComments = isset($aFieldsComments[$sAttCode]) ? $aFieldsComments[$sAttCode] : '';
-						$sInfos = '';
-						$iFlags = $this->GetFormAttributeFlags($sAttCode);
-						if (array_key_exists($sAttCode, $aExtraFlags))
-						{
-							// the caller may override some flags if needed
-							$iFlags = $iFlags | $aExtraFlags[$sAttCode];
-						}
-						$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
-						if ( (!$oAttDef->IsLinkSet()) && (($iFlags & OPT_ATT_HIDDEN) == 0))
-						{
-							$sInputId = $this->m_iFormId.'_'.$sAttCode;
-							if ($oAttDef->IsWritable())
+							$sComments = isset($aFieldsComments[$sAttCode]) ? $aFieldsComments[$sAttCode] : '';
+							$sInfos = '';
+							$iFlags = $this->GetFormAttributeFlags($sAttCode);
+							if (array_key_exists($sAttCode, $aExtraFlags))
 							{
-								if ($sStateAttCode == $sAttCode)
+								// the caller may override some flags if needed
+								$iFlags = $iFlags | $aExtraFlags[$sAttCode];
+							}
+							$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
+							if ((!$oAttDef->IsLinkSet()) && (($iFlags & OPT_ATT_HIDDEN) == 0))
+							{
+								$sInputId = $this->m_iFormId.'_'.$sAttCode;
+								if ($oAttDef->IsWritable())
 								{
-									// State attribute is always read-only from the UI
-									$sHTMLValue = $this->GetStateLabel();
-									$val = array('label' => '<label>'.$oAttDef->GetLabel().'</label>', 'value' => $sHTMLValue, 'comments' => $sComments, 'infos' => $sInfos, 'attcode' => $sAttCode);
-								}
-								else
-								{				
-									if ($iFlags & (OPT_ATT_READONLY|OPT_ATT_SLAVE))
+									if ($sStateAttCode == $sAttCode)
 									{
-										// Check if the attribute is not read-only because of a synchro...
-										if ($iFlags & OPT_ATT_SLAVE)
-										{
-											$aReasons = array();
-											$iSynchroFlags = $this->GetSynchroReplicaFlags($sAttCode, $aReasons);
-											$sSynchroIcon = "&nbsp;<img id=\"synchro_$sInputId\" src=\"../images/transp-lock.png\" style=\"vertical-align:middle\"/>";
-											$sTip = '';
-											foreach($aReasons as $aRow)
-											{
-												$sDescription = htmlentities($aRow['description'], ENT_QUOTES, 'UTF-8');
-												$sDescription = str_replace(array("\r\n", "\n"), "<br/>", $sDescription);
-												$sTip .= "<div class='synchro-source'>";
-												$sTip .= "<div class='synchro-source-title'>Synchronized with {$aRow['name']}</div>";
-												$sTip .= "<div class='synchro-source-description'>$sDescription</div>";
-											}
-											$sTip = addslashes($sTip);
-											$oPage->add_ready_script("$('#synchro_$sInputId').qtip( { content: '$sTip', show: 'mouseover', hide: 'mouseout', style: { name: 'dark', tip: 'leftTop' }, position: { corner: { target: 'rightMiddle', tooltip: 'leftTop' }} } );");
-											$sComments = $sSynchroIcon;
-										}
-
-										// Attribute is read-only
-										$sHTMLValue = "<span id=\"field_{$sInputId}\">".$this->GetAsHTML($sAttCode).'</span>';
+										// State attribute is always read-only from the UI
+										$sHTMLValue = $this->GetStateLabel();
+										$val = array('label' => '<label>'.$oAttDef->GetLabel().'</label>', 'value' => $sHTMLValue, 'comments' => $sComments, 'infos' => $sInfos, 'attcode' => $sAttCode);
 									}
 									else
 									{
-										$sValue = $this->Get($sAttCode);
-										$sDisplayValue = $this->GetEditValue($sAttCode);
-										$aArgs = array('this' => $this, 'formPrefix' => $sPrefix);
-										$sHTMLValue = "".self::GetFormElementForField($oPage, $sClass, $sAttCode, $oAttDef, $sValue, $sDisplayValue, $sInputId, '', $iFlags, $aArgs).'';
+										if ($iFlags & (OPT_ATT_READONLY | OPT_ATT_SLAVE))
+										{
+											// Check if the attribute is not read-only because of a synchro...
+											if ($iFlags & OPT_ATT_SLAVE)
+											{
+												$aReasons = array();
+												$iSynchroFlags = $this->GetSynchroReplicaFlags($sAttCode, $aReasons);
+												$sSynchroIcon = "&nbsp;<img id=\"synchro_$sInputId\" src=\"../images/transp-lock.png\" style=\"vertical-align:middle\"/>";
+												$sTip = '';
+												foreach($aReasons as $aRow)
+												{
+													$sDescription = htmlentities($aRow['description'], ENT_QUOTES, 'UTF-8');
+													$sDescription = str_replace(array("\r\n", "\n"), "<br/>", $sDescription);
+													$sTip .= "<div class='synchro-source'>";
+													$sTip .= "<div class='synchro-source-title'>Synchronized with {$aRow['name']}</div>";
+													$sTip .= "<div class='synchro-source-description'>$sDescription</div>";
+												}
+												$sTip = addslashes($sTip);
+												$oPage->add_ready_script("$('#synchro_$sInputId').qtip( { content: '$sTip', show: 'mouseover', hide: 'mouseout', style: { name: 'dark', tip: 'leftTop' }, position: { corner: { target: 'rightMiddle', tooltip: 'leftTop' }} } );");
+												$sComments = $sSynchroIcon;
+											}
+
+											// Attribute is read-only
+											$sHTMLValue = "<span id=\"field_{$sInputId}\">".$this->GetAsHTML($sAttCode).'</span>';
+										}
+										else
+										{
+											$sValue = $this->Get($sAttCode);
+											$sDisplayValue = $this->GetEditValue($sAttCode);
+											$aArgs = array('this' => $this, 'formPrefix' => $sPrefix);
+											$sHTMLValue = "".self::GetFormElementForField($oPage, $sClass, $sAttCode, $oAttDef, $sValue, $sDisplayValue, $sInputId, '', $iFlags, $aArgs).'';
+										}
+										$aFieldsMap[$sAttCode] = $sInputId;
+										$val = array('label' => '<span title="'.$oAttDef->GetDescription().'">'.$oAttDef->GetLabel().'</span>', 'value' => $sHTMLValue, 'comments' => $sComments, 'infos' => $sInfos, 'attcode' => $sAttCode);
 									}
+								}
+								else
+								{
+									$val = array(
+										'label' => '<span title="'.$oAttDef->GetDescription().'">'.$oAttDef->GetLabel().'</span>',
+										'value' => "<span id=\"field_{$sInputId}\">".$this->GetAsHTML($sAttCode)."</span>",
+										'comments' => $sComments,
+										'infos' => $sInfos,
+										'attcode' => $sAttCode
+									);
 									$aFieldsMap[$sAttCode] = $sInputId;
-									$val = array('label' => '<span title="'.$oAttDef->GetDescription().'">'.$oAttDef->GetLabel().'</span>', 'value' => $sHTMLValue, 'comments' => $sComments, 'infos' => $sInfos, 'attcode' => $sAttCode);
+								}
+
+								// Checking how the field should be rendered
+								// Note: For view mode, this is done in cmdbAbstractObject::GetFieldAsHtml()
+								// Note 2: Shouldn't this be a property of the AttDef instead an array that we have to maintain?
+								if (in_array($oAttDef->GetEditClass(), array('Text', 'HTML', 'CaseLog', 'CustomFields', 'OQLExpression')))
+								{
+									$val['layout'] = 'large';
+								}
+								else
+								{
+									$val['layout'] = 'small';
 								}
 							}
 							else
 							{
-								$val = array('label' => '<span title="'.$oAttDef->GetDescription().'">'.$oAttDef->GetLabel().'</span>', 'value' => "<span id=\"field_{$sInputId}\">".$this->GetAsHTML($sAttCode)."</span>", 'comments' => $sComments, 'infos' => $sInfos, 'attcode' => $sAttCode);
-								$aFieldsMap[$sAttCode] = $sInputId;	
+								$val = null; // Skip this field
 							}
 
-                            // Checking how the field should be rendered
-                            // Note: For view mode, this is done in cmdbAbstractObject::GetFieldAsHtml()
-							// Note 2: Shouldn't this be a property of the AttDef instead an array that we have to maintain?
-                            if(in_array($oAttDef->GetEditClass(), array('Text', 'HTML', 'CaseLog', 'CustomFields', 'OQLExpression')))
-                            {
-                                $val['layout'] = 'large';
-                            }
-                            else
-                            {
-                                $val['layout'] = 'small';
-                            }
-						}
-						else
-						{
-							$val = null; // Skip this field
-						}
-
-
-
-							
 						}
 						else
 						{
@@ -781,10 +784,10 @@ EOF
 
 						if ($val != null)
 						{
-						    // The field is visible, add it to the current column
+							// The field is visible, add it to the current column
 							$aDetails[$sTab][$sColIndex][] = $val;
 							$iInputId++;
-						}				
+						}
 					}
 				}
 				if (!empty($sPreviousLabel))
@@ -801,6 +804,7 @@ EOF
 			}
 			$oPage->add('</tr></table>');
 		}
+
 		return $aFieldsMap;
 	}
 
@@ -819,6 +823,7 @@ EOF
 		{
 			// Object's details
 			// template not found display the object using the *old style*
+			$oPage->add('<div id="search-widget-results-outer">');
 			$this->DisplayBareHeader($oPage, $bEditMode);
 			$oPage->AddTabContainer(OBJECT_PROPERTIES_TAB);
 			$oPage->SetCurrentTabContainer(OBJECT_PROPERTIES_TAB);
@@ -828,6 +833,7 @@ EOF
 			//$oPage->SetCurrentTab(Dict::S('UI:HistoryTab'));
 			//$this->DisplayBareHistory($oPage, $bEditMode);
 			$oPage->AddAjaxTab(Dict::S('UI:HistoryTab'), utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php?operation=history&class='.get_class($this).'&id='.$this->GetKey());
+			$oPage->add('</div>');
 		}
 	}
 	

From 0fdf6bfbb268f15db6b9f0e61eddcb19425cd543 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Mon, 19 Mar 2018 10:45:34 +0000
Subject: [PATCH 064/202] Advanced Search: Hidden criterion

SVN:b1162[5456]
---
 .../ui.linksdirectwidget.class.inc.php        | 36 ++++++++++---------
 application/ui.linkswidget.class.inc.php      | 14 ++++++--
 pages/ajax.searchform.php                     | 18 +++++++---
 .../search/criterionparser.class.inc.php      | 15 ++++++--
 .../search/searchform.class.inc.php           |  1 +
 5 files changed, 58 insertions(+), 26 deletions(-)

diff --git a/application/ui.linksdirectwidget.class.inc.php b/application/ui.linksdirectwidget.class.inc.php
index d41916813..d8e3deffa 100644
--- a/application/ui.linksdirectwidget.class.inc.php
+++ b/application/ui.linksdirectwidget.class.inc.php
@@ -289,6 +289,23 @@ class UILinksWidgetDirect
 	{
 		$sHtml = "<div class=\"wizContainer\" style=\"vertical-align:top;\">\n";
 
+		$oHiddenFilter = new DBObjectSearch($this->sLinkedClass);
+		if (($oCurrentObj != null) && MetaModel::IsSameFamilyBranch($this->sLinkedClass, $this->sClass))
+		{
+			// Prevent linking to self if the linked object is of the same family
+			// and already present in the database
+			if (!$oCurrentObj->IsNew())
+			{
+				$oHiddenFilter->AddCondition('id', $oCurrentObj->GetKey(), '!=');
+			}
+		}
+		if (count($aAlreadyLinked) > 0)
+		{
+			$oHiddenFilter->AddCondition('id', $aAlreadyLinked, 'NOTIN');
+		}
+		$oHiddenCriteria = $oHiddenFilter->GetCriteria();
+		$sHiddenCriteria = $oHiddenCriteria->Render();
+
 		$oLinkSetDef = MetaModel::GetAttributeDef($this->sClass, $this->sAttCode);
 		$valuesDef = $oLinkSetDef->GetValuesDef();
 		if ($valuesDef === null)
@@ -303,25 +320,11 @@ class UILinksWidgetDirect
 			}
 			$oFilter = DBObjectSearch::FromOQL($valuesDef->GetFilterExpression());
 		}
+
 		if ($oCurrentObj != null)
 		{
 			$this->SetSearchDefaultFromContext($oCurrentObj, $oFilter);
-		}
-		if (($oCurrentObj != null) && MetaModel::IsSameFamilyBranch($this->sLinkedClass, $this->sClass))
-		{
-			// Prevent linking to self if the linked object is of the same family
-			// and already present in the database
-			if (!$oCurrentObj->IsNew())
-			{
-				$oFilter->AddCondition('id', $oCurrentObj->GetKey(), '!=');
-			}
-		}
-		if (count($aAlreadyLinked) > 0)
-		{
-			$oFilter->AddCondition('id', $aAlreadyLinked, 'NOTIN');
-		}
-		if ($oCurrentObj != null)
-		{
+
 			$aArgs = array_merge($oCurrentObj->ToArgs('this'), $oFilter->GetInternalParams());
 			$oFilter->SetInternalParams($aArgs);
 		}
@@ -335,6 +338,7 @@ class UILinksWidgetDirect
 				'table_inner_id' => "ResultsToAdd_{$this->sInputid}",
 				'cssCount' => "#count_{$this->sInputid}",
 				'query_params' => $oFilter->GetInternalParams(),
+				'hidden_criteria' => $sHiddenCriteria,
 			)
         );
 		$sHtml .= "<form id=\"ObjectsAddForm_{$this->sInputid}\">\n";
diff --git a/application/ui.linkswidget.class.inc.php b/application/ui.linkswidget.class.inc.php
index 48d0d22ce..cd9f96f63 100644
--- a/application/ui.linkswidget.class.inc.php
+++ b/application/ui.linkswidget.class.inc.php
@@ -397,11 +397,20 @@ EOF
 	{
 		$bOpen = MetaModel::GetConfig()->Get('legacy_search_drawer_open');
 		$sHtml = "<div class=\"wizContainer\" style=\"vertical-align:top;\">\n";
-		$oFilter = new DBObjectSearch($this->m_sRemoteClass);
+
+		$oAlreadyLinkedFilter = new DBObjectSearch($this->m_sRemoteClass);
 		if (!$this->m_bDuplicatesAllowed && count($aAlreadyLinkedIds) > 0)
 		{
-			$oFilter->AddCondition('id', $aAlreadyLinkedIds, 'NOTIN');
+			$oAlreadyLinkedFilter->AddCondition('id', $aAlreadyLinkedIds, 'NOTIN');
+			$oAlreadyLinkedExpression = $oAlreadyLinkedFilter->GetCriteria();
+			$sAlreadyLinkedExpression = $oAlreadyLinkedExpression->Render();
 		}
+		else
+		{
+			$sAlreadyLinkedExpression = '';
+		}
+
+		$oFilter = new DBObjectSearch($this->m_sRemoteClass);
 		if ($oCurrentObj != null)
 		{
 			$this->SetSearchDefaultFromContext($oCurrentObj, $oFilter);
@@ -418,6 +427,7 @@ EOF
 				'json' => $sJson,
 				'cssCount' => '#count_'.$this->m_sAttCode.$this->m_sNameSuffix,
 				'query_params' => $oFilter->GetInternalParams(),
+				'hidden_criteria' => $sAlreadyLinkedExpression,
 			));
 		$sHtml .= "<form id=\"ObjectsAddForm_{$this->m_sAttCode}{$this->m_sNameSuffix}\">\n";
 		$sHtml .= "<div id=\"SearchResultsToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}\" style=\"vertical-align:top;background: #fff;height:100%;overflow:auto;padding:0;border:0;\">\n";
diff --git a/pages/ajax.searchform.php b/pages/ajax.searchform.php
index 0933fda06..6094a0a55 100644
--- a/pages/ajax.searchform.php
+++ b/pages/ajax.searchform.php
@@ -50,12 +50,20 @@ try
 	$oPage->no_cache();
 	$oPage->SetContentType('text/html');
 
-	$aParams = json_decode($sParams, true);
-	$oFilter = CriterionParser::Parse($aParams['base_oql'], $aParams['criterion']);
-	$oDisplayBlock = new DisplayBlock($oFilter, 'list', false);
-
 	$sListParams = utils::ReadParam('list_params', '{}', false, 'raw_data');
-	$aListParams = (array) json_decode($sListParams, true);
+	$aListParams = (array)json_decode($sListParams, true);
+
+	$aParams = json_decode($sParams, true);
+	if (array_key_exists('hidden_criteria', $aListParams))
+	{
+		$sHiddenCriteria = $aListParams['hidden_criteria'];
+	}
+	else
+	{
+		$sHiddenCriteria = '';
+	}
+	$oFilter = CriterionParser::Parse($aParams['base_oql'], $aParams['criterion'], $sHiddenCriteria);
+	$oDisplayBlock = new DisplayBlock($oFilter, 'list', false);
 
 	foreach($aListParams as $key => $value)
     {
diff --git a/sources/application/search/criterionparser.class.inc.php b/sources/application/search/criterionparser.class.inc.php
index 0c8365a22..903bb7b71 100644
--- a/sources/application/search/criterionparser.class.inc.php
+++ b/sources/application/search/criterionparser.class.inc.php
@@ -31,6 +31,7 @@ namespace Combodo\iTop\Application\Search;
 
 use Combodo\iTop\Application\Search\CriterionConversion\CriterionToOQL;
 use DBObjectSearch;
+use Expression;
 use IssueLog;
 use OQLException;
 
@@ -40,10 +41,11 @@ class CriterionParser
 	/**
 	 * @param $sBaseOql
 	 * @param $aCriterion
+	 * @param $sHiddenCriteria
 	 *
 	 * @return \DBSearch
 	 */
-	public static function Parse($sBaseOql, $aCriterion)
+	public static function Parse($sBaseOql, $aCriterion, $sHiddenCriteria = null)
 	{
 		$aExpression = array();
 		$aOr = $aCriterion['or'];
@@ -60,14 +62,21 @@ class CriterionParser
 		try
 		{
 			$oSearch = DBObjectSearch::FromOQL($sBaseOql);
+
+			if (!empty($sHiddenCriteria))
+			{
+				$oHiddenCriteriaExpression = Expression::FromOQL($sHiddenCriteria);
+				$oSearch->AddConditionExpression($oHiddenCriteriaExpression);
+			}
+
 			if (empty($aExpression))
 			{
 				return $oSearch;
 			}
 
-			$oExpression = \Expression::FromOQL(implode(" OR ", $aExpression));
+			$oExpression = Expression::FromOQL(implode(" OR ", $aExpression));
 			$oSearch->AddConditionExpression($oExpression);
-			
+
 			return $oSearch;
 		} catch (OQLException $e)
 		{
diff --git a/sources/application/search/searchform.class.inc.php b/sources/application/search/searchform.class.inc.php
index bff97eb51..a49d86639 100644
--- a/sources/application/search/searchform.class.inc.php
+++ b/sources/application/search/searchform.class.inc.php
@@ -146,6 +146,7 @@ class SearchForm
 		{
 			$aListParams['table_inner_id'] = uniqid('table_inner_id_');
 		}
+		// When table_id is different of result_list_outer_selector
 		if (array_key_exists('table_id2', $aExtraParams))
 		{
 			$aListParams['table_id'] = $aExtraParams['table_id2'];

From d6e3c7d1b75987f14c48d101a8d920b425638388 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Mon, 19 Mar 2018 14:24:41 +0000
Subject: [PATCH 065/202] Advanced Search: more info on fields and criterion

SVN:b1162[5457]
---
 .../search/searchform.class.inc.php           | 42 ++++++++++---------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/sources/application/search/searchform.class.inc.php b/sources/application/search/searchform.class.inc.php
index a49d86639..191eeddf1 100644
--- a/sources/application/search/searchform.class.inc.php
+++ b/sources/application/search/searchform.class.inc.php
@@ -159,6 +159,7 @@ class SearchForm
 			'date_format' => AttributeDateTime::GetFormat()->ToMomentJS(),
 			'list_params' => $aListParams,
 			'search' => array(
+				'has_hidden_criteria' => (array_key_exists('hidden_criteria', $aListParams) && !empty($aListParams['hidden_criteria'])),
 				'fields' => $aFields,
 				'criterion' => $aCriterion,
 				'base_oql' => $sBaseOQL,
@@ -308,46 +309,47 @@ class SearchForm
 	}
 
 	/**
-	 * @param $sClassName
+	 * @param $sClass
 	 * @param $sClassAlias
 	 * @param $sFilterCode
-	 * @param $oAttrDef
+	 * @param $oAttDef
 	 * @param $aFields
 	 *
 	 * @return mixed
 	 */
-	private function AppendField($sClassName, $sClassAlias, $sFilterCode, $oAttrDef, $aFields)
+	private function AppendField($sClass, $sClassAlias, $sFilterCode, $oAttDef, $aFields)
 	{
-		if (!is_null($oAttrDef) && ($oAttrDef->GetSearchType() != AttributeDefinition::SEARCH_WIDGET_TYPE_RAW))
+		if (!is_null($oAttDef) && ($oAttDef->GetSearchType() != AttributeDefinition::SEARCH_WIDGET_TYPE_RAW))
 		{
-			$sLabel = $oAttrDef->GetLabel();
+			$sLabel = $oAttDef->GetLabel();
 			if (!array_key_exists($sLabel, $this->aLabels))
 			{
 				$aField = array();
 				$aField['code'] = $sFilterCode;
-				$aField['class'] = $sClassName;
+				$aField['class'] = $sClass;
 				$aField['class_alias'] = $sClassAlias;
 				$aField['label'] = $sLabel;
-				$aField['widget'] = $oAttrDef->GetSearchType();
-				$aField['allowed_values'] = self::GetFieldAllowedValues($oAttrDef);
+				$aField['widget'] = $oAttDef->GetSearchType();
+				$aField['allowed_values'] = self::GetFieldAllowedValues($oAttDef);
+				$aField['is_null_allowed'] = $oAttDef->IsNullAllowed();
 				$aFields[$sClassAlias.'.'.$sFilterCode] = $aField;
 				$this->aLabels[$sLabel] = true;
 			}
 
 			// Sub items
 			//
-			//	if ($oAttDef->IsSearchable())
-			//	{
-			//		$sShortLabel = $oAttDef->GetLabel();
-			//		$sLabel = $sShortAlias.$oAttDef->GetLabel();
-			//		$aSubAttr = $this->GetSubAttributes($sClass, $sAttCode, $oAttDef);
-			//		$aValidSubAttr = array();
-			//		foreach($aSubAttr as $aSubAttDef)
-			//		{
-			//			$aValidSubAttr[] = array('attcodeex' => $aSubAttDef['code'], 'code' => $sShortAlias.$aSubAttDef['code'], 'label' => $aSubAttDef['label'], 'unique_label' => $sShortAlias.$aSubAttDef['unique_label']);
-			//		}
-			//		$aAllFields[] = array('attcodeex' => $sAttCode, 'code' => $sShortAlias.$sAttCode, 'label' => $sShortLabel, 'unique_label' => $sLabel, 'subattr' => $aValidSubAttr);
-			//	}
+			//			if ($oAttDef->IsSearchable())
+			//			{
+			//				$sShortLabel = $oAttDef->GetLabel();
+			//				$sLabel = $sShortAlias.$oAttDef->GetLabel();
+			//				$aSubAttr = $this->GetSubAttributes($sClass, $sFilterCode, $oAttDef);
+			//				$aValidSubAttr = array();
+			//				foreach($aSubAttr as $aSubAttDef)
+			//				{
+			//					$aValidSubAttr[] = array('attcodeex' => $aSubAttDef['code'], 'code' => $sShortAlias.$aSubAttDef['code'], 'label' => $aSubAttDef['label'], 'unique_label' => $sShortAlias.$aSubAttDef['unique_label']);
+			//				}
+			//				$aAllFields[] = array('attcodeex' => $sFilterCode, 'code' => $sShortAlias.$sFilterCode, 'label' => $sShortLabel, 'unique_label' => $sLabel, 'subattr' => $aValidSubAttr);
+			//			}
 
 		}
 

From c9526130b70391775fe5cc9a95bf334d10f059a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Mon, 19 Mar 2018 14:32:43 +0000
Subject: [PATCH 066/202] Advanced Search: Cleaner Dictionary entries

SVN:b1162[5458]
---
 application/nicewebpage.class.inc.php | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/application/nicewebpage.class.inc.php b/application/nicewebpage.class.inc.php
index 4dc6d0c13..a567f60c5 100644
--- a/application/nicewebpage.class.inc.php
+++ b/application/nicewebpage.class.inc.php
@@ -55,19 +55,10 @@ class NiceWebPage extends WebPage
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria.js');
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_raw.js');
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_string.js');
-	    // TODO: Remove
-	    $this->add_dict_entry('UI:Search:Criterion:MoreMenu:AddCriteria');
-	    $this->add_dict_entry('UI:Search:Criteria:Operator:Default:Empty');
-	    $this->add_dict_entry('UI:Search:Criteria:Operator:Default:NotEmpty');
-	    $this->add_dict_entry('UI:Search:Criteria:Operator:Default:Equals');
-	    $this->add_dict_entry('UI:Search:Criteria:Operator:String:Contains');
-	    $this->add_dict_entry('UI:Search:Criteria:Operator:String:StartsWith');
-	    $this->add_dict_entry('UI:Search:Criteria:Operator:String:EndsWith');
-	    $this->add_dict_entry('UI:Button:Apply');
-	    $this->add_dict_entry('UI:Button:Cancel');
-	    $this->add_dict_entry('UI:Button:Close');
-	    $this->add_dict_entry('UI:Button:More');
-	    $this->add_dict_entry('UI:Button:Less');
+
+	    $this->add_dict_entries('UI:Search:');
+	    $this->add_dict_entries('UI:Button:');
+
 	    $this->add_ready_script(
 <<< EOF
 	//add new widget called TruncatedList to properly display truncated lists when they are sorted

From d883e3e661e3ef41166cd2d723f29ac9e978e201 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Mon, 19 Mar 2018 15:44:23 +0000
Subject: [PATCH 067/202] Advanced Search: Dictionary compatible with the setup

SVN:b1162[5459]
---
 application/itopwebpage.class.inc.php |   6 +-
 application/nicewebpage.class.inc.php |   4 +-
 js/utils.js                           | 743 +++++++++++---------------
 3 files changed, 326 insertions(+), 427 deletions(-)

diff --git a/application/itopwebpage.class.inc.php b/application/itopwebpage.class.inc.php
index 666236257..2d7a2112f 100644
--- a/application/itopwebpage.class.inc.php
+++ b/application/itopwebpage.class.inc.php
@@ -111,8 +111,10 @@ class iTopWebPage extends NiceWebPage implements iTabbedPage
 		$sSearchAny = addslashes(Dict::S('UI:SearchValue:Any'));
 		$sSearchNbSelected = addslashes(Dict::S('UI:SearchValue:NbSelected'));
 		$this->add_dict_entry('UI:FillAllMandatoryFields');
-		$this->add_dict_entry('UI:Button:Cancel');
-		$this->add_dict_entry('UI:Button:Done');
+
+		$this->add_dict_entries('UI:Search:');
+		$this->add_dict_entries('UI:Button:');
+
 
 		if (!$this->IsPrintableVersion())
 		{
diff --git a/application/nicewebpage.class.inc.php b/application/nicewebpage.class.inc.php
index a567f60c5..718880b6b 100644
--- a/application/nicewebpage.class.inc.php
+++ b/application/nicewebpage.class.inc.php
@@ -56,8 +56,8 @@ class NiceWebPage extends WebPage
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_raw.js');
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_string.js');
 
-	    $this->add_dict_entries('UI:Search:');
-	    $this->add_dict_entries('UI:Button:');
+//	    $this->add_dict_entries('UI:Search:');
+//	    $this->add_dict_entries('UI:Button:');
 
 	    $this->add_ready_script(
 <<< EOF
diff --git a/js/utils.js b/js/utils.js
index b6bd92c03..c1659166e 100644
--- a/js/utils.js
+++ b/js/utils.js
@@ -2,39 +2,39 @@
 
 //IE 8 compatibility, copied from: https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Objects/Array/IndexOf
 if (!Array.prototype.indexOf) {
-	
+
 	if (false) // deactivated since it causes troubles: for(k in aData) => returns the indexOf function as first element on empty arrays !
 	{
-	Array.prototype.indexOf = function (searchElement /*, fromIndex */ ) {
-    	"use strict";
-        if (this == null) {
-        	throw new TypeError();
-        }
-        var t = Object(this);
-        var len = t.length >>> 0;
-        if (len === 0) {
-        	return -1;
-        }
-        var n = 0;
-        if (arguments.length > 1) {
-        	n = Number(arguments[1]);
-            if (n != n) { // shortcut for verifying if it's NaN
-            	n = 0;
-            } else if (n != 0 && n != Infinity && n != -Infinity) {
-            	n = (n > 0 || -1) * Math.floor(Math.abs(n));
-            }
-        }
-        if (n >= len) {
-        	return -1;
-        }
-        var k = n >= 0 ? n : Math.max(len - Math.abs(n), 0);
-        for (; k < len; k++) {
-        	if (k in t && t[k] === searchElement) {
-            	return k;
-            }
-        }
-        return -1;
-    }
+		Array.prototype.indexOf = function (searchElement /*, fromIndex */) {
+			"use strict";
+			if (this == null) {
+				throw new TypeError();
+			}
+			var t = Object(this);
+			var len = t.length >>> 0;
+			if (len === 0) {
+				return -1;
+			}
+			var n = 0;
+			if (arguments.length > 1) {
+				n = Number(arguments[1]);
+				if (n != n) { // shortcut for verifying if it's NaN
+					n = 0;
+				} else if (n != 0 && n != Infinity && n != -Infinity) {
+					n = (n > 0 || -1) * Math.floor(Math.abs(n));
+				}
+			}
+			if (n >= len) {
+				return -1;
+			}
+			var k = n >= 0 ? n : Math.max(len-Math.abs(n), 0);
+			for (; k < len; k++) {
+				if (k in t && t[k] === searchElement) {
+					return k;
+				}
+			}
+			return -1;
+		}
 	}
 }
 /**
@@ -42,63 +42,54 @@ if (!Array.prototype.indexOf) {
  */
 aTruncatedLists = {}; // To keep track of the list being loaded, each member is an ajaxRequest object
 
-function ReloadTruncatedList(divId, sSerializedFilter, sExtraParams)
-{
+function ReloadTruncatedList(divId, sSerializedFilter, sExtraParams) {
 	$('#'+divId).block();
 	//$('#'+divId).blockUI();
-	if (aTruncatedLists[divId] != undefined)
-	{
-		try
-		{
+	if (aTruncatedLists[divId] != undefined) {
+		try {
 			aAjaxRequest = aTruncatedLists[divId];
 			aAjaxRequest.abort();
 		}
-		catch(e)
-		{
+		catch (e) {
 			// Do nothing special, just continue
 			console.log('Uh,uh, exception !');
 		}
 	}
 	aTruncatedLists[divId] = $.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php?style=list',
-	   { operation: 'ajax', filter: sSerializedFilter, extra_params: sExtraParams },
-	     function(data)
-	     {
-			 aTruncatedLists[divId] = undefined;
-			 if (data.length > 0)
-			 {
-				 $('#'+divId).html(data);
-				 $('#'+divId+' .listResults').tableHover(); // hover tables
-				 $('#'+divId+' .listResults').each( function()
-					{
-						var table = $(this);
-						var id = $(this).parent();
-						aTruncatedLists[divId] = undefined;
-						var checkbox = (table.find('th:first :checkbox').length > 0);
-						if (checkbox)
-						{
-							// There is a checkbox in the first column, don't make it sortable
-							table.tablesorter( { headers: { 0: {sorter: false}}, widgets: ['myZebra', 'truncatedList']} ).tablesorterPager({container: $("#pager")}); // sortable and zebra tables
-						}
-						else
-						{
-							// There is NO checkbox in the first column, all columns are considered sortable
-							table.tablesorter( { widgets: ['myZebra', 'truncatedList']} ).tablesorterPager({container: $("#pager"), totalRows:97, filter: sSerializedFilter, extra_params: sExtraParams }); // sortable and zebra tables
-						}
-					});
-				 $('#'+divId).unblock();
-			 }
+		{operation: 'ajax', filter: sSerializedFilter, extra_params: sExtraParams},
+		function (data) {
+			aTruncatedLists[divId] = undefined;
+			if (data.length > 0) {
+				$('#'+divId).html(data);
+				$('#'+divId+' .listResults').tableHover(); // hover tables
+				$('#'+divId+' .listResults').each(function () {
+					var table = $(this);
+					var id = $(this).parent();
+					aTruncatedLists[divId] = undefined;
+					var checkbox = (table.find('th:first :checkbox').length > 0);
+					if (checkbox) {
+						// There is a checkbox in the first column, don't make it sortable
+						table.tablesorter({headers: {0: {sorter: false}}, widgets: ['myZebra', 'truncatedList']}).tablesorterPager({container: $("#pager")}); // sortable and zebra tables
+					}
+					else {
+						// There is NO checkbox in the first column, all columns are considered sortable
+						table.tablesorter({widgets: ['myZebra', 'truncatedList']}).tablesorterPager({container: $("#pager"), totalRows: 97, filter: sSerializedFilter, extra_params: sExtraParams}); // sortable and zebra tables
+					}
+				});
+				$('#'+divId).unblock();
+			}
 		}
-	 );
+	);
 }
+
 /**
  * Truncate a previously expanded list !
  */
-function TruncateList(divId, iLimit, sNewLabel, sLinkLabel)
-{
+function TruncateList(divId, iLimit, sNewLabel, sLinkLabel) {
 	$('#'+divId).block();
 	var iCount = 0;
-	$('#'+divId+' table.listResults tr:gt('+iLimit+')').each( function(){
-			$(this).remove();
+	$('#'+divId+' table.listResults tr:gt('+iLimit+')').each(function () {
+		$(this).remove();
 	});
 	$('#lbl_'+divId).html(sNewLabel);
 	$('#'+divId+' table.listResults tr:last td').addClass('truncated');
@@ -107,74 +98,66 @@ function TruncateList(divId, iLimit, sNewLabel, sLinkLabel)
 	$('#'+divId+' .listResults').trigger("update"); //  Reset the cache
 	$('#'+divId).unblock();
 }
+
 /**
  * Reload any block -- used for periodic auto-reload
- */ 
-function ReloadBlock(divId, sStyle, sSerializedFilter, sExtraParams)
-{
+ */
+function ReloadBlock(divId, sStyle, sSerializedFilter, sExtraParams) {
 	// Check if the user is not editing the list properties right now
 	var bDialogOpen = false;
 	var oDataTable = $('#'+divId+' :itop-datatable');
 	var bIsDataTable = false;
-	if (oDataTable.length > 0)
-	{
+	if (oDataTable.length > 0) {
 		bDialogOpen = oDataTable.datatable('IsDialogOpen');
 		bIsDataTable = true;
 	}
-	if (!bDialogOpen)
-	{
-		if (bIsDataTable)
-		{
+	if (!bDialogOpen) {
+		if (bIsDataTable) {
 			oDataTable.datatable('DoRefresh');
 		}
-		else
-		{
+		else {
 			$('#'+divId).block();
-			
+
 			$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php?style='+sStyle,
-			   { operation: 'ajax', filter: sSerializedFilter, extra_params: sExtraParams },
-			   function(data){
-				 $('#'+divId).empty();
-				 $('#'+divId).append(data);
-				 $('#'+divId).removeClass('loading');
+				{operation: 'ajax', filter: sSerializedFilter, extra_params: sExtraParams},
+				function (data) {
+					$('#'+divId).empty();
+					$('#'+divId).append(data);
+					$('#'+divId).removeClass('loading');
 				}
-			 );
+			);
 		}
 	}
 }
 
-function SaveGroupBySortOrder(sTableId, aValues)
-{
+function SaveGroupBySortOrder(sTableId, aValues) {
 	var sDashboardId = $('#'+sTableId).closest('.dashboard_contents').attr('id');
 	var sPrefKey = 'GroupBy_'+sDashboardId+'_'+sTableId;
-	if (aValues.length != 0)
-	{
+	if (aValues.length != 0) {
 		$sValue = JSON.stringify(aValues);
-		if (GetUserPreference(sPrefKey, null) != $sValue)
-		{
-			SetUserPreference(sPrefKey, $sValue, true);			
+		if (GetUserPreference(sPrefKey, null) != $sValue) {
+			SetUserPreference(sPrefKey, $sValue, true);
 		}
 	}
 }
 
-function LoadGroupBySortOrder(sTableId)
-{
+function LoadGroupBySortOrder(sTableId) {
 	var sDashboardId = $('#'+sTableId).closest('.dashboard_contents').attr('id');
 	var sPrefKey = 'GroupBy_'+sDashboardId+'_'+sTableId;
 	var sValues = GetUserPreference(sPrefKey, null);
-	if (sValues != null)
-	{
+	if (sValues != null) {
 		aValues = JSON.parse(sValues);
-		window.setTimeout(function () { $('#'+sTableId+' table.listResults').trigger('sorton', [aValues]); }, 50);
+		window.setTimeout(function () {
+			$('#'+sTableId+' table.listResults').trigger('sorton', [aValues]);
+		}, 50);
 	}
-	
+
 }
 
 /**
  * Update the display and value of a file input widget when the user picks a new file
- */ 
-function UpdateFileName(id, sNewFileName)
-{
+ */
+function UpdateFileName(id, sNewFileName) {
 	var aPath = sNewFileName.split('\\');
 	var sNewFileName = aPath[aPath.length-1];
 
@@ -183,12 +166,12 @@ function UpdateFileName(id, sNewFileName)
 	$('#name_'+id).text(sNewFileName);
 	return true;
 }
+
 /**
  * Reload a search form for the specified class
  */
-function ReloadSearchForm(divId, sClassName, sBaseClass, sContext)
-{
-    var oDiv = $('#ds_'+divId);
+function ReloadSearchForm(divId, sClassName, sBaseClass, sContext) {
+	var oDiv = $('#ds_'+divId);
 	oDiv.block();
 	// deprecated in jQuery 1.8 
 	//var oFormEvents = $('#ds_'+divId+' form').data('events');
@@ -196,19 +179,17 @@ function ReloadSearchForm(divId, sClassName, sBaseClass, sContext)
 	var oFormEvents = $._data(oForm[0], "events");
 
 	// Save the submit handlers
-    aSubmit = new Array();
-	if ( (oFormEvents != null) && (oFormEvents.submit != undefined))
-	{
-		for(var index = 0; index < oFormEvents.submit.length; index++)
-		{
-			aSubmit [index ] = { data:oFormEvents.submit[index].data, namespace:oFormEvents.submit[index].namespace, handler:  oFormEvents.submit[index].handler};
+	aSubmit = new Array();
+	if ((oFormEvents != null) && (oFormEvents.submit != undefined)) {
+		for (var index = 0; index < oFormEvents.submit.length; index++) {
+			aSubmit [index] = {data: oFormEvents.submit[index].data, namespace: oFormEvents.submit[index].namespace, handler: oFormEvents.submit[index].handler};
 		}
 	}
-	sAction =  $('#ds_'+divId+' form').attr('action');
+	sAction = $('#ds_'+divId+' form').attr('action');
 
 	// Save the current values in the form
 	var oMap = {};
-	$('#ds_'+divId+" form :input[name!='']").each(function() {
+	$('#ds_'+divId+" form :input[name!='']").each(function () {
 		oMap[this.name] = this.value;
 	});
 	oMap.operation = 'search_form';
@@ -216,57 +197,50 @@ function ReloadSearchForm(divId, sClassName, sBaseClass, sContext)
 	oMap.baseClass = sBaseClass;
 	oMap.currentId = divId;
 	oMap.action = sAction;
-	
+
 	$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php?'+sContext, oMap,
-	   function(data) {
-		   oDiv.empty();
-		   oDiv.append(data);
-		   if (aSubmit.length > 0)
-		   {
-			    var oForm = $('#ds_'+divId+' form'); // Form was reloaded, recompute it
-				for(var index = 0; index < aSubmit.length; index++)
-				{
+		function (data) {
+			oDiv.empty();
+			oDiv.append(data);
+			if (aSubmit.length > 0) {
+				var oForm = $('#ds_'+divId+' form'); // Form was reloaded, recompute it
+				for (var index = 0; index < aSubmit.length; index++) {
 					// Restore the previously bound submit handlers
 					var sEventName = 'submit';
-					if ((aSubmit[index].namespace != undefined) && (aSubmit[index].namespace != ''))
-					{
+					if ((aSubmit[index].namespace != undefined) && (aSubmit[index].namespace != '')) {
 						sEventName += '.'+aSubmit[index].namespace;
 					}
-					if (aSubmit[index].data != undefined)
-					{
+					if (aSubmit[index].data != undefined) {
 						oForm.bind(sEventName, aSubmit[index].data, aSubmit[index].handler)
 					}
-					else
-					{
+					else {
 						oForm.bind(sEventName, aSubmit[index].handler)
 					}
 				}
-		   }
-		   FixSearchFormsDisposition();
-		   oDiv.unblock();
-		   oDiv.parent().resize(); // Inform the parent that the form has just been (potentially) resized
-	   }
-	 );
+			}
+			FixSearchFormsDisposition();
+			oDiv.unblock();
+			oDiv.parent().resize(); // Inform the parent that the form has just been (potentially) resized
+		}
+	);
 }
 
-function FixSearchFormsDisposition()
-{
+function FixSearchFormsDisposition() {
 	// Fix search forms
-	$('.search_box').each(function() {
+	$('.search_box').each(function () {
 		var colWidth = 0;
 		var labelWidth = 0;
-		$('label:visible', $(this)).each( function() {
-			var l = $(this).parent().width() - $(this).width();
+		$('label:visible', $(this)).each(function () {
+			var l = $(this).parent().width()-$(this).width();
 			colWidth = Math.max(l, colWidth);
 			labelWidth = Math.max($(this).width(), labelWidth);
 		});
-		$('label:visible', $(this)).each( function() {
-			if($(this).data('resized') != true)
-			{
-				$(this).parent().width(colWidth + labelWidth);
-				$(this).width(labelWidth).css({display: 'inline-block'}).data('resized', true);					
+		$('label:visible', $(this)).each(function () {
+			if ($(this).data('resized') != true) {
+				$(this).parent().width(colWidth+labelWidth);
+				$(this).width(labelWidth).css({display: 'inline-block'}).data('resized', true);
 			}
-		});		
+		});
 	});
 
 }
@@ -276,23 +250,19 @@ function FixSearchFormsDisposition()
  * depends on a global variable oUserPreferences created/filled by the iTopWebPage
  * that acts as a local -write through- cache
  */
-function SetUserPreference(sPreferenceCode, sPrefValue, bPersistent)
-{
+function SetUserPreference(sPreferenceCode, sPrefValue, bPersistent) {
 	sPreviousValue = undefined;
-	try
-	{
+	try {
 		sPreviousValue = oUserPreferences[sPreferenceCode];
 	}
-	catch(err)
-	{
+	catch (err) {
 		sPreviousValue = undefined;
 	}
-    oUserPreferences[sPreferenceCode] = sPrefValue;
-    if (bPersistent && (sPrefValue != sPreviousValue))
-    {
-    	ajax_request = $.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php',
-    						  { operation: 'set_pref', code: sPreferenceCode, value: sPrefValue} ); // Make it persistent
-    }
+	oUserPreferences[sPreferenceCode] = sPrefValue;
+	if (bPersistent && (sPrefValue != sPreviousValue)) {
+		ajax_request = $.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php',
+			{operation: 'set_pref', code: sPreferenceCode, value: sPrefValue}); // Make it persistent
+	}
 }
 
 /**
@@ -300,11 +270,9 @@ function SetUserPreference(sPreferenceCode, sPrefValue, bPersistent)
  * depends on a global variable oUserPreferences created/filled by the iTopWebPage
  * that acts as a local -write through- cache
  */
-function GetUserPreference(sPreferenceCode, sDefaultValue)
-{
+function GetUserPreference(sPreferenceCode, sDefaultValue) {
 	var value = sDefaultValue;
-	if ( oUserPreferences[sPreferenceCode] != undefined)
-	{
+	if (oUserPreferences[sPreferenceCode] != undefined) {
 		value = oUserPreferences[sPreferenceCode];
 	}
 	return value;
@@ -313,12 +281,10 @@ function GetUserPreference(sPreferenceCode, sDefaultValue)
 /**
  * Check/uncheck a whole list of checkboxes
  */
-function CheckAll(sSelector, bValue)
-{
+function CheckAll(sSelector, bValue) {
 	var value = bValue;
-	$(sSelector).each( function() {
-		if (this.checked != value)
-		{	
+	$(sSelector).each(function () {
+		if (this.checked != value) {
 			this.checked = value;
 			$(this).trigger('change');
 		}
@@ -329,16 +295,13 @@ function CheckAll(sSelector, bValue)
 /**
  * Toggle (enabled/disabled) the specified field of a form
  */
-function ToogleField(value, field_id)
-{
-	if (value)
-	{
+function ToogleField(value, field_id) {
+	if (value) {
 		$('#'+field_id).removeAttr('disabled');
 		// In case the field is rendered as a div containing several inputs (e.g. RedundancySettings)
 		$('#'+field_id+' :input').removeAttr('disabled');
 	}
-	else
-	{
+	else {
 		$('#'+field_id).attr('disabled', 'disabled');
 		// In case the field is rendered as a div containing several inputs (e.g. RedundancySettings)
 		$('#'+field_id+' :input').attr('disabled', 'disabled');
@@ -351,14 +314,11 @@ function ToogleField(value, field_id)
  * For the fields that cannot be visually disabled, they can be blocked
  * @return
  */
-function BlockField(field_id, bBlocked)
-{
-	if (bBlocked)
-	{
-		$('#'+field_id).block({ message: ' ** disabled ** '});
+function BlockField(field_id, bBlocked) {
+	if (bBlocked) {
+		$('#'+field_id).block({message: ' ** disabled ** '});
 	}
-	else
-	{
+	else {
 		$('#'+field_id).unblock();
 	}
 }
@@ -366,22 +326,17 @@ function BlockField(field_id, bBlocked)
 /**
  * Updates (enables/disables) a "duration" field
  */
-function ToggleDurationField(field_id)
-{
+function ToggleDurationField(field_id) {
 	// Toggle all the subfields that compose the "duration" input
 	aSubFields = new Array('d', 'h', 'm', 's');
-	
-	if ($('#'+field_id).attr('disabled'))
-	{
-		for(var i=0; i<aSubFields.length; i++)
-		{
+
+	if ($('#'+field_id).attr('disabled')) {
+		for (var i = 0; i < aSubFields.length; i++) {
 			$('#'+field_id+'_'+aSubFields[i]).attr('disabled', 'disabled');
 		}
 	}
-	else
-	{
-		for(var i=0; i<aSubFields.length; i++)
-		{
+	else {
+		for (var i = 0; i < aSubFields.length; i++) {
 			$('#'+field_id+'_'+aSubFields[i]).removeAttr('disabled');
 		}
 	}
@@ -390,47 +345,38 @@ function ToggleDurationField(field_id)
 /**
  * PropagateCheckBox
  */
-function PropagateCheckBox(bCurrValue, aFieldsList, bCheck)
-{
-	if (bCurrValue == bCheck)
-	{
-		for(var i=0;i<aFieldsList.length;i++)
-		{
+function PropagateCheckBox(bCurrValue, aFieldsList, bCheck) {
+	if (bCurrValue == bCheck) {
+		for (var i = 0; i < aFieldsList.length; i++) {
 			$('#enable_'+aFieldsList[i]).attr('checked', bCheck);
 			ToogleField(bCheck, aFieldsList[i]);
 		}
 	}
 }
 
-function FixTableSorter(table)
-{
-	if (table[0].config == undefined)
-	{
+function FixTableSorter(table) {
+	if (table[0].config == undefined) {
 		// Table is not sort-able, let's fix it
 		var checkbox = (table.find('th:first :checkbox').length > 0);
-		if (checkbox)
-		{
+		if (checkbox) {
 			// There is a checkbox in the first column, don't make it sort-able
-			table.tablesorter( { headers: { 0: {sorter: false}}, widgets: ['myZebra', 'truncatedList']} ); // sort-able and zebra tables
+			table.tablesorter({headers: {0: {sorter: false}}, widgets: ['myZebra', 'truncatedList']}); // sort-able and zebra tables
 		}
-		else
-		{
+		else {
 			// There is NO checkbox in the first column, all columns are considered sort-able
-			table.tablesorter( { widgets: ['myZebra', 'truncatedList']} ); // sort-able and zebra tables
+			table.tablesorter({widgets: ['myZebra', 'truncatedList']}); // sort-able and zebra tables
 		}
 	}
 }
 
-function DashletCreationDlg(sOQL, sContext)
-{
-	$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php?'+sContext, {operation: 'dashlet_creation_dlg', oql: sOQL}, function(data){
+function DashletCreationDlg(sOQL, sContext) {
+	$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php?'+sContext, {operation: 'dashlet_creation_dlg', oql: sOQL}, function (data) {
 		$('body').append(data);
 	});
 	return false;
 }
 
-function ShortcutListDlg(sOQL, sDataTableId, sContext)
-{
+function ShortcutListDlg(sOQL, sDataTableId, sContext) {
 	var sDataTableName = 'datatable_'+sDataTableId;
 	var oTableSettings = {
 		oColumns: $('#'+sDataTableName).datatable('option', 'oColumns'),
@@ -438,28 +384,22 @@ function ShortcutListDlg(sOQL, sDataTableId, sContext)
 	};
 	var sTableSettings = JSON.stringify(oTableSettings);
 
-	$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php?'+sContext, {operation: 'shortcut_list_dlg', oql: sOQL, table_settings: sTableSettings}, function(data){
+	$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php?'+sContext, {operation: 'shortcut_list_dlg', oql: sOQL, table_settings: sTableSettings}, function (data) {
 		$('body').append(data);
 	});
 	return false;
 }
 
-function ExportListDlg(sOQL, sDataTableId, sFormat, sDlgTitle)
-{
+function ExportListDlg(sOQL, sDataTableId, sFormat, sDlgTitle) {
 	var aFields = [];
-	if (sDataTableId != '')
-	{
+	if (sDataTableId != '') {
 		var sDataTableName = 'datatable_'+sDataTableId;
 		var oColumns = $('#'+sDataTableName).datatable('option', 'oColumns');
-		for(var j in oColumns)
-		{
-			for(var k in oColumns[j])
-			{
-				if (oColumns[j][k].checked)
-				{
+		for (var j in oColumns) {
+			for (var k in oColumns[j]) {
+				if (oColumns[j][k].checked) {
 					var sCode = oColumns[j][k].code;
-					if (sCode == '_key_')
-					{
+					if (sCode == '_key_') {
 						sCode = 'id';
 					}
 					aFields.push(j+'.'+sCode);
@@ -467,50 +407,42 @@ function ExportListDlg(sOQL, sDataTableId, sFormat, sDlgTitle)
 			}
 		}
 	}
-	
+
 	var oParams = {
-			interactive: 1,
-			mode: 'dialog',
-			expression: sOQL,
-			suggested_fields: aFields.join(','),
-			dialog_title: sDlgTitle
+		interactive: 1,
+		mode: 'dialog',
+		expression: sOQL,
+		suggested_fields: aFields.join(','),
+		dialog_title: sDlgTitle
 	};
-	
-	if (sFormat !== null)
-	{
+
+	if (sFormat !== null) {
 		oParams.format = sFormat;
 	}
-	
-	$.post(GetAbsoluteUrlAppRoot()+'webservices/export-v2.php', oParams, function(data) {
+
+	$.post(GetAbsoluteUrlAppRoot()+'webservices/export-v2.php', oParams, function (data) {
 		$('body').append(data);
 	});
 	return false;
 }
 
-function ExportToggleFormat(sFormat)
-{
+function ExportToggleFormat(sFormat) {
 	$('.form_part').hide();
-	for(k in window.aFormParts[sFormat])
-	{
+	for (k in window.aFormParts[sFormat]) {
 		$('#form_part_'+window.aFormParts[sFormat][k]).show().trigger('form-part-activate');
-	}	 
+	}
 }
-		
-function ExportStartExport()
-{
+
+function ExportStartExport() {
 	var oParams = {};
-	$('.form_part:visible :input').each(function() {
-		if (this.name != '')
-		{
-			if ((this.type == 'radio') || (this.type == 'checkbox'))
-			{
-				if (this.checked)
-				{
+	$('.form_part:visible :input').each(function () {
+		if (this.name != '') {
+			if ((this.type == 'radio') || (this.type == 'checkbox')) {
+				if (this.checked) {
 					oParams[this.name] = $(this).val();
 				}
 			}
-			else
-			{
+			else {
 				oParams[this.name] = $(this).val();
 			}
 		}
@@ -521,231 +453,196 @@ function ExportStartExport()
 	oParams.operation = 'export_build';
 	oParams.format = $('#export-form :input[name=format]').val();
 	var sQueryMode = $(':input[name=query_mode]:checked').val();
-	if($(':input[name=query_mode]:checked').length > 0)
-	{
-		if (sQueryMode == 'oql')
-		{
+	if ($(':input[name=query_mode]:checked').length > 0) {
+		if (sQueryMode == 'oql') {
 			oParams.expression = $('#export-form :input[name=expression]').val();
 		}
-		else
-		{	
+		else {
 			oParams.query = $('#export-form :input[name=query]').val();
 		}
 	}
-	else
-	{
+	else {
 		oParams.expression = $('#export-form :input[name=expression]').val();
-		oParams.query = $('#export-form :input[name=query]').val();		
+		oParams.query = $('#export-form :input[name=query]').val();
 	}
-	$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php', oParams, function(data) {
-		if (data == null)
-		{
-			ExportError('Export failed (no data provided), please contact your administrator');
-		}
-		else
-		{
-			ExportRun(data);			
-		}
-	}, 'json')
-	.fail(function() {
-		ExportError('Export failed, please contact your administrator');
-	});
+	$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php', oParams, function (data) {
+			if (data == null) {
+				ExportError('Export failed (no data provided), please contact your administrator');
+			}
+			else {
+				ExportRun(data);
+			}
+		}, 'json')
+		.fail(function () {
+			ExportError('Export failed, please contact your administrator');
+		});
 }
 
-function ExportError(sMessage)
-{
+function ExportError(sMessage) {
 	$('.export-message').html(sMessage);
 	$('.export-progress-bar').hide();
-	$('#export-btn').hide();	
+	$('#export-btn').hide();
 }
-		
-function ExportRun(data)
-{
-	switch(data.code)
-	{
+
+function ExportRun(data) {
+	switch (data.code) {
 		case 'run':
-		// Continue
-		$('.export-progress-bar').progressbar({value: data.percentage });
-		$('.export-message').html(data.message); 
-		oParams = {};
-		oParams.token = data.token;
-		var sDataState = $('#export-form').attr('data-state');
-		if (sDataState == 'cancelled')
-		{
-			oParams.operation = 'export_cancel';
-		}
-		else
-		{
-			oParams.operation = 'export_build';
-		}
-		
-		$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php', oParams, function(data) {
-			ExportRun(data);
-		},
-		'json');
-		break;
+			// Continue
+			$('.export-progress-bar').progressbar({value: data.percentage});
+			$('.export-message').html(data.message);
+			oParams = {};
+			oParams.token = data.token;
+			var sDataState = $('#export-form').attr('data-state');
+			if (sDataState == 'cancelled') {
+				oParams.operation = 'export_cancel';
+			}
+			else {
+				oParams.operation = 'export_build';
+			}
+
+			$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php', oParams, function (data) {
+					ExportRun(data);
+				},
+				'json');
+			break;
 
 		case 'done':
-		$('#export-btn').hide();
-		sMessage = '<a href="'+GetAbsoluteUrlAppRoot()+'pages/ajax.render.php?operation=export_download&token='+data.token+'" target="_blank">'+data.message+'</a>'; 
-		$('.export-message').html(sMessage);
-		$('.export-progress-bar').hide();
-		$('#export-btn').hide();
-		$('#export-form').attr('data-state', 'done');
-		if(data.text_result != undefined)
-		{
-			if (data.mime_type == 'text/html')
-			{
-				$('#export_content').parent().html(data.text_result);
-				$('#export_text_result').show();
-				$('#export_text_result .listResults').tableHover();
-				$('#export_text_result .listResults').tablesorter( { widgets: ['myZebra']} );
-			}
-			else
-			{
-				if ($('#export_text_result').closest('ui-dialog').length == 0)
-				{
-					// not inside a dialog box, adjust the height... approximately
-					var jPane = $('#export_text_result').closest('.ui-layout-content');
-					var iTotalHeight = jPane.height();
-					jPane.children(':visible').each(function() {
-						if ($(this).attr('id') != '')
-						{
-							iTotalHeight -= $(this).height();
-						}
-					});
-					$('#export_content').height(iTotalHeight - 80);
+			$('#export-btn').hide();
+			sMessage = '<a href="'+GetAbsoluteUrlAppRoot()+'pages/ajax.render.php?operation=export_download&token='+data.token+'" target="_blank">'+data.message+'</a>';
+			$('.export-message').html(sMessage);
+			$('.export-progress-bar').hide();
+			$('#export-btn').hide();
+			$('#export-form').attr('data-state', 'done');
+			if (data.text_result != undefined) {
+				if (data.mime_type == 'text/html') {
+					$('#export_content').parent().html(data.text_result);
+					$('#export_text_result').show();
+					$('#export_text_result .listResults').tableHover();
+					$('#export_text_result .listResults').tablesorter({widgets: ['myZebra']});
+				}
+				else {
+					if ($('#export_text_result').closest('ui-dialog').length == 0) {
+						// not inside a dialog box, adjust the height... approximately
+						var jPane = $('#export_text_result').closest('.ui-layout-content');
+						var iTotalHeight = jPane.height();
+						jPane.children(':visible').each(function () {
+							if ($(this).attr('id') != '') {
+								iTotalHeight -= $(this).height();
+							}
+						});
+						$('#export_content').height(iTotalHeight-80);
+					}
+					$('#export_content').val(data.text_result);
+					$('#export_text_result').show();
 				}
-				$('#export_content').val(data.text_result);
-				$('#export_text_result').show();
 			}
-		}
-		$('#export-dlg-submit').button('option', 'label', Dict.S('UI:Button:Done')).button('enable');
-		break;
-		
+			$('#export-dlg-submit').button('option', 'label', Dict.S('UI:Button:Done')).button('enable');
+			break;
+
 		case 'error':
-		$('#export-form').attr('data-state', 'error');
-		$('.export-progress-bar').progressbar({value: data.percentage });
-		$('.export-message').html(data.message); 
-		$('#export-dlg-submit').button('option', 'label', Dict.S('UI:Button:Done')).button('enable');
-		$('#export-btn').hide();
+			$('#export-form').attr('data-state', 'error');
+			$('.export-progress-bar').progressbar({value: data.percentage});
+			$('.export-message').html(data.message);
+			$('#export-dlg-submit').button('option', 'label', Dict.S('UI:Button:Done')).button('enable');
+			$('#export-btn').hide();
 		default:
 	}
 }
-		
-function ExportInitButton(sSelector)
-{
-	$(sSelector).on('click', function() {
+
+function ExportInitButton(sSelector) {
+	$(sSelector).on('click', function () {
 		var sDataState = $('#export-form').attr('data-state');
-		switch(sDataState)
-		{
+		switch (sDataState) {
 			case 'not-yet-started':
-			$('.form_part:visible').each(function() {
-		 		$('#export-form').data('validation_messages', []);
-				var ret = $(this).trigger('validate');
-			});
-			var aMessages = $('#export-form').data('validation_messages');
-		
-			if(aMessages.length > 0)
-			{
-				alert(aMessages.join(''));
-				return;
-			}
-			if ($(this).hasClass('ui-button'))
-			{
-				$(this).button('option', 'label', Dict.S('UI:Button:Cancel'));
-			}
-			else
-			{
-				$(this).html(Dict.S('UI:Button:Cancel'));
-			}
-			$('#export-form').attr('data-state', 'running');
-			ExportStartExport();
-			break;
-		
+				$('.form_part:visible').each(function () {
+					$('#export-form').data('validation_messages', []);
+					var ret = $(this).trigger('validate');
+				});
+				var aMessages = $('#export-form').data('validation_messages');
+
+				if (aMessages.length > 0) {
+					alert(aMessages.join(''));
+					return;
+				}
+				if ($(this).hasClass('ui-button')) {
+					$(this).button('option', 'label', Dict.S('UI:Button:Cancel'));
+				}
+				else {
+					$(this).html(Dict.S('UI:Button:Cancel'));
+				}
+				$('#export-form').attr('data-state', 'running');
+				ExportStartExport();
+				break;
+
 			case 'running':
-			if ($(this).hasClass('ui-button'))
-			{
-				$(this).button('disable');
-			}
-			else
-			{
-				$(this).attr('disabled', 'disabled');
-			}
-			$('#export-form').attr('data-state', 'cancelled');
-			break;
-		
+				if ($(this).hasClass('ui-button')) {
+					$(this).button('disable');
+				}
+				else {
+					$(this).attr('disabled', 'disabled');
+				}
+				$('#export-form').attr('data-state', 'cancelled');
+				break;
+
 			case 'done':
 			case 'error':
-			$('#interactive_export_dlg').dialog('close');			
-			break;
-		
+				$('#interactive_export_dlg').dialog('close');
+				break;
+
 			default:
 			// Do nothing
 		}
 	});
 }
 
-function DisplayHistory(sSelector, sFilter, iCount, iStart)
-{
+function DisplayHistory(sSelector, sFilter, iCount, iStart) {
 	$(sSelector).block();
-	var oParams = { operation: 'history_from_filter', filter: sFilter, start: iStart, count: iCount };
-	$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php', oParams, function(data) {
+	var oParams = {operation: 'history_from_filter', filter: sFilter, start: iStart, count: iCount};
+	$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php', oParams, function (data) {
 			$(sSelector).html(data).unblock();
 		}
 	);
 }
 
 // Very simple equivalent to format: placeholders are %1$s %2$d ...
-function Format()
-{
+function Format() {
 	var args = [];
 	var str = '';
-	if (arguments[0] instanceof Array)
-	{
+	if (arguments[0] instanceof Array) {
 		str = arguments[0][0].toString();
 		args = arguments[0];
 	}
-	else
-	{
-	    str = arguments[0].toString();
-	    if (arguments.length > 1)
-	    {
-	        var t = typeof arguments[1];
-        	args = ("string" === t || "number" === t) ? Array.prototype.slice.call(arguments) : arguments[1];
-	    }
+	else {
+		str = arguments[0].toString();
+		if (arguments.length > 1) {
+			var t = typeof arguments[1];
+			args = ("string" === t || "number" === t) ? Array.prototype.slice.call(arguments) : arguments[1];
+		}
 	}
-    var key;
-    for (key in args)
-    {
-        str = str.replace(new RegExp("\\%" + key + "\\$.", "gi"), args[key]);
-    }
-    
-    return str;
+	var key;
+	for (key in args) {
+		str = str.replace(new RegExp("\\%"+key+"\\$.", "gi"), args[key]);
+	}
+
+	return str;
 }
 
 var Dict = {};
-if (aDictEntries == undefined)
-{
+if (typeof aDictEntries == 'undefined') {
 	Dict._entries = {}; // Entries have not been loaded (we are in the setup ?)
 }
-else
-{
+else {
 	Dict._entries = aDictEntries; // Entries were loaded asynchronously via their own js files	
 }
-Dict.S = function(sEntry)
-{
-	if (sEntry in Dict._entries)
-	{
+Dict.S = function (sEntry) {
+	if (sEntry in Dict._entries) {
 		return Dict._entries[sEntry];
 	}
-	else
-	{
+	else {
 		return sEntry;
 	}
 };
-Dict.Format = function()
-{
+Dict.Format = function () {
 	var args = Array.from(arguments);
 	args[0] = Dict.S(arguments[0]);
 	return Format(args);

From afda182b4edf12a5c745844bdd1ca6c7eed21c9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Mon, 19 Mar 2018 15:51:42 +0000
Subject: [PATCH 068/202] Advanced Search: typo

SVN:b1162[5460]
---
 test/application/search/CriterionConversionTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/application/search/CriterionConversionTest.php b/test/application/search/CriterionConversionTest.php
index 876c4cdc9..e0d20636a 100644
--- a/test/application/search/CriterionConversionTest.php
+++ b/test/application/search/CriterionConversionTest.php
@@ -299,7 +299,7 @@ class CriterionConversionTest extends ItopDataTestCase
 	 * @dataProvider OqlProvider
 	 * @throws \OQLException
 	 */
-	function testOqlToForlSearchToOql($sOQL)
+	function testOqlToForSearchToOql($sOQL)
 	{
 		$oSearchForm = new SearchForm();
 		$oSearch = \DBSearch::FromOQL($sOQL);

From a53a046351607dfc24cb6e28564fc88fafe22dac Mon Sep 17 00:00:00 2001
From: Guillaume Lajarige <guillaume.lajarige@combodo.com>
Date: Tue, 20 Mar 2018 08:19:33 +0000
Subject: [PATCH 069/202] Advanced search: WIP POC, UI/UX.

SVN:b1162[5461]
---
 application/nicewebpage.class.inc.php         |   4 +-
 css/css-variables.scss                        |   2 +-
 css/light-grey.css                            |  68 ++---
 css/light-grey.scss                           |  82 +++---
 js/search/search_form_criteria.js             |  13 +-
 js/search/search_form_criteria_enum.js        | 241 ++++++++++++++++++
 js/search/search_form_handler.js              |  55 ++--
 .../search/searchform.class.inc.php           |   1 +
 8 files changed, 370 insertions(+), 96 deletions(-)
 create mode 100644 js/search/search_form_criteria_enum.js

diff --git a/application/nicewebpage.class.inc.php b/application/nicewebpage.class.inc.php
index 718880b6b..a97d97b00 100644
--- a/application/nicewebpage.class.inc.php
+++ b/application/nicewebpage.class.inc.php
@@ -55,9 +55,7 @@ class NiceWebPage extends WebPage
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria.js');
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_raw.js');
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_string.js');
-
-//	    $this->add_dict_entries('UI:Search:');
-//	    $this->add_dict_entries('UI:Button:');
+	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_enum.js');
 
 	    $this->add_ready_script(
 <<< EOF
diff --git a/css/css-variables.scss b/css/css-variables.scss
index f8973d783..ba5dfddd8 100644
--- a/css/css-variables.scss
+++ b/css/css-variables.scss
@@ -34,4 +34,4 @@ $box-blue-border: 1px solid $box-blue-border-color;
 $box-blue-radius: 1px;
 
 // Beware the version number MUST be enclosed with quotes otherwise v2.3.0 becomes v2 0.3 .0
-$version: "v2.4.0";
\ No newline at end of file
+$version: "v2.4.0";
diff --git a/css/light-grey.css b/css/light-grey.css
index 1c38b0722..5bc713c01 100644
--- a/css/light-grey.css
+++ b/css/light-grey.css
@@ -675,35 +675,6 @@ input.dp-applied {
   float: left;
 }
 /* For search forms */
-/* TODO: Remove when cleaning up old search */
-/*.SearchDrawer {
- //background: $complement-color url(../images/search-top-left-corner.png?v=#{$version}) top left no-repeat;
- border-top: 5px solid $complement-color;
- border-left: 5px solid $complement-color;
- border-right: 5px solid $complement-color;
- border-bottom: 0;
- background: $complement-light;
- color: #000;
- padding: 10px;
- margin: 0;
- font-size: 12px;
- }
- .SearchDrawer label {
- background: $complement-light;
- color: #000;
- text-align: right;
- }
- .SearchDrawer h1 {
- color: #000;
- }
- .SearchDrawer .SearchAttribute{
- > .field_input_zone{
- display: inline-block;
- > .field_select_wrapper{
- display: inline-block;
- }
- }
- }*/
 .mini_tabs a {
   text-decoration: none;
   font-weight: bold;
@@ -744,6 +715,7 @@ input.dp-applied {
   border: 1px solid #3f7294;
   /* Sizing reset */
   /* Hyperlink reset */
+  /* Input reset */
 }
 .search_form_handler * {
   box-sizing: border-box;
@@ -752,6 +724,9 @@ input.dp-applied {
   color: inherit;
   text-decoration: none;
 }
+.search_form_handler input[type="text"] {
+  padding: 1px 2px;
+}
 .search_form_handler.opened .sf_title .sft_toggler {
   transform: rotateX(180deg);
 }
@@ -781,6 +756,11 @@ input.dp-applied {
 .search_form_handler .sf_title .sft_toggler {
   margin-left: 0.7em;
 }
+.search_form_handler .sf_message {
+  display: none;
+  margin: 8px 8px 0px 8px;
+  border-radius: 0px;
+}
 .search_form_handler .sf_criterion_area {
   /*display: none;*/
   padding: 8px 8px 3px 8px;
@@ -872,6 +852,12 @@ input.dp-applied {
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_title {
   padding-right: 35px;
   cursor: pointer;
+  /* Uncomment to try fixed width criteria tabs */
+  /*max-width: 240px;
+   padding-right: 25px;
+   white-space: nowrap;
+   overflow-x: hidden;
+   text-overflow: ellipsis;*/
 }
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group {
   /* Form group (operators) is displayed only when the criteria is toggled to opened state */
@@ -898,6 +884,30 @@ input.dp-applied {
   margin: 0px;
   margin-right: 7px;
 }
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_opc_multichoices label > input {
+  vertical-align: middle;
+  margin-right: 8px;
+}
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_opc_multichoices .sfc_opc_mc_filter {
+  position: relative;
+}
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_opc_multichoices .sfc_opc_mc_filter input {
+  width: 100%;
+}
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_opc_multichoices .sfc_opc_mc_filter .sfc_opc_mcf_picto {
+  position: absolute;
+  right: 5px;
+  top: 5px;
+  opacity: 0.6;
+  user-select: none;
+}
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_opc_multichoices .sfc_opc_mc_items .sfc_opc_mc_item {
+  margin-top: 5px;
+}
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_opc_multichoices .sfc_opc_mc_items .sfc_opc_mc_item label {
+  display: inline-block;
+  width: 100%;
+}
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator.sfc_fg_operator_equals .sfc_op_name, .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator.sfc_fg_operator_contains .sfc_op_name, .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator.sfc_fg_operator_starts_with .sfc_op_name, .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator.sfc_fg_operator_ends_with .sfc_op_name {
   width: 90px;
 }
diff --git a/css/light-grey.scss b/css/light-grey.scss
index c44e020f1..be0388a48 100644
--- a/css/light-grey.scss
+++ b/css/light-grey.scss
@@ -756,36 +756,6 @@ input.dp-applied {
 }
 
 /* For search forms */
-/* TODO: Remove when cleaning up old search */
-/*.SearchDrawer {
-	//background: $complement-color url(../images/search-top-left-corner.png?v=#{$version}) top left no-repeat;
-	border-top: 5px solid $complement-color;
-	border-left: 5px solid $complement-color;
-	border-right: 5px solid $complement-color;
-	border-bottom: 0;
-	background: $complement-light;
-	color: #000;
-	padding: 10px;
-	margin: 0;
-	font-size: 12px;
-}
-.SearchDrawer label {
-	background: $complement-light;
-	color: #000;
-	text-align: right;
-}
-.SearchDrawer h1 {
-	color: #000;
-}
-.SearchDrawer .SearchAttribute{
-	> .field_input_zone{
-		display: inline-block;
-
-		> .field_select_wrapper{
-			display: inline-block;
-		}
-	}
-}*/
 .mini_tabs a {
 	text-decoration: none;
 	font-weight:bold;
@@ -835,6 +805,10 @@ input.dp-applied {
 		color: inherit;
 		text-decoration: none;
 	}
+	/* Input reset */
+	input[type="text"]{
+		padding: 1px 2px;
+	}
 
 	&.opened{
 		.sf_title{
@@ -874,6 +848,11 @@ input.dp-applied {
 			margin-left: 0.7em;
 		}
 	}
+	.sf_message{
+		display: none;
+		margin: 8px 8px 0px 8px;
+		border-radius: 0px;
+	}
 	.sf_criterion_area{
 		/*display: none;*/
 		padding: 8px 8px 3px 8px; /* padding-bottom must equals to padding-top - .search_form_criteria:margin-bottom */
@@ -926,7 +905,8 @@ input.dp-applied {
 			display: inline-block;
 			margin-right: 5px;
 
-            /* Non editable criteria */
+
+			/* Non editable criteria */
 			&.locked{
 				background-color: $gray-extra-light;
 			}
@@ -978,6 +958,12 @@ input.dp-applied {
 			.sfc_title{
 				padding-right: 35px;
 				cursor: pointer;
+				/* Uncomment to try fixed width criteria tabs */
+				/*max-width: 240px;
+				padding-right: 25px;
+				white-space: nowrap;
+				overflow-x: hidden;
+				text-overflow: ellipsis;*/
 			}
 			.sfc_form_group{
 				/* Form group (operators) is displayed only when the criteria is toggled to opened state */
@@ -1003,6 +989,40 @@ input.dp-applied {
 							margin-right: 7px;
 						}
 
+						.sfc_opc_multichoices{
+							label > input{
+								vertical-align: middle;
+								margin-right: 8px;
+							}
+							.sfc_opc_mc_toggler{
+
+							}
+							.sfc_opc_mc_filter{
+								position: relative;
+
+								input{
+									width: 100%;
+								}
+								.sfc_opc_mcf_picto{
+									position: absolute;
+									right: 5px;
+									top: 5px;
+									opacity: 0.6;
+									user-select: none;
+								}
+							}
+							.sfc_opc_mc_items{
+								.sfc_opc_mc_item{
+									margin-top: 5px;
+
+									label{
+										display: inline-block;
+										width: 100%;
+									}
+								}
+							}
+						}
+
 						/* Common operators for most criteria types processing*/
 						&.sfc_fg_operator_equals,
 						&.sfc_fg_operator_contains,
diff --git a/js/search/search_form_criteria.js b/js/search/search_form_criteria.js
index 209b07fed..67ef1c1f1 100644
--- a/js/search/search_form_criteria.js
+++ b/js/search/search_form_criteria.js
@@ -14,12 +14,13 @@ $(function()
 			'operator': '=',
 			'values': [],
 			'oql': '',
-			'is_removable': true,
+			'is_removable': true, // Not used for now. If we come to show locked criterion they will need to have this flag set to false.
+			'is_null_allowed': false,
 
 			'field': {
 				'label': '',
+				'allowed_values': null,
 			},
-
 			// Available operators. They can be extended or restricted by derivated widgets (see this._initOperators() for more informations)
 			'available_operators': {
 				'=': {
@@ -191,7 +192,7 @@ $(function()
 			{
 				oOpElemToFocus = this.element.find('.sfc_fg_operator:first');
 			}
-			oOpElemToFocus.find('.sfc_op_content input:first').trigger('click').trigger('focus');
+			oOpElemToFocus.find('.sfc_op_content input[type="text"]:first').trigger('click').trigger('focus');
 		},
 		_close: function()
 		{
@@ -380,6 +381,8 @@ $(function()
 				// Append to form group
 				oOpElem.appendTo(this.element.find('.sfc_fg_operators'));
 			}
+
+			// TODO: We could hide the radio button if there is only one operator
 		},
 		// - Prepare the buttons (DOM and events) for a criteria
 		_prepareButtons: function()
@@ -440,7 +443,9 @@ $(function()
 				// TODO: Make nice label
 				sTitle = this.options.field.label + ' ' + this.operators[this.options.operator].label + ' ' + this._getValuesAsText();
 			}
-			this.element.find('.sfc_title').text(sTitle);
+			this.element.find('.sfc_title')
+				.text(sTitle)
+				.attr('title', sTitle);
 		},
 
 		// Operators helpers
diff --git a/js/search/search_form_criteria_enum.js b/js/search/search_form_criteria_enum.js
new file mode 100644
index 000000000..a96bbaa20
--- /dev/null
+++ b/js/search/search_form_criteria_enum.js
@@ -0,0 +1,241 @@
+//iTop Search form criteria enum
+;
+$(function()
+{
+	// the widget definition, where 'itop' is the namespace,
+	// 'search_form_criteria_enum' the widget name
+	$.widget( 'itop.search_form_criteria_enum', $.itop.search_form_criteria,
+	{
+		// default options
+		options:
+		{
+			// Overload default operator
+			'operator': 'IN',
+			// Available operators
+			'available_operators': {
+				'IN': {
+					'label': Dict.S('UI:Search:Criteria:Operator:Enum:In'),
+					'code': 'in',
+					'rank': 10,
+				},
+				'=': null,	// Remove this one from enum widget.
+			},
+		},
+
+   
+		// the constructor
+		_create: function()
+		{
+			var me = this;
+
+			this._super();
+			this.element.addClass('search_form_criteria_enum');
+		},
+		// called when created, and later when changing options
+		_refresh: function()
+		{
+
+		},
+		// events bound via _bind are removed automatically
+		// revert other modifications here
+		_destroy: function()
+		{
+			this.element.removeClass('search_form_criteria_enum');
+			this._super();
+		},
+		// _setOptions is called with a hash of all options that are changing
+		// always refresh when changing options
+		_setOptions: function()
+		{
+			this._superApply(arguments);
+		},
+		// _setOption is called for each individual option that is changing
+		_setOption: function( key, value )
+		{
+			this._super( key, value );
+		},
+
+		//------------------
+		// Inherited methods
+		//------------------
+
+		// DOM element helpers
+		// - Prepare element DOM structure
+		_prepareElement: function()
+		{
+			this._super();
+
+			// Remove buttons
+			this.element.find('.sfc_fg_buttons').remove();
+		},
+		_prepareInOperator: function(oOpElem, sOpIdx, oOp)
+		{
+			var me = this;
+
+			// Hide radio & name for now, until there is more than one operator
+			oOpElem.find('.sfc_op_radio, .sfc_op_name').hide();
+
+			// DOM element
+			var sOpId = oOpElem.attr('id');
+			var oOpContentElem = $('<div class="sfc_opc_multichoices"></div>');
+
+			// - Check / Uncheck all togglers
+			var sTogglerId = 'toggle_' + sOpId;
+			var oTogglersElem = $('<div class="sfc_opc_mc_toggler"></div>')
+				.append('<label for="' + sTogglerId + '"><input type="checkbox" id="' + sTogglerId + '" />' + Dict.S('TOTR: CHECK / UNCHECK ALL') + '</label>')
+				.appendTo(oOpContentElem);
+
+			// - Filter
+			var sFilterId = 'filter_' + sOpId;
+			var oFilterElem = $('<div class="sfc_opc_mc_filter"></div>')
+				.append('<input type="text" id="' + sFilterId + '" placeholder="TOTR: FILTER..." /><span class="sfc_opc_mcf_picto fa fa-filter"></span>')
+				.appendTo(oOpContentElem);
+
+			// - Allowed values
+			var oAllowedValuesElem = $('<div class="sfc_opc_mc_items"></div>');
+			if(this.options.field.allowed_values.values !== undefined)
+			{
+				var iValCounter = 0;
+				for(var sValCode in this.options.field.allowed_values.values)
+				{
+					var sItemId = 'value_' + sOpId + '_' + iValCounter;
+					var sValLabel = this.options.field.allowed_values.values[sValCode];
+					var oValueElem = $('<div class="sfc_opc_mc_item" data-value-code="' + sValCode + '"></div>')
+						.append('<label for="' + sItemId + '"><input type="checkbox" id="' + sItemId + '" value="' + sValCode + '"/>' + sValLabel + '</label>')
+						.appendTo(oAllowedValuesElem);
+
+					if(this._isSelectedValues(sValCode))
+					{
+						oValueElem.find(':checkbox').prop('checked', true);
+					}
+
+					iValCounter++;
+				}
+			}
+			oAllowedValuesElem.appendTo(oOpContentElem);
+
+			// Events
+			// - Check / Uncheck all toggler
+			oTogglersElem.on('click', function(oEvent){
+				// Check / uncheck all allowed values
+				var bChecked = $(this).closest('.sfc_opc_mc_toggler').find('input:checkbox').prop('checked');
+				oOpContentElem.find('.sfc_opc_mc_item input:checkbox').prop('checked', bChecked);
+
+				// Apply criteria
+				me._apply();
+			});
+			// - Filter
+			oFilterElem.find('input').on('keyup', function(){
+				var sFilter = $(this).val();
+
+				if(sFilter === '')
+				{
+					oOpContentElem.find('.sfc_opc_mc_item').show();
+				}
+				else
+				{
+					oOpContentElem.find('.sfc_opc_mc_item').each(function(){
+						var oRegExp = new RegExp(sFilter, 'ig');
+						var sValue = $(this).find('input').val();
+						var sLabel = $(this).text();
+
+						if( (sValue.match(oRegExp) !== null) || (sLabel.match(oRegExp) !== null) )
+						{
+							$(this).show();
+						}
+						else
+						{
+							$(this).hide();
+						}
+					});
+				}
+			});
+			// - Apply on check
+			oAllowedValuesElem.find('.sfc_opc_mc_item').on('click', function(){
+				// Uncheck toggler
+				oTogglersElem.find('input:checkbox').prop('checked', false);
+
+				// Apply criteria
+				me._apply();
+			});
+
+			oOpElem.find('.sfc_op_content').append(oOpContentElem);
+		},
+		// Reset operator's state
+		_resetInOperator: function(oOpElem)
+		{
+			// Uncheck toggler
+			oOpElem.find('sfc_opc_mc_toggler input').prop('checked', false);
+
+			// Clear filter
+			oOpElem.find('sfc_opc_mc_filter input').val('');
+		},
+		// Get operator's values
+		_getInOperatorValues: function(oOpElem)
+		{
+			var aValues = [];
+
+			oOpElem.find('.sfc_opc_mc_item input:checked').each(function(iIdx, oElem){
+				var sValue = $(oElem).val();
+				var sLabel = $(oElem).parent().text();
+				aValues.push({value: sValue, label: sLabel});
+			});
+
+			return aValues;
+		},
+		// Set operator's values
+		_setInOperatorValues: function(oOpElem, aValues)
+		{
+			if(aValues.length === 0)
+			{
+				return false;
+			}
+
+			// Uncheck all allowed values
+			oOpElem.find('.sfc_opc_mc_item input').prop('checked', false);
+
+			// Re-check allowed values from param
+			for(var iIdx in aValues)
+			{
+				oOpElem.find('.sfc_opc_mc_item[data-value-code="' + aValues[iIdx].value + '"] input').prop('checked', true);
+			}
+
+			return true;
+		},
+
+
+		// Value helpers
+		// - Return true if sValue is among the selected values "codes"
+		_isSelectedValues: function(sValue)
+		{
+			var bFound = false;
+
+			for(var iValIdx in this.options.values)
+			{
+				if(this.options.values[iValIdx].value === sValue)
+				{
+					bFound = true;
+					break;
+				}
+			}
+
+			return bFound;
+		},
+		// - Return true if sLabel is among the selected values "labels"
+		_isSelectedLabels: function(sLabel)
+		{
+			var bFound = false;
+
+			for(var iValIdx in this.options.values)
+			{
+				if(this.options.values[iValIdx].label === sLabel)
+				{
+					bFound = true;
+					break;
+				}
+			}
+
+			return bFound;
+		},
+	});
+});
diff --git a/js/search/search_form_handler.js b/js/search/search_form_handler.js
index cf62d9e95..005fe35d1 100644
--- a/js/search/search_form_handler.js
+++ b/js/search/search_form_handler.js
@@ -64,13 +64,13 @@ $(function()
 					// },
 				],
 			},
-			'supported_criterion_types': ['raw', 'string'],
 			'default_criteria_type': 'raw',
 		},
 
 		// jQuery elements
 		elements:
 		{
+			message_area: null,
 			active_criterion: null,
 			more_criterion: null,
 			results_area: null,
@@ -216,6 +216,11 @@ $(function()
 		{
 			var me = this;
 
+			// Build DOM elements
+			// - Message area
+			this.elements.message_area = this.element.find('.sf_message');
+			this._cleanMessageArea();
+
 			// Events
 			// - Refresh icon
 			this.element.find('.sft_refresh').on('click', function(oEvent){
@@ -426,6 +431,7 @@ $(function()
 						class_alias: oFieldDef.class_alias,
 						code: oFieldDef.code,
 						widget: oFieldDef.widget,
+						allowed_values: oFieldDef.allowed_values,
 					};
 				}
 
@@ -445,30 +451,18 @@ $(function()
 		// - Find a criteria's type from a field's ref (usually <CLASS_ALIAS>.<ATT_CODE>)
 		_getCriteriaTypeFromFieldRef: function(sRef)
 		{
-			var sType = null;
+			// Fallback for unknown widget types or unknown field refs
+			var sType = this.options.default_criteria_type;
 
 			for(var sListIdx in this.options.search.fields)
 			{
 				if(this.options.search.fields[sListIdx][sRef] !== undefined)
 				{
 					sType = this.options.search.fields[sListIdx][sRef].widget.toLowerCase();
-
-					// Make sure the criteria type is supported, otherwise we might try to initialize a unknown widget.
-					if(this.options.supported_criterion_types.indexOf(sType) < 0)
-					{
-						sType = this.options.default_criteria_type;
-					}
-
 					break;
 				}
 			}
 
-			// Fallback for unknown widget types or unknown field refs
-			if(sType === null)
-			{
-				sType = this.options.default_criteria_type;
-			}
-
 			return sType;
 		},
 		// - Find a criteria's widget name from a criteria's type
@@ -520,6 +514,22 @@ $(function()
 			return oFieldDef;
 		},
 
+		// Message helper
+		_cleanMessageArea: function()
+		{
+			this.elements.message_area
+				.hide()
+				.html('')
+				.removeClass('message_error');
+		},
+		_setErrorMessage: function(sMessage)
+		{
+			this.elements.message_area
+				.addClass('message_error')
+				.html(sMessage)
+				.show();
+		},
+
 		// Button handlers
 		_onSubmitClick: function(oEvent)
 		{
@@ -562,6 +572,7 @@ $(function()
 
 			// Show loader
 			this._showLoader();
+			this._cleanMessageArea();
 
 			// TODO: Make a throttle mecanism or cancel previous call when a newer is made.
 
@@ -582,7 +593,7 @@ $(function()
 		// - Called on form submit failures
 		_onSubmitFailure: function(oData)
 		{
-			// TODO: onSubmitFailure callback. Show oData in a debug or error div.
+			this._setErrorMessage(oData.responseText);
 		},
 		// - Called after form submits
 		_onSubmitAlways: function(oData)
@@ -617,18 +628,6 @@ $(function()
 
 
 		// Debug helpers
-		// - Converts a snake_case string to CamelCase
-		_toCamelCase: function(sString)
-		{
-			var aParts = sString.split('_');
-
-			for(var i in aParts)
-			{
-				aParts[i] = aParts[i].charAt(0).toUpperCase() + aParts[i].substr(1);
-			}
-
-			return aParts.join('');
-		},
 		// - Show a trace in the javascript console
 		_trace: function(sMessage, oData)
 		{
diff --git a/sources/application/search/searchform.class.inc.php b/sources/application/search/searchform.class.inc.php
index 191eeddf1..0229bd757 100644
--- a/sources/application/search/searchform.class.inc.php
+++ b/sources/application/search/searchform.class.inc.php
@@ -118,6 +118,7 @@ class SearchForm
 		$sStyle = (isset($aExtraParams['open']) && ($aExtraParams['open'] == 'true')) ? 'opened' : '';
 		$sHtml .= "<form id=\"fs_{$sSearchFormId}\" action=\"{$sAction}\" class=\"{$sStyle}\">\n"; // Don't use $_SERVER['SCRIPT_NAME'] since the form may be called asynchronously (from ajax.php)
 		$sHtml .= "<h2 class=\"sf_title\"><span class=\"sft_picto fa fa-search\"></span>" . Dict::Format('UI:SearchFor_Class_Objects', $sClassesCombo) . "<a class=\"sft_toggler fa fa-caret-down pull-right\" href=\"#\" title=\"" . Dict::S('UI:Search:Toggle') . "\"></a><a class=\"sft_refresh fa fa-refresh pull-right\" href=\"#\" title=\"" . Dict::S('UI:Button:Refresh') . "\"></a></h2>\n";
+		$sHtml .= "<div id=\"fs_{$sSearchFormId}_message\" class=\"sf_message header_message\"></div>\n";
 		$sHtml .= "<div id=\"fs_{$sSearchFormId}_criterion_outer\">\n";
 		$sHtml .= "</div>\n</form>\n";
 

From 87c5ee67c011891873157bca251f67b74de77bd8 Mon Sep 17 00:00:00 2001
From: Guillaume Lajarige <guillaume.lajarige@combodo.com>
Date: Tue, 20 Mar 2018 09:27:42 +0000
Subject: [PATCH 070/202] Advanced search: I would like to dedicate this commit
 to my beloved colleague, eespie <3

SVN:b1162[5462]
---
 dictionaries/en.dictionary.itop.ui.php | 10 ++++++++++
 dictionaries/fr.dictionary.itop.ui.php | 20 ++++++++++++++++++++
 js/search/search_form_criteria.js      | 14 +++++++++++---
 3 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/dictionaries/en.dictionary.itop.ui.php b/dictionaries/en.dictionary.itop.ui.php
index c770374b8..8c901c0f7 100644
--- a/dictionaries/en.dictionary.itop.ui.php
+++ b/dictionaries/en.dictionary.itop.ui.php
@@ -1372,12 +1372,22 @@ When associated with a trigger, each action is given an "order" number, specifyi
 	'UI:UploadNotSupportedInThisMode' => 'The modification of images or files is not supported in this mode.',
 
 	// TODO: Reorganize those entries with other search entries and make entries for other languages.
+	// Search form
 	'UI:Search:Toggle' => 'Minimize / Expand',
 	'UI:Search:Criterion:MoreMenu:AddCriteria' => 'Add new criteria',
+	// - Operators
 	'UI:Search:Criteria:Operator:Default:Empty' => 'Is empty',
 	'UI:Search:Criteria:Operator:Default:NotEmpty' => 'Is not empty',
 	'UI:Search:Criteria:Operator:Default:Equals' => 'Equals:',
 	'UI:Search:Criteria:Operator:String:Contains' => 'Contains:',
 	'UI:Search:Criteria:Operator:String:StartsWith' => 'Starts with:',
 	'UI:Search:Criteria:Operator:String:EndsWith' => 'Ends with:',
+	// - Criteria titles
+	'UI:Search:Criteria:Title:Default:Empty' => '%1$s is empty',
+	'UI:Search:Criteria:Title:Default:NotEmpty' => '%1$s is not empty',
+	'UI:Search:Criteria:Title:Default:Equals' => '%1$s equals %2$s',
+	'UI:Search:Criteria:Title:String:Contains' => '%1$s contains %2$s',
+	'UI:Search:Criteria:Title:String:StartsWith' => '%1$s starts with %2$s',
+	'UI:Search:Criteria:Title:String:EndsWith' => '%1$s ends with %2$s',
+	'UI:Search:Criteria:Title:Enum:In' => '%1$s in %2$s',
 ));
diff --git a/dictionaries/fr.dictionary.itop.ui.php b/dictionaries/fr.dictionary.itop.ui.php
index 908f9de97..c440b27aa 100644
--- a/dictionaries/fr.dictionary.itop.ui.php
+++ b/dictionaries/fr.dictionary.itop.ui.php
@@ -1199,4 +1199,24 @@ Lors de l\'association à un déclencheur, on attribue à chaque action un numé
 	'UI:Button:ResetImage' => 'Récupérer l\'image initiale',
 	'UI:Button:RemoveImage' => 'Supprimer l\'image',
 	'UI:UploadNotSupportedInThisMode' => 'La modification d\'images ou de fichiers n\'est pas supportée dans ce mode.',
+
+	// TODO: Reorganize those entries with other search entries and make entries for other languages.
+	// Search form
+	'UI:Search:Toggle' => 'Réduire / Ouvrir',
+	'UI:Search:Criterion:MoreMenu:AddCriteria' => 'Ajouter un critère',
+	// - Operators
+	'UI:Search:Criteria:Operator:Default:Empty' => 'Vide',
+	'UI:Search:Criteria:Operator:Default:NotEmpty' => 'Non vide',
+	'UI:Search:Criteria:Operator:Default:Equals' => 'Egal :',
+	'UI:Search:Criteria:Operator:String:Contains' => 'Contient :',
+	'UI:Search:Criteria:Operator:String:StartsWith' => 'Commence par :',
+	'UI:Search:Criteria:Operator:String:EndsWith' => 'Fini par :',
+	// - Criteria titles
+	'UI:Search:Criteria:Title:Default:Empty' => '%1$s vide',
+	'UI:Search:Criteria:Title:Default:NotEmpty' => '%1$s non vide',
+	'UI:Search:Criteria:Title:Default:Equals' => '%1$s égal %2$s',
+	'UI:Search:Criteria:Title:String:Contains' => '%1$s contient %2$s',
+	'UI:Search:Criteria:Title:String:StartsWith' => '%1$s commence par %2$s',
+	'UI:Search:Criteria:Title:String:EndsWith' => '%1$s fini par %2$s',
+	'UI:Search:Criteria:Title:Enum:In' => '%1$s parmi %2$s',
 ));
\ No newline at end of file
diff --git a/js/search/search_form_criteria.js b/js/search/search_form_criteria.js
index 67ef1c1f1..9b74a2a95 100644
--- a/js/search/search_form_criteria.js
+++ b/js/search/search_form_criteria.js
@@ -440,11 +440,19 @@ $(function()
 		{
 			if(sTitle === undefined)
 			{
-				// TODO: Make nice label
-				sTitle = this.options.field.label + ' ' + this.operators[this.options.operator].label + ' ' + this._getValuesAsText();
+				var sOperator = this.operators[this.options.operator].code;
+				var sDictEntry = 'UI:Search:Criteria:Title:' + this._toCamelCase(this.options.field.widget) + ':' + this._toCamelCase(sOperator);
+
+				// Fallback to default widget dict entry if none exists for the current widget
+				if(Dict.S(sDictEntry) === sDictEntry)
+				{
+					sDictEntry = 'UI:Search:Criteria:Title:Default:' + this._toCamelCase(sOperator);
+				}
+
+				sTitle = Dict.Format(sDictEntry, this.options.field.label, this._getValuesAsText());
 			}
 			this.element.find('.sfc_title')
-				.text(sTitle)
+				.html(sTitle)
 				.attr('title', sTitle);
 		},
 

From d04fb645ec6732458926034b0931c67887178239 Mon Sep 17 00:00:00 2001
From: Bruno Da Silva <bruno.dasilva@combodo.com>
Date: Tue, 20 Mar 2018 10:04:33 +0000
Subject: [PATCH 071/202] search widget : delete the "oql" parameter once the
 widget is modified

SVN:b1162[5463]
---
 js/search/search_form_criteria.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/js/search/search_form_criteria.js b/js/search/search_form_criteria.js
index 9b74a2a95..9dcb63aee 100644
--- a/js/search/search_form_criteria.js
+++ b/js/search/search_form_criteria.js
@@ -242,10 +242,17 @@ $(function()
 
 			// Update widget
 			this.options.operator = oActiveOpElem.find('.sfc_op_radio').val();
-			this.options.values = aValues;
-			this._setTitle();
+
+			if (JSON.stringify(this.options.values) != JSON.stringify(aValues))
+			{
+				this.is_modified = true;
+				this.options.oql = '';
+				this.options.values = aValues;
+				this._setTitle();
+			}
 			this._unmarkAsDraft();
 
+
 			// Trigger event to handler
 			this.handler.triggerHandler('itop.search.criteria.value_changed');
 		},

From e33596960a136593954893479f10f4524f7b4f22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Tue, 20 Mar 2018 10:38:52 +0000
Subject: [PATCH 072/202] Advanced Search: Better support of dates in
 expressions

SVN:b1162[5464]
---
 core/dict.class.inc.php                       |  39 +++--
 core/oql/expression.class.inc.php             | 160 +++++++++++++++---
 dictionaries/en.dictionary.itop.ui.php        |  11 ++
 dictionaries/fr.dictionary.itop.ui.php        |  15 +-
 .../criteriontosearchform.class.inc.php       |  51 ++++++
 5 files changed, 230 insertions(+), 46 deletions(-)

diff --git a/core/dict.class.inc.php b/core/dict.class.inc.php
index e3a2a9c8e..0e2cdd466 100644
--- a/core/dict.class.inc.php
+++ b/core/dict.class.inc.php
@@ -20,7 +20,7 @@
  * Class Dict
  * Management of localizable strings 
  *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @copyright   Copyright (C) 2010-2018 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
@@ -65,6 +65,11 @@ class Dict
 	protected static $m_aData = array();
 	protected static $m_sApplicationPrefix = null;
 
+	/**
+	 * @param $sLanguageCode
+	 *
+	 * @throws \DictExceptionUnknownLanguage
+	 */
 	public static function SetDefaultLanguage($sLanguageCode)
 	{
 		if (!array_key_exists($sLanguageCode, self::$m_aLanguages))
@@ -74,6 +79,11 @@ class Dict
 		self::$m_sDefaultLanguage = $sLanguageCode;
 	}
 
+	/**
+	 * @param $sLanguageCode
+	 *
+	 * @throws \DictExceptionUnknownLanguage
+	 */
 	public static function SetUserLanguage($sLanguageCode)
 	{
 		if (!array_key_exists($sLanguageCode, self::$m_aLanguages))
@@ -113,7 +123,6 @@ class Dict
 	 * @param string $sDefault Default value if there is no match in the dictionary
 	 * @param bool $bUserLanguageOnly True to allow the use of the default language as a fallback, false otherwise
 	 *
-	 * @throws DictExceptionMissingString
 	 * @return string
 	 */
 	public static function S($sStringCode, $sDefault = null, $bUserLanguageOnly = false)
@@ -124,7 +133,7 @@ class Dict
 
 		if (!array_key_exists(self::GetUserLanguage(), self::$m_aData))
 		{
-			// It may happen, when something happens before the dictionnaries get loaded
+			// It may happen, when something happens before the dictionaries get loaded
 			return $sStringCode;
 		}
 		$aCurrentDictionary = self::$m_aData[self::GetUserLanguage()];
@@ -155,25 +164,12 @@ class Dict
 		}
 		// Could not find the string...
 		//
-		switch (self::$m_iErrorMode)
+		if (is_null($sDefault))
 		{
-			case DICT_ERR_STRING:
-				if (is_null($sDefault))
-				{
-					return $sStringCode;
-				}
-				else
-				{
-					return $sDefault;
-				}
-				break;
-
-			case DICT_ERR_EXCEPTION:
-			default:
-				throw new DictExceptionMissingString(self::$m_sCurrentLanguage, $sStringCode);
-				break;
+			return $sStringCode;
 		}
-		return 'bug!';
+
+		return $sDefault;
 	}
 
 
@@ -285,6 +281,9 @@ class Dict
 
 	/**
 	 * Clone a string in every language (if it exists in that language)
+	 *
+	 * @param $sSourceCode
+	 * @param $sDestCode
 	 */
 	public static function CloneString($sSourceCode, $sDestCode)
 	{
diff --git a/core/oql/expression.class.inc.php b/core/oql/expression.class.inc.php
index faefb0e25..dd3a73192 100644
--- a/core/oql/expression.class.inc.php
+++ b/core/oql/expression.class.inc.php
@@ -160,7 +160,7 @@ abstract class Expression
 	public function GetCriterion($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
 	{
 		return array(
-			'widget' => AttributeDefinition::SEARCH_WIDGET_TYPE,
+			'widget' => AttributeDefinition::SEARCH_WIDGET_TYPE_RAW,
 			'oql' => $this->Render($aArgs, $bRetrofitParams),
 			'label' => $this->Display($oSearch, $aArgs, $bRetrofitParams, $oAttDef),
 			'source' => get_class($this),
@@ -315,27 +315,6 @@ class BinaryExpression extends Expression
 		return $this->m_sOperator;
 	}
 
-	// recursive rendering
-	public function Display($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
-	{
-		$sOperator = Dict::S($this->GetOperator(), " {$this->GetOperator()} ");
-		$oLeftExpr = $this->GetLeftExpr();
-		if ($oLeftExpr instanceof FieldExpression)
-		{
-			$oAttDef = $oLeftExpr->GetAttDef($oSearch->GetJoinedClasses());
-		}
-		$oRightExpr = $this->GetRightExpr();
-		if ($oRightExpr instanceof FieldExpression)
-		{
-			$oAttDef = $oRightExpr->GetAttDef($oSearch->GetJoinedClasses());
-		}
-
-		$sLeft = $oLeftExpr->Display($oSearch, $aArgs, $bRetrofitParams, $oAttDef);
-		$sRight = $oRightExpr->Display($oSearch, $aArgs, $bRetrofitParams, $oAttDef);
-
-		return "({$sLeft}{$sOperator}{$sRight})";
-	}
-
 	// recursive rendering
 	public function Render(&$aArgs = null, $bRetrofitParams = false)
 	{
@@ -444,6 +423,67 @@ class BinaryExpression extends Expression
 		$this->GetRightExpr()->RenameAlias($sOldName, $sNewName);
 	}
 
+	// recursive rendering
+	public function Display($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
+	{
+		$bReverseOperator = false;
+		$oLeftExpr = $this->GetLeftExpr();
+		if ($oLeftExpr instanceof FieldExpression)
+		{
+			$oAttDef = $oLeftExpr->GetAttDef($oSearch->GetJoinedClasses());
+		}
+		$oRightExpr = $this->GetRightExpr();
+		if ($oRightExpr instanceof FieldExpression)
+		{
+			$oAttDef = $oRightExpr->GetAttDef($oSearch->GetJoinedClasses());
+			$bReverseOperator = true;
+		}
+
+		$sLeft = $oLeftExpr->Display($oSearch, $aArgs, $bRetrofitParams, $oAttDef);
+		$sRight = $oRightExpr->Display($oSearch, $aArgs, $bRetrofitParams, $oAttDef);
+
+		if ($bReverseOperator)
+		{
+			// switch left and right expressions so reverse the operator
+			// Note that the operation is the same so < becomes > and not >=
+			switch ($this->GetOperator())
+			{
+				case '>':
+					$sOperator = '<';
+					break;
+				case '<':
+					$sOperator = '>';
+					break;
+				case '>=':
+					$sOperator = '<=';
+					break;
+				case '<=':
+					$sOperator = '>=';
+					break;
+				default:
+					$sOperator = $this->GetOperator();
+					break;
+			}
+			$sOperator = $this->OperatorToNaturalLanguage($sOperator, $oAttDef);
+
+			return "({$sRight}{$sOperator}{$sLeft})";
+		}
+
+		$sOperator = $this->GetOperator();
+		$sOperator = $this->OperatorToNaturalLanguage($sOperator, $oAttDef);
+
+		return "({$sLeft}{$sOperator}{$sRight})";
+	}
+
+	private function OperatorToNaturalLanguage($sOperator, $oAttDef)
+	{
+		if ($oAttDef instanceof AttributeDateTime)
+		{
+			return Dict::S('Expression:Operator:Date:'.$sOperator, " $sOperator ");
+		}
+
+		return Dict::S('Expression:Operator:'.$sOperator, " $sOperator ");
+	}
 
 	public function GetCriterion($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
 	{
@@ -473,10 +513,10 @@ class BinaryExpression extends Expression
 		$aCriteriaLeft = $oLeftExpr->GetCriterion($oSearch, $aArgs, $bRetrofitParams, $oAttDef);
 		$aCriteriaRight = $oRightExpr->GetCriterion($oSearch, $aArgs, $bRetrofitParams, $oAttDef);
 
-		$aCriteria = array_merge($aCriteriaLeft, $aCriteriaRight);
 
 		if ($bReverseOperator)
 		{
+			$aCriteria = array_merge($aCriteriaRight, $aCriteriaLeft);
 			// switch left and right expressions so reverse the operator
 			// Note that the operation is the same so < becomes > and not >=
 			switch ($this->GetOperator())
@@ -500,6 +540,7 @@ class BinaryExpression extends Expression
 		}
 		else
 		{
+			$aCriteria = array_merge($aCriteriaLeft, $aCriteriaRight);
 			$aCriteria['operator'] = $this->GetOperator();
 		}
 		$aCriteria['oql'] = $this->Render($aArgs, $bRetrofitParams);
@@ -598,7 +639,7 @@ class ScalarExpression extends UnaryExpression
 	 * @param AttributeDefinition $oAttDef
 	 *
 	 * @return array|string
-	 * @throws Exception
+	 * @throws \Exception
 	 */
 	public function Display($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
 	{
@@ -748,7 +789,9 @@ class FieldExpression extends UnaryExpression
 	 * @param AttributeDefinition $oAttDef
 	 *
 	 * @return array|string
-	 * @throws Exception
+	 * @throws \CoreException
+	 * @throws \DictExceptionMissingString
+	 * @throws \Exception
 	 */
 	public function Display($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
 	{
@@ -1458,6 +1501,60 @@ class FunctionExpression extends Expression
 		}
 		return $sRes;
 	}
+
+	public function Display($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
+	{
+		if ($this->m_sVerb != 'DATE_SUB' && $this->m_sVerb != 'DATE_ADD' && $this->m_sVerb != 'NOW')
+		{
+			return $this->Render($aArgs, $bRetrofitParams);
+		}
+		$sOperation = '';
+		switch ($this->m_sVerb)
+		{
+			case 'NOW':
+				$sOperation = '';
+				break;
+			case 'DATE_SUB':
+				$sOperation = '-';
+				break;
+			case 'DATE_ADD':
+				$sOperation = '+';
+				break;
+		}
+
+		foreach($this->m_aArgs as $oExpression)
+		{
+			$sOperation .= $oExpression->Display($oSearch, $aArgs, $bRetrofitParams, $oAttDef);
+		}
+
+		return $sOperation;
+	}
+
+	public function GetCriterion($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
+	{
+		if ($this->m_sVerb != 'DATE_SUB' && $this->m_sVerb != 'DATE_ADD' && $this->m_sVerb != 'NOW')
+		{
+			return parent::GetCriterion($oSearch, $aArgs, $bRetrofitParams, $oAttDef);
+		}
+
+		$aCriteria = array('widget' => 'date_time');
+
+		foreach($this->m_aArgs as $oExpression)
+		{
+			$aCriteria = array_merge($oExpression->GetCriterion($oSearch, $aArgs, $bRetrofitParams, $oAttDef), $aCriteria);
+		}
+
+		if ($this->m_sVerb == 'NOW')
+		{
+			$aCriteria['is_relative'] = true;
+		}
+		else
+		{
+			$aCriteria['verb'] = $this->m_sVerb;
+		}
+
+		return $aCriteria;
+	}
 }
 
 class IntervalExpression extends Expression
@@ -1544,6 +1641,19 @@ class IntervalExpression extends Expression
 	{
 		$this->m_oValue->RenameAlias($sOldName, $sNewName);
 	}
+
+	public function GetCriterion($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
+	{
+		$aCriteria = $this->m_oValue->GetCriterion($oSearch, $aArgs, $bRetrofitParams, $oAttDef);
+		$aCriteria['unit'] = $this->m_sUnit;
+
+		return $aCriteria;
+	}
+
+	public function Display($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
+	{
+		return $this->m_oValue->Render($aArgs, $bRetrofitParams).' '.$this->m_sUnit;
+	}
 }
 
 class CharConcatExpression extends Expression
diff --git a/dictionaries/en.dictionary.itop.ui.php b/dictionaries/en.dictionary.itop.ui.php
index 8c901c0f7..5f69811ca 100644
--- a/dictionaries/en.dictionary.itop.ui.php
+++ b/dictionaries/en.dictionary.itop.ui.php
@@ -311,6 +311,17 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:URP_AttributeGrant/Attribute:attcode+' => 'attribute code',
 ));
 
+//
+// Expression to Natural language
+//
+Dict::Add('EN US', 'English', 'English', array(
+	'Expression:Unit:Short:DAY' => 'd',
+	'Expression:Unit:Short:WEEK' => 'w',
+	'Expression:Unit:Short:MONTH' => 'm',
+	'Expression:Unit:Short:YEAR' => 'y',
+));
+
+
 //
 // String from the User Interface: menu, messages, buttons, etc...
 //
diff --git a/dictionaries/fr.dictionary.itop.ui.php b/dictionaries/fr.dictionary.itop.ui.php
index c440b27aa..afc3544f8 100644
--- a/dictionaries/fr.dictionary.itop.ui.php
+++ b/dictionaries/fr.dictionary.itop.ui.php
@@ -1219,4 +1219,17 @@ Lors de l\'association à un déclencheur, on attribue à chaque action un numé
 	'UI:Search:Criteria:Title:String:StartsWith' => '%1$s commence par %2$s',
 	'UI:Search:Criteria:Title:String:EndsWith' => '%1$s fini par %2$s',
 	'UI:Search:Criteria:Title:Enum:In' => '%1$s parmi %2$s',
-));
\ No newline at end of file
+));
+
+
+//
+// Expression to Natural language
+//
+Dict::Add('FR FR', 'French', 'Français', array(
+	'Expression:Operator:AND' => 'ET',
+	'Expression:Operator:OR' => 'OU',
+	'Expression:Unit:Short:DAY' => 'j',
+	'Expression:Unit:Short:WEEK' => 's',
+	'Expression:Unit:Short:MONTH' => 'm',
+	'Expression:Unit:Short:YEAR' => 'a',
+));
diff --git a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
index 24ce40b57..73ff8ffb4 100644
--- a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
+++ b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
@@ -30,10 +30,17 @@ use AttributeDefinition;
 use Combodo\iTop\Application\Search\CriterionConversionAbstract;
 use DateInterval;
 use DateTime;
+use Dict;
 
 class CriterionToSearchForm extends CriterionConversionAbstract
 {
 
+	/**
+	 * @param array $aAndCriterionRaw
+	 * @param array $aFieldsByCategory
+	 *
+	 * @return array
+	 */
 	public static function Convert($aAndCriterionRaw, $aFieldsByCategory)
 	{
 		$aAllFields = array();
@@ -50,6 +57,8 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 		$aMappingOperatorToFunction = array(
 			AttributeDefinition::SEARCH_WIDGET_TYPE_STRING => 'TextToSearchForm',
 			AttributeDefinition::SEARCH_WIDGET_TYPE_ENUM => 'EnumToSearchForm',
+			AttributeDefinition::SEARCH_WIDGET_TYPE_DATE => 'DateToSearchForm',
+			AttributeDefinition::SEARCH_WIDGET_TYPE_DATE_TIME => 'DateTimeToSearchForm',
 		);
 
 		foreach($aAndCriterionRaw as $aCriteria)
@@ -181,6 +190,7 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 		$aCurrCriterion['values'][] = array('value' => $sLastDate, 'label' => $sLastDate);
 
 		$aCurrCriterion['oql'] = "({$aPrevCriterion['oql']} AND {$aCurrCriterion['oql']})";
+		$aCurrCriterion['label'] = $aPrevCriterion['label'].' '.Dict::S('Expression:Operator:AND', 'AND').' '.$aCurrCriterion['label'];
 
 		$aMergedCriterion[] = $aCurrCriterion;
 
@@ -236,6 +246,7 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 		$aCurrCriterion['values'][] = array('value' => $sLastDate, 'label' => $sLastDate);
 
 		$aCurrCriterion['oql'] = "({$aPrevCriterion['oql']} AND {$aCurrCriterion['oql']})";
+		$aCurrCriterion['label'] = $aPrevCriterion['label'].' '.Dict::S('Expression:Operator:AND', 'AND').' '.$aCurrCriterion['label'];
 
 		$aMergedCriterion[] = $aCurrCriterion;
 
@@ -323,4 +334,44 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 
 		return $aCriteria;
 	}
+
+	protected static function DateToSearchForm($aCriteria, $aFields)
+	{
+		return DateTimeToSearchForm($aCriteria, $aFields);
+	}
+
+	protected static function DateTimeToSearchForm($aCriteria, $aFields)
+	{
+		if (!array_key_exists('is_relative', $aCriteria) || !$aCriteria['is_relative'])
+		{
+			return $aCriteria;
+		}
+
+		if (isset($aCriteria['values'][0]['value']))
+		{
+			$sLabel = $aCriteria['values'][0]['value'];
+			if (isset($aCriteria['verb']))
+			{
+				switch ($aCriteria['verb'])
+				{
+					case 'DATE_SUB':
+						$sLabel = '-'.$sLabel;
+						break;
+					case 'DATE_ADD':
+						$sLabel = '+'.$sLabel;
+						break;
+				}
+			}
+			if (isset($aCriteria['unit']))
+			{
+				$sLabel .= Dict::S('Expression:Unit:Short:'.$aCriteria['unit'], $aCriteria['unit']);
+			}
+			$aCriteria['values'][0]['label'] = $sLabel;
+		}
+
+		// Temporary until the JS widget support relative dates
+		$aCriteria['widget'] = AttributeDefinition::SEARCH_WIDGET_TYPE_RAW;
+
+		return $aCriteria;
+	}
 }
\ No newline at end of file

From e120b149dcaf9379c2a5eb98c5458422bb93ccd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Tue, 20 Mar 2018 12:50:30 +0000
Subject: [PATCH 073/202] Advanced Search: Fix shortcut menu with sub-classes

SVN:b1162[5465]
---
 js/utils.js                                         | 3 ++-
 sources/application/search/searchform.class.inc.php | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/js/utils.js b/js/utils.js
index c1659166e..aded8c386 100644
--- a/js/utils.js
+++ b/js/utils.js
@@ -170,7 +170,7 @@ function UpdateFileName(id, sNewFileName) {
 /**
  * Reload a search form for the specified class
  */
-function ReloadSearchForm(divId, sClassName, sBaseClass, sContext) {
+function ReloadSearchForm(divId, sClassName, sBaseClass, sContext, sTableId) {
 	var oDiv = $('#ds_'+divId);
 	oDiv.block();
 	// deprecated in jQuery 1.8 
@@ -196,6 +196,7 @@ function ReloadSearchForm(divId, sClassName, sBaseClass, sContext) {
 	oMap.className = sClassName;
 	oMap.baseClass = sBaseClass;
 	oMap.currentId = divId;
+	oMap._table_id_ = sTableId;
 	oMap.action = sAction;
 
 	$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php?'+sContext, oMap,
diff --git a/sources/application/search/searchform.class.inc.php b/sources/application/search/searchform.class.inc.php
index 0229bd757..69d82b1e0 100644
--- a/sources/application/search/searchform.class.inc.php
+++ b/sources/application/search/searchform.class.inc.php
@@ -107,7 +107,7 @@ class SearchForm
 			$aOptions[MetaModel::GetName($sClassName)] = "<option selected value=\"$sClassName\">".MetaModel::GetName($sClassName)."</options>\n";
 			ksort($aOptions);
 			$sContext = $oAppContext->GetForLink();
-			$sClassesCombo = "<select name=\"class\" onChange=\"ReloadSearchForm('$sSearchFormId', this.value, '$sRootClass', '$sContext')\">\n".implode('',
+			$sClassesCombo = "<select name=\"class\" onChange=\"ReloadSearchForm('$sSearchFormId', this.value, '$sRootClass', '$sContext', '{$aExtraParams['table_id']}')\">\n".implode('',
 					$aOptions)."</select>\n";
 		}
 		else
@@ -119,8 +119,8 @@ class SearchForm
 		$sHtml .= "<form id=\"fs_{$sSearchFormId}\" action=\"{$sAction}\" class=\"{$sStyle}\">\n"; // Don't use $_SERVER['SCRIPT_NAME'] since the form may be called asynchronously (from ajax.php)
 		$sHtml .= "<h2 class=\"sf_title\"><span class=\"sft_picto fa fa-search\"></span>" . Dict::Format('UI:SearchFor_Class_Objects', $sClassesCombo) . "<a class=\"sft_toggler fa fa-caret-down pull-right\" href=\"#\" title=\"" . Dict::S('UI:Search:Toggle') . "\"></a><a class=\"sft_refresh fa fa-refresh pull-right\" href=\"#\" title=\"" . Dict::S('UI:Button:Refresh') . "\"></a></h2>\n";
 		$sHtml .= "<div id=\"fs_{$sSearchFormId}_message\" class=\"sf_message header_message\"></div>\n";
-		$sHtml .= "<div id=\"fs_{$sSearchFormId}_criterion_outer\">\n";
-		$sHtml .= "</div>\n</form>\n";
+		$sHtml .= "<div id=\"fs_{$sSearchFormId}_criterion_outer\">\n</div>\n";
+		$sHtml .= "</form>\n";
 
 		$aFields = $this->GetFields($oSet);
 		$oSearch = $oSet->GetFilter();
@@ -145,7 +145,7 @@ class SearchForm
 		}
 		if (!array_key_exists('table_inner_id', $aExtraParams))
 		{
-			$aListParams['table_inner_id'] = uniqid('table_inner_id_');
+			$aListParams['table_inner_id'] = "table_inner_id_{$sSearchFormId}";
 		}
 		// When table_id is different of result_list_outer_selector
 		if (array_key_exists('table_id2', $aExtraParams))

From 0c41db76e2e4ecc639436500743f46fbaf03428d Mon Sep 17 00:00:00 2001
From: Bruno Da Silva <bruno.dasilva@combodo.com>
Date: Tue, 20 Mar 2018 13:02:51 +0000
Subject: [PATCH 074/202] search widget : numeric widget

SVN:b1162[5466]
---
 application/nicewebpage.class.inc.php     |   1 +
 dictionaries/en.dictionary.itop.ui.php    |   8 ++
 js/search/search_form_criteria_numeric.js | 162 ++++++++++++++++++++++
 3 files changed, 171 insertions(+)
 create mode 100644 js/search/search_form_criteria_numeric.js

diff --git a/application/nicewebpage.class.inc.php b/application/nicewebpage.class.inc.php
index a97d97b00..8c2da2264 100644
--- a/application/nicewebpage.class.inc.php
+++ b/application/nicewebpage.class.inc.php
@@ -56,6 +56,7 @@ class NiceWebPage extends WebPage
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_raw.js');
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_string.js');
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_enum.js');
+	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_numeric.js');
 
 	    $this->add_ready_script(
 <<< EOF
diff --git a/dictionaries/en.dictionary.itop.ui.php b/dictionaries/en.dictionary.itop.ui.php
index 5f69811ca..6ad50fb44 100644
--- a/dictionaries/en.dictionary.itop.ui.php
+++ b/dictionaries/en.dictionary.itop.ui.php
@@ -1393,6 +1393,14 @@ When associated with a trigger, each action is given an "order" number, specifyi
 	'UI:Search:Criteria:Operator:String:Contains' => 'Contains:',
 	'UI:Search:Criteria:Operator:String:StartsWith' => 'Starts with:',
 	'UI:Search:Criteria:Operator:String:EndsWith' => 'Ends with:',
+	'UI:Search:Criteria:Operator:Numeric:Equals' => '=',
+	'UI:Search:Criteria:Operator:Numeric:GreaterThan' => '>',
+	'UI:Search:Criteria:Operator:Numeric:GreaterThanOrEquals' => '>=',
+	'UI:Search:Criteria:Operator:Numeric:LessThan' => '<',
+	'UI:Search:Criteria:Operator:Numeric:LessThanOrEquals' => '<=',
+	'UI:Search:Criteria:Operator:Numeric:DifferentThan' => 'Different than:',
+	'UI:Search:Criteria:Operator:Numeric:Between' => 'Between:',
+
 	// - Criteria titles
 	'UI:Search:Criteria:Title:Default:Empty' => '%1$s is empty',
 	'UI:Search:Criteria:Title:Default:NotEmpty' => '%1$s is not empty',
diff --git a/js/search/search_form_criteria_numeric.js b/js/search/search_form_criteria_numeric.js
new file mode 100644
index 000000000..91c8b4463
--- /dev/null
+++ b/js/search/search_form_criteria_numeric.js
@@ -0,0 +1,162 @@
+//iTop Search form criteria numeric
+;
+$(function()
+{
+	// the widget definition, where 'itop' is the namespace,
+	// 'search_form_criteria_numeric' the widget name
+	$.widget( 'itop.search_form_criteria_numeric', $.itop.search_form_criteria,
+	{
+		// default options
+		options:
+		{
+			// Overload default operator
+			'operator': '=',
+			// Available operators
+			'available_operators': {
+				'=': {
+					'label': Dict.S('UI:Search:Criteria:Operator:Numeric:Equals'),//pre-existing, label changed
+					'dropdown_group':1,
+				},
+				'>': {
+					'label': Dict.S('UI:Search:Criteria:Operator:Numeric:GreaterThan'),
+					'code': 'greater_than',
+					'rank': 100,
+					'dropdown_group':1,
+				},
+				'>=': {
+					'label': Dict.S('UI:Search:Criteria:Operator:Numeric:GreaterThanOrEquals'),
+					'code': 'greater_than_or_equals',
+					'rank': 200,
+					'dropdown_group':1,
+				},
+				'<': {
+					'label': Dict.S('UI:Search:Criteria:Operator:Numeric:LessThan'),
+					'code': 'less_than',
+					'rank': 300,
+					'dropdown_group':1,
+				},
+				'<=': {
+					'label': Dict.S('UI:Search:Criteria:Operator:Numeric:LessThanOrEquals'),
+					'code': 'less_than_or_equals',
+					'rank': 400,
+					'dropdown_group':1,
+				},
+				'!=': {
+					'label': Dict.S('UI:Search:Criteria:Operator:Numeric:DifferentThan'),
+					'code': 'different',
+					'rank': 500,
+					'dropdown_group':1,
+				},
+				'between': {
+					'label': Dict.S('UI:Search:Criteria:Operator:Numeric:Between'),
+					'code': 'between',
+					'rank': 600,
+				},
+				'empty': {
+					'rank': 700,//pre-existing, reordered
+				},
+				'not_empty': {
+					'rank': 800,//pre-existing, reordered
+				},
+			},
+		},
+
+   
+		// the constructor
+		_create: function()
+		{
+			var me = this;
+
+			this._super();
+			this.element.addClass('search_form_criteria_numeric');
+		},
+		// called when created, and later when changing options
+		_refresh: function()
+		{
+
+		},
+		// events bound via _bind are removed automatically
+		// revert other modifications here
+		_destroy: function()
+		{
+			this.element.removeClass('search_form_criteria_numeric');
+			this._super();
+		},
+		// _setOptions is called with a hash of all options that are changing
+		// always refresh when changing options
+		_setOptions: function()
+		{
+			this._superApply(arguments);
+		},
+		// _setOption is called for each individual option that is changing
+		_setOption: function( key, value )
+		{
+			this._super( key, value );
+		},
+
+		//------------------
+		// Inherited methods
+		//------------------
+
+		//
+		// // Prepare operator's DOM element
+		// // - Base preparation, always called
+		// _prepareOperator: function(oOpElem, sOpIdx, oOp)
+		// {
+		// 	var me = this;
+		// 	if (typeof oOp.dropdown_group == 'undefined')
+		// 	{
+		// 		return this._super(oOpElem, sOpIdx, oOp);
+		// 	}
+		//
+		// 	this._super(oOpElem, sOpIdx, oOp);
+		// 	oOpElem.addClass('force_hide')
+		//
+		// 	// DOM element
+		// 	oDropdown = this.element.find('select.dropdown_group_'+oOp.dropdown_group);
+		// 	if (oDropdown.length == 0)
+		// 	{
+		// 		oDropdown = $('<select class="dropdown_group_'+oOp.dropdown_group+'" data-dropdown-group="'+oOp.dropdown_group+'"></select>');
+		//
+		// 		oDropdown.on('change', function(){
+		// 			$option = $(this);
+		// 			this.element.find('.sfc_op_radio').val($option.val());
+		//
+		// 			oOptionOp = $option.data('oOp');
+		// 			$option.attr('data-operator-code', oOptionOp.code);
+		// 		});
+		//
+		//
+		// 		// Create DOM element from template
+		// 		var oOpElemDropdown = $(this._getOperatorTemplate()).uniqueId();
+		//
+		// 		oOpElemDropdown
+		// 			.addClass('sfc_fg_operator_dropdown_group')
+		// 			.data('data-operator-code', 'dropdown_group')
+		// 			.find('.sfc_op_name')
+		// 				.append(oDropdown)
+		// 			.end()
+		// 			.find('.sfc_op_radio')
+		// 				.val(sOpIdx)
+		// 			.end()
+		// 			.on('click', function(){
+		// 				var bIsChecked = oOpElemDropdown.find('.sfc_op_radio').prop('checked');
+		//
+		// 				if(bIsChecked === false)
+		// 				{
+		// 					oOpElemDropdown.find('.sfc_op_radio').prop('checked', true);
+		// 					me._markAsDraft();
+		// 				}
+		// 			})
+		// 			.appendTo(this.element.find('.sfc_fg_operators'));
+		// 	}
+		//
+		// 	oDropdown
+		// 		.append('<option value="'+sOpIdx+'" >'+oOp.label+'</option>')
+		// 		.data('oOp', oOp)
+		// 	;
+		// },
+
+
+	});
+});

From 2fb0ecc44666f5c18f93cc518cad17c21c7c2ec4 Mon Sep 17 00:00:00 2001
From: Bruno Da Silva <bruno.dasilva@combodo.com>
Date: Tue, 20 Mar 2018 13:03:44 +0000
Subject: [PATCH 075/202] search widget : default width for operator name

SVN:b1162[5467]
---
 css/light-grey.css  | 3 +++
 css/light-grey.scss | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/css/light-grey.css b/css/light-grey.css
index 5bc713c01..94ecc20fa 100644
--- a/css/light-grey.css
+++ b/css/light-grey.css
@@ -884,6 +884,9 @@ input.dp-applied {
   margin: 0px;
   margin-right: 7px;
 }
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_op_name {
+  width: 90px;
+}
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_opc_multichoices label > input {
   vertical-align: middle;
   margin-right: 8px;
diff --git a/css/light-grey.scss b/css/light-grey.scss
index be0388a48..bf1db8864 100644
--- a/css/light-grey.scss
+++ b/css/light-grey.scss
@@ -989,6 +989,10 @@ input.dp-applied {
 							margin-right: 7px;
 						}
 
+						.sfc_op_name{
+							width: 90px;
+						}
+
 						.sfc_opc_multichoices{
 							label > input{
 								vertical-align: middle;

From ca0232ae7b808836c535710678ce034334158b76 Mon Sep 17 00:00:00 2001
From: Guillaume Lajarige <guillaume.lajarige@combodo.com>
Date: Tue, 20 Mar 2018 13:44:10 +0000
Subject: [PATCH 076/202] Advanced search: WIP POC, UI/UX.

SVN:b1162[5468]
---
 application/nicewebpage.class.inc.php         |   5 +-
 css/light-grey.css                            |  47 +++++-
 css/light-grey.scss                           |  46 +++++-
 dictionaries/en.dictionary.itop.ui.php        |  15 +-
 dictionaries/fr.dictionary.itop.ui.php        |  13 +-
 js/search/search_form_criteria_enum.js        |  43 ++++-
 .../search_form_criteria_external_key.js      | 152 ++++++++++++++++++
 7 files changed, 300 insertions(+), 21 deletions(-)
 create mode 100644 js/search/search_form_criteria_external_key.js

diff --git a/application/nicewebpage.class.inc.php b/application/nicewebpage.class.inc.php
index 8c2da2264..d33218c4c 100644
--- a/application/nicewebpage.class.inc.php
+++ b/application/nicewebpage.class.inc.php
@@ -55,8 +55,11 @@ class NiceWebPage extends WebPage
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria.js');
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_raw.js');
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_string.js');
-	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_enum.js');
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_numeric.js');
+	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_enum.js');
+	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_external_key.js');
+
+	    $this->add_dict_entries('UI:Combo');
 
 	    $this->add_ready_script(
 <<< EOF
diff --git a/css/light-grey.css b/css/light-grey.css
index 94ecc20fa..0a1276221 100644
--- a/css/light-grey.css
+++ b/css/light-grey.css
@@ -703,6 +703,9 @@ input.dp-applied {
 /* TODO: Remove comment before final commit */
 .search_box {
   box-sizing: border-box;
+  position: relative;
+  z-index: 1100;
+  /* To be over the table block/unblock UI. Not very sure about this. */
   /* Sizing reset */
 }
 .search_box * {
@@ -724,7 +727,7 @@ input.dp-applied {
   color: inherit;
   text-decoration: none;
 }
-.search_form_handler input[type="text"] {
+.search_form_handler input[type="text"], .search_form_handler select {
   padding: 1px 2px;
 }
 .search_form_handler.opened .sf_title .sft_toggler {
@@ -776,6 +779,7 @@ input.dp-applied {
 }
 .search_form_handler .sf_criterion_area .search_form_criteria, .search_form_handler .sf_criterion_area .sf_more_criterion {
   margin-bottom: 5px;
+  vertical-align: top;
 }
 .search_form_handler .sf_criterion_area .search_form_criteria.opened, .search_form_handler .sf_criterion_area .sf_more_criterion.opened {
   margin-bottom: 0px;
@@ -852,12 +856,12 @@ input.dp-applied {
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_title {
   padding-right: 35px;
   cursor: pointer;
-  /* Uncomment to try fixed width criteria tabs */
-  /*max-width: 240px;
-   padding-right: 25px;
-   white-space: nowrap;
-   overflow-x: hidden;
-   text-overflow: ellipsis;*/
+  /* TODO: Uncomment to try fixed width criteria tabs */
+  max-width: 240px;
+  padding-right: 25px;
+  white-space: nowrap;
+  overflow-x: hidden;
+  text-overflow: ellipsis;
 }
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group {
   /* Form group (operators) is displayed only when the criteria is toggled to opened state */
@@ -893,6 +897,7 @@ input.dp-applied {
 }
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_opc_multichoices .sfc_opc_mc_filter {
   position: relative;
+  margin-top: 8px;
 }
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_opc_multichoices .sfc_opc_mc_filter input {
   width: 100%;
@@ -904,8 +909,25 @@ input.dp-applied {
   opacity: 0.6;
   user-select: none;
 }
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_opc_multichoices .sfc_opc_mc_filter .sfc_opc_mc_reset {
+  display: none;
+}
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_opc_multichoices .sfc_opc_mc_items .sfc_opc_mc_item {
-  margin-top: 5px;
+  margin: 0px -5px 0px -5px;
+  /* -5px to compensate padding and keep aligned to the filter left side */
+  padding: 5px;
+}
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_opc_multichoices .sfc_opc_mc_items .sfc_opc_mc_item:first-of-type {
+  margin-top: 8px;
+}
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_opc_multichoices .sfc_opc_mc_items .sfc_opc_mc_item:hover {
+  padding: 4px;
+  /* Normal padding - border size */
+  background-color: #fff;
+  border: 1px solid #3f7294;
+  /* TODO: Try with this */
+  /*background-color: $box-blue-border-color;
+   color: $white;*/
 }
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_opc_multichoices .sfc_opc_mc_items .sfc_opc_mc_item label {
   display: inline-block;
@@ -970,6 +992,15 @@ input.dp-applied {
 .search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_raw .sfc_form_group {
   display: none;
 }
+.search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_enum .sfc_fg_operator_in > label {
+  display: inline-block;
+  width: 100%;
+  line-height: initial;
+  white-space: nowrap;
+}
+.search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_enum .sfc_fg_operator_in > label .sfc_op_content {
+  width: 100%;
+}
 .search_form_handler .sf_criterion_area .sf_more_criterion.opened {
   z-index: 2;
   /* To be over criterion */
diff --git a/css/light-grey.scss b/css/light-grey.scss
index bf1db8864..e4993e40c 100644
--- a/css/light-grey.scss
+++ b/css/light-grey.scss
@@ -784,6 +784,8 @@ input.dp-applied {
 /* TODO: Remove comment before final commit */
 .search_box{
 	box-sizing: border-box;
+	position: relative;
+	z-index: 1100; /* To be over the table block/unblock UI. Not very sure about this. */
 
 	/* Sizing reset */
 	*{
@@ -806,7 +808,8 @@ input.dp-applied {
 		text-decoration: none;
 	}
 	/* Input reset */
-	input[type="text"]{
+	input[type="text"],
+	select{
 		padding: 1px 2px;
 	}
 
@@ -868,6 +871,7 @@ input.dp-applied {
 		.search_form_criteria,
 		.sf_more_criterion {
 			margin-bottom: 5px;
+			vertical-align: top;
 
 			&.opened{
 				margin-bottom: 0px; /* To compensate the .sfc/.sfm_header:padding-bottom: 13px */
@@ -958,12 +962,12 @@ input.dp-applied {
 			.sfc_title{
 				padding-right: 35px;
 				cursor: pointer;
-				/* Uncomment to try fixed width criteria tabs */
-				/*max-width: 240px;
+				/* TODO: Uncomment to try fixed width criteria tabs */
+				max-width: 240px;
 				padding-right: 25px;
 				white-space: nowrap;
 				overflow-x: hidden;
-				text-overflow: ellipsis;*/
+				text-overflow: ellipsis;
 			}
 			.sfc_form_group{
 				/* Form group (operators) is displayed only when the criteria is toggled to opened state */
@@ -1003,6 +1007,7 @@ input.dp-applied {
 							}
 							.sfc_opc_mc_filter{
 								position: relative;
+								margin-top: 8px;
 
 								input{
 									width: 100%;
@@ -1014,10 +1019,27 @@ input.dp-applied {
 									opacity: 0.6;
 									user-select: none;
 								}
+								.sfc_opc_mc_reset{
+									display: none;
+								}
 							}
 							.sfc_opc_mc_items{
 								.sfc_opc_mc_item{
-									margin-top: 5px;
+									margin: 0px -5px 0px -5px; /* -5px to compensate padding and keep aligned to the filter left side */
+									padding: 5px;
+
+									&:first-of-type{
+										margin-top: 8px;
+									}
+									&:hover{
+										padding: 4px; /* Normal padding - border size */
+										background-color: $white;
+										border: 1px solid $box-blue-border-color;
+										/* TODO: Try with this */
+										/*background-color: $box-blue-border-color;
+										color: $white;*/
+
+									}
 
 									label{
 										display: inline-block;
@@ -1116,6 +1138,20 @@ input.dp-applied {
 					display: none;
 				}
 			}
+			&.search_form_criteria_enum{
+				.sfc_fg_operator_in{
+					> label{
+						display: inline-block;
+						width: 100%;
+						line-height: initial;
+						white-space: nowrap;
+
+						.sfc_op_content{
+							width: 100%;
+						}
+					}
+				}
+			}
 		}
 
 		/* More criterion */
diff --git a/dictionaries/en.dictionary.itop.ui.php b/dictionaries/en.dictionary.itop.ui.php
index 6ad50fb44..120d18357 100644
--- a/dictionaries/en.dictionary.itop.ui.php
+++ b/dictionaries/en.dictionary.itop.ui.php
@@ -1386,7 +1386,7 @@ When associated with a trigger, each action is given an "order" number, specifyi
 	// Search form
 	'UI:Search:Toggle' => 'Minimize / Expand',
 	'UI:Search:Criterion:MoreMenu:AddCriteria' => 'Add new criteria',
-	// - Operators
+	// - Criteria operators
 	'UI:Search:Criteria:Operator:Default:Empty' => 'Is empty',
 	'UI:Search:Criteria:Operator:Default:NotEmpty' => 'Is not empty',
 	'UI:Search:Criteria:Operator:Default:Equals' => 'Equals:',
@@ -1402,11 +1402,22 @@ When associated with a trigger, each action is given an "order" number, specifyi
 	'UI:Search:Criteria:Operator:Numeric:Between' => 'Between:',
 
 	// - Criteria titles
+	//   - Default widget
 	'UI:Search:Criteria:Title:Default:Empty' => '%1$s is empty',
 	'UI:Search:Criteria:Title:Default:NotEmpty' => '%1$s is not empty',
 	'UI:Search:Criteria:Title:Default:Equals' => '%1$s equals %2$s',
+	//   - String widget
 	'UI:Search:Criteria:Title:String:Contains' => '%1$s contains %2$s',
 	'UI:Search:Criteria:Title:String:StartsWith' => '%1$s starts with %2$s',
 	'UI:Search:Criteria:Title:String:EndsWith' => '%1$s ends with %2$s',
-	'UI:Search:Criteria:Title:Enum:In' => '%1$s in %2$s',
+	//   - External key widget
+	'UI:Search:Criteria:Title:ExternalKey:Empty' => '%1$s is defined',
+	'UI:Search:Criteria:Title:ExternalKey:NotEmpty' => '%1$s is not defined',
+	'UI:Search:Criteria:Title:ExternalKey:Equals' => '%1$s %2$s',
+	//   - Enum widget
+	'UI:Search:Criteria:Title:Enum:In' => '%1$s: %2$s',
+	'UI:Search:Criteria:Title:Enum:In:Many' => '%1$s: %2$s and %3$s others',
+	// -
+	'UI:Search:Value:Filter:Placeholder' => 'Filter...',
+	'UI:Search:Value:Toggler:CheckAllNone' => 'Check all / none',
 ));
diff --git a/dictionaries/fr.dictionary.itop.ui.php b/dictionaries/fr.dictionary.itop.ui.php
index afc3544f8..aa0c8c2be 100644
--- a/dictionaries/fr.dictionary.itop.ui.php
+++ b/dictionaries/fr.dictionary.itop.ui.php
@@ -1212,13 +1212,24 @@ Lors de l\'association à un déclencheur, on attribue à chaque action un numé
 	'UI:Search:Criteria:Operator:String:StartsWith' => 'Commence par :',
 	'UI:Search:Criteria:Operator:String:EndsWith' => 'Fini par :',
 	// - Criteria titles
+	//   - Default widget
 	'UI:Search:Criteria:Title:Default:Empty' => '%1$s vide',
 	'UI:Search:Criteria:Title:Default:NotEmpty' => '%1$s non vide',
 	'UI:Search:Criteria:Title:Default:Equals' => '%1$s égal %2$s',
+	//   - String widget
 	'UI:Search:Criteria:Title:String:Contains' => '%1$s contient %2$s',
 	'UI:Search:Criteria:Title:String:StartsWith' => '%1$s commence par %2$s',
 	'UI:Search:Criteria:Title:String:EndsWith' => '%1$s fini par %2$s',
-	'UI:Search:Criteria:Title:Enum:In' => '%1$s parmi %2$s',
+	//   - External key widget
+	'UI:Search:Criteria:Title:ExternalKey:Empty' => '%1$s est rempli',
+	'UI:Search:Criteria:Title:ExternalKey:NotEmpty' => '%1$s n\'est pas rempli',
+	'UI:Search:Criteria:Title:ExternalKey:Equals' => '%1$s %2$s',
+	//   - Enum widget
+	'UI:Search:Criteria:Title:Enum:In' => '%1$s : %2$s',
+	'UI:Search:Criteria:Title:Enum:In:Many' => '%1$s : %2$s et %3$s autres',
+	// -
+	'UI:Search:Value:Filter:Placeholder' => 'Filter...',
+	'UI:Search:Value:Toggler:CheckAllNone' => 'Check all / none',
 ));
 
 
diff --git a/js/search/search_form_criteria_enum.js b/js/search/search_form_criteria_enum.js
index a96bbaa20..4573e0dbe 100644
--- a/js/search/search_form_criteria_enum.js
+++ b/js/search/search_form_criteria_enum.js
@@ -75,20 +75,20 @@ $(function()
 			// Hide radio & name for now, until there is more than one operator
 			oOpElem.find('.sfc_op_radio, .sfc_op_name').hide();
 
-			// DOM element
+			// DOM elements
 			var sOpId = oOpElem.attr('id');
 			var oOpContentElem = $('<div class="sfc_opc_multichoices"></div>');
 
 			// - Check / Uncheck all togglers
 			var sTogglerId = 'toggle_' + sOpId;
 			var oTogglersElem = $('<div class="sfc_opc_mc_toggler"></div>')
-				.append('<label for="' + sTogglerId + '"><input type="checkbox" id="' + sTogglerId + '" />' + Dict.S('TOTR: CHECK / UNCHECK ALL') + '</label>')
+				.append('<label for="' + sTogglerId + '"><input type="checkbox" id="' + sTogglerId + '" />' + Dict.S('UI:Search:Value:Toggler:CheckAllNone') + '</label>')
 				.appendTo(oOpContentElem);
 
 			// - Filter
 			var sFilterId = 'filter_' + sOpId;
 			var oFilterElem = $('<div class="sfc_opc_mc_filter"></div>')
-				.append('<input type="text" id="' + sFilterId + '" placeholder="TOTR: FILTER..." /><span class="sfc_opc_mcf_picto fa fa-filter"></span>')
+				.append('<input type="text" id="' + sFilterId + '" placeholder="' + Dict.S('UI:Search:Value:Filter:Placeholder') + '" /><span class="sfc_opc_mcf_picto sfc_opc_mcf_filter fa fa-filter"></span><span class="sfc_opc_mcf_picto sfc_opc_mcf_reset fa fa-times"></span>')
 				.appendTo(oOpContentElem);
 
 			// - Allowed values
@@ -124,13 +124,18 @@ $(function()
 				// Apply criteria
 				me._apply();
 			});
+
 			// - Filter
-			oFilterElem.find('input').on('keyup', function(){
+			oFilterElem.find('input').on('keyup focus', function(oEvent){
+				// TODO: Move on values with up and down arrow keys; select with space or enter.
+
 				var sFilter = $(this).val();
 
 				if(sFilter === '')
 				{
 					oOpContentElem.find('.sfc_opc_mc_item').show();
+					oFilterElem.find('.sfc_opc_mcf_filter').show();
+					oFilterElem.find('.sfc_opc_mcf_reset').hide();
 				}
 				else
 				{
@@ -148,8 +153,19 @@ $(function()
 							$(this).hide();
 						}
 					});
+					oFilterElem.find('.sfc_opc_mcf_filter').hide();
+					oFilterElem.find('.sfc_opc_mcf_reset').show();
 				}
 			});
+			oFilterElem.find('.sfc_opc_mcf_filter').on('click', function(){
+				oFilterElem.find('input').trigger('focus');
+			});
+			oFilterElem.find('.sfc_opc_mcf_reset').on('click', function(){
+				oFilterElem.find('input')
+					.val('')
+					.trigger('focus');
+			});
+
 			// - Apply on check
 			oAllowedValuesElem.find('.sfc_opc_mc_item').on('click', function(){
 				// Uncheck toggler
@@ -161,6 +177,25 @@ $(function()
 
 			oOpElem.find('.sfc_op_content').append(oOpContentElem);
 		},
+		_setTitle: function(sTitle)
+		{
+			var iValLimit = 3;
+			var iValCount = Object.keys(this.options.values).length;
+			if(iValCount > iValLimit)
+			{
+				var aFirstValues = [];
+				for(var i=0; i<iValLimit-1; i++)
+				{
+					aFirstValues.push(this.options.values[i].label);
+				}
+
+				sTitle = Dict.Format('UI:Search:Criteria:Title:Enum:In:Many', this.options.field.label, aFirstValues.join(', '), (iValCount - iValLimit+1));
+			}
+
+			this._super(sTitle);
+		},
+
+		// Operators helpers
 		// Reset operator's state
 		_resetInOperator: function(oOpElem)
 		{
diff --git a/js/search/search_form_criteria_external_key.js b/js/search/search_form_criteria_external_key.js
new file mode 100644
index 000000000..60ddea2ce
--- /dev/null
+++ b/js/search/search_form_criteria_external_key.js
@@ -0,0 +1,152 @@
+//iTop Search form criteria external key
+;
+$(function()
+{
+	// the widget definition, where 'itop' is the namespace,
+	// 'search_form_criteria_external_key' the widget name
+	$.widget( 'itop.search_form_criteria_external_key', $.itop.search_form_criteria,
+	{
+		// default options
+		options:
+		{
+			// Overload default operator
+			'operator': '=',
+			// Available operators
+			'available_operators': {
+			},
+		},
+
+   
+		// the constructor
+		_create: function()
+		{
+			var me = this;
+
+			this._super();
+			this.element.addClass('search_form_criteria_external_key');
+		},
+		// called when created, and later when changing options
+		_refresh: function()
+		{
+
+		},
+		// events bound via _bind are removed automatically
+		// revert other modifications here
+		_destroy: function()
+		{
+			this.element.removeClass('search_form_criteria_external_key');
+			this._super();
+		},
+		// _setOptions is called with a hash of all options that are changing
+		// always refresh when changing options
+		_setOptions: function()
+		{
+			this._superApply(arguments);
+		},
+		// _setOption is called for each individual option that is changing
+		_setOption: function( key, value )
+		{
+			this._super( key, value );
+		},
+
+		//------------------
+		// Inherited methods
+		//------------------
+
+		// Protected methods
+		// - Cinematic
+		//   - Open / close criteria
+		_open: function()
+		{
+			this._super();
+
+			// Focus on right input
+			var oOpElemToFocus;
+			if(this.element.find('.sfc_form_group').hasClass('advanced'))
+			{
+				oOpElemToFocus = this.element.find('.sfc_fg_operator .sfc_op_radio:checked').closest('.sfc_fg_operator');
+			}
+			else
+			{
+				oOpElemToFocus = this.element.find('.sfc_fg_operator:first');
+			}
+			oOpElemToFocus.find('.sfc_op_content :input:first').trigger('click').trigger('focus');
+		},
+
+		// DOM element helpers
+		// TODO: Remove this function after UX tests
+		_prepareOperators: function()
+		{
+			var me = this;
+
+			this._super();
+
+			if(this.options.field.allowed_values.values !== undefined)
+			{
+				var sSelect = '<select>';
+				sSelect += '<option value="">' + Dict.S('UI:Combo:SelectValue') + '</option>';
+				for(var sValCode in this.options.field.allowed_values.values)
+				{
+					var sValLabel = this.options.field.allowed_values.values[sValCode];
+					sSelect += '<option value="' + sValCode + '">' + sValLabel + '</option>';
+				}
+				sSelect += '</select>';
+				this.element.find('.sfc_fg_operator[data-operator-code="equals"] .sfc_op_content').html(sSelect);
+			}
+			else
+			{
+				this.element.find('.sfc_fg_operator[data-operator-code="equals"] .sfc_op_content').html('Not implemented yet.');
+			}
+
+			this.element.find('.sfc_fg_operator[data-operator-code="equals"] .sfc_op_content select').on('change', function(){
+				me._apply();
+			});
+		},
+
+		// Operators helpers
+		// Reset operator's state
+		// TODO: Reset operator's state
+		// _resetEqualsOperator: function(oOpElem)
+		// {
+		// 	// Uncheck toggler
+		// 	oOpElem.find('sfc_opc_mc_toggler input').prop('checked', false);
+		//
+		// 	// Clear filter
+		// 	oOpElem.find('sfc_opc_mc_filter input').val('');
+		// },
+		// Get operator's values
+		_getEqualsOperatorValues: function(oOpElem)
+		{
+			var aValues = [];
+
+			var sValue = oOpElem.find('.sfc_op_content select > option:selected').val();
+			var sLabel = oOpElem.find('.sfc_op_content select > option:selected').text();
+			if(sValue !== "")
+			{
+				aValues.push({value: sValue, label: sLabel});
+			}
+
+			return aValues;
+		},
+		// Set operator's values
+		// TODO: Set operator's values
+		// _setInOperatorValues: function(oOpElem, aValues)
+		// {
+		// 	if(aValues.length === 0)
+		// 	{
+		// 		return false;
+		// 	}
+		//
+		// 	// Uncheck all allowed values
+		// 	oOpElem.find('.sfc_opc_mc_item input').prop('checked', false);
+		//
+		// 	// Re-check allowed values from param
+		// 	for(var iIdx in aValues)
+		// 	{
+		// 		oOpElem.find('.sfc_opc_mc_item[data-value-code="' + aValues[iIdx].value + '"] input').prop('checked', true);
+		// 	}
+		//
+		// 	return true;
+		// },
+	});
+});

From 1b807892882d5d7b9979552a4a8345ea2121fe5a Mon Sep 17 00:00:00 2001
From: Bruno Da Silva <bruno.dasilva@combodo.com>
Date: Tue, 20 Mar 2018 13:58:33 +0000
Subject: [PATCH 077/202] search widget : numeric widget

SVN:b1162[5469]
---
 css/light-grey.css                        |   3 +
 css/light-grey.scss                       |   4 +
 js/search/search_form_criteria_numeric.js | 154 ++++++++++++++--------
 3 files changed, 103 insertions(+), 58 deletions(-)

diff --git a/css/light-grey.css b/css/light-grey.css
index 0a1276221..c008dd40a 100644
--- a/css/light-grey.css
+++ b/css/light-grey.css
@@ -875,6 +875,9 @@ input.dp-applied {
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator {
   /* Common operators for most criteria types processing*/
 }
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator.force_hide {
+  display: none !important;
+}
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator > label {
   line-height: 20px;
   white-space: nowrap;
diff --git a/css/light-grey.scss b/css/light-grey.scss
index e4993e40c..64958cd62 100644
--- a/css/light-grey.scss
+++ b/css/light-grey.scss
@@ -977,6 +977,10 @@ input.dp-applied {
 					font-size: 12px;
 
 					.sfc_fg_operator{
+						&.force_hide {
+							display: none !important;
+						}
+
 						> label{
 							line-height: 20px;
 							white-space: nowrap;
diff --git a/js/search/search_form_criteria_numeric.js b/js/search/search_form_criteria_numeric.js
index 91c8b4463..8b4802581 100644
--- a/js/search/search_form_criteria_numeric.js
+++ b/js/search/search_form_criteria_numeric.js
@@ -94,68 +94,106 @@ $(function()
 			this._super( key, value );
 		},
 
+
+		// // Prepare operator's DOM element
+		// _prepareBetweenOperator: function(oOpElem, sOpIdx, oOp)
+		// {
+		// 	var me = this;
+		//
+		// 	// DOM element
+		// 	var oOpContentElem = $('<input type="text" />');
+		// 	oOpContentElem.val(this._getValuesAsText());
+		//
+		// 	// Events
+		// 	// - Focus input on click (radio, label, ...)
+		// 	oOpElem.on('click', ':not(input[type="text"])', function(){
+		// 		oOpContentElem.focus();
+		// 	});
+		// 	// - Apply on "enter" key hit
+		// 	oOpContentElem.on('keyup', function(oEvent){
+		// 		// Check operator's radio if not already (typically when focusing in input via "tab" key)
+		// 		if(oOpElem.find('.sfc_op_radio').prop('checked') === false)
+		// 		{
+		// 			oOpElem.find('.sfc_op_radio').prop('checked', true)
+		// 		}
+		//
+		// 		me._markAsDraft();
+		//
+		// 		// Apply if enter key
+		// 		if(oEvent.key === 'Enter')
+		// 		{
+		// 			me._apply();
+		// 		}
+		// 	});
+		//
+		// 	oOpElem.find('.sfc_op_content').append(oOpContentElem);
+		// },
+
 		//------------------
 		// Inherited methods
 		//------------------
 
-		//
-		// // Prepare operator's DOM element
-		// // - Base preparation, always called
-		// _prepareOperator: function(oOpElem, sOpIdx, oOp)
-		// {
-		// 	var me = this;
-		// 	if (typeof oOp.dropdown_group == 'undefined')
-		// 	{
-		// 		return this._super(oOpElem, sOpIdx, oOp);
-		// 	}
-		//
-		// 	this._super(oOpElem, sOpIdx, oOp);
-		// 	oOpElem.addClass('force_hide')
-		//
-		// 	// DOM element
-		// 	oDropdown = this.element.find('select.dropdown_group_'+oOp.dropdown_group);
-		// 	if (oDropdown.length == 0)
-		// 	{
-		// 		oDropdown = $('<select class="dropdown_group_'+oOp.dropdown_group+'" data-dropdown-group="'+oOp.dropdown_group+'"></select>');
-		//
-		// 		oDropdown.on('change', function(){
-		// 			$option = $(this);
-		// 			this.element.find('.sfc_op_radio').val($option.val());
-		//
-		// 			oOptionOp = $option.data('oOp');
-		// 			$option.attr('data-operator-code', oOptionOp.code);
-		// 		});
-		//
-		//
-		// 		// Create DOM element from template
-		// 		var oOpElemDropdown = $(this._getOperatorTemplate()).uniqueId();
-		//
-		// 		oOpElemDropdown
-		// 			.addClass('sfc_fg_operator_dropdown_group')
-		// 			.data('data-operator-code', 'dropdown_group')
-		// 			.find('.sfc_op_name')
-		// 				.append(oDropdown)
-		// 			.end()
-		// 			.find('.sfc_op_radio')
-		// 				.val(sOpIdx)
-		// 			.end()
-		// 			.on('click', function(){
-		// 				var bIsChecked = oOpElemDropdown.find('.sfc_op_radio').prop('checked');
-		//
-		// 				if(bIsChecked === false)
-		// 				{
-		// 					oOpElemDropdown.find('.sfc_op_radio').prop('checked', true);
-		// 					me._markAsDraft();
-		// 				}
-		// 			})
-		// 			.appendTo(this.element.find('.sfc_fg_operators'));
-		// 	}
-		//
-		// 	oDropdown
-		// 		.append('<option value="'+sOpIdx+'" >'+oOp.label+'</option>')
-		// 		.data('oOp', oOp)
-		// 	;
-		// },
+
+		// Prepare operator's DOM element
+		// - Base preparation, always called
+		_prepareOperator: function(oOpElem, sOpIdx, oOp)
+		{
+			var me = this;
+			if (typeof oOp.dropdown_group == 'undefined')
+			{
+				return this._super(oOpElem, sOpIdx, oOp);
+			}
+
+			this._super(oOpElem, sOpIdx, oOp);
+			oOpElem.addClass('force_hide')
+
+			// DOM element
+			oDropdown = this.element.find('select.dropdown_group_'+oOp.dropdown_group);
+			if (oDropdown.length == 0)
+			{
+				oDropdown = $('<select class="dropdown_group_'+oOp.dropdown_group+'" data-dropdown-group="'+oOp.dropdown_group+'"></select>');
+
+				oDropdown.on('change', function(){
+					$option = $(this);
+					me.element.find('.sfc_op_radio').val($option.val());
+
+					oOptionOp = $option.data('oOp');
+					$option.attr('data-operator-code', oOptionOp.code);
+				});
+
+
+				// Create DOM element from template
+				var oOpElemDropdown = $(this._getOperatorTemplate()).uniqueId();
+
+				oOpElemDropdown
+					.addClass('sfc_fg_operator_dropdown_group')
+					.attr('data-operator-code', 'dropdown_group')
+					.find('.sfc_op_name')
+						.append(oDropdown)
+					.end()
+					.find('.sfc_op_radio')
+						.val(sOpIdx)
+					.end()
+					.on('click', function(){
+						var bIsChecked = oOpElemDropdown.find('.sfc_op_radio').prop('checked');
+
+						if(bIsChecked === false)
+						{
+							oOpElemDropdown.find('.sfc_op_radio').prop('checked', true);
+							me._markAsDraft();
+						}
+					})
+					.appendTo(this.element.find('.sfc_fg_operators'))
+				;
+
+				this._prepareDefaultOperator(oOpElemDropdown, sOpIdx, oOp);
+			}
+
+			oDropdown
+				.append('<option value="'+sOpIdx+'" >'+oOp.label+'</option>')
+				.data('oOp', oOp)
+			;
+		},
 
 
 	});

From 1301aa5c35e9d792c2b6664bd211dc2eb1114392 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Tue, 20 Mar 2018 14:12:16 +0000
Subject: [PATCH 078/202] Advanced Search: Fix shortcut menu with sub-classes

SVN:b1162[5470]
---
 core/oql/expression.class.inc.php             | 42 ++++++++++++-------
 .../criteriontooql.class.inc.php              |  4 ++
 .../criteriontosearchform.class.inc.php       | 13 ++++++
 .../search/CriterionConversionTest.php        |  2 +
 4 files changed, 45 insertions(+), 16 deletions(-)

diff --git a/core/oql/expression.class.inc.php b/core/oql/expression.class.inc.php
index dd3a73192..2cea667be 100644
--- a/core/oql/expression.class.inc.php
+++ b/core/oql/expression.class.inc.php
@@ -960,6 +960,7 @@ class FieldExpression extends UnaryExpression
 	 */
 	public function GetCriterion($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
 	{
+		$oAttDef = $this->GetAttDef($oSearch->GetJoinedClasses());
 		if (!is_null($oAttDef))
 		{
 			$sSearchType = $oAttDef->GetSearchType();
@@ -968,7 +969,6 @@ class FieldExpression extends UnaryExpression
 		{
 			$sSearchType = AttributeDefinition::SEARCH_WIDGET_TYPE;
 		}
-
 		return array(
 			'widget' => $sSearchType,
 			'ref' => $this->GetParent().'.'.$this->GetName(),
@@ -1532,25 +1532,35 @@ class FunctionExpression extends Expression
 
 	public function GetCriterion($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
 	{
-		if ($this->m_sVerb != 'DATE_SUB' && $this->m_sVerb != 'DATE_ADD' && $this->m_sVerb != 'NOW')
+		$aCriteria = array();
+		switch ($this->m_sVerb)
 		{
-			return parent::GetCriterion($oSearch, $aArgs, $bRetrofitParams, $oAttDef);
-		}
+			case 'ISNULL':
+				$aCriteria['operator'] = $this->m_sVerb;
+				foreach($this->m_aArgs as $oExpression)
+				{
+					$aCriteria = array_merge($oExpression->GetCriterion($oSearch, $aArgs, $bRetrofitParams, $oAttDef), $aCriteria);
+				}
+				break;
 
-		$aCriteria = array('widget' => 'date_time');
+			case 'NOW':
+				$aCriteria = array('widget' => 'date_time');
+				$aCriteria['is_relative'] = true;
+				$aCriteria['verb'] = $this->m_sVerb;
+				break;
 
-		foreach($this->m_aArgs as $oExpression)
-		{
-			$aCriteria = array_merge($oExpression->GetCriterion($oSearch, $aArgs, $bRetrofitParams, $oAttDef), $aCriteria);
-		}
+			case 'DATE_ADD':
+			case 'DATE_SUB':
+				$aCriteria = array('widget' => 'date_time');
+				foreach($this->m_aArgs as $oExpression)
+				{
+					$aCriteria = array_merge($oExpression->GetCriterion($oSearch, $aArgs, $bRetrofitParams, $oAttDef), $aCriteria);
+				}
+				$aCriteria['verb'] = $this->m_sVerb;
+				break;
 
-		if ($this->m_sVerb == 'NOW')
-		{
-			$aCriteria['is_relative'] = true;
-		}
-		else
-		{
-			$aCriteria['verb'] = $this->m_sVerb;
+			default:
+				return parent::GetCriterion($oSearch, $aArgs, $bRetrofitParams, $oAttDef);
 		}
 
 		return $aCriteria;
diff --git a/sources/application/search/criterionconversion/criteriontooql.class.inc.php b/sources/application/search/criterionconversion/criteriontooql.class.inc.php
index c4fb75e4c..b341c103d 100644
--- a/sources/application/search/criterionconversion/criteriontooql.class.inc.php
+++ b/sources/application/search/criterionconversion/criteriontooql.class.inc.php
@@ -122,6 +122,10 @@ class CriterionToOQL extends CriterionConversionAbstract
 
 	protected static function EmptyToOql($sRef, $aCriteria)
 	{
+		if ($aCriteria['widget'] == AttributeDefinition::SEARCH_WIDGET_TYPE_NUMERIC)
+		{
+			return "ISNULL({$sRef})";
+		}
 		return "({$sRef} = '')";
 	}
 
diff --git a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
index 73ff8ffb4..a376eab97 100644
--- a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
+++ b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
@@ -59,6 +59,7 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 			AttributeDefinition::SEARCH_WIDGET_TYPE_ENUM => 'EnumToSearchForm',
 			AttributeDefinition::SEARCH_WIDGET_TYPE_DATE => 'DateToSearchForm',
 			AttributeDefinition::SEARCH_WIDGET_TYPE_DATE_TIME => 'DateTimeToSearchForm',
+			AttributeDefinition::SEARCH_WIDGET_TYPE_NUMERIC => 'NumericToSearchForm',
 		);
 
 		foreach($aAndCriterionRaw as $aCriteria)
@@ -374,4 +375,16 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 
 		return $aCriteria;
 	}
+
+	protected static function NumericToSearchForm($aCriteria, $aFields)
+	{
+		if ($aCriteria['operator'] == 'ISNULL')
+		{
+			$aCriteria['operator'] = CriterionConversionAbstract::OP_EMPTY;
+		}
+
+		return $aCriteria;
+	}
+
+
 }
\ No newline at end of file
diff --git a/test/application/search/CriterionConversionTest.php b/test/application/search/CriterionConversionTest.php
index e0d20636a..8c77d32c3 100644
--- a/test/application/search/CriterionConversionTest.php
+++ b/test/application/search/CriterionConversionTest.php
@@ -339,6 +339,7 @@ class CriterionConversionTest extends ItopDataTestCase
 	function OqlProvider()
 	{
 		return array(
+			array('OQL' => "SELECT Server WHERE ISNULL(nb_u)"),
 			array('OQL' => "SELECT Contact WHERE status = 'active'"),
 			array('OQL' => "SELECT Contact WHERE status = 'active' AND name LIKE 'toto%'"),
 			array('OQL' => "SELECT Contact WHERE status = 'active' AND org_id = 3"),
@@ -350,6 +351,7 @@ class CriterionConversionTest extends ItopDataTestCase
 			array('OQL' => "SELECT UserRequest WHERE start_date >= '2017-01-01 00:00:00' AND '2017-01-01 00:00:00' >= start_date"),
 			array('OQL' => "SELECT UserRequest WHERE start_date >= '2017-01-01 00:00:00' AND '2017-01-01 01:00:00' > start_date"),
 			array('OQL' => "SELECT UserRequest WHERE start_date >= '2017-01-01 00:00:00' AND '2017-01-02 00:00:00' > start_date"),
+
 		);
 	}
 }

From 27b9748f867809e3a45bc1294a69ba2b47260eaa Mon Sep 17 00:00:00 2001
From: Guillaume Lajarige <guillaume.lajarige@combodo.com>
Date: Tue, 20 Mar 2018 14:17:08 +0000
Subject: [PATCH 079/202] Advanced search: WIP POC, UI/UX.

SVN:b1162[5471]
---
 css/light-grey.css                            |  6 +-
 css/light-grey.scss                           |  6 +-
 dictionaries/en.dictionary.itop.ui.php        |  5 +
 js/search/search_form_criteria.js             |  2 +-
 .../search_form_criteria_external_key.js      | 99 +------------------
 js/search/search_form_criteria_string.js      |  3 +
 6 files changed, 15 insertions(+), 106 deletions(-)

diff --git a/css/light-grey.css b/css/light-grey.css
index c008dd40a..5404a4ed6 100644
--- a/css/light-grey.css
+++ b/css/light-grey.css
@@ -854,14 +854,12 @@ input.dp-applied {
   transition: all 0.3s ease-in-out;
 }
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_title {
-  padding-right: 35px;
-  cursor: pointer;
-  /* TODO: Uncomment to try fixed width criteria tabs */
   max-width: 240px;
-  padding-right: 25px;
+  padding-right: 30px;
   white-space: nowrap;
   overflow-x: hidden;
   text-overflow: ellipsis;
+  cursor: pointer;
 }
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group {
   /* Form group (operators) is displayed only when the criteria is toggled to opened state */
diff --git a/css/light-grey.scss b/css/light-grey.scss
index 64958cd62..ea48cd67f 100644
--- a/css/light-grey.scss
+++ b/css/light-grey.scss
@@ -960,14 +960,12 @@ input.dp-applied {
 			}
 
 			.sfc_title{
-				padding-right: 35px;
-				cursor: pointer;
-				/* TODO: Uncomment to try fixed width criteria tabs */
 				max-width: 240px;
-				padding-right: 25px;
+				padding-right: 30px;
 				white-space: nowrap;
 				overflow-x: hidden;
 				text-overflow: ellipsis;
+				cursor: pointer;
 			}
 			.sfc_form_group{
 				/* Form group (operators) is displayed only when the criteria is toggled to opened state */
diff --git a/dictionaries/en.dictionary.itop.ui.php b/dictionaries/en.dictionary.itop.ui.php
index 120d18357..955cb8e89 100644
--- a/dictionaries/en.dictionary.itop.ui.php
+++ b/dictionaries/en.dictionary.itop.ui.php
@@ -1387,12 +1387,15 @@ When associated with a trigger, each action is given an "order" number, specifyi
 	'UI:Search:Toggle' => 'Minimize / Expand',
 	'UI:Search:Criterion:MoreMenu:AddCriteria' => 'Add new criteria',
 	// - Criteria operators
+	//   - Default widget
 	'UI:Search:Criteria:Operator:Default:Empty' => 'Is empty',
 	'UI:Search:Criteria:Operator:Default:NotEmpty' => 'Is not empty',
 	'UI:Search:Criteria:Operator:Default:Equals' => 'Equals:',
+	//   - String widget
 	'UI:Search:Criteria:Operator:String:Contains' => 'Contains:',
 	'UI:Search:Criteria:Operator:String:StartsWith' => 'Starts with:',
 	'UI:Search:Criteria:Operator:String:EndsWith' => 'Ends with:',
+	//   - Numeric widget
 	'UI:Search:Criteria:Operator:Numeric:Equals' => '=',
 	'UI:Search:Criteria:Operator:Numeric:GreaterThan' => '>',
 	'UI:Search:Criteria:Operator:Numeric:GreaterThanOrEquals' => '>=',
@@ -1414,6 +1417,8 @@ When associated with a trigger, each action is given an "order" number, specifyi
 	'UI:Search:Criteria:Title:ExternalKey:Empty' => '%1$s is defined',
 	'UI:Search:Criteria:Title:ExternalKey:NotEmpty' => '%1$s is not defined',
 	'UI:Search:Criteria:Title:ExternalKey:Equals' => '%1$s %2$s',
+	'UI:Search:Criteria:Title:ExternalKey:In' => '%1$s: %2$s',
+	'UI:Search:Criteria:Title:ExternalKey:In:Many' => '%1$s: %2$s and %3$s others',
 	//   - Enum widget
 	'UI:Search:Criteria:Title:Enum:In' => '%1$s: %2$s',
 	'UI:Search:Criteria:Title:Enum:In:Many' => '%1$s: %2$s and %3$s others',
diff --git a/js/search/search_form_criteria.js b/js/search/search_form_criteria.js
index 9dcb63aee..ca22d3ac9 100644
--- a/js/search/search_form_criteria.js
+++ b/js/search/search_form_criteria.js
@@ -399,7 +399,7 @@ $(function()
 			// DOM elements
 			this.element.find('.sfc_fg_buttons')
 				.append('<button type="button" name="apply" class="sfc_fg_button sfc_fg_apply">' + Dict.S('UI:Button:Apply') + '</button>')
-				.append('<button type="button" name="cancel" class="sfc_fg_button sfc_fg_cancel">' + Dict.S('UI:Button:Cancel') + '</button>')
+				.append('<button type="button" name="cancel" class="sfc_fg_button sfc_fg_cancel">' + Dict.S('UI:Button:Close') + '</button>')
 				.append('<button type="button" name="more" class="sfc_fg_button sfc_fg_more">' + Dict.S('UI:Button:More') + '<span class="fa fa-angle-double-down"></span></button>')
 				.append('<button type="button" name="less" class="sfc_fg_button sfc_fg_less">' + Dict.S('UI:Button:Less') + '<span class="fa fa-angle-double-up"></span></button>');
 
diff --git a/js/search/search_form_criteria_external_key.js b/js/search/search_form_criteria_external_key.js
index 60ddea2ce..572bf87d7 100644
--- a/js/search/search_form_criteria_external_key.js
+++ b/js/search/search_form_criteria_external_key.js
@@ -4,13 +4,13 @@ $(function()
 {
 	// the widget definition, where 'itop' is the namespace,
 	// 'search_form_criteria_external_key' the widget name
-	$.widget( 'itop.search_form_criteria_external_key', $.itop.search_form_criteria,
+	$.widget( 'itop.search_form_criteria_external_key', $.itop.search_form_criteria_enum,
 	{
 		// default options
 		options:
 		{
 			// Overload default operator
-			'operator': '=',
+			'operator': 'IN',
 			// Available operators
 			'available_operators': {
 			},
@@ -53,100 +53,5 @@ $(function()
 		// Inherited methods
 		//------------------
 
-		// Protected methods
-		// - Cinematic
-		//   - Open / close criteria
-		_open: function()
-		{
-			this._super();
-
-			// Focus on right input
-			var oOpElemToFocus;
-			if(this.element.find('.sfc_form_group').hasClass('advanced'))
-			{
-				oOpElemToFocus = this.element.find('.sfc_fg_operator .sfc_op_radio:checked').closest('.sfc_fg_operator');
-			}
-			else
-			{
-				oOpElemToFocus = this.element.find('.sfc_fg_operator:first');
-			}
-			oOpElemToFocus.find('.sfc_op_content :input:first').trigger('click').trigger('focus');
-		},
-
-		// DOM element helpers
-		// TODO: Remove this function after UX tests
-		_prepareOperators: function()
-		{
-			var me = this;
-
-			this._super();
-
-			if(this.options.field.allowed_values.values !== undefined)
-			{
-				var sSelect = '<select>';
-				sSelect += '<option value="">' + Dict.S('UI:Combo:SelectValue') + '</option>';
-				for(var sValCode in this.options.field.allowed_values.values)
-				{
-					var sValLabel = this.options.field.allowed_values.values[sValCode];
-					sSelect += '<option value="' + sValCode + '">' + sValLabel + '</option>';
-				}
-				sSelect += '</select>';
-				this.element.find('.sfc_fg_operator[data-operator-code="equals"] .sfc_op_content').html(sSelect);
-			}
-			else
-			{
-				this.element.find('.sfc_fg_operator[data-operator-code="equals"] .sfc_op_content').html('Not implemented yet.');
-			}
-
-			this.element.find('.sfc_fg_operator[data-operator-code="equals"] .sfc_op_content select').on('change', function(){
-				me._apply();
-			});
-		},
-
-		// Operators helpers
-		// Reset operator's state
-		// TODO: Reset operator's state
-		// _resetEqualsOperator: function(oOpElem)
-		// {
-		// 	// Uncheck toggler
-		// 	oOpElem.find('sfc_opc_mc_toggler input').prop('checked', false);
-		//
-		// 	// Clear filter
-		// 	oOpElem.find('sfc_opc_mc_filter input').val('');
-		// },
-		// Get operator's values
-		_getEqualsOperatorValues: function(oOpElem)
-		{
-			var aValues = [];
-
-			var sValue = oOpElem.find('.sfc_op_content select > option:selected').val();
-			var sLabel = oOpElem.find('.sfc_op_content select > option:selected').text();
-			if(sValue !== "")
-			{
-				aValues.push({value: sValue, label: sLabel});
-			}
-
-			return aValues;
-		},
-		// Set operator's values
-		// TODO: Set operator's values
-		// _setInOperatorValues: function(oOpElem, aValues)
-		// {
-		// 	if(aValues.length === 0)
-		// 	{
-		// 		return false;
-		// 	}
-		//
-		// 	// Uncheck all allowed values
-		// 	oOpElem.find('.sfc_opc_mc_item input').prop('checked', false);
-		//
-		// 	// Re-check allowed values from param
-		// 	for(var iIdx in aValues)
-		// 	{
-		// 		oOpElem.find('.sfc_opc_mc_item[data-value-code="' + aValues[iIdx].value + '"] input').prop('checked', true);
-		// 	}
-		//
-		// 	return true;
-		// },
 	});
 });
diff --git a/js/search/search_form_criteria_string.js b/js/search/search_form_criteria_string.js
index 76f55026e..7359ce2f0 100644
--- a/js/search/search_form_criteria_string.js
+++ b/js/search/search_form_criteria_string.js
@@ -79,15 +79,18 @@ $(function()
 			{
 				// Remove starts/ends_with
 				this.element.find('.sfc_fg_operator[data-operator-code*="with"]').remove();
+
 				// Modify contains with a dropdown
 				this.element.find('.sfc_fg_operator[data-operator-code="contains"] .sfc_op_name')
 					.html('<select style="    padding: 1px 0px;"><option>Contains</option><option>Starts with</option><option>Ends with</option></select>')
 					.css('margin-right', '5px');
+
 				// Remove click event on dropdown
 				this.element.find('.sfc_fg_operator[data-operator-code="contains"] .sfc_op_name').on('click', function(oEvent){
 					oEvent.preventDefault();
 					oEvent.stopPropagation();
 				});
+
 				this.element.find('.sfc_fg_operator[data-operator-code="contains"] .sfc_op_name select').on('change', function(){
 					$(this).closest('.sfc_fg_operator').find('.sfc_op_content input:first').trigger('focus');
 				});

From 9b42af01490aa97f28f63ab1ecff72240ccc1074 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Tue, 20 Mar 2018 14:20:07 +0000
Subject: [PATCH 080/202] Advanced Search: Sort allowed values

SVN:b1162[5472]
---
 sources/application/search/searchform.class.inc.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/sources/application/search/searchform.class.inc.php b/sources/application/search/searchform.class.inc.php
index 69d82b1e0..7caa69df0 100644
--- a/sources/application/search/searchform.class.inc.php
+++ b/sources/application/search/searchform.class.inc.php
@@ -275,7 +275,13 @@ class SearchForm
 			}
 		}
 
-		return array('values' => $oAttrDef->GetAllowedValues());
+		$aAllowedValues = $oAttrDef->GetAllowedValues();
+		if (is_array($aAllowedValues))
+		{
+			asort($aAllowedValues);
+		}
+
+		return array('values' => $aAllowedValues);
 	}
 
 	/**

From 7131a505be23034dbfe6d85701718a56c998694c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Tue, 20 Mar 2018 14:28:40 +0000
Subject: [PATCH 081/202] Advanced Search: Sort allowed values

SVN:b1162[5473]
---
 test/application/search/SearchFormTest.php | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/test/application/search/SearchFormTest.php b/test/application/search/SearchFormTest.php
index 054fdd3bb..21aaec5e9 100644
--- a/test/application/search/SearchFormTest.php
+++ b/test/application/search/SearchFormTest.php
@@ -40,23 +40,29 @@ class SearchFormTest extends ItopDataTestCase
 	}
 
 	/**
+	 * @dataProvider GetFieldsProvider
 	 * @throws \OQLException
 	 */
-	public function testGetFields()
+	public function testGetFields($sOQL, $iNum, $sList)
 	{
 		$oSearchForm = new SearchForm();
-		$oSearch = \DBSearch::FromOQL("SELECT Contact");
+		$oSearch = \DBSearch::FromOQL($sOQL);
 		$aFields = $oSearchForm->GetFields(new \DBObjectSet($oSearch));
 		$this->debug(json_encode($aFields, JSON_PRETTY_PRINT));
-		$this->assertCount(7, $aFields['zlist']);
+		$this->assertCount($iNum, $aFields[$sList]);
 
-		$oSearchForm = new SearchForm();
-		$oSearch = \DBSearch::FromOQL("SELECT Contact AS C WHERE C.status = 'active'");
-		$aFields = $oSearchForm->GetFields(new \DBObjectSet($oSearch));
-		$this->debug(json_encode($aFields, JSON_PRETTY_PRINT));
-		$this->assertCount(4, $aFields['others']);
 	}
 
+	public function GetFieldsProvider()
+	{
+		return array(
+			array("SELECT Contact", 7, 'zlist'),
+			array("SELECT Contact AS C WHERE C.status = 'active'", 4, 'others'),
+			array("SELECT Person", 11, 'zlist'),
+		);
+	}
+
+
 	/**
 	 * @dataProvider GetCriterionProvider
 	 *

From 4abcf75b34b6fd691e09acfe729160e19c975955 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Tue, 20 Mar 2018 14:36:52 +0000
Subject: [PATCH 082/202] Advanced Search: Revert Sort on allowed values (done
 by JavaScript)

SVN:b1162[5474]
---
 sources/application/search/searchform.class.inc.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/sources/application/search/searchform.class.inc.php b/sources/application/search/searchform.class.inc.php
index 7caa69df0..ab222175e 100644
--- a/sources/application/search/searchform.class.inc.php
+++ b/sources/application/search/searchform.class.inc.php
@@ -276,10 +276,6 @@ class SearchForm
 		}
 
 		$aAllowedValues = $oAttrDef->GetAllowedValues();
-		if (is_array($aAllowedValues))
-		{
-			asort($aAllowedValues);
-		}
 
 		return array('values' => $aAllowedValues);
 	}

From a5e41b224f7482b6461fb932ae183e9f82a85cd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Tue, 20 Mar 2018 14:44:43 +0000
Subject: [PATCH 083/202] Advanced Search: Support '=' for external keys

SVN:b1162[5475]
---
 .../criteriontosearchform.class.inc.php               | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
index a376eab97..0a0bc1bb7 100644
--- a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
+++ b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
@@ -60,6 +60,7 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 			AttributeDefinition::SEARCH_WIDGET_TYPE_DATE => 'DateToSearchForm',
 			AttributeDefinition::SEARCH_WIDGET_TYPE_DATE_TIME => 'DateTimeToSearchForm',
 			AttributeDefinition::SEARCH_WIDGET_TYPE_NUMERIC => 'NumericToSearchForm',
+			AttributeDefinition::SEARCH_WIDGET_TYPE_EXTERNAL_KEY => 'ExternalKeyToSearchForm',
 		);
 
 		foreach($aAndCriterionRaw as $aCriteria)
@@ -387,4 +388,14 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 	}
 
 
+	protected static function ExternalKeyToSearchForm($aCriteria, $aFields)
+	{
+		if ($aCriteria['operator'] == '=')
+		{
+			$aCriteria['operator'] = CriterionConversionAbstract::OP_IN;
+		}
+
+		return $aCriteria;
+	}
+
 }
\ No newline at end of file

From 306ec09118cfc6a2157b93dcf8d352907493e3a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Tue, 20 Mar 2018 15:04:33 +0000
Subject: [PATCH 084/202] Advanced Search: Support '=', '!=', 'IN' and 'NOT IN'
 for enums and external keys (with empty/not empty and IN)

SVN:b1162[5476]
---
 .../criteriontosearchform.class.inc.php       | 117 ++++++++++++------
 1 file changed, 77 insertions(+), 40 deletions(-)

diff --git a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
index 0a0bc1bb7..be6adc83e 100644
--- a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
+++ b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
@@ -297,44 +297,7 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 
 	protected static function EnumToSearchForm($aCriteria, $aFields)
 	{
-		$sOperator = $aCriteria['operator'];
-		if ($sOperator == '=')
-		{
-			$aCriteria['operator'] = 'IN';
-		}
-		if ($sOperator != 'NOT IN')
-		{
-			return $aCriteria;
-		}
-		$sRef = $aCriteria['ref'];
-		$aValues = $aCriteria['values'];
-		if (array_key_exists($sRef, $aFields))
-		{
-			$aField = $aFields[$sRef];
-			if (array_key_exists('allowed_values', $aField) && array_key_exists('values', $aField['allowed_values']))
-			{
-				$aAllowedValues = $aField['allowed_values']['values'];
-			}
-		}
-
-		if (isset($aAllowedValues))
-		{
-			foreach($aValues as $aValue)
-			{
-				$sValue = $aValue['value'];
-				unset($aAllowedValues[$sValue]);
-			}
-			$aCriteria['values'] = array();
-
-			foreach($aAllowedValues as $sValue => $sLabel)
-			{
-				$aValue = array('value' => $sValue, 'label' => $sLabel);
-				$aCriteria['values'][] = $aValue;
-			}
-			$aCriteria['operator'] = 'IN';
-		}
-
-		return $aCriteria;
+		return self::ExternalKeyToSearchForm($aCriteria, $aFields);
 	}
 
 	protected static function DateToSearchForm($aCriteria, $aFields)
@@ -390,9 +353,83 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 
 	protected static function ExternalKeyToSearchForm($aCriteria, $aFields)
 	{
-		if ($aCriteria['operator'] == '=')
+		$sOperator = $aCriteria['operator'];
+		switch ($sOperator)
 		{
-			$aCriteria['operator'] = CriterionConversionAbstract::OP_IN;
+			case '=':
+				if (!isset($aCriteria['values'][0]))
+				{
+					$aCriteria['operator'] = CriterionConversionAbstract::OP_EMPTY;
+				}
+				else
+				{
+					$aCriteria['operator'] = CriterionConversionAbstract::OP_IN;
+				}
+				break;
+			case '!=':
+				if (!isset($aCriteria['values'][0]))
+				{
+					$aCriteria['operator'] = CriterionConversionAbstract::OP_NOT_EMPTY;
+				}
+				else
+				{
+					// Same as NOT IN
+					$aCriteria = self::RevertValues($aCriteria, $aFields);
+				}
+				break;
+			case 'NOT IN':
+				$aCriteria = self::RevertValues($aCriteria, $aFields);
+				break;
+			case 'IN':
+				break;
+			default:
+				// Unknown operator
+				$aCriteria['widget'] = AttributeDefinition::SEARCH_WIDGET_TYPE_RAW;
+				break;
+		}
+
+		return $aCriteria;
+	}
+
+	/**
+	 * @param $aCriteria
+	 * @param $aFields
+	 *
+	 * @return mixed
+	 */
+	protected static function RevertValues($aCriteria, $aFields)
+	{
+		$sRef = $aCriteria['ref'];
+		$aValues = $aCriteria['values'];
+		if (array_key_exists($sRef, $aFields))
+		{
+			$aField = $aFields[$sRef];
+			if (array_key_exists('allowed_values', $aField) && array_key_exists('values', $aField['allowed_values']))
+			{
+				$aAllowedValues = $aField['allowed_values']['values'];
+			}
+			else
+			{
+				// Can't obtain the list of allowed values, just set as unknown
+				$aCriteria['widget'] = AttributeDefinition::SEARCH_WIDGET_TYPE_RAW;
+			}
+		}
+
+		if (isset($aAllowedValues))
+		{
+			foreach($aValues as $aValue)
+			{
+				$sValue = $aValue['value'];
+				unset($aAllowedValues[$sValue]);
+			}
+			$aCriteria['values'] = array();
+
+			foreach($aAllowedValues as $sValue => $sLabel)
+			{
+				$aValue = array('value' => $sValue, 'label' => $sLabel);
+				$aCriteria['values'][] = $aValue;
+			}
+			$aCriteria['operator'] = 'IN';
 		}
 
 		return $aCriteria;

From fbd7abf4e2cb47fc0e1df7e87a1d052825714247 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Tue, 20 Mar 2018 15:07:19 +0000
Subject: [PATCH 085/202] Advanced Search: Fix 'undefined index error' in
 'empty' operator

SVN:b1162[5477]
---
 .../search/criterionconversion/criteriontooql.class.inc.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sources/application/search/criterionconversion/criteriontooql.class.inc.php b/sources/application/search/criterionconversion/criteriontooql.class.inc.php
index b341c103d..da70708d3 100644
--- a/sources/application/search/criterionconversion/criteriontooql.class.inc.php
+++ b/sources/application/search/criterionconversion/criteriontooql.class.inc.php
@@ -122,7 +122,7 @@ class CriterionToOQL extends CriterionConversionAbstract
 
 	protected static function EmptyToOql($sRef, $aCriteria)
 	{
-		if ($aCriteria['widget'] == AttributeDefinition::SEARCH_WIDGET_TYPE_NUMERIC)
+		if (isset($aCriteria['widget']) && ($aCriteria['widget'] == AttributeDefinition::SEARCH_WIDGET_TYPE_NUMERIC))
 		{
 			return "ISNULL({$sRef})";
 		}

From 92a08a1865bf17ad9d79b3a8df5cb8f32b44d2de Mon Sep 17 00:00:00 2001
From: Guillaume Lajarige <guillaume.lajarige@combodo.com>
Date: Tue, 20 Mar 2018 15:12:36 +0000
Subject: [PATCH 086/202] Advanced search: WIP POC, UI/UX.

SVN:b1162[5478]
---
 js/search/search_form_criteria_raw.js | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/js/search/search_form_criteria_raw.js b/js/search/search_form_criteria_raw.js
index 21185be80..ca7f27244 100644
--- a/js/search/search_form_criteria_raw.js
+++ b/js/search/search_form_criteria_raw.js
@@ -9,6 +9,7 @@ $(function()
 		// default options
 		options:
 		{
+			'label': '', // Computed by server
 		},
    
 		// the constructor
@@ -71,14 +72,7 @@ $(function()
 		{
 			if(sTitle === undefined)
 			{
-				if(this.options.oql !== '')
-				{
-					sTitle = this.options.oql;
-				}
-				else
-				{
-					sTitle = this._makeOQLExpression();
-				}
+				sTitle = this.options.label;
 			}
 			this._super(sTitle);
 		},

From 4295437b3ed5024f31407e78e41fb2fbbdfecc85 Mon Sep 17 00:00:00 2001
From: Guillaume Lajarige <guillaume.lajarige@combodo.com>
Date: Tue, 20 Mar 2018 15:34:27 +0000
Subject: [PATCH 087/202] Advanced search: WIP POC, UI/UX.

SVN:b1162[5479]
---
 js/search/search_form_criteria_enum.js | 30 ++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/js/search/search_form_criteria_enum.js b/js/search/search_form_criteria_enum.js
index 4573e0dbe..f7559858b 100644
--- a/js/search/search_form_criteria_enum.js
+++ b/js/search/search_form_criteria_enum.js
@@ -95,11 +95,14 @@ $(function()
 			var oAllowedValuesElem = $('<div class="sfc_opc_mc_items"></div>');
 			if(this.options.field.allowed_values.values !== undefined)
 			{
+				var aSortedValues = this._sortValuesByLabel(this.options.field.allowed_values.values);
+
 				var iValCounter = 0;
-				for(var sValCode in this.options.field.allowed_values.values)
+				for(var i in aSortedValues)
 				{
 					var sItemId = 'value_' + sOpId + '_' + iValCounter;
-					var sValLabel = this.options.field.allowed_values.values[sValCode];
+					var sValCode = aSortedValues[i][0];
+					var sValLabel = aSortedValues[i][1];
 					var oValueElem = $('<div class="sfc_opc_mc_item" data-value-code="' + sValCode + '"></div>')
 						.append('<label for="' + sItemId + '"><input type="checkbox" id="' + sItemId + '" value="' + sValCode + '"/>' + sValLabel + '</label>')
 						.appendTo(oAllowedValuesElem);
@@ -272,5 +275,28 @@ $(function()
 
 			return bFound;
 		},
+		// - Return an array of allowed values sorted by labels
+		_sortValuesByLabel: function(oSource)
+		{
+			var aSortable = [];
+			for (var sKey in oSource) {
+				aSortable.push([sKey, oSource[sKey]]);
+			}
+
+			aSortable.sort(function(a, b) {
+				if(a[1] < b[1])
+				{
+					return -1;
+				}
+				else if(a[1] > b[1])
+				{
+					return 1;
+				}
+
+				return 0;
+			});
+
+			return aSortable;
+		}
 	});
 });

From fd8c7c99bd2c9e12cccaa1899755f245a5a4d35e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Tue, 20 Mar 2018 15:35:01 +0000
Subject: [PATCH 088/202] Advanced Search: IN with all values => 'true'

SVN:b1162[5480]
---
 .../criteriontooql.class.inc.php              |  7 ++++-
 .../search/CriterionConversionTest.php        | 26 ++++++++++---------
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/sources/application/search/criterionconversion/criteriontooql.class.inc.php b/sources/application/search/criterionconversion/criteriontooql.class.inc.php
index da70708d3..0eb470bc2 100644
--- a/sources/application/search/criterionconversion/criteriontooql.class.inc.php
+++ b/sources/application/search/criterionconversion/criteriontooql.class.inc.php
@@ -159,8 +159,13 @@ class CriterionToOQL extends CriterionConversionAbstract
 					if (!$oAttDef->IsNullAllowed())
 					{
 						$aAllowedValues = $aAllowedValues['values'];
+						if (count($aValues) == count($aAllowedValues))
+						{
+							// All entries are selected
+							return "1";
+						}
 						// more selected values than remaining so use NOT IN
-						if (count($aValues) > (count($aAllowedValues) / 2))
+						else if (count($aValues) > (count($aAllowedValues) / 2))
 						{
 							foreach($aValues as $aValue)
 							{
diff --git a/test/application/search/CriterionConversionTest.php b/test/application/search/CriterionConversionTest.php
index 8c77d32c3..ac222cf06 100644
--- a/test/application/search/CriterionConversionTest.php
+++ b/test/application/search/CriterionConversionTest.php
@@ -339,18 +339,20 @@ class CriterionConversionTest extends ItopDataTestCase
 	function OqlProvider()
 	{
 		return array(
-			array('OQL' => "SELECT Server WHERE ISNULL(nb_u)"),
-			array('OQL' => "SELECT Contact WHERE status = 'active'"),
-			array('OQL' => "SELECT Contact WHERE status = 'active' AND name LIKE 'toto%'"),
-			array('OQL' => "SELECT Contact WHERE status = 'active' AND org_id = 3"),
-			array('OQL' => "SELECT Contact WHERE status IN ('active', 'inactive')"),
-			array('OQL' => "SELECT Contact WHERE status NOT IN ('active')"),
-			array('OQL' => "SELECT UserRequest WHERE DATE_SUB(NOW(), INTERVAL 14 DAY) < start_date"),
-			array('OQL' => "SELECT UserRequest WHERE start_date > '2017-01-01 00:00:00' AND '2018-01-01 00:00:00' >= start_date"),
-			array('OQL' => "SELECT UserRequest WHERE start_date > '2017-01-01 00:00:00' AND status = 'active' AND org_id = 3 AND '2018-01-01 00:00:00' >= start_date"),
-			array('OQL' => "SELECT UserRequest WHERE start_date >= '2017-01-01 00:00:00' AND '2017-01-01 00:00:00' >= start_date"),
-			array('OQL' => "SELECT UserRequest WHERE start_date >= '2017-01-01 00:00:00' AND '2017-01-01 01:00:00' > start_date"),
-			array('OQL' => "SELECT UserRequest WHERE start_date >= '2017-01-01 00:00:00' AND '2017-01-02 00:00:00' > start_date"),
+			'ISNULL' => array('OQL' => "SELECT Server WHERE ISNULL(nb_u)"),
+			'start' => array('OQL' => "SELECT Contact WHERE status = 'active' AND name LIKE 'toto%'"),
+			'enum + key =' => array('OQL' => "SELECT Contact WHERE status = 'active' AND org_id = 3"),
+			'enum =' => array('OQL' => "SELECT Contact WHERE status = 'active'"),
+			'enum IN' => array('OQL' => "SELECT Contact WHERE status IN ('active', 'inactive')"),
+			'enum NOT IN' => array('OQL' => "SELECT Contact WHERE status NOT IN ('active')"),
+			'key NOT IN' => array('OQL' => "SELECT Contact WHERE org_id NOT IN ('1')"),
+			'key IN' => array('OQL' => "SELECT Contact WHERE org_id IN ('1')"),
+			'Date relative' => array('OQL' => "SELECT UserRequest WHERE DATE_SUB(NOW(), INTERVAL 14 DAY) < start_date"),
+			'Date between 1' => array('OQL' => "SELECT UserRequest WHERE start_date > '2017-01-01 00:00:00' AND '2018-01-01 00:00:00' >= start_date"),
+			'Date between 2' => array('OQL' => "SELECT UserRequest WHERE start_date > '2017-01-01 00:00:00' AND status = 'active' AND org_id = 3 AND '2018-01-01 00:00:00' >= start_date"),
+			'Date between 3' => array('OQL' => "SELECT UserRequest WHERE start_date >= '2017-01-01 00:00:00' AND '2017-01-01 00:00:00' >= start_date"),
+			'Date between 4' => array('OQL' => "SELECT UserRequest WHERE start_date >= '2017-01-01 00:00:00' AND '2017-01-01 01:00:00' > start_date"),
+			'Date between 5' => array('OQL' => "SELECT UserRequest WHERE start_date >= '2017-01-01 00:00:00' AND '2017-01-02 00:00:00' > start_date"),
 
 		);
 	}

From d1ef987dca4d34fa75ed01beae7a3727ab38d16a Mon Sep 17 00:00:00 2001
From: Bruno Da Silva <bruno.dasilva@combodo.com>
Date: Tue, 20 Mar 2018 16:10:53 +0000
Subject: [PATCH 089/202] search widget : numeric widget between operator

SVN:b1162[5481]
---
 css/light-grey.css                        |   6 ++
 css/light-grey.scss                       |  12 +++
 dictionaries/en.dictionary.itop.ui.php    |   2 +-
 js/search/search_form_criteria.js         |  16 ++-
 js/search/search_form_criteria_numeric.js | 114 +++++++++++++++-------
 5 files changed, 111 insertions(+), 39 deletions(-)

diff --git a/css/light-grey.css b/css/light-grey.css
index 5404a4ed6..db5c95928 100644
--- a/css/light-grey.css
+++ b/css/light-grey.css
@@ -1002,6 +1002,12 @@ input.dp-applied {
 .search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_enum .sfc_fg_operator_in > label .sfc_op_content {
   width: 100%;
 }
+.search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_numeric .sfc_fg_operator_dropdown_group select {
+  width: 88px;
+}
+.search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_numeric .sfc_fg_operator_between input {
+  width: 88px;
+}
 .search_form_handler .sf_criterion_area .sf_more_criterion.opened {
   z-index: 2;
   /* To be over criterion */
diff --git a/css/light-grey.scss b/css/light-grey.scss
index ea48cd67f..e16c189b4 100644
--- a/css/light-grey.scss
+++ b/css/light-grey.scss
@@ -1154,6 +1154,18 @@ input.dp-applied {
 					}
 				}
 			}
+			&.search_form_criteria_numeric {
+				.sfc_fg_operator_dropdown_group {
+					select {
+						width: 88px;
+					}
+				}
+				.sfc_fg_operator_between {
+					input {
+						width: 88px;
+					}
+				}
+			}
 		}
 
 		/* More criterion */
diff --git a/dictionaries/en.dictionary.itop.ui.php b/dictionaries/en.dictionary.itop.ui.php
index 955cb8e89..534f5e6aa 100644
--- a/dictionaries/en.dictionary.itop.ui.php
+++ b/dictionaries/en.dictionary.itop.ui.php
@@ -1401,7 +1401,7 @@ When associated with a trigger, each action is given an "order" number, specifyi
 	'UI:Search:Criteria:Operator:Numeric:GreaterThanOrEquals' => '>=',
 	'UI:Search:Criteria:Operator:Numeric:LessThan' => '<',
 	'UI:Search:Criteria:Operator:Numeric:LessThanOrEquals' => '<=',
-	'UI:Search:Criteria:Operator:Numeric:DifferentThan' => 'Different than:',
+	'UI:Search:Criteria:Operator:Numeric:DifferentThan' => 'Not',
 	'UI:Search:Criteria:Operator:Numeric:Between' => 'Between:',
 
 	// - Criteria titles
diff --git a/js/search/search_form_criteria.js b/js/search/search_form_criteria.js
index ca22d3ac9..697d90913 100644
--- a/js/search/search_form_criteria.js
+++ b/js/search/search_form_criteria.js
@@ -511,7 +511,10 @@ $(function()
 
 			// Events
 			// - Focus input on click (radio, label, ...)
-			oOpElem.on('click', ':not(input[type="text"])', function(){
+			oOpElem.on('click', ':not(input[type="text"], select)', function(oEvent) {
+				if ($(oEvent.target).is('input[type="text"], select')) {
+					return;
+				}
 				oOpContentElem.focus();
 			});
 			// - Apply on "enter" key hit
@@ -579,7 +582,7 @@ $(function()
 
 		// Values helpers
 		// - Convert values to a standard string
-		_getValuesAsText: function()
+		_getValues: function()
 		{
 			var aValues = [];
 			for(var iValueIdx in this.options.values)
@@ -587,7 +590,14 @@ $(function()
 				aValues.push(this.options.values[iValueIdx].label);
 			}
 
-			return aValues.join(', ');
+			return aValues;
+		},
+		// - Convert values to a standard string
+		_getValuesAsText: function()
+		{
+
+
+			return this._getValues().join(', ');
 		},
 		// - Make an OQL expression from the criteria values and operator
 		_makeOQLExpression: function()
diff --git a/js/search/search_form_criteria_numeric.js b/js/search/search_form_criteria_numeric.js
index 8b4802581..c310c29df 100644
--- a/js/search/search_form_criteria_numeric.js
+++ b/js/search/search_form_criteria_numeric.js
@@ -95,39 +95,82 @@ $(function()
 		},
 
 
-		// // Prepare operator's DOM element
-		// _prepareBetweenOperator: function(oOpElem, sOpIdx, oOp)
-		// {
-		// 	var me = this;
-		//
-		// 	// DOM element
-		// 	var oOpContentElem = $('<input type="text" />');
-		// 	oOpContentElem.val(this._getValuesAsText());
-		//
-		// 	// Events
-		// 	// - Focus input on click (radio, label, ...)
-		// 	oOpElem.on('click', ':not(input[type="text"])', function(){
-		// 		oOpContentElem.focus();
-		// 	});
-		// 	// - Apply on "enter" key hit
-		// 	oOpContentElem.on('keyup', function(oEvent){
-		// 		// Check operator's radio if not already (typically when focusing in input via "tab" key)
-		// 		if(oOpElem.find('.sfc_op_radio').prop('checked') === false)
-		// 		{
-		// 			oOpElem.find('.sfc_op_radio').prop('checked', true)
-		// 		}
-		//
-		// 		me._markAsDraft();
-		//
-		// 		// Apply if enter key
-		// 		if(oEvent.key === 'Enter')
-		// 		{
-		// 			me._apply();
-		// 		}
-		// 	});
-		//
-		// 	oOpElem.find('.sfc_op_content').append(oOpContentElem);
-		// },
+		// Prepare operator's DOM element
+		_prepareBetweenOperator: function(oOpElem, sOpIdx, oOp)
+		{
+			var me = this;
+
+			aValues = me._getValues();
+
+			// DOM elements
+			var oOpContentElemFrom = $('<input type="text" name="from" />').uniqueId();
+			if (0 in aValues)
+			{
+				oOpContentElemFrom.val(aValues[0]);
+			}
+
+			var oOpContentElemUntil = $('<input type="text" name="until" />').uniqueId();
+			if (1 in aValues)
+			{
+				oOpContentElemUntil.val(aValues[1]);
+			}
+
+			oOpContentElemFrom.data('focusNext', '#'+oOpContentElemUntil.attr('id'));
+			// oOpContentElemUntil.data('focusNext', '#'+oOpContentElemFrom.attr('id'));
+
+
+			oOpContentElem = $().add(oOpContentElemFrom).add(oOpContentElemUntil);
+
+			// Events
+			// - Focus input on click (radio, label, ...)
+			oOpElem.on('click', function(oEvent){
+				if ($(oEvent.target).is('input[type="text"], select')) {
+					return;
+				}
+				oOpContentElemFrom.focus();
+			});
+			// - Apply on "enter" key hit
+			oOpContentElem.on('keyup', function(oEvent){
+				// Check operator's radio if not already (typically when focusing in input via "tab" key)
+				if(oOpElem.find('.sfc_op_radio').prop('checked') === false)
+				{
+					oOpElem.find('.sfc_op_radio').prop('checked', true)
+				}
+
+				me._markAsDraft();
+
+				// Apply if enter key
+				if(oEvent.key === 'Enter')
+				{
+					if (focusNext = $(this).data('focusNext'))
+					{
+						$(focusNext).focus();
+					}
+					else
+					{
+						me._apply();
+					}
+				}
+
+
+			});
+
+			oOpElem.find('.sfc_op_content').append(oOpContentElem);
+		},
+
+		_getBetweenOperatorValues: function(oOpElem)
+		{
+			var aValues = [];
+
+			var sValueFrom  = oOpElem.find('.sfc_op_content input[name="from"]').val();
+			var sValueUntil = oOpElem.find('.sfc_op_content input[name="until"]').val();
+
+			aValues.push({value: sValueFrom, label: sValueFrom});
+			aValues.push({value: sValueUntil, label: sValueUntil});
+
+
+			return aValues;
+		},
 
 		//------------------
 		// Inherited methods
@@ -155,7 +198,7 @@ $(function()
 
 				oDropdown.on('change', function(){
 					$option = $(this);
-					me.element.find('.sfc_op_radio').val($option.val());
+					me.element.find('.sfc_fg_operator_dropdown_group .sfc_op_radio').val($option.val());
 
 					oOptionOp = $option.data('oOp');
 					$option.attr('data-operator-code', oOptionOp.code);
@@ -174,7 +217,7 @@ $(function()
 					.find('.sfc_op_radio')
 						.val(sOpIdx)
 					.end()
-					.on('click', function(){
+					.on('click', function(oEvent){
 						var bIsChecked = oOpElemDropdown.find('.sfc_op_radio').prop('checked');
 
 						if(bIsChecked === false)
@@ -182,6 +225,7 @@ $(function()
 							oOpElemDropdown.find('.sfc_op_radio').prop('checked', true);
 							me._markAsDraft();
 						}
+						oOpElemDropdown.find('input[type="text"]:first').focus();
 					})
 					.appendTo(this.element.find('.sfc_fg_operators'))
 				;

From 157d404019858388e31af359f09dbfef56d19a7e Mon Sep 17 00:00:00 2001
From: Bruno Da Silva <bruno.dasilva@combodo.com>
Date: Wed, 21 Mar 2018 08:31:56 +0000
Subject: [PATCH 090/202] search widget : reload interval moved from
 oDisplayBlock->Display() to oDisplayBlock->Render()

SVN:b1162[5482]
---
 application/displayblock.class.inc.php | 104 +++++++++++++------------
 1 file changed, 55 insertions(+), 49 deletions(-)

diff --git a/application/displayblock.class.inc.php b/application/displayblock.class.inc.php
index cccf13273..7eb5f4cc2 100644
--- a/application/displayblock.class.inc.php
+++ b/application/displayblock.class.inc.php
@@ -220,40 +220,7 @@ class DisplayBlock
 		$aExtraParams['currentId'] = $sId;
 		$sExtraParams = addslashes(str_replace('"', "'", json_encode($aExtraParams))); // JSON encode, change the style of the quotes and escape them
 		
-		$bAutoReload = false;
-		if (isset($aExtraParams['auto_reload']))
-		{
-			if ($aExtraParams['auto_reload'] === true)
-			{
-				// Note: does not work in the switch (case true) because a positive number evaluates to true!!!
-				$aExtraParams['auto_reload'] = 'standard';
-			}
-			switch($aExtraParams['auto_reload'])
-			{
-				case 'fast':
-				$bAutoReload = true;
-				$iReloadInterval = MetaModel::GetConfig()->GetFastReloadInterval()*1000;
-				break;
-				
-				case 'standard':
-				case 'true':
-				$bAutoReload = true;
-				$iReloadInterval = MetaModel::GetConfig()->GetStandardReloadInterval()*1000;
-				break;
-				
-				default:
-				if (is_numeric($aExtraParams['auto_reload']) && ($aExtraParams['auto_reload'] > 0))
-				{
-					$bAutoReload = true;
-					$iReloadInterval = max(MetaModel::GetConfig()->Get('min_reload_interval'), $aExtraParams['auto_reload'])*1000;
-				}
-				else
-				{
-					// incorrect config, ignore it
-					$bAutoReload = false;
-				}
-			}
-		}
+
 
 		$sFilter = $this->m_oFilter->serialize(); // Used either for asynchronous or auto_reload
 		if (!$this->m_bAsynchronous)
@@ -290,11 +257,9 @@ class DisplayBlock
             $listJsonExtraParams = json_encode(json_encode($aExtraParams));
             $oPage->add_ready_script("
             $('#$sId').data('sExtraParams', ".$listJsonExtraParams.");
-            $('#$sId').data('bAutoReload', \"".(int) $bAutoReload."\");
-            console.debug($('#$sId').data());
-            console.debug($('#$sId'));
-            console.debug('#$sId');
-            
+//            console.debug($('#$sId').data());
+//            console.debug($('#$sId'));
+//            console.debug('#$sId'); 
             ");
 
 
@@ -304,16 +269,7 @@ class DisplayBlock
 
         }
 
-		if (($bAutoReload) && ($this->m_sStyle != 'search')) // Search form do NOT auto-reload
-		{
-			$oPage->add_script('if (typeof aAutoReloadBlock == "undefined") {
-			    aAutoReloadBlock = [];
-			}
-			if (typeof aAutoReloadBlock[\''.$sId.'\'] != "undefined") {
-			    clearInterval(aAutoReloadBlock[\''.$sId.'\']);
-			}
-			aAutoReloadBlock[\''.$sId.'\'] = setInterval("ReloadBlock(\''.$sId.'\', \''.$this->m_sStyle.'\', \''.$sFilter.'\', \"'.$sExtraParams.'\")", '.$iReloadInterval.');');
-		}
+
 		return $sHtml;
 	}
 	
@@ -1129,6 +1085,56 @@ EOF
 			// Unsupported style, do nothing.
 			$sHtml .= Dict::format('UI:Error:UnsupportedStyleOfBlock', $this->m_sStyle);
 		}
+
+
+		$bAutoReload = false;
+		if (isset($aExtraParams['auto_reload']))
+		{
+			if ($aExtraParams['auto_reload'] === true)
+			{
+				// Note: does not work in the switch (case true) because a positive number evaluates to true!!!
+				$aExtraParams['auto_reload'] = 'standard';
+			}
+			switch($aExtraParams['auto_reload'])
+			{
+				case 'fast':
+					$bAutoReload = true;
+					$iReloadInterval = MetaModel::GetConfig()->GetFastReloadInterval()*1000;
+					break;
+
+				case 'standard':
+				case 'true':
+					$bAutoReload = true;
+					$iReloadInterval = MetaModel::GetConfig()->GetStandardReloadInterval()*1000;
+					break;
+
+				default:
+					if (is_numeric($aExtraParams['auto_reload']) && ($aExtraParams['auto_reload'] > 0))
+					{
+						$bAutoReload = true;
+						$iReloadInterval = max(MetaModel::GetConfig()->Get('min_reload_interval'), $aExtraParams['auto_reload'])*1000;
+					}
+					else
+					{
+						// incorrect config, ignore it
+						$bAutoReload = false;
+					}
+			}
+		}
+		if (($bAutoReload) && ($this->m_sStyle != 'search')) // Search form do NOT auto-reload
+		{
+			$sFilter = $this->m_oFilter->serialize(); // Used either for asynchronous or auto_reload
+			$sExtraParams = addslashes(str_replace('"', "'", json_encode($aExtraParams))); // JSON encode, change the style of the quotes and escape them
+
+			$oPage->add_script('if (typeof window.oAutoReloadBlock == "undefined") {
+				    window.oAutoReloadBlock = {};
+				}
+				if (typeof window.oAutoReloadBlock[\''.$sId.'\'] != "undefined") {
+				    clearInterval(window.oAutoReloadBlock[\''.$sId.'\']);
+				}
+				window.oAutoReloadBlock[\''.$sId.'\'] = setInterval("ReloadBlock(\''.$sId.'\', \''.$this->m_sStyle.'\', \''.$sFilter.'\', \"'.$sExtraParams.'\")", '.$iReloadInterval.');');
+		}
+
 		return $sHtml;
 	}
 

From 34f17074cad434cce7134a41d5283ac30966896e Mon Sep 17 00:00:00 2001
From: Bruno Da Silva <bruno.dasilva@combodo.com>
Date: Wed, 21 Mar 2018 09:51:36 +0000
Subject: [PATCH 091/202] search widget : numeric widget

SVN:b1162[5483]
---
 js/search/search_form_criteria.js         | 19 +++---
 js/search/search_form_criteria_numeric.js | 81 +++++++++++++----------
 2 files changed, 58 insertions(+), 42 deletions(-)

diff --git a/js/search/search_form_criteria.js b/js/search/search_form_criteria.js
index 697d90913..eca8b7171 100644
--- a/js/search/search_form_criteria.js
+++ b/js/search/search_form_criteria.js
@@ -509,9 +509,12 @@ $(function()
 			var oOpContentElem = $('<input type="text" />');
 			oOpContentElem.val(this._getValuesAsText());
 
+			console.debug(oOp, oOpElem, oOpContentElem.val(), '--');
+
 			// Events
 			// - Focus input on click (radio, label, ...)
 			oOpElem.on('click', ':not(input[type="text"], select)', function(oEvent) {
+				//in order to prevent from the bubling of the event from inputs so their parents, we filter on oEvent.target, we could have stoped the bubling but it would have been a little agressive.
 				if ($(oEvent.target).is('input[type="text"], select')) {
 					return;
 				}
@@ -584,20 +587,20 @@ $(function()
 		// - Convert values to a standard string
 		_getValues: function()
 		{
-			var aValues = [];
-			for(var iValueIdx in this.options.values)
-			{
-				aValues.push(this.options.values[iValueIdx].label);
-			}
-
-			return aValues;
+			return this.options.values;
 		},
 		// - Convert values to a standard string
 		_getValuesAsText: function()
 		{
+			var aRawValues = this._getValues();
 
+			var aValues = [];
+			for(var iValueIdx in aRawValues)
+			{
+				aValues.push(aRawValues[iValueIdx].label);
+			}
 
-			return this._getValues().join(', ');
+			return aValues.join(', ');
 		},
 		// - Make an OQL expression from the criteria values and operator
 		_makeOQLExpression: function()
diff --git a/js/search/search_form_criteria_numeric.js b/js/search/search_form_criteria_numeric.js
index c310c29df..ac312a805 100644
--- a/js/search/search_form_criteria_numeric.js
+++ b/js/search/search_form_criteria_numeric.js
@@ -15,37 +15,37 @@ $(function()
 			'available_operators': {
 				'=': {
 					'label': Dict.S('UI:Search:Criteria:Operator:Numeric:Equals'),//pre-existing, label changed
-					'dropdown_group':1,
+					// 'dropdown_group':1,
 				},
 				'>': {
 					'label': Dict.S('UI:Search:Criteria:Operator:Numeric:GreaterThan'),
 					'code': 'greater_than',
 					'rank': 100,
-					'dropdown_group':1,
+					// 'dropdown_group':1,
 				},
 				'>=': {
 					'label': Dict.S('UI:Search:Criteria:Operator:Numeric:GreaterThanOrEquals'),
 					'code': 'greater_than_or_equals',
 					'rank': 200,
-					'dropdown_group':1,
+					// 'dropdown_group':1,
 				},
 				'<': {
 					'label': Dict.S('UI:Search:Criteria:Operator:Numeric:LessThan'),
 					'code': 'less_than',
 					'rank': 300,
-					'dropdown_group':1,
+					// 'dropdown_group':1,
 				},
 				'<=': {
 					'label': Dict.S('UI:Search:Criteria:Operator:Numeric:LessThanOrEquals'),
 					'code': 'less_than_or_equals',
 					'rank': 400,
-					'dropdown_group':1,
+					// 'dropdown_group':1,
 				},
 				'!=': {
 					'label': Dict.S('UI:Search:Criteria:Operator:Numeric:DifferentThan'),
 					'code': 'different',
 					'rank': 500,
-					'dropdown_group':1,
+					// 'dropdown_group':1,
 				},
 				'between': {
 					'label': Dict.S('UI:Search:Criteria:Operator:Numeric:Between'),
@@ -100,24 +100,21 @@ $(function()
 		{
 			var me = this;
 
-			aValues = me._getValues();
+			aValues = me._getValues();//TODO : tenir compte du refactoring de la structure
 
 			// DOM elements
 			var oOpContentElemFrom = $('<input type="text" name="from" />').uniqueId();
-			if (0 in aValues)
+			if (0 in aValues && typeof aValues[0].value != 'undefined')
 			{
-				oOpContentElemFrom.val(aValues[0]);
+				oOpContentElemFrom.val(aValues[0].value);
 			}
 
 			var oOpContentElemUntil = $('<input type="text" name="until" />').uniqueId();
-			if (1 in aValues)
+			if (1 in aValues && typeof aValues[1].value != 'undefined')
 			{
-				oOpContentElemUntil.val(aValues[1]);
+				oOpContentElemUntil.val(aValues[1].value);
 			}
 
-			oOpContentElemFrom.data('focusNext', '#'+oOpContentElemUntil.attr('id'));
-			// oOpContentElemUntil.data('focusNext', '#'+oOpContentElemFrom.attr('id'));
-
 
 			oOpContentElem = $().add(oOpContentElemFrom).add(oOpContentElemUntil);
 
@@ -130,6 +127,7 @@ $(function()
 				oOpContentElemFrom.focus();
 			});
 			// - Apply on "enter" key hit
+			//todo: this could be refactored
 			oOpContentElem.on('keyup', function(oEvent){
 				// Check operator's radio if not already (typically when focusing in input via "tab" key)
 				if(oOpElem.find('.sfc_op_radio').prop('checked') === false)
@@ -142,17 +140,8 @@ $(function()
 				// Apply if enter key
 				if(oEvent.key === 'Enter')
 				{
-					if (focusNext = $(this).data('focusNext'))
-					{
-						$(focusNext).focus();
-					}
-					else
-					{
-						me._apply();
-					}
+					me._apply();
 				}
-
-
 			});
 
 			oOpElem.find('.sfc_op_content').append(oOpContentElem);
@@ -172,6 +161,28 @@ $(function()
 			return aValues;
 		},
 
+		_setBetweenOperatorValues: function(oOpElem, aValues)
+		{
+			switch (aValues.length)
+			{
+				case 2:
+					oOpElem.find('.sfc_op_content input[name="until"]').val(aValues[0].value);
+					//NO BREAK!!!
+				case 1:
+					oOpElem.find('.sfc_op_content input[name="from"]').val(aValues[0].value);
+					break;
+				default:
+					return false;
+			}
+
+			return true;
+		},
+
+		_resetBetweenOperator: function(oOpElem)
+		{
+			this._resetOperator(oOpElem);
+		},
+
 		//------------------
 		// Inherited methods
 		//------------------
@@ -190,18 +201,20 @@ $(function()
 			this._super(oOpElem, sOpIdx, oOp);
 			oOpElem.addClass('force_hide')
 
+			//TODO: move this into the abstract widget
+
 			// DOM element
-			oDropdown = this.element.find('select.dropdown_group_'+oOp.dropdown_group);
-			if (oDropdown.length == 0)
+			oDropdownElem = this.element.find('select.dropdown_group_'+oOp.dropdown_group);
+			if (oDropdownElem.length == 0)
 			{
-				oDropdown = $('<select class="dropdown_group_'+oOp.dropdown_group+'" data-dropdown-group="'+oOp.dropdown_group+'"></select>');
+				oDropdownElem = $('<select class="dropdown_group_'+oOp.dropdown_group+'" data-dropdown-group="'+oOp.dropdown_group+'"></select>');
 
-				oDropdown.on('change', function(){
-					$option = $(this);
-					me.element.find('.sfc_fg_operator_dropdown_group .sfc_op_radio').val($option.val());
+				oDropdownElem.on('change', function(){
+					// $option = $(this);
+					me.element.find('.sfc_fg_operator_dropdown_group .sfc_op_radio').val(oDropdownElem.val());
 
-					oOptionOp = $option.data('oOp');
-					$option.attr('data-operator-code', oOptionOp.code);
+					oOptionOp = oDropdownElem.data('oOp');
+					oDropdownElem.attr('data-operator-code', oOptionOp.code);
 				});
 
 
@@ -212,7 +225,7 @@ $(function()
 					.addClass('sfc_fg_operator_dropdown_group')
 					.attr('data-operator-code', 'dropdown_group')
 					.find('.sfc_op_name')
-						.append(oDropdown)
+						.append(oDropdownElem)
 					.end()
 					.find('.sfc_op_radio')
 						.val(sOpIdx)
@@ -233,7 +246,7 @@ $(function()
 				this._prepareDefaultOperator(oOpElemDropdown, sOpIdx, oOp);
 			}
 
-			oDropdown
+			oDropdownElem
 				.append('<option value="'+sOpIdx+'" >'+oOp.label+'</option>')
 				.data('oOp', oOp)
 			;

From 53535dd82d7508b481436f6a55398eff90711afa Mon Sep 17 00:00:00 2001
From: Bruno Da Silva <bruno.dasilva@combodo.com>
Date: Wed, 21 Mar 2018 10:02:52 +0000
Subject: [PATCH 092/202] search widget : console.debug removal (woops)

SVN:b1162[5484]
---
 js/search/search_form_criteria.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/search/search_form_criteria.js b/js/search/search_form_criteria.js
index eca8b7171..455ed28a2 100644
--- a/js/search/search_form_criteria.js
+++ b/js/search/search_form_criteria.js
@@ -509,7 +509,7 @@ $(function()
 			var oOpContentElem = $('<input type="text" />');
 			oOpContentElem.val(this._getValuesAsText());
 
-			console.debug(oOp, oOpElem, oOpContentElem.val(), '--');
+
 
 			// Events
 			// - Focus input on click (radio, label, ...)

From cfa5163590fbdc2d7aa4cc8f3a212725d819caeb Mon Sep 17 00:00:00 2001
From: Bruno Da Silva <bruno.dasilva@combodo.com>
Date: Wed, 21 Mar 2018 12:37:59 +0000
Subject: [PATCH 093/202] search widget : todo added

SVN:b1162[5485]
---
 js/search/search_form_criteria_numeric.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/js/search/search_form_criteria_numeric.js b/js/search/search_form_criteria_numeric.js
index ac312a805..3b357c50b 100644
--- a/js/search/search_form_criteria_numeric.js
+++ b/js/search/search_form_criteria_numeric.js
@@ -221,6 +221,7 @@ $(function()
 				// Create DOM element from template
 				var oOpElemDropdown = $(this._getOperatorTemplate()).uniqueId();
 
+				//todo : if this code is keeped, the radio mustr have an id and the label need to point to it
 				oOpElemDropdown
 					.addClass('sfc_fg_operator_dropdown_group')
 					.attr('data-operator-code', 'dropdown_group')

From 114a3405272992d7fe1994d8da8e3e9d9925102c Mon Sep 17 00:00:00 2001
From: Guillaume Lajarige <guillaume.lajarige@combodo.com>
Date: Wed, 21 Mar 2018 13:10:48 +0000
Subject: [PATCH 094/202] Advanced search: WIP POC, UI/UX.

SVN:b1162[5486]
---
 application/itopwebpage.class.inc.php          |  1 +
 css/light-grey.css                             |  4 +---
 css/light-grey.scss                            |  4 +---
 dictionaries/en.dictionary.itop.ui.php         |  2 ++
 dictionaries/fr.dictionary.itop.ui.php         |  8 ++++++--
 js/search/search_form_criteria.js              | 12 ++++++++----
 js/search/search_form_criteria_enum.js         |  2 +-
 js/search/search_form_criteria_external_key.js |  5 -----
 js/search/search_form_handler.js               |  8 +++++++-
 9 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/application/itopwebpage.class.inc.php b/application/itopwebpage.class.inc.php
index 2d7a2112f..9dda44bdf 100644
--- a/application/itopwebpage.class.inc.php
+++ b/application/itopwebpage.class.inc.php
@@ -114,6 +114,7 @@ class iTopWebPage extends NiceWebPage implements iTabbedPage
 
 		$this->add_dict_entries('UI:Search:');
 		$this->add_dict_entries('UI:Button:');
+		$this->add_dict_entries('Error:');
 
 
 		if (!$this->IsPrintableVersion())
diff --git a/css/light-grey.css b/css/light-grey.css
index db5c95928..0b9e6643f 100644
--- a/css/light-grey.css
+++ b/css/light-grey.css
@@ -899,6 +899,7 @@ input.dp-applied {
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_opc_multichoices .sfc_opc_mc_filter {
   position: relative;
   margin-top: 8px;
+  margin-bottom: 8px;
 }
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_opc_multichoices .sfc_opc_mc_filter input {
   width: 100%;
@@ -918,9 +919,6 @@ input.dp-applied {
   /* -5px to compensate padding and keep aligned to the filter left side */
   padding: 5px;
 }
-.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_opc_multichoices .sfc_opc_mc_items .sfc_opc_mc_item:first-of-type {
-  margin-top: 8px;
-}
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_opc_multichoices .sfc_opc_mc_items .sfc_opc_mc_item:hover {
   padding: 4px;
   /* Normal padding - border size */
diff --git a/css/light-grey.scss b/css/light-grey.scss
index e16c189b4..28a435552 100644
--- a/css/light-grey.scss
+++ b/css/light-grey.scss
@@ -1010,6 +1010,7 @@ input.dp-applied {
 							.sfc_opc_mc_filter{
 								position: relative;
 								margin-top: 8px;
+								margin-bottom: 8px;
 
 								input{
 									width: 100%;
@@ -1030,9 +1031,6 @@ input.dp-applied {
 									margin: 0px -5px 0px -5px; /* -5px to compensate padding and keep aligned to the filter left side */
 									padding: 5px;
 
-									&:first-of-type{
-										margin-top: 8px;
-									}
 									&:hover{
 										padding: 4px; /* Normal padding - border size */
 										background-color: $white;
diff --git a/dictionaries/en.dictionary.itop.ui.php b/dictionaries/en.dictionary.itop.ui.php
index 534f5e6aa..0efb28ee5 100644
--- a/dictionaries/en.dictionary.itop.ui.php
+++ b/dictionaries/en.dictionary.itop.ui.php
@@ -1419,9 +1419,11 @@ When associated with a trigger, each action is given an "order" number, specifyi
 	'UI:Search:Criteria:Title:ExternalKey:Equals' => '%1$s %2$s',
 	'UI:Search:Criteria:Title:ExternalKey:In' => '%1$s: %2$s',
 	'UI:Search:Criteria:Title:ExternalKey:In:Many' => '%1$s: %2$s and %3$s others',
+	'UI:Search:Criteria:Title:ExternalKey:In:All' => '%1$s: Any',
 	//   - Enum widget
 	'UI:Search:Criteria:Title:Enum:In' => '%1$s: %2$s',
 	'UI:Search:Criteria:Title:Enum:In:Many' => '%1$s: %2$s and %3$s others',
+	'UI:Search:Criteria:Title:Enum:In:All' => '%1$s: Any',
 	// -
 	'UI:Search:Value:Filter:Placeholder' => 'Filter...',
 	'UI:Search:Value:Toggler:CheckAllNone' => 'Check all / none',
diff --git a/dictionaries/fr.dictionary.itop.ui.php b/dictionaries/fr.dictionary.itop.ui.php
index aa0c8c2be..fadf34b1a 100644
--- a/dictionaries/fr.dictionary.itop.ui.php
+++ b/dictionaries/fr.dictionary.itop.ui.php
@@ -1221,12 +1221,16 @@ Lors de l\'association à un déclencheur, on attribue à chaque action un numé
 	'UI:Search:Criteria:Title:String:StartsWith' => '%1$s commence par %2$s',
 	'UI:Search:Criteria:Title:String:EndsWith' => '%1$s fini par %2$s',
 	//   - External key widget
-	'UI:Search:Criteria:Title:ExternalKey:Empty' => '%1$s est rempli',
-	'UI:Search:Criteria:Title:ExternalKey:NotEmpty' => '%1$s n\'est pas rempli',
+	'UI:Search:Criteria:Title:ExternalKey:Empty' => '%1$s est renseigné',
+	'UI:Search:Criteria:Title:ExternalKey:NotEmpty' => '%1$s n\'est pas renseigné',
 	'UI:Search:Criteria:Title:ExternalKey:Equals' => '%1$s %2$s',
+	'UI:Search:Criteria:Title:ExternalKey:In' => '%1$s: %2$s',
+	'UI:Search:Criteria:Title:ExternalKey:In:Many' => '%1$s: %2$s et %3$s autres',
+	'UI:Search:Criteria:Title:ExternalKey:In:All' => '%1$s: Indifférent',
 	//   - Enum widget
 	'UI:Search:Criteria:Title:Enum:In' => '%1$s : %2$s',
 	'UI:Search:Criteria:Title:Enum:In:Many' => '%1$s : %2$s et %3$s autres',
+	'UI:Search:Criteria:Title:Enum:In:All' => '%1$s: Indifférent',
 	// -
 	'UI:Search:Value:Filter:Placeholder' => 'Filter...',
 	'UI:Search:Value:Toggler:CheckAllNone' => 'Check all / none',
diff --git a/js/search/search_form_criteria.js b/js/search/search_form_criteria.js
index 455ed28a2..ae8269401 100644
--- a/js/search/search_form_criteria.js
+++ b/js/search/search_form_criteria.js
@@ -124,6 +124,12 @@ $(function()
 				var sOpIdx = aSortable[iIdx][0];
 				this.operators[sOpIdx] = this.options.available_operators[sOpIdx];
 			}
+
+			// Fallback operator in case the current operator is not available. Should not happen.
+			if(this.operators[this.options.operator] === undefined)
+			{
+				this.options.operator = Object.keys(this.operators)[0];
+			}
 		},
 		// - Bind external events
 		_bindEvents: function()
@@ -509,12 +515,10 @@ $(function()
 			var oOpContentElem = $('<input type="text" />');
 			oOpContentElem.val(this._getValuesAsText());
 
-
-
 			// Events
 			// - Focus input on click (radio, label, ...)
 			oOpElem.on('click', ':not(input[type="text"], select)', function(oEvent) {
-				//in order to prevent from the bubling of the event from inputs so their parents, we filter on oEvent.target, we could have stoped the bubling but it would have been a little agressive.
+				// Stopping propagation like this instead of oEvent.stopPropagation() as the event could be used by something.
 				if ($(oEvent.target).is('input[type="text"], select')) {
 					return;
 				}
@@ -584,7 +588,7 @@ $(function()
 
 
 		// Values helpers
-		// - Convert values to a standard string
+		// - Return current values
 		_getValues: function()
 		{
 			return this.options.values;
diff --git a/js/search/search_form_criteria_enum.js b/js/search/search_form_criteria_enum.js
index f7559858b..bb0d91a6d 100644
--- a/js/search/search_form_criteria_enum.js
+++ b/js/search/search_form_criteria_enum.js
@@ -170,7 +170,7 @@ $(function()
 			});
 
 			// - Apply on check
-			oAllowedValuesElem.find('.sfc_opc_mc_item').on('click', function(){
+			oAllowedValuesElem.find('.sfc_opc_mc_item').on('click', function(oEvent){
 				// Uncheck toggler
 				oTogglersElem.find('input:checkbox').prop('checked', false);
 
diff --git a/js/search/search_form_criteria_external_key.js b/js/search/search_form_criteria_external_key.js
index 572bf87d7..ff31806be 100644
--- a/js/search/search_form_criteria_external_key.js
+++ b/js/search/search_form_criteria_external_key.js
@@ -9,11 +9,6 @@ $(function()
 		// default options
 		options:
 		{
-			// Overload default operator
-			'operator': 'IN',
-			// Available operators
-			'available_operators': {
-			},
 		},
 
    
diff --git a/js/search/search_form_handler.js b/js/search/search_form_handler.js
index 005fe35d1..5176cf51c 100644
--- a/js/search/search_form_handler.js
+++ b/js/search/search_form_handler.js
@@ -298,6 +298,7 @@ $(function()
 			// Content part
 			var oContentElem = $('<div class="sfm_content"></div>')
 				.appendTo(this.elements.more_criterion);
+
 			// - Add list
 			var oListElem = $('<ul class="sfm_list"></ul>')
 				.appendTo(oContentElem);
@@ -313,6 +314,7 @@ $(function()
 					.text(oField.label);
 				oListElem.append(oFieldElem);
 			}
+
 			// - Others
 			if(this.options.search.fields.others !== undefined)
 			{
@@ -593,7 +595,11 @@ $(function()
 		// - Called on form submit failures
 		_onSubmitFailure: function(oData)
 		{
-			this._setErrorMessage(oData.responseText);
+			// Fallback message in case the server send back only HTML markup.
+			var oErrorElem = $(oData.responseText);
+			var sErrorMessage = (oErrorElem.text() !== '') ? oErrorElem.text() : Dict.Format('Error:XHR:Fail', '');
+
+			this._setErrorMessage(sErrorMessage);
 		},
 		// - Called after form submits
 		_onSubmitAlways: function(oData)

From b05b41c7cc9c5487ea93bc97ac51000a7b2c07b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Wed, 21 Mar 2018 13:12:13 +0000
Subject: [PATCH 095/202] Advanced Search: 'between' for numeric criteria

SVN:b1162[5487]
---
 .../criteriontooql.class.inc.php              | 77 +++++++++++++++++--
 .../criteriontosearchform.class.inc.php       | 46 ++++++++++-
 .../criterionconversionabstract.class.inc.php |  1 +
 .../search/CriterionConversionTest.php        | 15 ++--
 4 files changed, 127 insertions(+), 12 deletions(-)

diff --git a/sources/application/search/criterionconversion/criteriontooql.class.inc.php b/sources/application/search/criterionconversion/criteriontooql.class.inc.php
index 0eb470bc2..a565f5d3d 100644
--- a/sources/application/search/criterionconversion/criteriontooql.class.inc.php
+++ b/sources/application/search/criterionconversion/criteriontooql.class.inc.php
@@ -25,6 +25,7 @@ namespace Combodo\iTop\Application\Search\CriterionConversion;
 
 use AttributeDateTime;
 use AttributeDefinition;
+use Combodo\iTop\Application\Search\AjaxSearchException;
 use Combodo\iTop\Application\Search\CriterionConversionAbstract;
 use Combodo\iTop\Application\Search\SearchForm;
 use DateInterval;
@@ -56,6 +57,7 @@ class CriterionToOQL extends CriterionConversionAbstract
 			self::OP_NOT_EMPTY => 'NotEmptyToOql',
 			self::OP_BETWEEN_DAYS => 'BetweenDaysToOql',
 			self::OP_BETWEEN_HOURS => 'BetweenHoursToOql',
+			self::OP_BETWEEN => 'BetweenToOql',
 			self::OP_IN => 'InToOql',
 			self::OP_ALL => 'AllToOql',
 		);
@@ -126,6 +128,7 @@ class CriterionToOQL extends CriterionConversionAbstract
 		{
 			return "ISNULL({$sRef})";
 		}
+
 		return "({$sRef} = '')";
 	}
 
@@ -165,15 +168,18 @@ class CriterionToOQL extends CriterionConversionAbstract
 							return "1";
 						}
 						// more selected values than remaining so use NOT IN
-						else if (count($aValues) > (count($aAllowedValues) / 2))
+						else
 						{
-							foreach($aValues as $aValue)
+							if (count($aValues) > (count($aAllowedValues) / 2))
 							{
-								unset($aAllowedValues[$aValue['value']]);
-							}
-							$sInList = implode("','", array_keys($aAllowedValues));
+								foreach($aValues as $aValue)
+								{
+									unset($aAllowedValues[$aValue['value']]);
+								}
+								$sInList = implode("','", array_keys($aAllowedValues));
 
-							return "({$sRef} NOT IN ('$sInList'))";
+								return "({$sRef} NOT IN ('$sInList'))";
+							}
 						}
 					}
 				}
@@ -283,6 +289,65 @@ class CriterionToOQL extends CriterionConversionAbstract
 		return $sOQL;
 	}
 
+	/**
+	 * @param $sRef
+	 * @param $aCriteria
+	 *
+	 * @return string
+	 * @throws \Combodo\iTop\Application\Search\AjaxSearchException
+	 */
+	protected static function BetweenToOql($sRef, $aCriteria)
+	{
+		$aOQL = array();
+
+		$aValues = self::GetValues($aCriteria);
+		if (count($aValues) != 2)
+		{
+			return "1";
+		}
+
+		if (isset($aValues[0]['value']))
+		{
+			$sStartNum = trim($aValues[0]['value']);
+			if (is_numeric($sStartNum))
+			{
+				$aOQL[] = "({$sRef} >= '$sStartNum')";
+			}
+			else
+			{
+				if (!empty($sStartNum))
+				{
+					throw new AjaxSearchException("'$sStartNum' is not a numeric value", 400);
+				}
+			}
+		}
+
+		if (isset($aValues[1]['value']))
+		{
+			$sEndNum = trim($aValues[1]['value']);
+			if (is_numeric($sEndNum))
+			{
+				$aOQL[] = "({$sRef} <= '$sEndNum')";
+			}
+			else
+			{
+				if (!empty($sEndNum))
+				{
+					throw new AjaxSearchException("'$sEndNum' is not a numeric value", 400);
+				}
+			}
+		}
+
+		$sOQL = implode(' AND ', $aOQL);
+
+		if (empty($sOQL))
+		{
+			$sOQL = "1";
+		}
+
+		return $sOQL;
+	}
+
 
 	protected static function AllToOql($sRef, $aCriteria)
 	{
diff --git a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
index be6adc83e..a8e04594b 100644
--- a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
+++ b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
@@ -108,6 +108,7 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 		$aMergeFctByWidget = array(
 			AttributeDefinition::SEARCH_WIDGET_TYPE_DATE => 'MergeDate',
 			AttributeDefinition::SEARCH_WIDGET_TYPE_DATE_TIME => 'MergeDateTime',
+			AttributeDefinition::SEARCH_WIDGET_TYPE_NUMERIC => 'MergeNumeric',
 		);
 
 		$aPrevCriterion = null;
@@ -151,7 +152,7 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 	 * @param $aCurrCriterion
 	 * @param $aMergedCriterion
 	 *
-	 * @return null
+	 * @return Current criteria or null if merged
 	 * @throws \Exception
 	 */
 	protected static function MergeDate($aPrevCriterion, $aCurrCriterion, &$aMergedCriterion)
@@ -199,6 +200,49 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 		return null;
 	}
 
+	/**
+	 * @param $aPrevCriterion
+	 * @param $aCurrCriterion
+	 * @param $aMergedCriterion
+	 *
+	 * @return Current criteria or null if merged
+	 * @throws \Exception
+	 */
+	protected static function MergeNumeric($aPrevCriterion, $aCurrCriterion, &$aMergedCriterion)
+	{
+		$sPrevOperator = $aPrevCriterion['operator'];
+		$sCurrOperator = $aCurrCriterion['operator'];
+		if (($sPrevOperator != '<=') || ($sCurrOperator != '>='))
+		{
+			$aMergedCriterion[] = $aPrevCriterion;
+
+			return $aCurrCriterion;
+		}
+
+		// Merge into 'between' operation.
+		$sLastNum = $aPrevCriterion['values'][0]['value'];
+		$sFirstNum = $aCurrCriterion['values'][0]['value'];
+		$aCurrCriterion['values'] = array();
+		$aCurrCriterion['values'][] = array('value' => $sFirstNum, 'label' => $sFirstNum);
+		$aCurrCriterion['values'][] = array('value' => $sLastNum, 'label' => $sLastNum);
+
+		$aCurrCriterion['oql'] = "({$aPrevCriterion['oql']} AND {$aCurrCriterion['oql']})";
+		$aCurrCriterion['label'] = $aPrevCriterion['label'].' '.Dict::S('Expression:Operator:AND', 'AND').' '.$aCurrCriterion['label'];
+		$aCurrCriterion['operator'] = 'between';
+
+		$aMergedCriterion[] = $aCurrCriterion;
+
+		return null;
+	}
+
+	/**
+	 * @param $aPrevCriterion
+	 * @param $aCurrCriterion
+	 * @param $aMergedCriterion
+	 *
+	 * @return Current criteria or null if merged
+	 * @throws \Exception
+	 */
 	protected static function MergeDateTime($aPrevCriterion, $aCurrCriterion, &$aMergedCriterion)
 	{
 		$sPrevOperator = $aPrevCriterion['operator'];
diff --git a/sources/application/search/criterionconversionabstract.class.inc.php b/sources/application/search/criterionconversionabstract.class.inc.php
index e0eb743be..2307669f3 100644
--- a/sources/application/search/criterionconversionabstract.class.inc.php
+++ b/sources/application/search/criterionconversionabstract.class.inc.php
@@ -34,6 +34,7 @@ abstract class CriterionConversionAbstract
 	const OP_IN = 'IN';
 	const OP_BETWEEN_DAYS = 'between_days';
 	const OP_BETWEEN_HOURS = 'between_hours';
+	const OP_BETWEEN = 'between';
 	const OP_ALL = 'all';
 
 }
diff --git a/test/application/search/CriterionConversionTest.php b/test/application/search/CriterionConversionTest.php
index ac222cf06..6da7fafe8 100644
--- a/test/application/search/CriterionConversionTest.php
+++ b/test/application/search/CriterionConversionTest.php
@@ -312,12 +312,17 @@ class CriterionConversionTest extends ItopDataTestCase
 		$aNewCriterion = array();
 		foreach($aAndCriterion as $aCriteria)
 		{
-			if (($aCriteria['widget'] == \AttributeDefinition::SEARCH_WIDGET_TYPE_STRING)
-				|| ($aCriteria['widget'] == \AttributeDefinition::SEARCH_WIDGET_TYPE_DATE_TIME)
-				|| ($aCriteria['widget'] == \AttributeDefinition::SEARCH_WIDGET_TYPE_ENUM))
+			if ($aCriteria['widget'] != \AttributeDefinition::SEARCH_WIDGET_TYPE_RAW)
 			{
 				unset($aCriteria['oql']);
-				$aField = $aFields['zlist'][$aCriteria['ref']];
+				if (isset($aFields['zlist'][$aCriteria['ref']]))
+				{
+					$aField = $aFields['zlist'][$aCriteria['ref']];
+				}
+				else
+				{
+					$aField = $aFields['others'][$aCriteria['ref']];
+				}
 				$aCriteria['code'] = $aField['code'];
 				$aCriteria['class'] = $aField['class'];
 			}
@@ -353,7 +358,7 @@ class CriterionConversionTest extends ItopDataTestCase
 			'Date between 3' => array('OQL' => "SELECT UserRequest WHERE start_date >= '2017-01-01 00:00:00' AND '2017-01-01 00:00:00' >= start_date"),
 			'Date between 4' => array('OQL' => "SELECT UserRequest WHERE start_date >= '2017-01-01 00:00:00' AND '2017-01-01 01:00:00' > start_date"),
 			'Date between 5' => array('OQL' => "SELECT UserRequest WHERE start_date >= '2017-01-01 00:00:00' AND '2017-01-02 00:00:00' > start_date"),
-
+			'Num between 1' => array('OQL' => "SELECT Server WHERE nb_u >= 0 AND 1 >= nb_u"),
 		);
 	}
 }

From 3cdf22e9b2d6e4fabaaeb1df96129ed90302de3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Wed, 21 Mar 2018 13:45:37 +0000
Subject: [PATCH 096/202] Advanced Search: resolve variables for the search
 screen

SVN:b1162[5488]
---
 core/oql/expression.class.inc.php             |  8 +++++++
 .../search/searchform.class.inc.php           | 23 +++++++++++++++++--
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/core/oql/expression.class.inc.php b/core/oql/expression.class.inc.php
index 2cea667be..ff899d170 100644
--- a/core/oql/expression.class.inc.php
+++ b/core/oql/expression.class.inc.php
@@ -34,6 +34,14 @@ abstract class Expression
 
 	// recursive translation of identifiers
 	abstract public function GetUnresolvedFields($sAlias, &$aUnresolved);
+
+	/**
+	 * @param array $aTranslationData
+	 * @param bool $bMatchAll
+	 * @param bool $bMarkFieldsAsResolved
+	 *
+	 * @return Expression Translated expression
+	 */
 	abstract public function Translate($aTranslationData, $bMatchAll = true, $bMarkFieldsAsResolved = true);
 
 	// recursive rendering (aArgs used as input by default, or used as output if bRetrofitParams set to True
diff --git a/sources/application/search/searchform.class.inc.php b/sources/application/search/searchform.class.inc.php
index ab222175e..3b0454976 100644
--- a/sources/application/search/searchform.class.inc.php
+++ b/sources/application/search/searchform.class.inc.php
@@ -122,9 +122,18 @@ class SearchForm
 		$sHtml .= "<div id=\"fs_{$sSearchFormId}_criterion_outer\">\n</div>\n";
 		$sHtml .= "</form>\n";
 
+		if (isset($aExtraParams['query_params']))
+		{
+			$aArgs = $aExtraParams['query_params'];
+		}
+		else
+		{
+			$aArgs = array();
+		}
+
 		$aFields = $this->GetFields($oSet);
 		$oSearch = $oSet->GetFilter();
-		$aCriterion = $this->GetCriterion($oSearch, $aFields);
+		$aCriterion = $this->GetCriterion($oSearch, $aFields, $aArgs);
 
 		$oBaseSearch = $oSearch->DeepClone();
 		$oBaseSearch->ResetCondition();
@@ -284,12 +293,22 @@ class SearchForm
 	 * @param \DBSearch $oSearch
 	 * @param array $aFields
 	 *
+	 * @param array $aArgs
+	 *
 	 * @return array
 	 */
-	public function GetCriterion($oSearch, $aFields)
+	public function GetCriterion($oSearch, $aFields, $aArgs = array())
 	{
 		$oExpression = $oSearch->GetCriteria();
 
+		if (!empty($aArgs))
+		{
+			$aArgs = MetaModel::PrepareQueryArguments($aArgs);
+
+			$sOQL = $oExpression->Render($aArgs);
+			$oExpression = Expression::FromOQL($sOQL);
+		}
+
 		$aOrCriterion = array();
 		$aORExpressions = Expression::Split($oExpression, 'OR');
 		foreach($aORExpressions as $oORSubExpr)

From 6afb3a06acd97adb3cf883b3016c182e166a8d2d Mon Sep 17 00:00:00 2001
From: Guillaume Lajarige <guillaume.lajarige@combodo.com>
Date: Wed, 21 Mar 2018 15:34:00 +0000
Subject: [PATCH 097/202] Advanced search: WIP POC, UI/UX.

SVN:b1162[5489]
---
 js/search/search_form_criteria.js      | 12 +++++-------
 js/search/search_form_criteria_enum.js | 12 ++++++++++--
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/js/search/search_form_criteria.js b/js/search/search_form_criteria.js
index ae8269401..fa036bd52 100644
--- a/js/search/search_form_criteria.js
+++ b/js/search/search_form_criteria.js
@@ -249,13 +249,11 @@ $(function()
 			// Update widget
 			this.options.operator = oActiveOpElem.find('.sfc_op_radio').val();
 
-			if (JSON.stringify(this.options.values) != JSON.stringify(aValues))
-			{
-				this.is_modified = true;
-				this.options.oql = '';
-				this.options.values = aValues;
-				this._setTitle();
-			}
+			// TODO: Better modification check. The previous if has been removed as it caused a regression.
+			this.is_modified = true;
+			this.options.oql = '';
+			this.options.values = aValues;
+			this._setTitle();
 			this._unmarkAsDraft();
 
 
diff --git a/js/search/search_form_criteria_enum.js b/js/search/search_form_criteria_enum.js
index bb0d91a6d..02e7b2610 100644
--- a/js/search/search_form_criteria_enum.js
+++ b/js/search/search_form_criteria_enum.js
@@ -170,7 +170,10 @@ $(function()
 			});
 
 			// - Apply on check
-			oAllowedValuesElem.find('.sfc_opc_mc_item').on('click', function(oEvent){
+			oAllowedValuesElem.find('.sfc_opc_mc_item input').on('click', function(oEvent){
+				// Prevent propagation, otherwise there will be multiple "_apply()"
+				oEvent.stopPropagation();
+
 				// Uncheck toggler
 				oTogglersElem.find('input:checkbox').prop('checked', false);
 
@@ -184,7 +187,12 @@ $(function()
 		{
 			var iValLimit = 3;
 			var iValCount = Object.keys(this.options.values).length;
-			if(iValCount > iValLimit)
+			var iAllowedValuesCount = (this.options.field.allowed_values.values !== undefined) ? Object.keys(this.options.field.allowed_values.values).length : 0;
+			if( (iValCount === 0) || (iValCount === iAllowedValuesCount) )
+			{
+				sTitle = Dict.Format('UI:Search:Criteria:Title:Enum:In:All', this.options.field.label);
+			}
+			else if(iValCount > iValLimit)
 			{
 				var aFirstValues = [];
 				for(var i=0; i<iValLimit-1; i++)

From 60d6bb79b306676e8a9e71347e4be2b3a79ce8d5 Mon Sep 17 00:00:00 2001
From: Bruno Da Silva <bruno.dasilva@combodo.com>
Date: Wed, 21 Mar 2018 16:38:30 +0000
Subject: [PATCH 098/202] search widget : date widget UI tests

SVN:b1162[5490]
---
 application/nicewebpage.class.inc.php     |  1 +
 dictionaries/en.dictionary.itop.ui.php    | 20 +++++++++++++++++++-
 js/search/search_form_criteria_numeric.js |  2 +-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/application/nicewebpage.class.inc.php b/application/nicewebpage.class.inc.php
index d33218c4c..890ec2763 100644
--- a/application/nicewebpage.class.inc.php
+++ b/application/nicewebpage.class.inc.php
@@ -58,6 +58,7 @@ class NiceWebPage extends WebPage
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_numeric.js');
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_enum.js');
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_external_key.js');
+	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_date_time.js');
 
 	    $this->add_dict_entries('UI:Combo');
 
diff --git a/dictionaries/en.dictionary.itop.ui.php b/dictionaries/en.dictionary.itop.ui.php
index 0efb28ee5..49c776d6b 100644
--- a/dictionaries/en.dictionary.itop.ui.php
+++ b/dictionaries/en.dictionary.itop.ui.php
@@ -1401,18 +1401,32 @@ When associated with a trigger, each action is given an "order" number, specifyi
 	'UI:Search:Criteria:Operator:Numeric:GreaterThanOrEquals' => '>=',
 	'UI:Search:Criteria:Operator:Numeric:LessThan' => '<',
 	'UI:Search:Criteria:Operator:Numeric:LessThanOrEquals' => '<=',
-	'UI:Search:Criteria:Operator:Numeric:DifferentThan' => 'Not',
+	'UI:Search:Criteria:Operator:Numeric:Different' => '≠',
 	'UI:Search:Criteria:Operator:Numeric:Between' => 'Between:',
+	//   - DateTime widget
+	'UI:Search:Criteria:Operator:DateTime:Between' => 'Between:',
 
 	// - Criteria titles
 	//   - Default widget
 	'UI:Search:Criteria:Title:Default:Empty' => '%1$s is empty',
 	'UI:Search:Criteria:Title:Default:NotEmpty' => '%1$s is not empty',
 	'UI:Search:Criteria:Title:Default:Equals' => '%1$s equals %2$s',
+
+	'UI:Search:Criteria:Title:Default:GreaterThan' => '%1$s > %2$s',
+	'UI:Search:Criteria:Title:Default:GreaterThanOrEquals' => '%1$s >= %2$s',
+	'UI:Search:Criteria:Title:Default:LessThan' => '%1$s < %2$s',
+	'UI:Search:Criteria:Title:Default:LessThanOrEquals' => '%1$s <= %2$s',
+	'UI:Search:Criteria:Title:Default:Different' => '%1$s ≠ %2$s',
+	'UI:Search:Criteria:Title:Default:Between' => '%1$s between (%2$s)',
+	'UI:Search:Criteria:Title:Default:BetweenDays' => '%1$s between (%2$s)',
 	//   - String widget
 	'UI:Search:Criteria:Title:String:Contains' => '%1$s contains %2$s',
 	'UI:Search:Criteria:Title:String:StartsWith' => '%1$s starts with %2$s',
 	'UI:Search:Criteria:Title:String:EndsWith' => '%1$s ends with %2$s',
+	//   - Numeric widget
+//	'UI:Search:Criteria:Title:Numeric:Equals' => '%1$s equals %2$s',
+	//   - DateTime widget
+	'UI:Search:Criteria:Title:DateTime:Between' => '%2$s <= 1$s <= %3$s',
 	//   - External key widget
 	'UI:Search:Criteria:Title:ExternalKey:Empty' => '%1$s is defined',
 	'UI:Search:Criteria:Title:ExternalKey:NotEmpty' => '%1$s is not defined',
@@ -1427,4 +1441,8 @@ When associated with a trigger, each action is given an "order" number, specifyi
 	// -
 	'UI:Search:Value:Filter:Placeholder' => 'Filter...',
 	'UI:Search:Value:Toggler:CheckAllNone' => 'Check all / none',
+
+	// - Widget other translations
+	'UI:Search:Criteria:DateTime:From' => 'From',
+	'UI:Search:Criteria:DateTime:Until' => 'Until',
 ));
diff --git a/js/search/search_form_criteria_numeric.js b/js/search/search_form_criteria_numeric.js
index 3b357c50b..a03c56451 100644
--- a/js/search/search_form_criteria_numeric.js
+++ b/js/search/search_form_criteria_numeric.js
@@ -42,7 +42,7 @@ $(function()
 					// 'dropdown_group':1,
 				},
 				'!=': {
-					'label': Dict.S('UI:Search:Criteria:Operator:Numeric:DifferentThan'),
+					'label': Dict.S('UI:Search:Criteria:Operator:Numeric:Different'),
 					'code': 'different',
 					'rank': 500,
 					// 'dropdown_group':1,

From 2d9041c04522bcab24ae22532812aa808fbf91bc Mon Sep 17 00:00:00 2001
From: Guillaume Lajarige <guillaume.lajarige@combodo.com>
Date: Thu, 22 Mar 2018 08:07:50 +0000
Subject: [PATCH 099/202] Advanced search: WIP POC, UI/UX.

SVN:b1162[5491]
---
 css/light-grey.css                        | 14 ++++----
 css/light-grey.scss                       | 19 +++++-----
 js/search/search_form_criteria.js         | 43 ++++++++++++-----------
 js/search/search_form_criteria_enum.js    |  2 +-
 js/search/search_form_criteria_numeric.js | 29 +++------------
 js/search/search_form_handler.js          | 28 ++++++++++-----
 6 files changed, 68 insertions(+), 67 deletions(-)

diff --git a/css/light-grey.css b/css/light-grey.css
index 0b9e6643f..533163e57 100644
--- a/css/light-grey.css
+++ b/css/light-grey.css
@@ -700,7 +700,6 @@ input.dp-applied {
   margin-top: 0;
 }
 /* Search forms v2 */
-/* TODO: Remove comment before final commit */
 .search_box {
   box-sizing: border-box;
   position: relative;
@@ -773,11 +772,9 @@ input.dp-applied {
   /* Criteria tags */
   /* More criterion */
 }
-.search_form_handler .sf_criterion_area .sf_active_criterion, .search_form_handler .sf_criterion_area .sf_more_criterion {
+.search_form_handler .sf_criterion_area .search_form_criteria, .search_form_handler .sf_criterion_area .sf_more_criterion {
   position: relative;
   display: inline-block;
-}
-.search_form_handler .sf_criterion_area .search_form_criteria, .search_form_handler .sf_criterion_area .sf_more_criterion {
   margin-bottom: 5px;
   vertical-align: top;
 }
@@ -808,8 +805,6 @@ input.dp-applied {
   margin-top: -1px;
 }
 .search_form_handler .sf_criterion_area .search_form_criteria {
-  position: relative;
-  display: inline-block;
   margin-right: 5px;
   /* Non editable criteria */
   /* Draft criteria (modifications not applied) */
@@ -1034,6 +1029,13 @@ input.dp-applied {
   cursor: pointer;
   white-space: nowrap;
 }
+.sf_results_area .sf_results_placeholder {
+  margin-top: 100px;
+  text-align: center;
+}
+.sf_results_area .sf_results_placeholder button > span {
+  margin-left: 0.5em;
+}
 .mandatory {
   border: 1px solid #f00;
 }
diff --git a/css/light-grey.scss b/css/light-grey.scss
index 28a435552..d3934570e 100644
--- a/css/light-grey.scss
+++ b/css/light-grey.scss
@@ -781,7 +781,6 @@ input.dp-applied {
 	margin-top: 0;
 }
 /* Search forms v2 */
-/* TODO: Remove comment before final commit */
 .search_box{
 	box-sizing: border-box;
 	position: relative;
@@ -862,14 +861,10 @@ input.dp-applied {
 		background-color: $white;
 
 		/* Common style between criterion and more criterion */
-		.sf_active_criterion,
+		.search_form_criteria,
 		.sf_more_criterion {
 			position: relative;
 			display: inline-block;
-		}
-
-		.search_form_criteria,
-		.sf_more_criterion {
 			margin-bottom: 5px;
 			vertical-align: top;
 
@@ -905,8 +900,6 @@ input.dp-applied {
 
 		/* Criteria tags */
 		.search_form_criteria{
-			position: relative;
-			display: inline-block;
 			margin-right: 5px;
 
 
@@ -1207,6 +1200,16 @@ input.dp-applied {
 		}
 	}
 }
+.sf_results_area{
+	.sf_results_placeholder{
+		margin-top: 100px;
+		text-align: center;
+
+		button > span{
+			margin-left: 0.5em;
+		}
+	}
+}
 
 .mandatory {
 	border: 1px solid #f00;
diff --git a/js/search/search_form_criteria.js b/js/search/search_form_criteria.js
index fa036bd52..7abb41dcd 100644
--- a/js/search/search_form_criteria.js
+++ b/js/search/search_form_criteria.js
@@ -260,10 +260,6 @@ $(function()
 			// Trigger event to handler
 			this.handler.triggerHandler('itop.search.criteria.value_changed');
 		},
-		_cancel: function()
-		{
-			this._close();
-		},
 
 
 		// Event callbacks
@@ -271,10 +267,11 @@ $(function()
 		_onButtonApply: function()
 		{
 			this._apply();
+			this._close();
 		},
 		_onButtonCancel: function()
 		{
-			this._cancel();
+			this._close();
 		},
 		_onButtonMore: function()
 		{
@@ -332,6 +329,24 @@ $(function()
 					me._open();
 				}
 			});
+			this.element.on('keydown', function(oEvent){
+				// Apply if "enter" key
+				if(oEvent.key === 'Enter')
+				{
+					me._apply();
+
+					// Keep criteria open only on Ctrl + Enter.
+					if(oEvent.ctrlKey === false)
+					{
+						me._close();
+					}
+				}
+				// Close if "escape" key
+				else if(oEvent.key === 'Escape')
+				{
+					me._close();
+				}
+			});
 
 			// Removable / locked decoration
 			if(this.options.is_removable === true)
@@ -494,7 +509,7 @@ $(function()
 
 			// Bind events
 			// - Check radio button on click and mark criteria as draft
-			oOpElem.on('click', function(){
+			oOpElem.on('click focusin', function(){
 				var bIsChecked = oOpElem.find('.sfc_op_radio').prop('checked');
 
 				if(bIsChecked === false)
@@ -522,21 +537,9 @@ $(function()
 				}
 				oOpContentElem.focus();
 			});
-			// - Apply on "enter" key hit
-			oOpContentElem.on('keyup', function(oEvent){
-				// Check operator's radio if not already (typically when focusing in input via "tab" key)
-				if(oOpElem.find('.sfc_op_radio').prop('checked') === false)
-				{
-					oOpElem.find('.sfc_op_radio').prop('checked', true)
-				}
-
+			// - Mark as draft on key typing
+			oOpContentElem.on('keydown', function(oEvent){
 				me._markAsDraft();
-
-				// Apply if enter key
-				if(oEvent.key === 'Enter')
-				{
-					me._apply();
-				}
 			});
 
 			oOpElem.find('.sfc_op_content').append(oOpContentElem);
diff --git a/js/search/search_form_criteria_enum.js b/js/search/search_form_criteria_enum.js
index 02e7b2610..eae65f3c1 100644
--- a/js/search/search_form_criteria_enum.js
+++ b/js/search/search_form_criteria_enum.js
@@ -129,7 +129,7 @@ $(function()
 			});
 
 			// - Filter
-			oFilterElem.find('input').on('keyup focus', function(oEvent){
+			oFilterElem.find('input').on('keydown focus', function(oEvent){
 				// TODO: Move on values with up and down arrow keys; select with space or enter.
 
 				var sFilter = $(this).val();
diff --git a/js/search/search_form_criteria_numeric.js b/js/search/search_form_criteria_numeric.js
index a03c56451..e9aa1c00f 100644
--- a/js/search/search_form_criteria_numeric.js
+++ b/js/search/search_form_criteria_numeric.js
@@ -127,21 +127,9 @@ $(function()
 				oOpContentElemFrom.focus();
 			});
 			// - Apply on "enter" key hit
-			//todo: this could be refactored
-			oOpContentElem.on('keyup', function(oEvent){
-				// Check operator's radio if not already (typically when focusing in input via "tab" key)
-				if(oOpElem.find('.sfc_op_radio').prop('checked') === false)
-				{
-					oOpElem.find('.sfc_op_radio').prop('checked', true)
-				}
-
+			// TODO: this could be refactored
+			oOpContentElem.on('keydown', function(oEvent){
 				me._markAsDraft();
-
-				// Apply if enter key
-				if(oEvent.key === 'Enter')
-				{
-					me._apply();
-				}
 			});
 
 			oOpElem.find('.sfc_op_content').append(oOpContentElem);
@@ -201,7 +189,7 @@ $(function()
 			this._super(oOpElem, sOpIdx, oOp);
 			oOpElem.addClass('force_hide')
 
-			//TODO: move this into the abstract widget
+			//TODO: Move this into the abstract widget
 
 			// DOM element
 			oDropdownElem = this.element.find('select.dropdown_group_'+oOp.dropdown_group);
@@ -221,7 +209,7 @@ $(function()
 				// Create DOM element from template
 				var oOpElemDropdown = $(this._getOperatorTemplate()).uniqueId();
 
-				//todo : if this code is keeped, the radio mustr have an id and the label need to point to it
+				// TODO: If this code is keeped, the radio must have an id and the label need to point to it
 				oOpElemDropdown
 					.addClass('sfc_fg_operator_dropdown_group')
 					.attr('data-operator-code', 'dropdown_group')
@@ -232,14 +220,7 @@ $(function()
 						.val(sOpIdx)
 					.end()
 					.on('click', function(oEvent){
-						var bIsChecked = oOpElemDropdown.find('.sfc_op_radio').prop('checked');
-
-						if(bIsChecked === false)
-						{
-							oOpElemDropdown.find('.sfc_op_radio').prop('checked', true);
-							me._markAsDraft();
-						}
-						oOpElemDropdown.find('input[type="text"]:first').focus();
+						//oOpElemDropdown.find('input[type="text"]:first').focus();
 					})
 					.appendTo(this.element.find('.sfc_fg_operators'))
 				;
diff --git a/js/search/search_form_handler.js b/js/search/search_form_handler.js
index 5176cf51c..48702ea26 100644
--- a/js/search/search_form_handler.js
+++ b/js/search/search_form_handler.js
@@ -71,7 +71,7 @@ $(function()
 		elements:
 		{
 			message_area: null,
-			active_criterion: null,
+			criterion_area: null,
 			more_criterion: null,
 			results_area: null,
 		},
@@ -160,7 +160,7 @@ $(function()
 				}]
 			};
 			// - Retrieve criterion
-			this.elements.active_criterion.find('.search_form_criteria').each(function(){
+			this.elements.criterion_area.find('.search_form_criteria').each(function(){
 				var oCriteriaData = $(this).triggerHandler('itop.search.criteria.get_data');
 				oCriterion['or'][0]['and'].push(oCriteriaData);
 			});
@@ -205,7 +205,7 @@ $(function()
 		// - Close all criterion
 		_closeAllCriterion: function()
 		{
-			this.elements.active_criterion.find('.search_form_criteria').each(function(){
+			this.elements.criterion_area.find('.search_form_criteria').each(function(){
 				$(this).triggerHandler('itop.search.criteria.close');
 			});
 		},
@@ -255,13 +255,12 @@ $(function()
 				oCriterionAreaElem = $('<div></div>').appendTo(this.element);
 			}
 			oCriterionAreaElem.addClass('sf_criterion_area');
+			this.elements.criterion_area = oCriterionAreaElem;
 
-			// Clean area
+				// Clean area
 			oCriterionAreaElem
 				.html('')
-				.append('<div class="sf_active_criterion"></div>')
 				.append('<div class="sf_more_criterion"></div>');
-			this.elements.active_criterion = oCriterionAreaElem.find('.sf_active_criterion');
 			this.elements.more_criterion = oCriterionAreaElem.find('.sf_more_criterion');
 
 			// Prepare content
@@ -386,6 +385,8 @@ $(function()
 		// - Prepare results area
 		_prepareResultsArea: function()
 		{
+			var me = this;
+
 			var oResultAreaElem;
 
 			// Build area element
@@ -402,11 +403,22 @@ $(function()
 				}
 				else
 				{
-					oResultAreaElem = $('<div></div>').insertAfter(this.element.closest('.display_block'));
+					oResultAreaElem = $('<div class="display_block"></div>').insertAfter(this.element.closest('.display_block'));
 				}
 			}
 			oResultAreaElem.addClass('sf_results_area');
 
+			// Make placeholder if nothing yet
+			if(oResultAreaElem.html() === '')
+			{
+				// TODO: Make a good UI for this POC.
+				// TODO: Translate sentence.
+				oResultAreaElem.html('<div class="sf_results_placeholder"><p>Add some criterion on the search box or click the search button to view the objects.</p><p><button type="button">Search<span class="fa fa-search"></span></button></p></div>');
+				oResultAreaElem.find('button').on('click', function(){
+					me._onSubmitClick();
+				});
+			}
+
 			this.elements.results_area = oResultAreaElem;
 		},
 
@@ -440,7 +452,7 @@ $(function()
 				// Create DOM element
 				var oCriteriaElem = $('<div></div>')
 					.addClass('sf_criteria')
-					.appendTo(this.elements.active_criterion);
+					.insertBefore(this.elements.more_criterion);
 
 				// Instanciate widget
 				$.itop[sWidgetName](oData, oCriteriaElem);

From 73e1e3422dd97d49465575c25bb9b22770502334 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Thu, 22 Mar 2018 16:28:54 +0000
Subject: [PATCH 100/202] Advanced Search: Numeric fields and dates

SVN:b1162[5492]
---
 core/oql/expression.class.inc.php             | 66 ++++++++++++-------
 js/search/search_form_criteria_numeric.js     |  2 +-
 .../search/CriterionConversionTest.php        |  2 +-
 3 files changed, 44 insertions(+), 26 deletions(-)

diff --git a/core/oql/expression.class.inc.php b/core/oql/expression.class.inc.php
index ff899d170..63f806382 100644
--- a/core/oql/expression.class.inc.php
+++ b/core/oql/expression.class.inc.php
@@ -50,14 +50,13 @@ abstract class Expression
 	/**
 	 * @param DBObjectSearch $oSearch
 	 * @param array $aArgs
-	 * @param bool $bRetrofitParams
 	 * @param AttributeDefinition $oAttDef
 	 *
 	 * @return array parameters for the search form
 	 */
-	public function Display($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
+	public function Display($oSearch, &$aArgs = null, $oAttDef = null)
 	{
-		return $this->Render($aArgs, $bRetrofitParams);
+		return $this->Render($aArgs);
 	}
 
 	/**
@@ -170,7 +169,7 @@ abstract class Expression
 		return array(
 			'widget' => AttributeDefinition::SEARCH_WIDGET_TYPE_RAW,
 			'oql' => $this->Render($aArgs, $bRetrofitParams),
-			'label' => $this->Display($oSearch, $aArgs, $bRetrofitParams, $oAttDef),
+			'label' => $this->Display($oSearch, $aArgs, $oAttDef),
 			'source' => get_class($this),
 		);
 	}
@@ -432,7 +431,7 @@ class BinaryExpression extends Expression
 	}
 
 	// recursive rendering
-	public function Display($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
+	public function Display($oSearch, &$aArgs = null, $oAttDef = null)
 	{
 		$bReverseOperator = false;
 		$oLeftExpr = $this->GetLeftExpr();
@@ -447,8 +446,8 @@ class BinaryExpression extends Expression
 			$bReverseOperator = true;
 		}
 
-		$sLeft = $oLeftExpr->Display($oSearch, $aArgs, $bRetrofitParams, $oAttDef);
-		$sRight = $oRightExpr->Display($oSearch, $aArgs, $bRetrofitParams, $oAttDef);
+		$sLeft = $oLeftExpr->Display($oSearch, $aArgs, $oAttDef);
+		$sRight = $oRightExpr->Display($oSearch, $aArgs, $oAttDef);
 
 		if ($bReverseOperator)
 		{
@@ -552,7 +551,7 @@ class BinaryExpression extends Expression
 			$aCriteria['operator'] = $this->GetOperator();
 		}
 		$aCriteria['oql'] = $this->Render($aArgs, $bRetrofitParams);
-		$aCriteria['label'] = $this->Display($oSearch, $aArgs, $bRetrofitParams, $oAttDef);
+		$aCriteria['label'] = $this->Display($oSearch, $aArgs, $oAttDef);
 
 		return $aCriteria;
 	}
@@ -643,13 +642,12 @@ class ScalarExpression extends UnaryExpression
 	/**
 	 * @param array $oSearch
 	 * @param array $aArgs
-	 * @param bool $bRetrofitParams
 	 * @param AttributeDefinition $oAttDef
 	 *
 	 * @return array|string
 	 * @throws \Exception
 	 */
-	public function Display($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
+	public function Display($oSearch, &$aArgs = null, $oAttDef = null)
 	{
 		if (!is_null($oAttDef))
 		{
@@ -670,7 +668,12 @@ class ScalarExpression extends UnaryExpression
 			return $oAttDef->GetAsPlainText($this->m_value);
 		}
 
-		return $this->Render($aArgs, $bRetrofitParams);
+		if (strpos($this->m_value, '%') === 0)
+		{
+			return '';
+		}
+
+		return $this->Render($aArgs);
 	}
 
 	// recursive rendering
@@ -718,8 +721,24 @@ class ScalarExpression extends UnaryExpression
 					break;
 			}
 		}
+		$aCriteria = array();
+		switch ((string)($this->m_value))
+		{
+			case '%Y-%m-%d':
+				$aCriteria['date'] = 'd';
+				break;
+			case '%Y-%m':
+				$aCriteria['date'] = 'm';
+				break;
+			case '%w':
+				$aCriteria['date'] = 'w';
+				break;
+			default:
+				$aCriteria['values'] = array($aValue);
+				break;
+		}
 
-		return array('values' => array($aValue));
+		return $aCriteria;
 	}
 
 }
@@ -793,7 +812,6 @@ class FieldExpression extends UnaryExpression
 	/**
 	 * @param DBObjectSearch $oSearch
 	 * @param array $aArgs
-	 * @param bool $bRetrofitParams
 	 * @param AttributeDefinition $oAttDef
 	 *
 	 * @return array|string
@@ -801,7 +819,7 @@ class FieldExpression extends UnaryExpression
 	 * @throws \DictExceptionMissingString
 	 * @throws \Exception
 	 */
-	public function Display($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
+	public function Display($oSearch, &$aArgs = null, $oAttDef = null)
 	{
 		if (empty($this->m_sParent))
 		{
@@ -1019,7 +1037,7 @@ class VariableExpression extends UnaryExpression
 		return $this->m_sName;
 	}
 
-	public function Display($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
+	public function Display($oSearch, &$aArgs = null, $oAttDef = null)
 	{
 		$sValue = $this->m_value;
 		if (!is_null($aArgs) && (array_key_exists($this->m_sName, $aArgs)))
@@ -1074,7 +1092,7 @@ class VariableExpression extends UnaryExpression
 			return $oAttDef->GetAsPlainText($sValue);
 		}
 
-		return $this->Render($aArgs, $bRetrofitParams);
+		return $this->Render($aArgs);
 	}
 
 	// recursive rendering
@@ -1510,12 +1528,8 @@ class FunctionExpression extends Expression
 		return $sRes;
 	}
 
-	public function Display($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
+	public function Display($oSearch, &$aArgs = null, $oAttDef = null)
 	{
-		if ($this->m_sVerb != 'DATE_SUB' && $this->m_sVerb != 'DATE_ADD' && $this->m_sVerb != 'NOW')
-		{
-			return $this->Render($aArgs, $bRetrofitParams);
-		}
 		$sOperation = '';
 		switch ($this->m_sVerb)
 		{
@@ -1528,11 +1542,15 @@ class FunctionExpression extends Expression
 			case 'DATE_ADD':
 				$sOperation = '+';
 				break;
+			case 'DATE_FORMAT':
+				break;
+			default:
+				return $this->Render($aArgs);
 		}
 
 		foreach($this->m_aArgs as $oExpression)
 		{
-			$sOperation .= $oExpression->Display($oSearch, $aArgs, $bRetrofitParams, $oAttDef);
+			$sOperation .= $oExpression->Display($oSearch, $aArgs, $oAttDef);
 		}
 
 		return $sOperation;
@@ -1668,9 +1686,9 @@ class IntervalExpression extends Expression
 		return $aCriteria;
 	}
 
-	public function Display($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
+	public function Display($oSearch, &$aArgs = null, $oAttDef = null)
 	{
-		return $this->m_oValue->Render($aArgs, $bRetrofitParams).' '.$this->m_sUnit;
+		return $this->m_oValue->Render($aArgs) . ' ' . $this->m_sUnit;
 	}
 }
 
diff --git a/js/search/search_form_criteria_numeric.js b/js/search/search_form_criteria_numeric.js
index e9aa1c00f..543d4ace8 100644
--- a/js/search/search_form_criteria_numeric.js
+++ b/js/search/search_form_criteria_numeric.js
@@ -154,7 +154,7 @@ $(function()
 			switch (aValues.length)
 			{
 				case 2:
-					oOpElem.find('.sfc_op_content input[name="until"]').val(aValues[0].value);
+                    oOpElem.find('.sfc_op_content input[name="until"]').val(aValues[1].value);
 					//NO BREAK!!!
 				case 1:
 					oOpElem.find('.sfc_op_content input[name="from"]').val(aValues[0].value);
diff --git a/test/application/search/CriterionConversionTest.php b/test/application/search/CriterionConversionTest.php
index 6da7fafe8..65439e78b 100644
--- a/test/application/search/CriterionConversionTest.php
+++ b/test/application/search/CriterionConversionTest.php
@@ -301,11 +301,11 @@ class CriterionConversionTest extends ItopDataTestCase
 	 */
 	function testOqlToForSearchToOql($sOQL)
 	{
+		$this->debug($sOQL);
 		$oSearchForm = new SearchForm();
 		$oSearch = \DBSearch::FromOQL($sOQL);
 		$aFields = $oSearchForm->GetFields(new \DBObjectSet($oSearch));
 		$aCriterion = $oSearchForm->GetCriterion($oSearch, $aFields);
-		$this->debug($sOQL);
 
 		$aAndCriterion = $aCriterion['or'][0]['and'];
 

From 32809ae7d41721ccf188810f76a9b796552fc09a Mon Sep 17 00:00:00 2001
From: Guillaume Lajarige <guillaume.lajarige@combodo.com>
Date: Thu, 22 Mar 2018 16:52:35 +0000
Subject: [PATCH 101/202] Advanced search: WIP POC, UI/UX.

SVN:b1162[5493]
---
 application/itopwebpage.class.inc.php         |  6 +++--
 js/search/search_form_criteria.js             |  2 +-
 js/search/search_form_criteria_enum.js        | 22 ++++++++++++++++++-
 .../search_form_criteria_external_key.js      |  4 ++++
 js/search/search_form_handler.js              |  1 +
 5 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/application/itopwebpage.class.inc.php b/application/itopwebpage.class.inc.php
index 9dda44bdf..9cc27ac98 100644
--- a/application/itopwebpage.class.inc.php
+++ b/application/itopwebpage.class.inc.php
@@ -112,9 +112,11 @@ class iTopWebPage extends NiceWebPage implements iTabbedPage
 		$sSearchNbSelected = addslashes(Dict::S('UI:SearchValue:NbSelected'));
 		$this->add_dict_entry('UI:FillAllMandatoryFields');
 
-		$this->add_dict_entries('UI:Search:');
-		$this->add_dict_entries('UI:Button:');
 		$this->add_dict_entries('Error:');
+		$this->add_dict_entries('UI:Button:');
+		$this->add_dict_entries('UI:Search:');
+		$this->add_dict_entry('UI:UndefinedObject');
+		$this->add_dict_entries('Enum:Undefined');
 
 
 		if (!$this->IsPrintableVersion())
diff --git a/js/search/search_form_criteria.js b/js/search/search_form_criteria.js
index 7abb41dcd..fda9b2c3a 100644
--- a/js/search/search_form_criteria.js
+++ b/js/search/search_form_criteria.js
@@ -15,11 +15,11 @@ $(function()
 			'values': [],
 			'oql': '',
 			'is_removable': true, // Not used for now. If we come to show locked criterion they will need to have this flag set to false.
-			'is_null_allowed': false,
 
 			'field': {
 				'label': '',
 				'allowed_values': null,
+				'is_null_allowed': false,
 			},
 			// Available operators. They can be extended or restricted by derivated widgets (see this._initOperators() for more informations)
 			'available_operators': {
diff --git a/js/search/search_form_criteria_enum.js b/js/search/search_form_criteria_enum.js
index eae65f3c1..ead3d7d7f 100644
--- a/js/search/search_form_criteria_enum.js
+++ b/js/search/search_form_criteria_enum.js
@@ -18,7 +18,15 @@ $(function()
 					'code': 'in',
 					'rank': 10,
 				},
-				'=': null,	// Remove this one from enum widget.
+				'=': null,			// Remove this one from enum widget.
+				'empty': null,		// Remove as it will be handle by the "null" value in the "IN" operator
+				'not_empty': null,	// Remove as it will be handle by the "null" value in the "IN" operator
+			},
+
+			// Null value
+			'null_value': {
+				'code': null,
+				'label': Dict.S('Enum:Undefined'),
 			},
 		},
 
@@ -93,6 +101,18 @@ $(function()
 
 			// - Allowed values
 			var oAllowedValuesElem = $('<div class="sfc_opc_mc_items"></div>');
+			//   - Null value is allowed
+			// TODO: We might want to move this into the allowed_values for a standard behavior. But that needs to know how to send the "null" value to the server.
+			if(this.options.field.is_null_allowed === true)
+			{
+				var sItemId = 'value_' + sOpId + '_null';
+				var sValCode = this.options.null_value.code;
+				var sValLabel = this.options.null_value.label;
+				var oValueElem = $('<div class="sfc_opc_mc_item" data-value-code="' + sValCode + '"></div>')
+					.append('<label for="' + sItemId + '"><input type="checkbox" id="' + sItemId + '" value="' + sValCode + '"/>' + sValLabel + '</label>')
+					.appendTo(oAllowedValuesElem);
+			}
+			//   - Regular allowed values
 			if(this.options.field.allowed_values.values !== undefined)
 			{
 				var aSortedValues = this._sortValuesByLabel(this.options.field.allowed_values.values);
diff --git a/js/search/search_form_criteria_external_key.js b/js/search/search_form_criteria_external_key.js
index ff31806be..1513cb24e 100644
--- a/js/search/search_form_criteria_external_key.js
+++ b/js/search/search_form_criteria_external_key.js
@@ -9,6 +9,10 @@ $(function()
 		// default options
 		options:
 		{
+			// Null value
+			'null_value': {
+				'label': Dict.S('UI:UndefinedObject'),
+			}
 		},
 
    
diff --git a/js/search/search_form_handler.js b/js/search/search_form_handler.js
index 48702ea26..d4bcf11f5 100644
--- a/js/search/search_form_handler.js
+++ b/js/search/search_form_handler.js
@@ -446,6 +446,7 @@ $(function()
 						code: oFieldDef.code,
 						widget: oFieldDef.widget,
 						allowed_values: oFieldDef.allowed_values,
+						is_null_allowed: oFieldDef.is_null_allowed,
 					};
 				}
 

From 62895eedb7617b83ad86542ef2e1d777514fb9f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Thu, 22 Mar 2018 16:59:42 +0000
Subject: [PATCH 102/202] Advanced Search: Add Id in search forms

SVN:b1162[5494]
---
 .../search/searchform.class.inc.php           | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/sources/application/search/searchform.class.inc.php b/sources/application/search/searchform.class.inc.php
index 3b0454976..45a2ca182 100644
--- a/sources/application/search/searchform.class.inc.php
+++ b/sources/application/search/searchform.class.inc.php
@@ -205,7 +205,8 @@ class SearchForm
 			{
 				$aAttributeDefs = MetaModel::ListAttributeDefs($sClass);
 				$aList = MetaModel::GetZListItems($sClass, 'standard_search');
-				$aZList = array();
+				
+				$aZList = $this->AppendId($sClass, $sAlias, array());
 				foreach($aList as $sAttCode)
 				{
 					if (array_key_exists($sAttCode, $aAttributeDefs))
@@ -330,6 +331,26 @@ class SearchForm
 		return array('or' => $aOrCriterion);
 	}
 
+	/**
+	 * @param $sClass
+	 * @param $sClassAlias
+	 * @param $aFields
+	 *
+	 * @return mixed
+	 */
+	private function AppendId($sClass, $sClassAlias, $aFields)
+	{
+		$aField = array();
+		$aField['code'] = 'id';
+		$aField['class'] = $sClass;
+		$aField['class_alias'] = $sClassAlias;
+		$aField['label'] = 'Id';
+		$aField['widget'] = AttributeDefinition::SEARCH_WIDGET_TYPE_NUMERIC;
+		$aField['is_null_allowed'] = false;
+		$aFields[$sClassAlias . '.id'] = $aField;
+		$this->aLabels['Id'] = true;
+		return $aFields;
+	}
 	/**
 	 * @param $sClass
 	 * @param $sClassAlias

From 35c016482b6b5750ba652d355808823f196e53cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Thu, 22 Mar 2018 17:36:29 +0000
Subject: [PATCH 103/202] Advanced Search: Support of undefined values for enum
 and external keys

SVN:b1162[5495]
---
 .../criteriontooql.class.inc.php              | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/sources/application/search/criterionconversion/criteriontooql.class.inc.php b/sources/application/search/criterionconversion/criteriontooql.class.inc.php
index a565f5d3d..cc8b69fd2 100644
--- a/sources/application/search/criterionconversion/criteriontooql.class.inc.php
+++ b/sources/application/search/criterionconversion/criteriontooql.class.inc.php
@@ -25,6 +25,7 @@ namespace Combodo\iTop\Application\Search\CriterionConversion;
 
 use AttributeDateTime;
 use AttributeDefinition;
+use AttributeExternalKey;
 use Combodo\iTop\Application\Search\AjaxSearchException;
 use Combodo\iTop\Application\Search\CriterionConversionAbstract;
 use Combodo\iTop\Application\Search\SearchForm;
@@ -149,6 +150,8 @@ class CriterionToOQL extends CriterionConversionAbstract
 			return "1";
 		}
 
+		$bFilterOnUndefined = false;
+		$sFilterOnUndefined = '';
 		try
 		{
 			$aAttributeDefs = \MetaModel::ListAttributeDefs($sClass);
@@ -182,6 +185,25 @@ class CriterionToOQL extends CriterionConversionAbstract
 							}
 						}
 					}
+					// search for "undefined"
+					for ($i = 0; $i < count($aValues); $i++)
+					{
+						$aValue = $aValues[$i];
+						if (isset($aValue['value']) && ($aValue['value'] === 'null'))
+						{
+							if ($oAttDef instanceof AttributeExternalKey)
+							{
+								$sFilterOnUndefined = "({$sRef} = 0)";
+							}
+							else
+							{
+								$sFilterOnUndefined = "ISNULL({$sRef})";
+							}
+							$bFilterOnUndefined = true;
+							unset($aValues[$i]);
+							break;
+						}
+					}
 				}
 			}
 		} catch (\CoreException $e)
@@ -195,6 +217,21 @@ class CriterionToOQL extends CriterionConversionAbstract
 		}
 		$sInList = implode("','", $aInValues);
 
+		if ($bFilterOnUndefined)
+		{
+			if (count($aValues) === 0)
+			{
+				return "{$sFilterOnUndefined}";
+			}
+
+			if (count($aInValues) == 1)
+			{
+				return "(({$sRef} = '$sInList') OR {$sFilterOnUndefined})";
+			}
+
+			return "({$sRef} IN ('$sInList') OR {$sFilterOnUndefined})";
+		}
+
 		if (count($aInValues) == 1)
 		{
 			return "({$sRef} = '$sInList')";

From 254b3fe9aacc461f9d8f6d2fd963f08b9f0e371b Mon Sep 17 00:00:00 2001
From: Guillaume Lajarige <guillaume.lajarige@combodo.com>
Date: Thu, 22 Mar 2018 17:56:19 +0000
Subject: [PATCH 104/202] Advanced search: UX on enum widget.

SVN:b1162[5496]
---
 css/light-grey.css                     | 30 ++++++++++++++++-------
 css/light-grey.scss                    | 33 +++++++++++++++++---------
 js/search/search_form_criteria_enum.js |  3 ++-
 3 files changed, 46 insertions(+), 20 deletions(-)

diff --git a/css/light-grey.css b/css/light-grey.css
index 533163e57..f9257acf1 100644
--- a/css/light-grey.css
+++ b/css/light-grey.css
@@ -859,6 +859,8 @@ input.dp-applied {
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group {
   /* Form group (operators) is displayed only when the criteria is toggled to opened state */
   display: none;
+  max-height: 520px;
+  overflow: auto;
   /* Show only first operator in simple mode */
   /* Show all operators in advanced mode */
 }
@@ -887,8 +889,12 @@ input.dp-applied {
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_op_name {
   width: 90px;
 }
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_opc_multichoices {
+  padding: 4px 8px;
+}
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_opc_multichoices label > input {
   vertical-align: middle;
+  margin-left: 0px;
   margin-right: 8px;
 }
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_opc_multichoices .sfc_opc_mc_filter {
@@ -909,16 +915,20 @@ input.dp-applied {
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_opc_multichoices .sfc_opc_mc_filter .sfc_opc_mc_reset {
   display: none;
 }
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_opc_multichoices .sfc_opc_mc_items {
+  max-height: 445px;
+  /* Must be less than .sfc_form_group:max-height - .sfc_opc_mc_toggler:height - .sfc_opc_mc_filter:height */
+  overflow-x: hidden;
+  overflow-y: auto;
+  margin: 0px -8px;
+  /* Compensate .sfc_opc_multichoices side padding so the hover style can take the full with */
+}
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_opc_multichoices .sfc_opc_mc_items .sfc_opc_mc_item {
-  margin: 0px -5px 0px -5px;
-  /* -5px to compensate padding and keep aligned to the filter left side */
-  padding: 5px;
+  padding: 4px 8px;
+  /* Putting back the padding remove by .sfc_opc_mc_items */
 }
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_opc_multichoices .sfc_opc_mc_items .sfc_opc_mc_item:hover {
-  padding: 4px;
-  /* Normal padding - border size */
   background-color: #fff;
-  border: 1px solid #3f7294;
   /* TODO: Try with this */
   /*background-color: $box-blue-border-color;
    color: $white;*/
@@ -986,13 +996,17 @@ input.dp-applied {
 .search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_raw .sfc_form_group {
   display: none;
 }
-.search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_enum .sfc_fg_operator_in > label {
+.search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_enum .sfc_form_group {
+  padding: 0px;
+  /* Resetting as there will be only the multichoices operator. Remove this if other operators are added. */
+}
+.search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_enum .sfc_form_group .sfc_fg_operator_in > label {
   display: inline-block;
   width: 100%;
   line-height: initial;
   white-space: nowrap;
 }
-.search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_enum .sfc_fg_operator_in > label .sfc_op_content {
+.search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_enum .sfc_form_group .sfc_fg_operator_in > label .sfc_op_content {
   width: 100%;
 }
 .search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_numeric .sfc_fg_operator_dropdown_group select {
diff --git a/css/light-grey.scss b/css/light-grey.scss
index d3934570e..63e543877 100644
--- a/css/light-grey.scss
+++ b/css/light-grey.scss
@@ -963,6 +963,8 @@ input.dp-applied {
 			.sfc_form_group{
 				/* Form group (operators) is displayed only when the criteria is toggled to opened state */
 				display: none;
+				max-height: 520px;
+				overflow: auto;
 
 				.sfc_fg_operators{
 					font-size: 12px;
@@ -993,8 +995,11 @@ input.dp-applied {
 						}
 
 						.sfc_opc_multichoices{
+							padding: 4px 8px;
+
 							label > input{
 								vertical-align: middle;
+								margin-left: 0px;
 								margin-right: 8px;
 							}
 							.sfc_opc_mc_toggler{
@@ -1020,14 +1025,16 @@ input.dp-applied {
 								}
 							}
 							.sfc_opc_mc_items{
+								max-height: 445px; /* Must be less than .sfc_form_group:max-height - .sfc_opc_mc_toggler:height - .sfc_opc_mc_filter:height */
+								overflow-x: hidden;
+								overflow-y: auto;
+								margin: 0px -8px; /* Compensate .sfc_opc_multichoices side padding so the hover style can take the full with */
+
 								.sfc_opc_mc_item{
-									margin: 0px -5px 0px -5px; /* -5px to compensate padding and keep aligned to the filter left side */
-									padding: 5px;
+									padding: 4px 8px; /* Putting back the padding remove by .sfc_opc_mc_items */
 
 									&:hover{
-										padding: 4px; /* Normal padding - border size */
 										background-color: $white;
-										border: 1px solid $box-blue-border-color;
 										/* TODO: Try with this */
 										/*background-color: $box-blue-border-color;
 										color: $white;*/
@@ -1132,15 +1139,19 @@ input.dp-applied {
 				}
 			}
 			&.search_form_criteria_enum{
-				.sfc_fg_operator_in{
-					> label{
-						display: inline-block;
-						width: 100%;
-						line-height: initial;
-						white-space: nowrap;
+				.sfc_form_group{
+					padding: 0px; /* Resetting as there will be only the multichoices operator. Remove this if other operators are added. */
 
-						.sfc_op_content{
+					.sfc_fg_operator_in{
+						> label{
+							display: inline-block;
 							width: 100%;
+							line-height: initial;
+							white-space: nowrap;
+
+							.sfc_op_content{
+								width: 100%;
+							}
 						}
 					}
 				}
diff --git a/js/search/search_form_criteria_enum.js b/js/search/search_form_criteria_enum.js
index ead3d7d7f..a5d81da0d 100644
--- a/js/search/search_form_criteria_enum.js
+++ b/js/search/search_form_criteria_enum.js
@@ -149,7 +149,8 @@ $(function()
 			});
 
 			// - Filter
-			oFilterElem.find('input').on('keydown focus', function(oEvent){
+			// Note: "keyup" event is use instead of "keydown", otherwise, the inpu value would not be set yet.
+			oFilterElem.find('input').on('keyup focus', function(oEvent){
 				// TODO: Move on values with up and down arrow keys; select with space or enter.
 
 				var sFilter = $(this).val();

From bbb4959f22efc11fa4520d3929936fc3ca76bf25 Mon Sep 17 00:00:00 2001
From: Guillaume Lajarige <guillaume.lajarige@combodo.com>
Date: Thu, 22 Mar 2018 18:15:56 +0000
Subject: [PATCH 105/202] Advanced search: UX on enum widget.

SVN:b1162[5497]
---
 js/search/search_form_criteria_enum.js | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/js/search/search_form_criteria_enum.js b/js/search/search_form_criteria_enum.js
index a5d81da0d..d68f2438c 100644
--- a/js/search/search_form_criteria_enum.js
+++ b/js/search/search_form_criteria_enum.js
@@ -101,8 +101,11 @@ $(function()
 
 			// - Allowed values
 			var oAllowedValuesElem = $('<div class="sfc_opc_mc_items"></div>');
-			//   - Null value is allowed
-			// TODO: We might want to move this into the allowed_values for a standard behavior. But that needs to know how to send the "null" value to the server.
+
+			//   - Null value if allowed
+			//   Note: null values is NOT put among the allowed values for two reasons:
+			//     - It must be the first value of the list
+			//     - It is not give by neither the autocomplete or the pre-filled values, so we would need to manually add it in both cases, all operations.
 			if(this.options.field.is_null_allowed === true)
 			{
 				var sItemId = 'value_' + sOpId + '_null';
@@ -112,6 +115,7 @@ $(function()
 					.append('<label for="' + sItemId + '"><input type="checkbox" id="' + sItemId + '" value="' + sValCode + '"/>' + sValLabel + '</label>')
 					.appendTo(oAllowedValuesElem);
 			}
+
 			//   - Regular allowed values
 			if(this.options.field.allowed_values.values !== undefined)
 			{
@@ -209,6 +213,14 @@ $(function()
 			var iValLimit = 3;
 			var iValCount = Object.keys(this.options.values).length;
 			var iAllowedValuesCount = (this.options.field.allowed_values.values !== undefined) ? Object.keys(this.options.field.allowed_values.values).length : 0;
+
+			// Manually increase allowed values count if null is allowed
+			if(this.options.field.is_null_allowed === true)
+			{
+				iAllowedValuesCount++;
+			}
+
+			// Making right tite regarding the number of selected values
 			if( (iValCount === 0) || (iValCount === iAllowedValuesCount) )
 			{
 				sTitle = Dict.Format('UI:Search:Criteria:Title:Enum:In:All', this.options.field.label);

From a7d11c66705a12e995d151deb7f5180f4f918381 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Fri, 23 Mar 2018 09:00:57 +0000
Subject: [PATCH 106/202] Advanced Search: Dates between

SVN:b1162[5498]
---
 .../criteriontooql.class.inc.php                  | 15 +++++++++++----
 .../criteriontosearchform.class.inc.php           |  5 ++---
 .../criterionconversionabstract.class.inc.php     |  3 +--
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/sources/application/search/criterionconversion/criteriontooql.class.inc.php b/sources/application/search/criterionconversion/criteriontooql.class.inc.php
index cc8b69fd2..aa283a902 100644
--- a/sources/application/search/criterionconversion/criteriontooql.class.inc.php
+++ b/sources/application/search/criterionconversion/criteriontooql.class.inc.php
@@ -56,8 +56,7 @@ class CriterionToOQL extends CriterionConversionAbstract
 			self::OP_ENDS_WITH => 'EndsWithToOql',
 			self::OP_EMPTY => 'EmptyToOql',
 			self::OP_NOT_EMPTY => 'NotEmptyToOql',
-			self::OP_BETWEEN_DAYS => 'BetweenDaysToOql',
-			self::OP_BETWEEN_HOURS => 'BetweenHoursToOql',
+			self::OP_BETWEEN_DATES => 'BetweenDatesToOql',
 			self::OP_BETWEEN => 'BetweenToOql',
 			self::OP_IN => 'InToOql',
 			self::OP_ALL => 'AllToOql',
@@ -287,7 +286,7 @@ class CriterionToOQL extends CriterionConversionAbstract
 		return $sOQL;
 	}
 
-	protected static function BetweenHoursToOql($sRef, $aCriteria)
+	protected static function BetweenDatesToOql($sRef, $aCriteria)
 	{
 		$aOQL = array();
 
@@ -302,7 +301,15 @@ class CriterionToOQL extends CriterionConversionAbstract
 		$sStartDate = $aValues[0]['value'];
 		if (!empty($sStartDate))
 		{
-			$oDate = $oFormat->parse($sStartDate);
+			try
+			{
+				$oDate = $oFormat->parse($sStartDate);
+			}
+			catch (\Exception $e)
+			{
+				// Not the date time format, try the date format
+				return self::BetweenDaysToOql($sRef, $aCriteria);
+			}
 			$sStartDate = $oDate->format(AttributeDateTime::GetSQLFormat());
 			$aOQL[] = "({$sRef} >= '$sStartDate')";
 		}
diff --git a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
index a8e04594b..c330133bc 100644
--- a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
+++ b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
@@ -168,7 +168,7 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 
 		// Merge into 'between' operation.
 		// The ends of the interval are included
-		$aCurrCriterion['operator'] = 'between_days';
+		$aCurrCriterion['operator'] = 'between_dates';
 		$sFormat = AttributeDateTime::GetFormat()->ToMomentJS();
 		$sLastDate = $aPrevCriterion['values'][0]['value'];
 		if ($sPrevOperator == '<')
@@ -259,14 +259,13 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 		$sLastDate = $aPrevCriterion['values'][0]['value'];
 		$sFirstDate = $aCurrCriterion['values'][0]['value'];
 		$oDate = new DateTime($sLastDate);
+		$aCurrCriterion['operator'] = 'between_dates';
 		if ((strpos($sFirstDate, '00:00:00') != false) && (strpos($sLastDate, '00:00:00') != false))
 		{
-			$aCurrCriterion['operator'] = 'between_days';
 			$sInterval = '1 day';
 		}
 		else
 		{
-			$aCurrCriterion['operator'] = 'between_hours';
 			$sInterval = '1 second';
 		}
 
diff --git a/sources/application/search/criterionconversionabstract.class.inc.php b/sources/application/search/criterionconversionabstract.class.inc.php
index 2307669f3..041d840e8 100644
--- a/sources/application/search/criterionconversionabstract.class.inc.php
+++ b/sources/application/search/criterionconversionabstract.class.inc.php
@@ -32,8 +32,7 @@ abstract class CriterionConversionAbstract
 	const OP_EMPTY = 'empty';
 	const OP_NOT_EMPTY = 'not_empty';
 	const OP_IN = 'IN';
-	const OP_BETWEEN_DAYS = 'between_days';
-	const OP_BETWEEN_HOURS = 'between_hours';
+	const OP_BETWEEN_DATES = 'between_dates';
 	const OP_BETWEEN = 'between';
 	const OP_ALL = 'all';
 

From ddcb709fd15dd2ef5df92e886ae6b127db7bf2c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Fri, 23 Mar 2018 09:21:44 +0000
Subject: [PATCH 107/202] Advanced Search: Dates between

SVN:b1162[5499]
---
 .../criterionconversion/criteriontosearchform.class.inc.php    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
index c330133bc..441c45e9d 100644
--- a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
+++ b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
@@ -260,7 +260,8 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 		$sFirstDate = $aCurrCriterion['values'][0]['value'];
 		$oDate = new DateTime($sLastDate);
 		$aCurrCriterion['operator'] = 'between_dates';
-		if ((strpos($sFirstDate, '00:00:00') != false) && (strpos($sLastDate, '00:00:00') != false))
+		$sPattern = '@^[\d-]{10}( 00:00:00)?$@';
+		if (preg_match($sPattern, $sFirstDate) && preg_match($sPattern, $sLastDate))
 		{
 			$sInterval = '1 day';
 		}

From 0253f7d0690bfc9cf38288cf7952654cba9fffa6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Fri, 23 Mar 2018 09:28:47 +0000
Subject: [PATCH 108/202] Advanced Search: Dates between

SVN:b1162[5500]
---
 .../criteriontosearchform.class.inc.php                | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
index 441c45e9d..d86fbd18a 100644
--- a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
+++ b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
@@ -260,15 +260,7 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 		$sFirstDate = $aCurrCriterion['values'][0]['value'];
 		$oDate = new DateTime($sLastDate);
 		$aCurrCriterion['operator'] = 'between_dates';
-		$sPattern = '@^[\d-]{10}( 00:00:00)?$@';
-		if (preg_match($sPattern, $sFirstDate) && preg_match($sPattern, $sLastDate))
-		{
-			$sInterval = '1 day';
-		}
-		else
-		{
-			$sInterval = '1 second';
-		}
+		$sInterval = '1 second';
 
 		if ($sPrevOperator == '<')
 		{

From 85397c4e281e8c43c2e7344713f280559d001670 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Fri, 23 Mar 2018 09:34:21 +0000
Subject: [PATCH 109/202] Advanced Search: Dates between

SVN:b1162[5501]
---
 .../criteriontooql.class.inc.php              | 57 +------------------
 1 file changed, 1 insertion(+), 56 deletions(-)

diff --git a/sources/application/search/criterionconversion/criteriontooql.class.inc.php b/sources/application/search/criterionconversion/criteriontooql.class.inc.php
index aa283a902..ab628bfef 100644
--- a/sources/application/search/criterionconversion/criteriontooql.class.inc.php
+++ b/sources/application/search/criterionconversion/criteriontooql.class.inc.php
@@ -239,53 +239,6 @@ class CriterionToOQL extends CriterionConversionAbstract
 		return "({$sRef} IN ('$sInList'))";
 	}
 
-	protected static function BetweenDaysToOql($sRef, $aCriteria)
-	{
-		$aOQL = array();
-
-		$aValues = self::GetValues($aCriteria);
-		if (count($aValues) != 2)
-		{
-			return "1";
-		}
-
-		$oFormat = AttributeDateTime::GetFormat();
-
-		$sStartDate = $aValues[0]['value'];
-		if (!empty($sStartDate))
-		{
-			$oDate = $oFormat->parse($sStartDate);
-			$sStartDate = $oDate->format(AttributeDateTime::GetSQLFormat());
-			$aOQL[] = "({$sRef} >= '$sStartDate')";
-		}
-
-		$sEndDate = $aValues[1]['value'];
-		if (!empty($sEndDate))
-		{
-			$oDate = $oFormat->parse($sEndDate);
-			if ($aCriteria['widget'] == AttributeDefinition::SEARCH_WIDGET_TYPE_DATE_TIME)
-			{
-				$oDate->add(DateInterval::createFromDateString('1 day'));
-				$sEndDate = $oDate->format(AttributeDateTime::GetSQLFormat());
-				$aOQL[] = "({$sRef} < '$sEndDate')";
-			}
-			else
-			{
-				$sEndDate = $oDate->format(AttributeDateTime::GetSQLFormat());
-				$aOQL[] = "({$sRef} <= '$sEndDate')";
-			}
-		}
-
-		$sOQL = implode(' AND ', $aOQL);
-
-		if (empty($sOQL))
-		{
-			$sOQL = "1";
-		}
-
-		return $sOQL;
-	}
-
 	protected static function BetweenDatesToOql($sRef, $aCriteria)
 	{
 		$aOQL = array();
@@ -301,15 +254,7 @@ class CriterionToOQL extends CriterionConversionAbstract
 		$sStartDate = $aValues[0]['value'];
 		if (!empty($sStartDate))
 		{
-			try
-			{
-				$oDate = $oFormat->parse($sStartDate);
-			}
-			catch (\Exception $e)
-			{
-				// Not the date time format, try the date format
-				return self::BetweenDaysToOql($sRef, $aCriteria);
-			}
+			$oDate = $oFormat->parse($sStartDate);
 			$sStartDate = $oDate->format(AttributeDateTime::GetSQLFormat());
 			$aOQL[] = "({$sRef} >= '$sStartDate')";
 		}

From 78ccc44014150bf652410e1ae793527560d03541 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Fri, 23 Mar 2018 09:40:41 +0000
Subject: [PATCH 110/202] Advanced Search: open/closed search form

SVN:b1162[5502]
---
 sources/application/search/searchform.class.inc.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/sources/application/search/searchform.class.inc.php b/sources/application/search/searchform.class.inc.php
index 45a2ca182..4e93987e3 100644
--- a/sources/application/search/searchform.class.inc.php
+++ b/sources/application/search/searchform.class.inc.php
@@ -161,11 +161,17 @@ class SearchForm
 		{
 			$aListParams['table_id'] = $aExtraParams['table_id2'];
 		}
+		$bOpen = false;
+		if (array_key_exists('open', $aExtraParams))
+		{
+			$bOpen = $aExtraParams['open'];
+		}
 		$aSearchParams = array(
 			'criterion_outer_selector' => "#fs_{$sSearchFormId}_criterion_outer",
             'result_list_outer_selector' => "#{$aExtraParams['table_id']}",
 			'data_config_list_selector' => "#{$sDataConfigListSelector}",
 			'endpoint' => utils::GetAbsoluteUrlAppRoot().'pages/ajax.searchform.php',
+			'open' => $bOpen,
 			'date_format' => AttributeDateTime::GetFormat()->ToMomentJS(),
 			'list_params' => $aListParams,
 			'search' => array(

From 024459408a080df0751c5a71bbd02759910aa681 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Fri, 23 Mar 2018 09:41:49 +0000
Subject: [PATCH 111/202] Advanced Search: open/closed search form

SVN:b1162[5503]
---
 sources/application/search/searchform.class.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sources/application/search/searchform.class.inc.php b/sources/application/search/searchform.class.inc.php
index 4e93987e3..ba6bb5fa7 100644
--- a/sources/application/search/searchform.class.inc.php
+++ b/sources/application/search/searchform.class.inc.php
@@ -171,7 +171,7 @@ class SearchForm
             'result_list_outer_selector' => "#{$aExtraParams['table_id']}",
 			'data_config_list_selector' => "#{$sDataConfigListSelector}",
 			'endpoint' => utils::GetAbsoluteUrlAppRoot().'pages/ajax.searchform.php',
-			'open' => $bOpen,
+			'init_opened' => $bOpen,
 			'date_format' => AttributeDateTime::GetFormat()->ToMomentJS(),
 			'list_params' => $aListParams,
 			'search' => array(

From 956b8958fbd5c15eaf167bead492423afe297a8f Mon Sep 17 00:00:00 2001
From: Bruno Da Silva <bruno.dasilva@combodo.com>
Date: Fri, 23 Mar 2018 09:53:49 +0000
Subject: [PATCH 112/202] search widget : date and datetime widget

SVN:b1162[5504]
---
 application/nicewebpage.class.inc.php  |  2 ++
 css/light-grey.css                     |  6 ++++++
 css/light-grey.scss                    | 13 +++++++++++++
 dictionaries/en.dictionary.itop.ui.php |  6 ++++++
 js/search/search_form_handler.js       | 16 ++++++++++++++--
 5 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/application/nicewebpage.class.inc.php b/application/nicewebpage.class.inc.php
index 890ec2763..d0b4fa44b 100644
--- a/application/nicewebpage.class.inc.php
+++ b/application/nicewebpage.class.inc.php
@@ -58,6 +58,8 @@ class NiceWebPage extends WebPage
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_numeric.js');
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_enum.js');
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_external_key.js');
+	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_date_abstract.js');
+	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_date.js');
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_date_time.js');
 
 	    $this->add_dict_entries('UI:Combo');
diff --git a/css/light-grey.css b/css/light-grey.css
index f9257acf1..2320e188b 100644
--- a/css/light-grey.css
+++ b/css/light-grey.css
@@ -990,6 +990,12 @@ input.dp-applied {
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.advanced .sfc_fg_more {
   display: none;
 }
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group.advanced .hide_on_advanced {
+  display: none;
+}
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group:not(.advanced) .hide_on_less {
+  display: none;
+}
 .search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_raw .sfc_title {
   cursor: initial;
 }
diff --git a/css/light-grey.scss b/css/light-grey.scss
index 63e543877..b253edfe9 100644
--- a/css/light-grey.scss
+++ b/css/light-grey.scss
@@ -1126,6 +1126,16 @@ input.dp-applied {
 					.sfc_fg_more{
 						display: none;
 					}
+
+					.hide_on_advanced {
+						display: none;
+					}
+				}
+
+				&:not(.advanced) {
+					.hide_on_less {
+						display: none;
+					}
 				}
 			}
 
@@ -1168,6 +1178,9 @@ input.dp-applied {
 					}
 				}
 			}
+
+
+
 		}
 
 		/* More criterion */
diff --git a/dictionaries/en.dictionary.itop.ui.php b/dictionaries/en.dictionary.itop.ui.php
index 49c776d6b..ac3d939cc 100644
--- a/dictionaries/en.dictionary.itop.ui.php
+++ b/dictionaries/en.dictionary.itop.ui.php
@@ -1444,5 +1444,11 @@ When associated with a trigger, each action is given an "order" number, specifyi
 
 	// - Widget other translations
 	'UI:Search:Criteria:DateTime:From' => 'From',
+	'UI:Search:Criteria:DateTime:FromTime' => 'From',
 	'UI:Search:Criteria:DateTime:Until' => 'Until',
+	'UI:Search:Criteria:DateTime:UntilTime' => 'Until',
+	'UI:Search:Criteria:DateTime:PlaceholderFrom' => 'Any date',
+	'UI:Search:Criteria:DateTime:PlaceholderFromTime' => 'Any date',
+	'UI:Search:Criteria:DateTime:PlaceholderUntil' => 'Any date',
+	'UI:Search:Criteria:DateTime:PlaceholderUntilTime' => 'Any date',
 ));
diff --git a/js/search/search_form_handler.js b/js/search/search_form_handler.js
index d4bcf11f5..975ddaba3 100644
--- a/js/search/search_form_handler.js
+++ b/js/search/search_form_handler.js
@@ -338,15 +338,27 @@ $(function()
 				// Prevent propagation to parents and therefore multiple attempts to close it
 				oEvent.stopPropagation();
 
+				oEventTargetElem = $(oEvent.target);
+
 				// If not more menu, close all criterion
-				if($(oEvent.target).closest('.sf_more_criterion').length > 0)
+				if(oEventTargetElem.closest('.sf_more_criterion').length > 0)
 				{
 					me._closeAllCriterion();
 				}
 				else
 				{
+					//if using the datetimepicker, do not close anything
+					if (oEventTargetElem.closest('#ui-datepicker-div, .ui-datepicker-prev, .ui-datepicker-next').length > 0 )
+					{
+						//no closing in this case
+					}
+					// //if the context is not document, then we  have encountered a bug : the css ::after elements do have a context on click and thus, we cannot check if they are inside a  #ui-datepicker-div
+					// else if (typeof oEventTargetElem.context != 'undefined' && $(oEventTargetElem.context).is('.ui-icon'))
+					// {
+					// 	//no closing in this case (bugfix)
+					// }
 					// If criteria, close more menu & all criterion but me
-					if($(oEvent.target).closest('.search_form_criteria').length > 0)
+					else if(oEventTargetElem.closest('.search_form_criteria').length > 0)
 					{
 						me._closeMoreCriterion();
 						// All criterion but me is already handle by the criterion, no callback needed.

From 43615450adb86c462bae97aff8dd9ad655815200 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Fri, 23 Mar 2018 10:41:37 +0000
Subject: [PATCH 113/202] Advanced Search: Dates between

SVN:b1162[5505]
---
 .../criteriontooql.class.inc.php                 | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/sources/application/search/criterionconversion/criteriontooql.class.inc.php b/sources/application/search/criterionconversion/criteriontooql.class.inc.php
index ab628bfef..36c946030 100644
--- a/sources/application/search/criterionconversion/criteriontooql.class.inc.php
+++ b/sources/application/search/criterionconversion/criteriontooql.class.inc.php
@@ -23,6 +23,7 @@
 namespace Combodo\iTop\Application\Search\CriterionConversion;
 
 
+use AttributeDate;
 use AttributeDateTime;
 use AttributeDefinition;
 use AttributeExternalKey;
@@ -249,13 +250,22 @@ class CriterionToOQL extends CriterionConversionAbstract
 			return "1";
 		}
 
-		$oFormat = AttributeDateTime::GetFormat();
+		$sWidget = $aCriteria['widget'];
+		if ($sWidget == AttributeDefinition::SEARCH_WIDGET_TYPE_DATE_TIME)
+		{
+			$sAttributeClass = AttributeDateTime::class;
+		}
+		else
+		{
+			$sAttributeClass = AttributeDate::class;
+		}
+		$oFormat = $sAttributeClass::GetFormat();
 
 		$sStartDate = $aValues[0]['value'];
 		if (!empty($sStartDate))
 		{
 			$oDate = $oFormat->parse($sStartDate);
-			$sStartDate = $oDate->format(AttributeDateTime::GetSQLFormat());
+			$sStartDate = $oDate->format($sAttributeClass::GetSQLFormat());
 			$aOQL[] = "({$sRef} >= '$sStartDate')";
 		}
 
@@ -264,7 +274,7 @@ class CriterionToOQL extends CriterionConversionAbstract
 		{
 			$oDate = $oFormat->parse($sEndDate);
 			$oDate->add(DateInterval::createFromDateString('1 second'));
-			$sEndDate = $oDate->format(AttributeDateTime::GetSQLFormat());
+			$sEndDate = $oDate->format($sAttributeClass::GetSQLFormat());
 			$aOQL[] = "({$sRef} < '$sEndDate')";
 		}
 

From 27f41baa9a860753d551c65187d1b3b47fc48849 Mon Sep 17 00:00:00 2001
From: Bruno Da Silva <bruno.dasilva@combodo.com>
Date: Fri, 23 Mar 2018 10:44:04 +0000
Subject: [PATCH 114/202] search widget : date and datetime widget

SVN:b1162[5506]
---
 js/search/search_form_criteria_date.js        |  77 ++++
 .../search_form_criteria_date_abstract.js     | 389 ++++++++++++++++++
 js/search/search_form_criteria_date_time.js   | 106 +++++
 3 files changed, 572 insertions(+)
 create mode 100644 js/search/search_form_criteria_date.js
 create mode 100644 js/search/search_form_criteria_date_abstract.js
 create mode 100644 js/search/search_form_criteria_date_time.js

diff --git a/js/search/search_form_criteria_date.js b/js/search/search_form_criteria_date.js
new file mode 100644
index 000000000..c208541e0
--- /dev/null
+++ b/js/search/search_form_criteria_date.js
@@ -0,0 +1,77 @@
+//iTop Search form criteria date
+;
+$(function()
+{
+	// the widget definition, where 'itop' is the namespace,
+	// 'search_form_criteria_date' the widget name
+	$.widget( 'itop.search_form_criteria_date', $.itop.search_form_criteria_date_abstract,
+	{
+		// default options
+		options:
+		{
+			// // Overload default operator
+			// 'operator': 'between_dates',
+			// // Available operators
+			// 'available_operators': {
+			//
+			// },
+			aInputsParam: [
+				{
+					"code": "from",
+					"code_uc_first":"From",
+					"x_picker" : 'datepicker',
+					"value_index": 0,
+					"onclose_show" : "until",
+				},
+				{
+					"code": "until",
+					"code_uc_first":"Until",
+					"x_picker" : 'datepicker',
+					"value_index": 1,
+				}
+			]
+		},
+
+   
+		// the constructor
+		_create: function()
+		{
+			var me = this;
+
+			this._super();
+			this.element.addClass('search_form_criteria_date');
+		},
+		// called when created, and later when changing options
+		_refresh: function()
+		{
+
+		},
+		// events bound via _bind are removed automatically
+		// revert other modifications here
+		_destroy: function()
+		{
+			this.element.removeClass('search_form_criteria_date');
+			this._super();
+		},
+		// _setOptions is called with a hash of all options that are changing
+		// always refresh when changing options
+		_setOptions: function()
+		{
+			this._superApply(arguments);
+		},
+		// _setOption is called for each individual option that is changing
+		_setOption: function( key, value )
+		{
+			this._super( key, value );
+		},
+
+
+		//------------------
+		// Inherited methods
+		//------------------
+
+
+
+
+	});
+});
diff --git a/js/search/search_form_criteria_date_abstract.js b/js/search/search_form_criteria_date_abstract.js
new file mode 100644
index 000000000..11536d214
--- /dev/null
+++ b/js/search/search_form_criteria_date_abstract.js
@@ -0,0 +1,389 @@
+//iTop Search form criteria date_abstract
+;
+$(function()
+{
+	// the widget definition, where 'itop' is the namespace,
+	// 'search_form_criteria_date_abstract' the widget name
+	$.widget( 'itop.search_form_criteria_date_abstract', $.itop.search_form_criteria,
+	{
+		// default options
+		options:
+		{
+			// Overload default operator
+			'operator': 'between_dates',
+			// Available operators
+			'available_operators': {
+				'between_dates': {
+					'label': Dict.S('UI:Search:Criteria:Operator:DateTime:Between'),
+					'code': 'between_days',
+					'rank': 1,
+				},
+				'=': {
+					'label': Dict.S('UI:Search:Criteria:Operator:DateTime:Equals'),//pre-existing, label changed
+					// 'dropdown_group':1,
+				},
+				'>': {
+					'label': Dict.S('UI:Search:Criteria:Operator:DateTime:GreaterThan'),
+					'code': 'greater_than',
+					'rank': 100,
+					// 'dropdown_group':1,
+				},
+				'>=': {
+					'label': Dict.S('UI:Search:Criteria:Operator:DateTime:GreaterThanOrEquals'),
+					'code': 'greater_than_or_equals',
+					'rank': 200,
+					// 'dropdown_group':1,
+				},
+				'<': {
+					'label': Dict.S('UI:Search:Criteria:Operator:DateTime:LessThan'),
+					'code': 'less_than',
+					'rank': 300,
+					// 'dropdown_group':1,
+				},
+				'<=': {
+					'label': Dict.S('UI:Search:Criteria:Operator:DateTime:LessThanOrEquals'),
+					'code': 'less_than_or_equals',
+					'rank': 400,
+					// 'dropdown_group':1,
+				},
+				'!=': {
+					'label': Dict.S('UI:Search:Criteria:Operator:DateTime:DifferentThan'),
+					'code': 'different',
+					'rank': 500,
+					// 'dropdown_group':1,
+				},
+				'empty': {
+					'rank': 700,//pre-existing, reordered
+				},
+				'not_empty': {
+					'rank': 800,//pre-existing, reordered
+				},
+			},
+			aInputsParam: [
+				{
+					// Common settings :
+					//  "code": "from",					=> the code used in the HTML
+					//  "code_uc_first":"From",			=> the code used in the translations
+					//  "onclose_show" : "until",		=> on x_picker close, should we open another one (on "from" close shall we show "until")
+					//  "value_index": 0,				=> the widget communicate with an array of values, the index 0 is "from" the index 1 is "until"
+
+					// Date_time widget specifi settings :
+					//  "x_picker" : 'datetimepicker',	=> the plugin used either datepicker or datetimepicker
+					//  "default_time_add": false,		=> either false to disable it or number of second to add (used by the datetimepicker to choose the right time on synched datepicker change, its value change from 0 for "from" to +1d-1s for "until"
+					//  "show_on_advanced": true,		=> is the input displaye on "more" or "less" mode advanced is an lais for "more" in the css
+					//  "synced_with": "from_time",		=> from and until has both two input (datepicker and datetimepicker). each time one input change, the other one has to change
+					//  "getter_code":"from_time"			=> iTop expect datetime to always provide time, so we must always use the datetimepicker in order to compute the value to be sent to iTop event if whe are in the display mode "less" with datepicker visible
+				}
+			]
+		},
+
+   
+		// // the constructor
+		// _create: function()
+		// {
+		// 	this._super();
+		// },
+		// // called when created, and later when changing options
+		// _refresh: function()
+		// {
+		//
+		// },
+		// // events bound via _bind are removed automatically
+		// // revert other modifications here
+		// _destroy: function()
+		// {
+		// 	this._super();
+		// },
+		// // _setOptions is called with a hash of all options that are changing
+		// // always refresh when changing options
+		// _setOptions: function()
+		// {
+		// 	this._superApply(arguments);
+		// },
+		// // _setOption is called for each individual option that is changing
+		// _setOption: function( key, value )
+		// {
+		// 	this._super( key, value );
+		// },
+
+
+		// Prepare operator's DOM element
+		_prepareBetweenDaysOperator: function(oOpElem, sOpIdx, oOp)
+		{
+			var me = this;
+			var aInputsParam = me.options.aInputsParam;
+			var aInputsParamLength = aInputsParam.length;
+			var aValues = me._getValues();//TODO : tenir compte du refactoring de la structure
+			var oInputsParamIndexByCode = {};
+			for (var i = 0; i < aInputsParamLength; i++) {
+				oInputsParamIndexByCode[aInputsParam[i].code] = i;
+			}
+
+			oContentElem = $(); //will be populated on each loop
+
+			for (var i = 0; i < aInputsParamLength; i++) {
+				var oInputParam = aInputsParam[i];
+				var oOpContentElem = $('<span class="sfc_op_content_'+oInputParam.code+'_outer '+(oInputParam.show_on_advanced ? 'hide_on_less' : 'hide_on_advanced')+'"><label class="sfc_op_content_'+oInputParam.code+'_label" for=""> '+Dict.S('UI:Search:Criteria:DateTime:'+oInputParam.code_uc_first)+'</label><input type="text" name="'+oInputParam.code+'" placeholder="'+Dict.S('UI:Search:Criteria:DateTime:Placeholder'+oInputParam.code_uc_first)+'"/></span>');
+				var oInputElem = oOpContentElem
+					.find('input')
+					.uniqueId()
+				;
+				oOpContentElem
+					.find('label')
+					.attr('for', oInputElem.attr('id'))
+				;
+
+				if (oInputParam.value_index in aValues && typeof aValues[oInputParam.value_index].value != 'undefined')
+				{
+					oInputElem.val(aValues[oInputParam.value_index].value);
+				}
+
+				oContentElem = oContentElem.add(oOpContentElem);
+			}
+
+
+			// Events
+			// - Focus input on click (radio, label, ...)
+			oOpElem.on('click', function(oEvent){
+				if ($(oEvent.target).is('input[type="text"], select')) {
+					return;
+				}
+				oOpElem.find('input:visible:first').focus();
+			});
+			// - Apply on "enter" key hit
+			//todo: this could be refactored
+			oOpContentElem.on('keyup', function(oEvent){
+				// Check operator's radio if not already (typically when focusing in input via "tab" key)
+				if(oOpElem.find('.sfc_op_radio').prop('checked') === false)
+				{
+					oOpElem.find('.sfc_op_radio').prop('checked', true)
+				}
+
+				me._markAsDraft();
+
+				// Apply if enter key
+				if(oEvent.key === 'Enter')
+				{
+					me._apply();
+				}
+			});
+
+			oOpElem
+				.find('.sfc_op_name')
+					.remove()
+				.end()
+				.find('.sfc_op_content')
+					.append(oContentElem)
+			;
+
+
+			// once the inputs are appended into the DOM we can safely use jQuery UI
+			var odatetimepickerOptionsDefault = {
+				dateFormat: 'yy-mm-dd',
+				timeFormat: 'HH:mm:ss',
+				buttonImage: GetAbsoluteUrlAppRoot()+"/images/calendar.png",
+				buttonImageOnly: true,
+				buttonText: "",
+				showOn:'both'
+			};
+			for (var i = 0; i < aInputsParamLength; i++) {
+				var oInputParam = aInputsParam[i];
+
+				var odatetimepickerOptions = $.extend({}, odatetimepickerOptionsDefault, {
+					onClose: function(dateText, inst) {
+						var selectElem 				= $(this);
+						var sOnCLoseShow 			= selectElem.data('onclose_show');
+
+						// if (typeof oInputParam.onclose_show != 'undefined')
+						// {
+						// 	oOpElem.find('input[name="'+oInputParam.onclose_show+'"]')
+						// 		[oInputParam.x_picker]('show')
+						// 	;
+						// }
+
+						// if (sOnCLoseShow != undefined && selectElem.is(':visible'))
+						// {
+						// 	var oOnCLoseShowInputElem = oOpElem.find('input[name="'+sOnCLoseShow+'"]');
+						// 	oOnCLoseShowInputElem[oInputParam.x_picker]('show');
+						// }
+
+					},
+					onSelect: function(sDateText, oXPicker) {
+						var selectElem 				= $(this);
+						var sSyncedWith 			= selectElem.data('synced_with');
+
+
+						if (sSyncedWith != undefined)
+						{
+							var sCode 				= selectElem.data('code');
+							var oInputParam 		= aInputsParam[oInputsParamIndexByCode[sCode]];
+							var oSyncedInputParam 	= aInputsParam[oInputsParamIndexByCode[sSyncedWith]];
+							var oSyncedInputElem 	= oOpElem.find('input[name="'+sSyncedWith+'"]');
+
+							var dSyncedDate 		= selectElem[oInputParam.x_picker]('getDate');
+
+							if (typeof oSyncedInputParam.default_time_add != 'undefined' && oSyncedInputParam.default_time_add)
+							{
+								dSyncedDate.setSeconds(dSyncedDate.getSeconds() + oSyncedInputParam.default_time_add);
+							}
+							oSyncedInputElem[oSyncedInputParam.x_picker]('setDate', dSyncedDate);
+						}
+
+						me._apply();
+					}
+				});
+
+				var oInputElem = oOpElem.find('input[name="'+oInputParam.code+'"]');
+				oInputElem.data('code', oInputParam.code);
+				oInputElem.data('onclose_show', oInputParam.onclose_show);
+				oInputElem[oInputParam.x_picker](odatetimepickerOptions);
+
+				if (typeof aInputsParam[oInputsParamIndexByCode[oInputParam.synced_with]] != 'undefined')
+				{
+					var oSyncedInputParam = aInputsParam[oInputsParamIndexByCode[oInputParam.synced_with]];
+					oInputElem.data('synced_with', oSyncedInputParam.code);
+				}
+			}
+		},
+
+
+
+		_getBetweenDaysOperatorValues: function(oOpElem)
+		{
+			var me = this;
+			var aValues = [];
+			var aInputsParam = me.options.aInputsParam;
+			var aInputsParamLength = aInputsParam.length;
+			for (var i = 0; i < aInputsParamLength; i++) {
+				var oInputParam = aInputsParam[i];
+				var oInputElem = oOpElem.find('input[name="'+oInputParam.code+'"]');
+				if (oInputElem.is(':visible'))
+				{
+					if (typeof oInputParam.getter_code != 'undefined')
+					{
+						oInputElem = oOpElem.find('input[name="'+oInputParam.getter_code+'"]');
+					}
+
+					aValues[oInputParam.value_index] = {value: oInputElem.val(), label: oInputElem.val()};
+				}
+			}
+			//
+			// var sValueFrom  = oOpElem.find('.sfc_op_content input[name="from"]').val();
+			// var sValueUntil = oOpElem.find('.sfc_op_content input[name="until"]').val();
+			//
+			// aValues.push({value: sValueFrom, label: sValueFrom});
+			// aValues.push({value: sValueUntil, label: sValueUntil});
+
+
+			return aValues;
+		},
+
+		_setBetweenDaysOperatorValues: function(oOpElem, aValues)
+		{
+
+			var me = this;
+			var aInputsParam = me.options.aInputsParam;
+			var aInputsParamLength = aInputsParam.length;
+			for (var i = 0; i < aInputsParamLength; i++) {
+				var oInputParam = aInputsParam[i];
+				var oInputElem = oOpElem.find('input[name="'+oInputParam.code+'"]');
+				// oInputElem.val(aValues[0].value);
+
+				if (typeof aValues[oInputParam.value_index] != 'undefined' && typeof aValues[oInputParam.value_index].value != 'undefined')
+				{
+					oInputElem[oInputParam.x_picker]('setDate', aValues[oInputParam.value_index].value);
+				}
+			}
+			// switch (aValues.length)
+			// {
+			// 	case 2:
+			// 		oOpElem.find('.sfc_op_content input[name="until"]').val(aValues[0].value);
+			// 		//NO BREAK!!!
+			// 	case 1:
+			// 		oOpElem.find('.sfc_op_content input[name="from"]').val(aValues[0].value);
+			// 		break;
+			// 	default:
+			// 		return false;
+			// }
+			//
+			// return true;
+		},
+
+		_resetBetweenDaysOperator: function(oOpElem)
+		{
+			this._resetOperator(oOpElem);
+		},
+
+		//------------------
+		// Inherited methods
+		//------------------
+
+
+		// Prepare operator's DOM element
+		// - Base preparation, always called
+		_prepareOperator: function(oOpElem, sOpIdx, oOp)
+		{
+			var me = this;
+			if (typeof oOp.dropdown_group == 'undefined')
+			{
+				return this._super(oOpElem, sOpIdx, oOp);
+			}
+
+			this._super(oOpElem, sOpIdx, oOp);
+			oOpElem.addClass('force_hide')
+
+			//TODO: move this into the abstract widget
+
+			// DOM element
+			oDropdownElem = this.element.find('select.dropdown_group_'+oOp.dropdown_group);
+			if (oDropdownElem.length == 0)
+			{
+				oDropdownElem = $('<select class="dropdown_group_'+oOp.dropdown_group+'" data-dropdown-group="'+oOp.dropdown_group+'"></select>');
+
+				oDropdownElem.on('change', function(){
+					// $option = $(this);
+					me.element.find('.sfc_fg_operator_dropdown_group .sfc_op_radio').val(oDropdownElem.val());
+
+					oOptionOp = oDropdownElem.data('oOp');
+					oDropdownElem.attr('data-operator-code', oOptionOp.code);
+				});
+
+
+				// Create DOM element from template
+				var oOpElemDropdown = $(this._getOperatorTemplate()).uniqueId();
+
+				//todo : if this code is keeped, the radio mustr have an id and the label need to point to it
+				oOpElemDropdown
+					.addClass('sfc_fg_operator_dropdown_group')
+					.attr('data-operator-code', 'dropdown_group')
+					.find('.sfc_op_name')
+						.append(oDropdownElem)
+					.end()
+					.find('.sfc_op_radio')
+						.val(sOpIdx)
+					.end()
+					.on('click', function(oEvent){
+						var bIsChecked = oOpElemDropdown.find('.sfc_op_radio').prop('checked');
+
+						if(bIsChecked === false)
+						{
+							oOpElemDropdown.find('.sfc_op_radio').prop('checked', true);
+							me._markAsDraft();
+						}
+						oOpElemDropdown.find('input[type="text"]:first').focus();
+					})
+					.appendTo(this.element.find('.sfc_fg_operators'))
+				;
+
+				this._prepareDefaultOperator(oOpElemDropdown, sOpIdx, oOp);
+			}
+
+			oDropdownElem
+				.append('<option value="'+sOpIdx+'" >'+oOp.label+'</option>')
+				.data('oOp', oOp)
+			;
+		},
+
+
+	});
+});
diff --git a/js/search/search_form_criteria_date_time.js b/js/search/search_form_criteria_date_time.js
new file mode 100644
index 000000000..e38f48a83
--- /dev/null
+++ b/js/search/search_form_criteria_date_time.js
@@ -0,0 +1,106 @@
+//iTop Search form criteria date_time
+;
+$(function()
+{
+	// the widget definition, where 'itop' is the namespace,
+	// 'search_form_criteria_date_time' the widget name
+	$.widget( 'itop.search_form_criteria_date_time', $.itop.search_form_criteria_date_abstract,
+	{
+		// default options
+		options:
+		{
+			// // Overload default operator
+			// 'operator': 'between_dates',
+			// // Available operators
+			// 'available_operators': {
+			//
+			// },
+			aInputsParam: [
+				{
+					"code": "from",
+					"code_uc_first":"From",
+					"x_picker" : 'datepicker',
+					"default_time_add": false,
+					"show_on_advanced": false,
+					"value_index": 0,
+					"onclose_show" : "until",
+					"synced_with": "from_time",
+					"getter_code":"from_time",
+				},
+				{
+					"code": "from_time",
+					"code_uc_first":"FromTime",
+					"x_picker" : 'datetimepicker',
+					"default_time_add": 0,
+					"show_on_advanced": true,
+					"value_index": 0,
+					"onclose_show" : "until_time",
+					"synced_with": "from",
+				},
+				{
+					"code": "until",
+					"code_uc_first":"Until",
+					"x_picker" : 'datepicker',
+					"default_time_add": false,
+					"show_on_advanced": false,
+					"value_index": 1,
+					"synced_with": "until_time",
+					"getter_code":"until_time",
+				},
+				{
+					"code": "until_time",
+					"code_uc_first":"UntilTime",
+					"x_picker" : 'datetimepicker',
+					"default_time_add": 86399, // 24 * 60 * 60 - 1
+					"show_on_advanced": true,
+					"value_index": 1,
+					"synced_with": "until"
+				}
+			]
+		},
+
+   
+		// the constructor
+		_create: function()
+		{
+			var me = this;
+
+			this._super();
+			this.element.addClass('search_form_criteria_date_time');
+		},
+		// called when created, and later when changing options
+		_refresh: function()
+		{
+
+		},
+		// events bound via _bind are removed automatically
+		// revert other modifications here
+		_destroy: function()
+		{
+			this.element.removeClass('search_form_criteria_date_time');
+			this._super();
+		},
+		// _setOptions is called with a hash of all options that are changing
+		// always refresh when changing options
+		_setOptions: function()
+		{
+			this._superApply(arguments);
+		},
+		// _setOption is called for each individual option that is changing
+		_setOption: function( key, value )
+		{
+			this._super( key, value );
+		},
+
+
+
+		//------------------
+		// Inherited methods
+		//------------------
+
+
+
+
+
+	});
+});

From 965e7b48df192a6bb911dc96f8f3f0c1be8e8a16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Fri, 23 Mar 2018 13:33:09 +0000
Subject: [PATCH 115/202] Advanced Search: Dates between

SVN:b1162[5507]
---
 core/oql/expression.class.inc.php             | 110 ++++++++++++------
 .../criteriontooql.class.inc.php              |   4 +-
 .../criteriontosearchform.class.inc.php       |  32 ++++-
 .../search/CriterionConversionTest.php        |   3 +
 4 files changed, 105 insertions(+), 44 deletions(-)

diff --git a/core/oql/expression.class.inc.php b/core/oql/expression.class.inc.php
index 63f806382..98510a594 100644
--- a/core/oql/expression.class.inc.php
+++ b/core/oql/expression.class.inc.php
@@ -59,6 +59,11 @@ abstract class Expression
 		return $this->Render($aArgs);
 	}
 
+	public function GetAttDef($aClasses = array())
+	{
+		return null;
+	}
+
 	/**
 	 * Recursively browse the expression tree
 	 * @param Closure $callback
@@ -384,6 +389,14 @@ class BinaryExpression extends Expression
 		$this->GetRightExpr()->CollectUsedParents($aTable);
 	}
 
+	public function GetAttDef($aClasses = array())
+	{
+		$oAttDef = $this->GetLeftExpr()->GetAttDef($aClasses);
+		if (!is_null($oAttDef)) return $oAttDef;
+
+		return $this->GetRightExpr()->GetAttDef($aClasses);
+	}
+
 	/**
 	 * List all constant expression of the form <field> = <scalar> or <field> = :<variable>
 	 * Could be extended to support <field> = <function><constant_expression>
@@ -502,11 +515,10 @@ class BinaryExpression extends Expression
 			// Default criterion (Field OPE Field) is not supported
 			return parent::GetCriterion($oSearch, $aArgs, $bRetrofitParams, $oAttDef);
 		}
-		if ($oLeftExpr instanceof FieldExpression)
-		{
-			$oAttDef = $oLeftExpr->GetAttDef($oSearch->GetJoinedClasses());
-		}
-		if ($oRightExpr instanceof FieldExpression)
+
+		$oAttDef = $oLeftExpr->GetAttDef($oSearch->GetJoinedClasses());
+
+		if (is_null($oAttDef))
 		{
 			$oAttDef = $oRightExpr->GetAttDef($oSearch->GetJoinedClasses());
 			$bReverseOperator = true;
@@ -649,6 +661,11 @@ class ScalarExpression extends UnaryExpression
 	 */
 	public function Display($oSearch, &$aArgs = null, $oAttDef = null)
 	{
+		if (strpos($this->m_value, '%') === 0)
+		{
+			return '';
+		}
+
 		if (!is_null($oAttDef))
 		{
 			if ($oAttDef->IsExternalKey())
@@ -668,11 +685,6 @@ class ScalarExpression extends UnaryExpression
 			return $oAttDef->GetAsPlainText($this->m_value);
 		}
 
-		if (strpos($this->m_value, '%') === 0)
-		{
-			return '';
-		}
-
 		return $this->Render($aArgs);
 	}
 
@@ -697,43 +709,44 @@ class ScalarExpression extends UnaryExpression
 
 	public function GetCriterion($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
 	{
-		$aValue = array('value' => $this->GetValue());
-		if (!is_null($oAttDef))
-		{
-			switch (true)
-			{
-				case $oAttDef->IsExternalKey():
-					try
-					{
-						/** @var AttributeExternalKey $oAttDef */
-						$sTarget = $oAttDef->GetTargetClass();
-						$oObj = MetaModel::GetObject($sTarget, $this->GetValue());
-
-						$aValue['label'] = $oObj->Get("friendlyname");
-
-					} catch (Exception $e)
-					{
-						IssueLog::Error($e->getMessage());
-					}
-					break;
-				default:
-					$aValue['label'] = $oAttDef->GetAsPlainText($this->GetValue());
-					break;
-			}
-		}
 		$aCriteria = array();
 		switch ((string)($this->m_value))
 		{
 			case '%Y-%m-%d':
-				$aCriteria['date'] = 'd';
+				$aCriteria['date_type'] = 'd';
 				break;
 			case '%Y-%m':
-				$aCriteria['date'] = 'm';
+				$aCriteria['date_type'] = 'm';
 				break;
 			case '%w':
-				$aCriteria['date'] = 'w';
+				$aCriteria['date_type'] = 'w';
 				break;
 			default:
+				$aValue = array('value' => $this->GetValue());
+				if (!is_null($oAttDef))
+				{
+					switch (true)
+					{
+						case $oAttDef->IsExternalKey():
+							try
+							{
+								/** @var AttributeExternalKey $oAttDef */
+								$sTarget = $oAttDef->GetTargetClass();
+								$oObj = MetaModel::GetObject($sTarget, $this->GetValue());
+
+								$aValue['label'] = $oObj->Get("friendlyname");
+
+							}
+							catch (Exception $e)
+							{
+								IssueLog::Error($e->getMessage());
+							}
+							break;
+						default:
+							$aValue['label'] = $oAttDef->GetAsPlainText($this->GetValue());
+							break;
+					}
+				}
 				$aCriteria['values'] = array($aValue);
 				break;
 		}
@@ -1313,6 +1326,17 @@ class ListExpression extends Expression
 		}
 	}
 
+	public function GetAttDef($aClasses = array())
+	{
+		foreach($this->m_aExpressions as $oExpression)
+		{
+			$oAttDef = $oExpression->GetAttDef($aClasses);
+			if (!is_null($oAttDef)) return $oAttDef;
+		}
+
+		return null;
+	}
+
 	public function GetCriterion($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
 	{
 		$aValues = array();
@@ -1456,6 +1480,17 @@ class FunctionExpression extends Expression
 		}
 	}
 
+	public function GetAttDef($aClasses = array())
+	{
+		foreach($this->m_aArgs as $oExpression)
+		{
+			$oAttDef = $oExpression->GetAttDef($aClasses);
+			if (!is_null($oAttDef)) return $oAttDef;
+		}
+
+		return null;
+	}
+
 	/**
 	 * Make the most relevant label, given the value of the expression
 	 *
@@ -1577,6 +1612,7 @@ class FunctionExpression extends Expression
 
 			case 'DATE_ADD':
 			case 'DATE_SUB':
+			case 'DATE_FORMAT':
 				$aCriteria = array('widget' => 'date_time');
 				foreach($this->m_aArgs as $oExpression)
 				{
diff --git a/sources/application/search/criterionconversion/criteriontooql.class.inc.php b/sources/application/search/criterionconversion/criteriontooql.class.inc.php
index 36c946030..b116904e1 100644
--- a/sources/application/search/criterionconversion/criteriontooql.class.inc.php
+++ b/sources/application/search/criterionconversion/criteriontooql.class.inc.php
@@ -30,7 +30,6 @@ use AttributeExternalKey;
 use Combodo\iTop\Application\Search\AjaxSearchException;
 use Combodo\iTop\Application\Search\CriterionConversionAbstract;
 use Combodo\iTop\Application\Search\SearchForm;
-use DateInterval;
 
 class CriterionToOQL extends CriterionConversionAbstract
 {
@@ -273,9 +272,8 @@ class CriterionToOQL extends CriterionConversionAbstract
 		if (!empty($sEndDate))
 		{
 			$oDate = $oFormat->parse($sEndDate);
-			$oDate->add(DateInterval::createFromDateString('1 second'));
 			$sEndDate = $oDate->format($sAttributeClass::GetSQLFormat());
-			$aOQL[] = "({$sRef} < '$sEndDate')";
+			$aOQL[] = "({$sRef} <= '$sEndDate')";
 		}
 
 		$sOQL = implode(' AND ', $aOQL);
diff --git a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
index d86fbd18a..34a003e64 100644
--- a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
+++ b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
@@ -25,6 +25,7 @@
 namespace Combodo\iTop\Application\Search\CriterionConversion;
 
 
+use AttributeDate;
 use AttributeDateTime;
 use AttributeDefinition;
 use Combodo\iTop\Application\Search\CriterionConversionAbstract;
@@ -169,14 +170,14 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 		// Merge into 'between' operation.
 		// The ends of the interval are included
 		$aCurrCriterion['operator'] = 'between_dates';
-		$sFormat = AttributeDateTime::GetFormat()->ToMomentJS();
+		$oFormat = AttributeDate::GetFormat();
 		$sLastDate = $aPrevCriterion['values'][0]['value'];
 		if ($sPrevOperator == '<')
 		{
 			// previous day to include ends
 			$oDate = new DateTime($sLastDate);
 			$oDate->sub(DateInterval::createFromDateString('1 day'));
-			$sLastDate = $oDate->format($sFormat);
+			$sLastDate = $oFormat->format($oDate);
 		}
 
 		$sFirstDate = $aCurrCriterion['values'][0]['value'];
@@ -185,7 +186,7 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 			// next day to include ends
 			$oDate = new DateTime($sFirstDate);
 			$oDate->add(DateInterval::createFromDateString('1 day'));
-			$sFirstDate = $oDate->format($sFormat);
+			$sFirstDate = $oFormat->format($oDate);
 		}
 
 		$aCurrCriterion['values'] = array();
@@ -338,13 +339,36 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 
 	protected static function DateToSearchForm($aCriteria, $aFields)
 	{
-		return DateTimeToSearchForm($aCriteria, $aFields);
+		return self::DateTimeToSearchForm($aCriteria, $aFields);
 	}
 
 	protected static function DateTimeToSearchForm($aCriteria, $aFields)
 	{
 		if (!array_key_exists('is_relative', $aCriteria) || !$aCriteria['is_relative'])
 		{
+			// Convert '=' in 'between'
+			if (isset($aCriteria['operator']) && ($aCriteria['operator'] === '='))
+			{
+				$aCriteria['operator'] = CriterionConversionAbstract::OP_BETWEEN_DATES;
+				$sWidget = $aCriteria['widget'];
+				if ($sWidget == AttributeDefinition::SEARCH_WIDGET_TYPE_DATE)
+				{
+					$aCriteria['values'][1] = $aCriteria['values'][0];
+				}
+				else
+				{
+					$sDate = $aCriteria['values'][0]['value'];
+					$oDate = new DateTime($sDate);
+
+					$oDate->add(DateInterval::createFromDateString('1 day'));
+					$oDate->sub(DateInterval::createFromDateString('1 second'));
+
+					$sLastDate = $oDate->format(AttributeDateTime::GetSQLFormat());
+					$sLastDate = AttributeDateTime::GetFormat()->Format($sLastDate);
+					$aCriteria['values'][1] = array('value' => $sLastDate, 'label' => $sLastDate);
+				}
+			}
+
 			return $aCriteria;
 		}
 
diff --git a/test/application/search/CriterionConversionTest.php b/test/application/search/CriterionConversionTest.php
index 65439e78b..38cf022d0 100644
--- a/test/application/search/CriterionConversionTest.php
+++ b/test/application/search/CriterionConversionTest.php
@@ -297,6 +297,9 @@ class CriterionConversionTest extends ItopDataTestCase
 
 	/**
 	 * @dataProvider OqlProvider
+	 *
+	 * @param $sOQL
+	 *
 	 * @throws \OQLException
 	 */
 	function testOqlToForSearchToOql($sOQL)

From b0332b6ef530f90ece1bd7f502790c425cccc986 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Fri, 23 Mar 2018 13:55:44 +0000
Subject: [PATCH 116/202] Advanced Search: Dates between

SVN:b1162[5508]
---
 .../criteriontosearchform.class.inc.php               | 11 ++++++++---
 test/application/search/CriterionConversionTest.php   |  4 ++++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
index 34a003e64..e559813ca 100644
--- a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
+++ b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
@@ -360,12 +360,17 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 					$sDate = $aCriteria['values'][0]['value'];
 					$oDate = new DateTime($sDate);
 
+					$sFirstDateValue = $oDate->format(AttributeDateTime::GetSQLFormat());
+					$sFirstDateLabel = AttributeDateTime::GetFormat()->Format($sFirstDateValue);
+					$aCriteria['values'][0] = array('value' => $sFirstDateValue, 'label' => $sFirstDateLabel);
+
+
 					$oDate->add(DateInterval::createFromDateString('1 day'));
 					$oDate->sub(DateInterval::createFromDateString('1 second'));
 
-					$sLastDate = $oDate->format(AttributeDateTime::GetSQLFormat());
-					$sLastDate = AttributeDateTime::GetFormat()->Format($sLastDate);
-					$aCriteria['values'][1] = array('value' => $sLastDate, 'label' => $sLastDate);
+					$sLastDateValue = $oDate->format(AttributeDateTime::GetSQLFormat());
+					$sLastDateLabel = AttributeDateTime::GetFormat()->Format($sLastDateValue);
+					$aCriteria['values'][1] = array('value' => $sLastDateValue, 'label' => $sLastDateLabel);
 				}
 			}
 
diff --git a/test/application/search/CriterionConversionTest.php b/test/application/search/CriterionConversionTest.php
index 38cf022d0..5d0887808 100644
--- a/test/application/search/CriterionConversionTest.php
+++ b/test/application/search/CriterionConversionTest.php
@@ -361,6 +361,10 @@ class CriterionConversionTest extends ItopDataTestCase
 			'Date between 3' => array('OQL' => "SELECT UserRequest WHERE start_date >= '2017-01-01 00:00:00' AND '2017-01-01 00:00:00' >= start_date"),
 			'Date between 4' => array('OQL' => "SELECT UserRequest WHERE start_date >= '2017-01-01 00:00:00' AND '2017-01-01 01:00:00' > start_date"),
 			'Date between 5' => array('OQL' => "SELECT UserRequest WHERE start_date >= '2017-01-01 00:00:00' AND '2017-01-02 00:00:00' > start_date"),
+			'Date between 6' => array('OQL' => "SELECT UserRequest WHERE start_date >= '2017-01-01' AND '2017-01-02' >= start_date"),
+			'Date between 7' => array('OQL' => "SELECT CustomerContract WHERE ((start_date >= '2018-03-01') AND (start_date < '2018-04-01'))"),
+			'Date =' => array('OQL' => "SELECT CustomerContract WHERE (start_date = '2018-03-01')"),
+			'Date =2' => array('OQL' => "SELECT UserRequest WHERE (DATE_FORMAT(start_date, '%Y-%m-%d') = '2018-03-21')"),
 			'Num between 1' => array('OQL' => "SELECT Server WHERE nb_u >= 0 AND 1 >= nb_u"),
 		);
 	}

From c1adf880a44e4338980e321988f63afd53b2d0de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Fri, 23 Mar 2018 14:03:58 +0000
Subject: [PATCH 117/202] Advanced Search: Dates between

SVN:b1162[5509]
---
 .../criteriontosearchform.class.inc.php       | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
index e559813ca..ca3836696 100644
--- a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
+++ b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
@@ -172,26 +172,28 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 		$aCurrCriterion['operator'] = 'between_dates';
 		$oFormat = AttributeDate::GetFormat();
 		$sLastDate = $aPrevCriterion['values'][0]['value'];
+		$oDate = new DateTime($sLastDate);
 		if ($sPrevOperator == '<')
 		{
 			// previous day to include ends
-			$oDate = new DateTime($sLastDate);
 			$oDate->sub(DateInterval::createFromDateString('1 day'));
-			$sLastDate = $oFormat->format($oDate);
 		}
+		$sLastDateValue = $oDate->format(AttributeDate::GetSQLFormat());
+		$sLastDateLabel = $oFormat->format($oDate);
 
 		$sFirstDate = $aCurrCriterion['values'][0]['value'];
+		$oDate = new DateTime($sFirstDate);
 		if ($sCurrOperator == '>')
 		{
 			// next day to include ends
-			$oDate = new DateTime($sFirstDate);
 			$oDate->add(DateInterval::createFromDateString('1 day'));
-			$sFirstDate = $oFormat->format($oDate);
 		}
+		$sFirstDateValue = $oDate->format(AttributeDate::GetSQLFormat());
+		$sFirstDateLabel = $oFormat->format($oDate);
 
 		$aCurrCriterion['values'] = array();
-		$aCurrCriterion['values'][] = array('value' => $sFirstDate, 'label' => $sFirstDate);
-		$aCurrCriterion['values'][] = array('value' => $sLastDate, 'label' => $sLastDate);
+		$aCurrCriterion['values'][] = array('value' => $sFirstDateValue, 'label' => $sFirstDateLabel);
+		$aCurrCriterion['values'][] = array('value' => $sLastDateValue, 'label' => $sLastDateLabel);
 
 		$aCurrCriterion['oql'] = "({$aPrevCriterion['oql']} AND {$aCurrCriterion['oql']})";
 		$aCurrCriterion['label'] = $aPrevCriterion['label'].' '.Dict::S('Expression:Operator:AND', 'AND').' '.$aCurrCriterion['label'];
@@ -268,8 +270,8 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 			// previous day/second to include ends
 			$oDate->sub(DateInterval::createFromDateString($sInterval));
 		}
-		$sLastDate = $oDate->format(AttributeDateTime::GetSQLFormat());
-		$sLastDate = AttributeDateTime::GetFormat()->Format($sLastDate);
+		$sLastDateValue = $oDate->format(AttributeDateTime::GetSQLFormat());
+		$sLastDateLabel = AttributeDateTime::GetFormat()->Format($sLastDateValue);
 
 		$oDate = new DateTime($sFirstDate);
 		if ($sCurrOperator == '>')
@@ -277,12 +279,12 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 			// next day/second to include ends
 			$oDate->add(DateInterval::createFromDateString($sInterval));
 		}
-		$sFirstDate = $oDate->format(AttributeDateTime::GetSQLFormat());
-		$sFirstDate = AttributeDateTime::GetFormat()->Format($sFirstDate);
+		$sFirstDateValue = $oDate->format(AttributeDateTime::GetSQLFormat());
+		$sFirstDateLabel = AttributeDateTime::GetFormat()->Format($sFirstDateValue);
 
 		$aCurrCriterion['values'] = array();
-		$aCurrCriterion['values'][] = array('value' => $sFirstDate, 'label' => $sFirstDate);
-		$aCurrCriterion['values'][] = array('value' => $sLastDate, 'label' => $sLastDate);
+		$aCurrCriterion['values'][] = array('value' => $sFirstDateValue, 'label' => $sFirstDateLabel);
+		$aCurrCriterion['values'][] = array('value' => $sLastDateValue, 'label' => $sLastDateLabel);
 
 		$aCurrCriterion['oql'] = "({$aPrevCriterion['oql']} AND {$aCurrCriterion['oql']})";
 		$aCurrCriterion['label'] = $aPrevCriterion['label'].' '.Dict::S('Expression:Operator:AND', 'AND').' '.$aCurrCriterion['label'];

From 3a32bd62ef26d8fe131a81e872ee8bef89b26f9c Mon Sep 17 00:00:00 2001
From: Guillaume Lajarige <guillaume.lajarige@combodo.com>
Date: Fri, 23 Mar 2018 14:23:32 +0000
Subject: [PATCH 118/202] Advanced search: More criteria UX WIP.

SVN:b1162[5510]
---
 css/light-grey.css                            | 63 +++++++++----
 css/light-grey.scss                           | 73 +++++++++++----
 dictionaries/en.dictionary.itop.ui.php        |  8 +-
 js/search/search_form_criteria_enum.js        | 34 ++++---
 .../search_form_criteria_external_key.js      |  1 +
 js/search/search_form_handler.js              | 93 ++++++++++++++++---
 6 files changed, 201 insertions(+), 71 deletions(-)

diff --git a/css/light-grey.css b/css/light-grey.css
index 2320e188b..bc8ac9d7e 100644
--- a/css/light-grey.css
+++ b/css/light-grey.css
@@ -718,6 +718,7 @@ input.dp-applied {
   /* Sizing reset */
   /* Hyperlink reset */
   /* Input reset */
+  /* List helpers */
 }
 .search_form_handler * {
   box-sizing: border-box;
@@ -897,24 +898,6 @@ input.dp-applied {
   margin-left: 0px;
   margin-right: 8px;
 }
-.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_opc_multichoices .sfc_opc_mc_filter {
-  position: relative;
-  margin-top: 8px;
-  margin-bottom: 8px;
-}
-.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_opc_multichoices .sfc_opc_mc_filter input {
-  width: 100%;
-}
-.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_opc_multichoices .sfc_opc_mc_filter .sfc_opc_mcf_picto {
-  position: absolute;
-  right: 5px;
-  top: 5px;
-  opacity: 0.6;
-  user-select: none;
-}
-.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_opc_multichoices .sfc_opc_mc_filter .sfc_opc_mc_reset {
-  display: none;
-}
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_opc_multichoices .sfc_opc_mc_items {
   max-height: 445px;
   /* Must be less than .sfc_form_group:max-height - .sfc_opc_mc_toggler:height - .sfc_opc_mc_filter:height */
@@ -1049,6 +1032,50 @@ input.dp-applied {
   cursor: pointer;
   white-space: nowrap;
 }
+.search_form_handler .sf_list .sfl_title {
+  font-weight: bold;
+}
+.search_form_handler .sf_list .sfl_items {
+  margin: 5px -8px 0px -8px;
+  padding: 0px;
+}
+.search_form_handler .sf_list .sfl_items > li {
+  padding: 4px 8px;
+  list-style: none;
+  white-space: nowrap;
+}
+.search_form_handler .sf_list .sfl_items > li:hover {
+  background-color: #fff;
+}
+.search_form_handler .sf_list .sfl_items > li > label {
+  display: inline-block;
+  width: 100%;
+}
+.search_form_handler .sf_list .sfl_items > li > label > * {
+  vertical-align: middle;
+}
+.search_form_handler .sf_list .sfl_items > li > label > input[type="checkbox"] {
+  margin-left: 0px;
+  margin-right: 8px;
+}
+.search_form_handler .sf_filter {
+  position: relative;
+  margin-top: 8px;
+  margin-bottom: 8px;
+}
+.search_form_handler .sf_filter input {
+  width: 100%;
+}
+.search_form_handler .sf_filter .sff_picto {
+  position: absolute;
+  right: 5px;
+  top: 5px;
+  opacity: 0.6;
+  user-select: none;
+}
+.search_form_handler .sf_filter .sff_reset {
+  display: none;
+}
 .sf_results_area .sf_results_placeholder {
   margin-top: 100px;
   text-align: center;
diff --git a/css/light-grey.scss b/css/light-grey.scss
index b253edfe9..9be4cbf44 100644
--- a/css/light-grey.scss
+++ b/css/light-grey.scss
@@ -1004,25 +1004,6 @@ input.dp-applied {
 							}
 							.sfc_opc_mc_toggler{
 
-							}
-							.sfc_opc_mc_filter{
-								position: relative;
-								margin-top: 8px;
-								margin-bottom: 8px;
-
-								input{
-									width: 100%;
-								}
-								.sfc_opc_mcf_picto{
-									position: absolute;
-									right: 5px;
-									top: 5px;
-									opacity: 0.6;
-									user-select: none;
-								}
-								.sfc_opc_mc_reset{
-									display: none;
-								}
 							}
 							.sfc_opc_mc_items{
 								max-height: 445px; /* Must be less than .sfc_form_group:max-height - .sfc_opc_mc_toggler:height - .sfc_opc_mc_filter:height */
@@ -1223,6 +1204,60 @@ input.dp-applied {
 			}
 		}
 	}
+
+	/* List helpers */
+	.sf_list{
+		.sfl_title{
+			font-weight: bold;
+
+		}
+		.sfl_items{
+			margin: 5px -8px 0px -8px;
+			padding: 0px;
+
+			> li{
+				padding: 4px 8px;
+				list-style: none;
+				white-space: nowrap;
+
+				&:hover{
+					background-color: $white;
+				}
+
+				> label{
+					display: inline-block;
+					width: 100%;
+
+					> *{
+						vertical-align: middle;
+					}
+					> input[type="checkbox"]{
+						margin-left: 0px;
+						margin-right: 8px;
+					}
+				}
+			}
+		}
+	}
+	.sf_filter{
+		position: relative;
+		margin-top: 8px;
+		margin-bottom: 8px;
+
+		input{
+			width: 100%;
+		}
+		.sff_picto{
+			position: absolute;
+			right: 5px;
+			top: 5px;
+			opacity: 0.6;
+			user-select: none;
+		}
+		.sff_reset{
+			display: none;
+		}
+	}
 }
 .sf_results_area{
 	.sf_results_placeholder{
diff --git a/dictionaries/en.dictionary.itop.ui.php b/dictionaries/en.dictionary.itop.ui.php
index ac3d939cc..cbb175a89 100644
--- a/dictionaries/en.dictionary.itop.ui.php
+++ b/dictionaries/en.dictionary.itop.ui.php
@@ -1386,6 +1386,11 @@ When associated with a trigger, each action is given an "order" number, specifyi
 	// Search form
 	'UI:Search:Toggle' => 'Minimize / Expand',
 	'UI:Search:Criterion:MoreMenu:AddCriteria' => 'Add new criteria',
+	// - Add new criteria button
+	'UI:Search:AddCriteria:List:RecentlyUsed:Title' => 'Recently used',
+	'UI:Search:AddCriteria:List:MostPopular:Title' => 'Most popular',
+	'UI:Search:AddCriteria:List:Others:Title' => 'Others',
+
 	// - Criteria operators
 	//   - Default widget
 	'UI:Search:Criteria:Operator:Default:Empty' => 'Is empty',
@@ -1438,7 +1443,8 @@ When associated with a trigger, each action is given an "order" number, specifyi
 	'UI:Search:Criteria:Title:Enum:In' => '%1$s: %2$s',
 	'UI:Search:Criteria:Title:Enum:In:Many' => '%1$s: %2$s and %3$s others',
 	'UI:Search:Criteria:Title:Enum:In:All' => '%1$s: Any',
-	// -
+
+	// - Other translations
 	'UI:Search:Value:Filter:Placeholder' => 'Filter...',
 	'UI:Search:Value:Toggler:CheckAllNone' => 'Check all / none',
 
diff --git a/js/search/search_form_criteria_enum.js b/js/search/search_form_criteria_enum.js
index d68f2438c..48018c5ca 100644
--- a/js/search/search_form_criteria_enum.js
+++ b/js/search/search_form_criteria_enum.js
@@ -95,8 +95,8 @@ $(function()
 
 			// - Filter
 			var sFilterId = 'filter_' + sOpId;
-			var oFilterElem = $('<div class="sfc_opc_mc_filter"></div>')
-				.append('<input type="text" id="' + sFilterId + '" placeholder="' + Dict.S('UI:Search:Value:Filter:Placeholder') + '" /><span class="sfc_opc_mcf_picto sfc_opc_mcf_filter fa fa-filter"></span><span class="sfc_opc_mcf_picto sfc_opc_mcf_reset fa fa-times"></span>')
+			var oFilterElem = $('<div class="sf_filter"></div>')
+				.append('<input type="text" id="' + sFilterId + '" placeholder="' + Dict.S('UI:Search:Value:Filter:Placeholder') + '" /><span class="sff_picto sff_filter fa fa-filter"></span><span class="sff_picto sff_reset fa fa-times"></span>')
 				.appendTo(oOpContentElem);
 
 			// - Allowed values
@@ -108,11 +108,12 @@ $(function()
 			//     - It is not give by neither the autocomplete or the pre-filled values, so we would need to manually add it in both cases, all operations.
 			if(this.options.field.is_null_allowed === true)
 			{
-				var sItemId = 'value_' + sOpId + '_null';
 				var sValCode = this.options.null_value.code;
 				var sValLabel = this.options.null_value.label;
-				var oValueElem = $('<div class="sfc_opc_mc_item" data-value-code="' + sValCode + '"></div>')
-					.append('<label for="' + sItemId + '"><input type="checkbox" id="' + sItemId + '" value="' + sValCode + '"/>' + sValLabel + '</label>')
+				var oValueElem = $('<div></div>')
+					.addClass('sfc_opc_mc_item')
+					.attr('data-value-code', sValCode)
+					.append('<label><input type="checkbox" value="' + sValCode + '"/>' + sValLabel + '</label>')
 					.appendTo(oAllowedValuesElem);
 			}
 
@@ -120,23 +121,20 @@ $(function()
 			if(this.options.field.allowed_values.values !== undefined)
 			{
 				var aSortedValues = this._sortValuesByLabel(this.options.field.allowed_values.values);
-
-				var iValCounter = 0;
 				for(var i in aSortedValues)
 				{
-					var sItemId = 'value_' + sOpId + '_' + iValCounter;
 					var sValCode = aSortedValues[i][0];
 					var sValLabel = aSortedValues[i][1];
-					var oValueElem = $('<div class="sfc_opc_mc_item" data-value-code="' + sValCode + '"></div>')
-						.append('<label for="' + sItemId + '"><input type="checkbox" id="' + sItemId + '" value="' + sValCode + '"/>' + sValLabel + '</label>')
+					var oValueElem = $('<div></div>')
+						.addClass('sfc_opc_mc_item')
+						.attr('data-value-code', sValCode)
+						.append('<label><input type="checkbox" value="' + sValCode + '"/>' + sValLabel + '</label>')
 						.appendTo(oAllowedValuesElem);
 
 					if(this._isSelectedValues(sValCode))
 					{
 						oValueElem.find(':checkbox').prop('checked', true);
 					}
-
-					iValCounter++;
 				}
 			}
 			oAllowedValuesElem.appendTo(oOpContentElem);
@@ -162,8 +160,8 @@ $(function()
 				if(sFilter === '')
 				{
 					oOpContentElem.find('.sfc_opc_mc_item').show();
-					oFilterElem.find('.sfc_opc_mcf_filter').show();
-					oFilterElem.find('.sfc_opc_mcf_reset').hide();
+					oFilterElem.find('.sff_filter').show();
+					oFilterElem.find('.sff_reset').hide();
 				}
 				else
 				{
@@ -181,14 +179,14 @@ $(function()
 							$(this).hide();
 						}
 					});
-					oFilterElem.find('.sfc_opc_mcf_filter').hide();
-					oFilterElem.find('.sfc_opc_mcf_reset').show();
+					oFilterElem.find('.sff_filter').hide();
+					oFilterElem.find('.sff_reset').show();
 				}
 			});
-			oFilterElem.find('.sfc_opc_mcf_filter').on('click', function(){
+			oFilterElem.find('.sff_filter').on('click', function(){
 				oFilterElem.find('input').trigger('focus');
 			});
-			oFilterElem.find('.sfc_opc_mcf_reset').on('click', function(){
+			oFilterElem.find('.sff_reset').on('click', function(){
 				oFilterElem.find('input')
 					.val('')
 					.trigger('focus');
diff --git a/js/search/search_form_criteria_external_key.js b/js/search/search_form_criteria_external_key.js
index 1513cb24e..2d148befe 100644
--- a/js/search/search_form_criteria_external_key.js
+++ b/js/search/search_form_criteria_external_key.js
@@ -11,6 +11,7 @@ $(function()
 		{
 			// Null value
 			'null_value': {
+				'code': 0,
 				'label': Dict.S('UI:UndefinedObject'),
 			}
 		},
diff --git a/js/search/search_form_handler.js b/js/search/search_form_handler.js
index 975ddaba3..38a9aeee3 100644
--- a/js/search/search_form_handler.js
+++ b/js/search/search_form_handler.js
@@ -298,36 +298,57 @@ $(function()
 			var oContentElem = $('<div class="sfm_content"></div>')
 				.appendTo(this.elements.more_criterion);
 
-			// - Add list
-			var oListElem = $('<ul class="sfm_list"></ul>')
+			// - Filter
+			var oFilterElem = $('<div class="sf_filter"></div>')
+				.append('<input type="text" placeholder="' + Dict.S('UI:Search:Value:Filter:Placeholder') + '" /><span class="sff_picto sff_filter fa fa-filter"></span><span class="sff_picto sff_reset fa fa-times"></span>')
 				.appendTo(oContentElem);
-			// - Add fields
-			// TODO: Find a widget to handle dropdown menu
-			// - From "search" zlist
+
+			// - Add fields from zlist list
+			var oZlistElem = $('<div></div>')
+				.addClass('sf_list')
+				.addClass('sf_list_zlist')
+				.appendTo(oContentElem);
+
+			$('<div class="sfl_title"></div>')
+				.text(Dict.S('UI:Search:AddCriteria:List:MostPopular:Title'))
+				.appendTo(oZlistElem);
+
+			var oZListItemsElem = $('<ul class="sfl_items"></ul>')
+				.appendTo(oZlistElem);
+
 			for(var sFieldRef in this.options.search.fields.zlist)
 			{
 				var oField = this.options.search.fields.zlist[sFieldRef];
 				var oFieldElem = $('<li></li>')
 					.addClass('sfm_field')
 					.attr('data-field-ref', sFieldRef)
-					.text(oField.label);
-				oListElem.append(oFieldElem);
+					.append('<label><input type="checkbox" value="' + sFieldRef + '" />' + oField.label + '</label>')
+					.appendTo(oZListItemsElem);
 			}
 
-			// - Others
+			// - Add fields remaining
 			if(this.options.search.fields.others !== undefined)
 			{
-				oListElem.append('<li>==================</li>');
-				oListElem.append('<li>|| TODO: Better separation ||</li>');
-				oListElem.append('<li>==================</li>');
+				var oOthersElem = $('<div></div>')
+					.addClass('sf_list')
+					.addClass('sf_list_others')
+					.appendTo(oContentElem);
+
+				$('<div class="sfl_title"></div>')
+					.text(Dict.S('UI:Search:AddCriteria:List:Others:Title'))
+					.appendTo(oOthersElem);
+
+				var oOthersItemsElem = $('<ul class="sfl_items"></ul>')
+					.appendTo(oOthersElem);
+
 				for(var sFieldRef in this.options.search.fields.others)
 				{
 					var oField = this.options.search.fields.others[sFieldRef];
 					var oFieldElem = $('<li></li>')
 						.addClass('sfm_field')
 						.attr('data-field-ref', sFieldRef)
-						.text(oField.label);
-					oListElem.append(oFieldElem);
+						.append('<label><input type="checkbox" value="' + sFieldRef + '" />' + oField.label + '</label>')
+						.appendTo(oOthersItemsElem);
 				}
 			}
 
@@ -347,10 +368,11 @@ $(function()
 				}
 				else
 				{
-					//if using the datetimepicker, do not close anything
+					// TODO: Try to put this back in the date widget as it introduced a non necessary coupling.
+					// If using the datetimepicker, do not close anything
 					if (oEventTargetElem.closest('#ui-datepicker-div, .ui-datepicker-prev, .ui-datepicker-next').length > 0 )
 					{
-						//no closing in this case
+						// No closing in this case
 					}
 					// //if the context is not document, then we  have encountered a bug : the css ::after elements do have a context on click and thus, we cannot check if they are inside a  #ui-datepicker-div
 					// else if (typeof oEventTargetElem.context != 'undefined' && $(oEventTargetElem.context).is('.ui-icon'))
@@ -377,6 +399,47 @@ $(function()
 
 				me._toggleMoreCriterion();
 			});
+			// - Filter
+			// Note: "keyup" event is use instead of "keydown", otherwise, the inpu value would not be set yet.
+			oFilterElem.find('input').on('keyup focus', function(oEvent){
+				// TODO: Move on values with up and down arrow keys; select with space or enter.
+
+				var sFilter = $(this).val();
+
+				if(sFilter === '')
+				{
+					oContentElem.find('.sfl_items > li').show();
+					oFilterElem.find('.sff_filter').show();
+					oFilterElem.find('.sff_reset').hide();
+				}
+				else
+				{
+					oContentElem.find('.sfl_items > li').each(function(){
+						var oRegExp = new RegExp(sFilter, 'ig');
+						var sValue = $(this).find('input').val();
+						var sLabel = $(this).text();
+
+						if( (sValue.match(oRegExp) !== null) || (sLabel.match(oRegExp) !== null) )
+						{
+							$(this).show();
+						}
+						else
+						{
+							$(this).hide();
+						}
+					});
+					oFilterElem.find('.sff_filter').hide();
+					oFilterElem.find('.sff_reset').show();
+				}
+			});
+			oFilterElem.find('.sff_filter').on('click', function(){
+				oFilterElem.find('input').trigger('focus');
+			});
+			oFilterElem.find('.sff_reset').on('click', function(){
+				oFilterElem.find('input')
+					.val('')
+					.trigger('focus');
+			});
 			// - Add criteria
 			this.elements.more_criterion.find('.sfm_field').on('click', function(oEvent){
 				// Prevent anchor

From b3cdbfc71b7182c9ecb2889151da618ec797cbeb Mon Sep 17 00:00:00 2001
From: Bruno Da Silva <bruno.dasilva@combodo.com>
Date: Fri, 23 Mar 2018 14:44:13 +0000
Subject: [PATCH 119/202] search widget : date and datetime widget

SVN:b1162[5511]
---
 dictionaries/en.dictionary.itop.ui.php        |  13 +-
 .../search_form_criteria_date_abstract.js     | 222 ++++++++++--------
 js/search/search_form_criteria_date_time.js   |  29 +--
 3 files changed, 138 insertions(+), 126 deletions(-)

diff --git a/dictionaries/en.dictionary.itop.ui.php b/dictionaries/en.dictionary.itop.ui.php
index cbb175a89..a39c8d3a4 100644
--- a/dictionaries/en.dictionary.itop.ui.php
+++ b/dictionaries/en.dictionary.itop.ui.php
@@ -1396,6 +1396,7 @@ When associated with a trigger, each action is given an "order" number, specifyi
 	'UI:Search:Criteria:Operator:Default:Empty' => 'Is empty',
 	'UI:Search:Criteria:Operator:Default:NotEmpty' => 'Is not empty',
 	'UI:Search:Criteria:Operator:Default:Equals' => 'Equals:',
+	'UI:Search:Criteria:Operator:Default:Between' => 'Between:',
 	//   - String widget
 	'UI:Search:Criteria:Operator:String:Contains' => 'Contains:',
 	'UI:Search:Criteria:Operator:String:StartsWith' => 'Starts with:',
@@ -1407,9 +1408,8 @@ When associated with a trigger, each action is given an "order" number, specifyi
 	'UI:Search:Criteria:Operator:Numeric:LessThan' => '<',
 	'UI:Search:Criteria:Operator:Numeric:LessThanOrEquals' => '<=',
 	'UI:Search:Criteria:Operator:Numeric:Different' => '≠',
-	'UI:Search:Criteria:Operator:Numeric:Between' => 'Between:',
-	//   - DateTime widget
-	'UI:Search:Criteria:Operator:DateTime:Between' => 'Between:',
+
+
 
 	// - Criteria titles
 	//   - Default widget
@@ -1422,8 +1422,11 @@ When associated with a trigger, each action is given an "order" number, specifyi
 	'UI:Search:Criteria:Title:Default:LessThan' => '%1$s < %2$s',
 	'UI:Search:Criteria:Title:Default:LessThanOrEquals' => '%1$s <= %2$s',
 	'UI:Search:Criteria:Title:Default:Different' => '%1$s ≠ %2$s',
-	'UI:Search:Criteria:Title:Default:Between' => '%1$s between (%2$s)',
-	'UI:Search:Criteria:Title:Default:BetweenDays' => '%1$s between (%2$s)',
+	'UI:Search:Criteria:Title:Default:Between' => '%1$s between [%2$s]',
+	'UI:Search:Criteria:Title:Default:BetweenDates:All' => '%1$s All',
+	'UI:Search:Criteria:Title:Default:BetweenDates:From' => '%1$s From %2$s',
+	'UI:Search:Criteria:Title:Default:BetweenDates:Until' => '%1$s Until %2$s',
+	'UI:Search:Criteria:Title:Default:BetweenDays' => '%1$s [%2$s]',
 	//   - String widget
 	'UI:Search:Criteria:Title:String:Contains' => '%1$s contains %2$s',
 	'UI:Search:Criteria:Title:String:StartsWith' => '%1$s starts with %2$s',
diff --git a/js/search/search_form_criteria_date_abstract.js b/js/search/search_form_criteria_date_abstract.js
index 11536d214..9a4b9e04f 100644
--- a/js/search/search_form_criteria_date_abstract.js
+++ b/js/search/search_form_criteria_date_abstract.js
@@ -14,44 +14,10 @@ $(function()
 			// Available operators
 			'available_operators': {
 				'between_dates': {
-					'label': Dict.S('UI:Search:Criteria:Operator:DateTime:Between'),
+					'label': Dict.S('UI:Search:Criteria:Operator:Default:Between'),
 					'code': 'between_days',
 					'rank': 1,
 				},
-				'=': {
-					'label': Dict.S('UI:Search:Criteria:Operator:DateTime:Equals'),//pre-existing, label changed
-					// 'dropdown_group':1,
-				},
-				'>': {
-					'label': Dict.S('UI:Search:Criteria:Operator:DateTime:GreaterThan'),
-					'code': 'greater_than',
-					'rank': 100,
-					// 'dropdown_group':1,
-				},
-				'>=': {
-					'label': Dict.S('UI:Search:Criteria:Operator:DateTime:GreaterThanOrEquals'),
-					'code': 'greater_than_or_equals',
-					'rank': 200,
-					// 'dropdown_group':1,
-				},
-				'<': {
-					'label': Dict.S('UI:Search:Criteria:Operator:DateTime:LessThan'),
-					'code': 'less_than',
-					'rank': 300,
-					// 'dropdown_group':1,
-				},
-				'<=': {
-					'label': Dict.S('UI:Search:Criteria:Operator:DateTime:LessThanOrEquals'),
-					'code': 'less_than_or_equals',
-					'rank': 400,
-					// 'dropdown_group':1,
-				},
-				'!=': {
-					'label': Dict.S('UI:Search:Criteria:Operator:DateTime:DifferentThan'),
-					'code': 'different',
-					'rank': 500,
-					// 'dropdown_group':1,
-				},
 				'empty': {
 					'rank': 700,//pre-existing, reordered
 				},
@@ -72,39 +38,16 @@ $(function()
 					//  "default_time_add": false,		=> either false to disable it or number of second to add (used by the datetimepicker to choose the right time on synched datepicker change, its value change from 0 for "from" to +1d-1s for "until"
 					//  "show_on_advanced": true,		=> is the input displaye on "more" or "less" mode advanced is an lais for "more" in the css
 					//  "synced_with": "from_time",		=> from and until has both two input (datepicker and datetimepicker). each time one input change, the other one has to change
-					//  "getter_code":"from_time"			=> iTop expect datetime to always provide time, so we must always use the datetimepicker in order to compute the value to be sent to iTop event if whe are in the display mode "less" with datepicker visible
+					//  "getter_code":"from_time"		=> iTop expect datetime to always provide time, so we must always use the datetimepicker in order to compute the value to be sent to iTop event if whe are in the display mode "less" with datepicker visible
+					//  "title_getter_code":"from",		=> if present, the title will be computed base on the given input code. Because the datetime widget title area is not large enought, so we remove the time info, in order to do so we use this.
 				}
 			]
 		},
 
    
-		// // the constructor
-		// _create: function()
-		// {
-		// 	this._super();
-		// },
-		// // called when created, and later when changing options
-		// _refresh: function()
-		// {
-		//
-		// },
-		// // events bound via _bind are removed automatically
-		// // revert other modifications here
-		// _destroy: function()
-		// {
-		// 	this._super();
-		// },
-		// // _setOptions is called with a hash of all options that are changing
-		// // always refresh when changing options
-		// _setOptions: function()
-		// {
-		// 	this._superApply(arguments);
-		// },
-		// // _setOption is called for each individual option that is changing
-		// _setOption: function( key, value )
-		// {
-		// 	this._super( key, value );
-		// },
+
+
+
 
 
 		// Prepare operator's DOM element
@@ -127,6 +70,7 @@ $(function()
 				var oInputElem = oOpContentElem
 					.find('input')
 					.uniqueId()
+					.attr('data-no-auto-focus', true)
 				;
 				oOpContentElem
 					.find('label')
@@ -142,14 +86,14 @@ $(function()
 			}
 
 
-			// Events
-			// - Focus input on click (radio, label, ...)
-			oOpElem.on('click', function(oEvent){
-				if ($(oEvent.target).is('input[type="text"], select')) {
-					return;
-				}
-				oOpElem.find('input:visible:first').focus();
-			});
+			// // Events
+			// // - Focus input on click (radio, label, ...)
+			// oOpElem.on('click', function(oEvent){
+			// 	if ($(oEvent.target).is('input[type="text"], select')) {
+			// 		return;
+			// 	}
+			// 	oOpElem.find('input:visible:first').filter('[data-no-auto-focus]').focus();
+			// });
 			// - Apply on "enter" key hit
 			//todo: this could be refactored
 			oOpContentElem.on('keyup', function(oEvent){
@@ -222,11 +166,19 @@ $(function()
 
 							var dSyncedDate 		= selectElem[oInputParam.x_picker]('getDate');
 
-							if (typeof oSyncedInputParam.default_time_add != 'undefined' && oSyncedInputParam.default_time_add)
+							if (null == dSyncedDate)
 							{
-								dSyncedDate.setSeconds(dSyncedDate.getSeconds() + oSyncedInputParam.default_time_add);
+								oSyncedInputElem.val('');
 							}
-							oSyncedInputElem[oSyncedInputParam.x_picker]('setDate', dSyncedDate);
+							else
+							{
+								if (typeof oSyncedInputParam.default_time_add != 'undefined' && oSyncedInputParam.default_time_add)
+								{
+									dSyncedDate.setSeconds(dSyncedDate.getSeconds() + oSyncedInputParam.default_time_add);
+								}
+								oSyncedInputElem[oSyncedInputParam.x_picker]('setDate', dSyncedDate);
+							}
+
 						}
 
 						me._apply();
@@ -254,26 +206,24 @@ $(function()
 			var aValues = [];
 			var aInputsParam = me.options.aInputsParam;
 			var aInputsParamLength = aInputsParam.length;
+			var bAdvancedMode = (oOpElem.find('adanced').length > 0);
 			for (var i = 0; i < aInputsParamLength; i++) {
 				var oInputParam = aInputsParam[i];
-				var oInputElem = oOpElem.find('input[name="'+oInputParam.code+'"]');
-				if (oInputElem.is(':visible'))
+				var oInputElemForLabel = oOpElem.find('input[name="'+oInputParam.code+'"]');
+				if (typeof oInputParam.show_on_advanced == 'undefined' || bAdvancedMode == oInputParam.show_on_advanced)
 				{
 					if (typeof oInputParam.getter_code != 'undefined')
 					{
-						oInputElem = oOpElem.find('input[name="'+oInputParam.getter_code+'"]');
+						oInputElemForValue = oOpElem.find('input[name="'+oInputParam.getter_code+'"]');
+					}
+					else
+					{
+						oInputElemForValue = oInputElemForLabel;
 					}
 
-					aValues[oInputParam.value_index] = {value: oInputElem.val(), label: oInputElem.val()};
+					aValues[oInputParam.value_index] = {value: oInputElemForValue.val(), label: oInputElemForLabel.val()};
 				}
 			}
-			//
-			// var sValueFrom  = oOpElem.find('.sfc_op_content input[name="from"]').val();
-			// var sValueUntil = oOpElem.find('.sfc_op_content input[name="until"]').val();
-			//
-			// aValues.push({value: sValueFrom, label: sValueFrom});
-			// aValues.push({value: sValueUntil, label: sValueUntil});
-
 
 			return aValues;
 		},
@@ -291,22 +241,17 @@ $(function()
 
 				if (typeof aValues[oInputParam.value_index] != 'undefined' && typeof aValues[oInputParam.value_index].value != 'undefined')
 				{
-					oInputElem[oInputParam.x_picker]('setDate', aValues[oInputParam.value_index].value);
+					var sDate = aValues[oInputParam.value_index].value;
+					var oDate = new Date(aValues[oInputParam.value_index].value);
+					// switch (true)
+					// {
+					// 	case (i == 0 && sDate.search(/(\s\d{2}:\d{2}:\d{2})/) === -1):
+					// 		//if there is no given hour, the GMT offset is appended by javascript, so we need to remove it (if not, we would have our GMT offset add, ie GMT +1 would become "00:01:00"
+					// 		oDate = new Date(oDate.valueOf() + oDate.getTimezoneOffset() * 60000);
+					// }
+					oInputElem[oInputParam.x_picker]('setDate', oDate);
 				}
 			}
-			// switch (aValues.length)
-			// {
-			// 	case 2:
-			// 		oOpElem.find('.sfc_op_content input[name="until"]').val(aValues[0].value);
-			// 		//NO BREAK!!!
-			// 	case 1:
-			// 		oOpElem.find('.sfc_op_content input[name="from"]').val(aValues[0].value);
-			// 		break;
-			// 	default:
-			// 		return false;
-			// }
-			//
-			// return true;
 		},
 
 		_resetBetweenDaysOperator: function(oOpElem)
@@ -318,6 +263,85 @@ $(function()
 		// Inherited methods
 		//------------------
 
+		_setTitle: function(sTitle)
+		{
+			var me = this;
+			if (sTitle === undefined && me.options.operator == 'between_dates')
+			{
+				var oActiveOpElem = me.element.find('.sfc_op_radio:checked').closest('.sfc_fg_operator');
+				var aValues = me._getValues();
+				switch (true)
+				{
+					case (typeof aValues[0] == 'undefined' && typeof aValues[1] == 'undefined'):
+					case (typeof aValues[0].label == 'undefined' && typeof aValues[1].label == 'undefined'):
+					case (aValues[0].label.trim() == '' && aValues[1].label.trim() == ''):
+						var sDictEntrySuffix = ':All';
+						break;
+					case (typeof aValues[0] == 'undefined' ):
+					case (typeof aValues[0].label == 'undefined' ):
+					case (aValues[0].label.trim() == '' ):
+						var sDictEntrySuffix = ':Until';
+						break;
+					case (typeof aValues[1] == 'undefined'):
+					case (typeof aValues[1].label == 'undefined' ):
+					case (aValues[1].label.trim() == ''):
+						var sDictEntrySuffix = ':From';
+						break;
+					default:
+						var sDictEntrySuffix = undefined;
+						break;
+				}
+
+				if (sDictEntrySuffix != undefined)
+				{
+					var sDictEntry = 'UI:Search:Criteria:Title:' + this._toCamelCase(this.options.field.widget) + ':' + this._toCamelCase(me.options.operator) + sDictEntrySuffix ;
+					// Fallback to default widget dict entry if none exists for the current widget
+					if(Dict.S(sDictEntry) === sDictEntry)
+					{
+						sDictEntry = 'UI:Search:Criteria:Title:Default:' + this._toCamelCase(me.options.operator) + sDictEntrySuffix;
+					}
+
+					sTitle = Dict.Format(sDictEntry, this.options.field.label, this._getValuesAsText());
+				}
+
+			}
+
+			return me._super(sTitle);
+		},
+
+
+		// - Convert values to a standard string
+		_getValuesAsText: function(aRawValues)
+		{
+			var me = this;
+			var aRawValues = undefined;
+			if (me.options.operator == 'between_dates')
+			{
+				var oActiveOpElem = this.element.find('.sfc_op_radio[value="'+me.options.operator+'"]').closest('.sfc_fg_operator'); // me.element.find('.sfc_op_radio:checked').closest('.sfc_fg_operator');
+				aRawValues = me._getValues();
+
+				if (typeof aRawValues[1] == 'undefined' || typeof aRawValues[1].label == 'undefined' || aRawValues[1].label == '')
+				{
+					aRawValues.splice(1, 1);
+				}
+				else
+				{
+					aRawValues[1].label = aRawValues[1].label.replace(/(\s\d{2}:\d{2}:\d{2})/, '');
+				}
+				if (typeof aRawValues[0] == 'undefined' || typeof aRawValues[0].label == 'undefined' || aRawValues[0].label == '')
+				{
+					aRawValues.splice(0, 1);
+				}
+				else
+				{
+					aRawValues[0].label = aRawValues[0].label.replace(/(\s\d{2}:\d{2}:\d{2})/, '');
+				}
+			}
+			return me._super(aRawValues);
+		},
+
+
+
 
 		// Prepare operator's DOM element
 		// - Base preparation, always called
diff --git a/js/search/search_form_criteria_date_time.js b/js/search/search_form_criteria_date_time.js
index e38f48a83..e80997556 100644
--- a/js/search/search_form_criteria_date_time.js
+++ b/js/search/search_form_criteria_date_time.js
@@ -36,6 +36,7 @@ $(function()
 					"value_index": 0,
 					"onclose_show" : "until_time",
 					"synced_with": "from",
+					"title_getter_code":"from",
 				},
 				{
 					"code": "until",
@@ -54,11 +55,16 @@ $(function()
 					"default_time_add": 86399, // 24 * 60 * 60 - 1
 					"show_on_advanced": true,
 					"value_index": 1,
-					"synced_with": "until"
+					"synced_with": "until",
+					"title_getter_code":"until",
 				}
 			]
 		},
 
+
+		//------------------
+		// Inherited methods
+		//------------------
    
 		// the constructor
 		_create: function()
@@ -68,11 +74,7 @@ $(function()
 			this._super();
 			this.element.addClass('search_form_criteria_date_time');
 		},
-		// called when created, and later when changing options
-		_refresh: function()
-		{
 
-		},
 		// events bound via _bind are removed automatically
 		// revert other modifications here
 		_destroy: function()
@@ -80,23 +82,6 @@ $(function()
 			this.element.removeClass('search_form_criteria_date_time');
 			this._super();
 		},
-		// _setOptions is called with a hash of all options that are changing
-		// always refresh when changing options
-		_setOptions: function()
-		{
-			this._superApply(arguments);
-		},
-		// _setOption is called for each individual option that is changing
-		_setOption: function( key, value )
-		{
-			this._super( key, value );
-		},
-
-
-
-		//------------------
-		// Inherited methods
-		//------------------
 
 
 

From 0feb0fe9723aff63d00430e096b03ee5a558e1b2 Mon Sep 17 00:00:00 2001
From: Bruno Da Silva <bruno.dasilva@combodo.com>
Date: Fri, 23 Mar 2018 14:56:16 +0000
Subject: [PATCH 120/202] search widget : date and datetime widget

SVN:b1162[5512]
---
 js/search/search_form_criteria.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/js/search/search_form_criteria.js b/js/search/search_form_criteria.js
index fda9b2c3a..6822b8726 100644
--- a/js/search/search_form_criteria.js
+++ b/js/search/search_form_criteria.js
@@ -198,7 +198,7 @@ $(function()
 			{
 				oOpElemToFocus = this.element.find('.sfc_fg_operator:first');
 			}
-			oOpElemToFocus.find('.sfc_op_content input[type="text"]:first').trigger('click').trigger('focus');
+			oOpElemToFocus.find('.sfc_op_content input[type="text"]:first').filter(':not([data-no-auto-focus])').trigger('click').trigger('focus');
 		},
 		_close: function()
 		{
@@ -595,9 +595,13 @@ $(function()
 			return this.options.values;
 		},
 		// - Convert values to a standard string
-		_getValuesAsText: function()
+		_getValuesAsText: function(aRawValues)
 		{
-			var aRawValues = this._getValues();
+			if (aRawValues == undefined)
+			{
+				aRawValues = this._getValues();
+			}
+
 
 			var aValues = [];
 			for(var iValueIdx in aRawValues)

From 7153ae96149641b068bceffdbc02083011f1dd5f Mon Sep 17 00:00:00 2001
From: Bruno Da Silva <bruno.dasilva@combodo.com>
Date: Fri, 23 Mar 2018 14:58:37 +0000
Subject: [PATCH 121/202] search widget : date and datetime widget

remove = operator

SVN:b1162[5513]
---
 js/search/search_form_criteria_date_abstract.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/js/search/search_form_criteria_date_abstract.js b/js/search/search_form_criteria_date_abstract.js
index 9a4b9e04f..76f14ce4b 100644
--- a/js/search/search_form_criteria_date_abstract.js
+++ b/js/search/search_form_criteria_date_abstract.js
@@ -24,6 +24,7 @@ $(function()
 				'not_empty': {
 					'rank': 800,//pre-existing, reordered
 				},
+				'=': null
 			},
 			aInputsParam: [
 				{

From 465532014bbb3626b9729b943f0fde467ccc35dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Fri, 23 Mar 2018 15:02:23 +0000
Subject: [PATCH 122/202] Advanced Search: Undefined and Id first

SVN:b1162[5514]
---
 .../criteriontooql.class.inc.php                | 17 ++++-------------
 .../criteriontosearchform.class.inc.php         |  9 +--------
 .../application/search/searchform.class.inc.php |  7 ++++---
 .../search/CriterionConversionTest.php          |  8 ++++++--
 4 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/sources/application/search/criterionconversion/criteriontooql.class.inc.php b/sources/application/search/criterionconversion/criteriontooql.class.inc.php
index b116904e1..cacbe96e9 100644
--- a/sources/application/search/criterionconversion/criteriontooql.class.inc.php
+++ b/sources/application/search/criterionconversion/criteriontooql.class.inc.php
@@ -26,7 +26,6 @@ namespace Combodo\iTop\Application\Search\CriterionConversion;
 use AttributeDate;
 use AttributeDateTime;
 use AttributeDefinition;
-use AttributeExternalKey;
 use Combodo\iTop\Application\Search\AjaxSearchException;
 use Combodo\iTop\Application\Search\CriterionConversionAbstract;
 use Combodo\iTop\Application\Search\SearchForm;
@@ -150,7 +149,6 @@ class CriterionToOQL extends CriterionConversionAbstract
 		}
 
 		$bFilterOnUndefined = false;
-		$sFilterOnUndefined = '';
 		try
 		{
 			$aAttributeDefs = \MetaModel::ListAttributeDefs($sClass);
@@ -190,14 +188,6 @@ class CriterionToOQL extends CriterionConversionAbstract
 						$aValue = $aValues[$i];
 						if (isset($aValue['value']) && ($aValue['value'] === 'null'))
 						{
-							if ($oAttDef instanceof AttributeExternalKey)
-							{
-								$sFilterOnUndefined = "({$sRef} = 0)";
-							}
-							else
-							{
-								$sFilterOnUndefined = "ISNULL({$sRef})";
-							}
 							$bFilterOnUndefined = true;
 							unset($aValues[$i]);
 							break;
@@ -218,17 +208,18 @@ class CriterionToOQL extends CriterionConversionAbstract
 
 		if ($bFilterOnUndefined)
 		{
+			$sFilterOnUndefined = "ISNULL({$sRef})";
 			if (count($aValues) === 0)
 			{
-				return "{$sFilterOnUndefined}";
+				return $sFilterOnUndefined;
 			}
 
 			if (count($aInValues) == 1)
 			{
-				return "(({$sRef} = '$sInList') OR {$sFilterOnUndefined})";
+				return "((({$sRef} = '$sInList') OR {$sFilterOnUndefined}) AND 1)";
 			}
 
-			return "({$sRef} IN ('$sInList') OR {$sFilterOnUndefined})";
+			return "(({$sRef} IN ('$sInList') OR {$sFilterOnUndefined}) AND 1)";
 		}
 
 		if (count($aInValues) == 1)
diff --git a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
index ca3836696..ac3eed301 100644
--- a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
+++ b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
@@ -424,14 +424,7 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 		switch ($sOperator)
 		{
 			case '=':
-				if (!isset($aCriteria['values'][0]))
-				{
-					$aCriteria['operator'] = CriterionConversionAbstract::OP_EMPTY;
-				}
-				else
-				{
-					$aCriteria['operator'] = CriterionConversionAbstract::OP_IN;
-				}
+				$aCriteria['operator'] = CriterionConversionAbstract::OP_IN;
 				break;
 			case '!=':
 				if (!isset($aCriteria['values'][0]))
diff --git a/sources/application/search/searchform.class.inc.php b/sources/application/search/searchform.class.inc.php
index ba6bb5fa7..7a69715fe 100644
--- a/sources/application/search/searchform.class.inc.php
+++ b/sources/application/search/searchform.class.inc.php
@@ -211,8 +211,7 @@ class SearchForm
 			{
 				$aAttributeDefs = MetaModel::ListAttributeDefs($sClass);
 				$aList = MetaModel::GetZListItems($sClass, 'standard_search');
-				
-				$aZList = $this->AppendId($sClass, $sAlias, array());
+				$aZList = array();
 				foreach($aList as $sAttCode)
 				{
 					if (array_key_exists($sAttCode, $aAttributeDefs))
@@ -225,6 +224,7 @@ class SearchForm
 				uasort($aZList, function ($aItem1, $aItem2) {
 					return strcmp($aItem1['label'], $aItem2['label']);
 				});
+				$aZList = $this->AppendId($sClass, $sAlias, $aZList);
 				$aAllFields['zlist'] = $aZList;
 
 				$aOthers = array();
@@ -353,7 +353,8 @@ class SearchForm
 		$aField['label'] = 'Id';
 		$aField['widget'] = AttributeDefinition::SEARCH_WIDGET_TYPE_NUMERIC;
 		$aField['is_null_allowed'] = false;
-		$aFields[$sClassAlias . '.id'] = $aField;
+		$aNewFields = array($sClassAlias.'.id' => $aField);
+		$aFields = array_merge($aNewFields, $aFields);
 		$this->aLabels['Id'] = true;
 		return $aFields;
 	}
diff --git a/test/application/search/CriterionConversionTest.php b/test/application/search/CriterionConversionTest.php
index 5d0887808..aff5eea85 100644
--- a/test/application/search/CriterionConversionTest.php
+++ b/test/application/search/CriterionConversionTest.php
@@ -347,14 +347,17 @@ class CriterionConversionTest extends ItopDataTestCase
 	function OqlProvider()
 	{
 		return array(
-			'ISNULL' => array('OQL' => "SELECT Server WHERE ISNULL(nb_u)"),
-			'start' => array('OQL' => "SELECT Contact WHERE status = 'active' AND name LIKE 'toto%'"),
+			'string starts' => array('OQL' => "SELECT Contact WHERE name LIKE 'toto%'"),
+			'string ends' => array('OQL' => "SELECT Contact WHERE name LIKE '%toto'"),
+			'string contains' => array('OQL' => "SELECT Contact WHERE name LIKE '%toto%'"),
 			'enum + key =' => array('OQL' => "SELECT Contact WHERE status = 'active' AND org_id = 3"),
 			'enum =' => array('OQL' => "SELECT Contact WHERE status = 'active'"),
 			'enum IN' => array('OQL' => "SELECT Contact WHERE status IN ('active', 'inactive')"),
 			'enum NOT IN' => array('OQL' => "SELECT Contact WHERE status NOT IN ('active')"),
+			'enum undefined' => array('OQL' => "SELECT FunctionalCI WHERE ((business_criticity = 'high') OR ISNULL(business_criticity)) AND 1"),
 			'key NOT IN' => array('OQL' => "SELECT Contact WHERE org_id NOT IN ('1')"),
 			'key IN' => array('OQL' => "SELECT Contact WHERE org_id IN ('1')"),
+			'key empty' => array('OQL' => "SELECT Person WHERE location_id = '0'"),
 			'Date relative' => array('OQL' => "SELECT UserRequest WHERE DATE_SUB(NOW(), INTERVAL 14 DAY) < start_date"),
 			'Date between 1' => array('OQL' => "SELECT UserRequest WHERE start_date > '2017-01-01 00:00:00' AND '2018-01-01 00:00:00' >= start_date"),
 			'Date between 2' => array('OQL' => "SELECT UserRequest WHERE start_date > '2017-01-01 00:00:00' AND status = 'active' AND org_id = 3 AND '2018-01-01 00:00:00' >= start_date"),
@@ -366,6 +369,7 @@ class CriterionConversionTest extends ItopDataTestCase
 			'Date =' => array('OQL' => "SELECT CustomerContract WHERE (start_date = '2018-03-01')"),
 			'Date =2' => array('OQL' => "SELECT UserRequest WHERE (DATE_FORMAT(start_date, '%Y-%m-%d') = '2018-03-21')"),
 			'Num between 1' => array('OQL' => "SELECT Server WHERE nb_u >= 0 AND 1 >= nb_u"),
+			'Num ISNULL' => array('OQL' => "SELECT Server WHERE ISNULL(nb_u)"),
 		);
 	}
 }

From 52731d7b0a2b11182508681855507eb687597c51 Mon Sep 17 00:00:00 2001
From: Guillaume Lajarige <guillaume.lajarige@combodo.com>
Date: Fri, 23 Mar 2018 15:39:34 +0000
Subject: [PATCH 123/202] Advanced search: Integration with endpoint.

SVN:b1162[5515]
---
 js/search/search_form_handler.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/search/search_form_handler.js b/js/search/search_form_handler.js
index 38a9aeee3..deb6b8f25 100644
--- a/js/search/search_form_handler.js
+++ b/js/search/search_form_handler.js
@@ -503,7 +503,7 @@ $(function()
 		_addCriteria: function(oData)
 		{
 			var sRef = oData.ref;
-			var sType = this._getCriteriaTypeFromFieldRef(sRef);
+			var sType = (oData.widget !== undefined) ? oData.widget : this._getCriteriaTypeFromFieldRef(sRef);
 
 			if(sType !== null)
 			{

From b566bead31880faf01e88b264442b77d4e519513 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Fri, 23 Mar 2018 16:05:37 +0000
Subject: [PATCH 124/202] Advanced Search: Undefined for enums and unit tests

SVN:b1162[5516]
---
 core/oql/expression.class.inc.php               |  1 +
 dictionaries/fr.dictionary.itop.ui.php          |  4 ++--
 .../criteriontosearchform.class.inc.php         | 17 ++++++++++++-----
 .../search/CriterionConversionTest.php          |  1 +
 test/application/search/SearchFormTest.php      |  4 ++--
 5 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/core/oql/expression.class.inc.php b/core/oql/expression.class.inc.php
index 98510a594..c6ab22fb4 100644
--- a/core/oql/expression.class.inc.php
+++ b/core/oql/expression.class.inc.php
@@ -1602,6 +1602,7 @@ class FunctionExpression extends Expression
 				{
 					$aCriteria = array_merge($oExpression->GetCriterion($oSearch, $aArgs, $bRetrofitParams, $oAttDef), $aCriteria);
 				}
+				$aCriteria['has_undefined'] = true;
 				break;
 
 			case 'NOW':
diff --git a/dictionaries/fr.dictionary.itop.ui.php b/dictionaries/fr.dictionary.itop.ui.php
index fadf34b1a..68763f5af 100644
--- a/dictionaries/fr.dictionary.itop.ui.php
+++ b/dictionaries/fr.dictionary.itop.ui.php
@@ -1241,8 +1241,8 @@ Lors de l\'association à un déclencheur, on attribue à chaque action un numé
 // Expression to Natural language
 //
 Dict::Add('FR FR', 'French', 'Français', array(
-	'Expression:Operator:AND' => 'ET',
-	'Expression:Operator:OR' => 'OU',
+	'Expression:Operator:AND' => ' ET ',
+	'Expression:Operator:OR' => ' OU ',
 	'Expression:Unit:Short:DAY' => 'j',
 	'Expression:Unit:Short:WEEK' => 's',
 	'Expression:Unit:Short:MONTH' => 'm',
diff --git a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
index ac3eed301..4970a7a2e 100644
--- a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
+++ b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
@@ -334,11 +334,6 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 		return $aCriteria;
 	}
 
-	protected static function EnumToSearchForm($aCriteria, $aFields)
-	{
-		return self::ExternalKeyToSearchForm($aCriteria, $aFields);
-	}
-
 	protected static function DateToSearchForm($aCriteria, $aFields)
 	{
 		return self::DateTimeToSearchForm($aCriteria, $aFields);
@@ -417,6 +412,10 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 		return $aCriteria;
 	}
 
+	protected static function EnumToSearchForm($aCriteria, $aFields)
+	{
+		return self::ExternalKeyToSearchForm($aCriteria, $aFields);
+	}
 
 	protected static function ExternalKeyToSearchForm($aCriteria, $aFields)
 	{
@@ -442,6 +441,14 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 				break;
 			case 'IN':
 				break;
+			case 'OR':
+				// Special case when undefined and other values are selected
+				$aCriteria['operator'] = CriterionConversionAbstract::OP_IN;
+				if (isset($aCriteria['has_undefined']) && $aCriteria['has_undefined'])
+				{
+					$aCriteria['values'][] = array('value' => 'null', 'label' => 'null');
+				}
+				break;
 			default:
 				// Unknown operator
 				$aCriteria['widget'] = AttributeDefinition::SEARCH_WIDGET_TYPE_RAW;
diff --git a/test/application/search/CriterionConversionTest.php b/test/application/search/CriterionConversionTest.php
index aff5eea85..98da18c5f 100644
--- a/test/application/search/CriterionConversionTest.php
+++ b/test/application/search/CriterionConversionTest.php
@@ -355,6 +355,7 @@ class CriterionConversionTest extends ItopDataTestCase
 			'enum IN' => array('OQL' => "SELECT Contact WHERE status IN ('active', 'inactive')"),
 			'enum NOT IN' => array('OQL' => "SELECT Contact WHERE status NOT IN ('active')"),
 			'enum undefined' => array('OQL' => "SELECT FunctionalCI WHERE ((business_criticity = 'high') OR ISNULL(business_criticity)) AND 1"),
+			'enum undefined1' => array('OQL' => "SELECT FunctionalCI WHERE ((business_criticity IN ('high', 'medium')) OR ISNULL(business_criticity)) AND 1"),
 			'key NOT IN' => array('OQL' => "SELECT Contact WHERE org_id NOT IN ('1')"),
 			'key IN' => array('OQL' => "SELECT Contact WHERE org_id IN ('1')"),
 			'key empty' => array('OQL' => "SELECT Person WHERE location_id = '0'"),
diff --git a/test/application/search/SearchFormTest.php b/test/application/search/SearchFormTest.php
index 21aaec5e9..f2b538bdb 100644
--- a/test/application/search/SearchFormTest.php
+++ b/test/application/search/SearchFormTest.php
@@ -56,9 +56,9 @@ class SearchFormTest extends ItopDataTestCase
 	public function GetFieldsProvider()
 	{
 		return array(
-			array("SELECT Contact", 7, 'zlist'),
+			array("SELECT Contact", 8, 'zlist'),
 			array("SELECT Contact AS C WHERE C.status = 'active'", 4, 'others'),
-			array("SELECT Person", 11, 'zlist'),
+			array("SELECT Person", 12, 'zlist'),
 		);
 	}
 

From 50e0ea5ec5575729151636b8387a64074704f3c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Fri, 23 Mar 2018 16:22:10 +0000
Subject: [PATCH 125/202] Advanced Search: Undefined for enums and unit tests

SVN:b1162[5517]
---
 .../criterionconversion/criteriontosearchform.class.inc.php  | 5 +++++
 test/application/search/CriterionConversionTest.php          | 1 +
 test/application/search/SearchFormTest.php                   | 5 +++++
 3 files changed, 11 insertions(+)

diff --git a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
index 4970a7a2e..e22c58725 100644
--- a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
+++ b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
@@ -442,10 +442,15 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 			case 'IN':
 				break;
 			case 'OR':
+			case 'ISNULL':
 				// Special case when undefined and other values are selected
 				$aCriteria['operator'] = CriterionConversionAbstract::OP_IN;
 				if (isset($aCriteria['has_undefined']) && $aCriteria['has_undefined'])
 				{
+					if (!isset($aCriteria['values']))
+					{
+						$aCriteria['values'] = array();
+					}
 					$aCriteria['values'][] = array('value' => 'null', 'label' => 'null');
 				}
 				break;
diff --git a/test/application/search/CriterionConversionTest.php b/test/application/search/CriterionConversionTest.php
index 98da18c5f..8c914b3b8 100644
--- a/test/application/search/CriterionConversionTest.php
+++ b/test/application/search/CriterionConversionTest.php
@@ -356,6 +356,7 @@ class CriterionConversionTest extends ItopDataTestCase
 			'enum NOT IN' => array('OQL' => "SELECT Contact WHERE status NOT IN ('active')"),
 			'enum undefined' => array('OQL' => "SELECT FunctionalCI WHERE ((business_criticity = 'high') OR ISNULL(business_criticity)) AND 1"),
 			'enum undefined1' => array('OQL' => "SELECT FunctionalCI WHERE ((business_criticity IN ('high', 'medium')) OR ISNULL(business_criticity)) AND 1"),
+			'enum undefined2' => array('OQL' => "SELECT FunctionalCI WHERE ISNULL(business_criticity)"),
 			'key NOT IN' => array('OQL' => "SELECT Contact WHERE org_id NOT IN ('1')"),
 			'key IN' => array('OQL' => "SELECT Contact WHERE org_id IN ('1')"),
 			'key empty' => array('OQL' => "SELECT Person WHERE location_id = '0'"),
diff --git a/test/application/search/SearchFormTest.php b/test/application/search/SearchFormTest.php
index f2b538bdb..d3b3c42c5 100644
--- a/test/application/search/SearchFormTest.php
+++ b/test/application/search/SearchFormTest.php
@@ -109,6 +109,11 @@ class SearchFormTest extends ItopDataTestCase
 			array('OQL' => "SELECT UserRequest WHERE start_date >= '2017-01-01 00:00:00' AND '2017-01-01 00:00:00' >= start_date", 1),
 			array('OQL' => "SELECT UserRequest WHERE start_date >= '2017-01-01 00:00:00' AND '2017-01-01 01:00:00' > start_date", 1),
 			array('OQL' => "SELECT UserRequest WHERE start_date >= '2017-01-01 00:00:00' AND '2017-01-02 00:00:00' > start_date", 1),
+			array(
+				'OQL' => "SELECT FunctionalCI WHERE ((business_criticity IN ('high', 'medium')) OR ISNULL(business_criticity)) AND 1",
+				1
+			),
+
 		);
 	}
 }

From 5f86a609543c248652181d4b60b5f3d27df29171 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Fri, 23 Mar 2018 16:32:23 +0000
Subject: [PATCH 126/202] Advanced Search: Undefined for enums

SVN:b1162[5518]
---
 .../criteriontooql.class.inc.php               |  2 ++
 .../criteriontosearchform.class.inc.php        | 18 ++++++------------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/sources/application/search/criterionconversion/criteriontooql.class.inc.php b/sources/application/search/criterionconversion/criteriontooql.class.inc.php
index cacbe96e9..4171538d6 100644
--- a/sources/application/search/criterionconversion/criteriontooql.class.inc.php
+++ b/sources/application/search/criterionconversion/criteriontooql.class.inc.php
@@ -216,9 +216,11 @@ class CriterionToOQL extends CriterionConversionAbstract
 
 			if (count($aInValues) == 1)
 			{
+				// Add 'AND 1' to group the 'OR' inside an AND list for OQL parsing
 				return "((({$sRef} = '$sInList') OR {$sFilterOnUndefined}) AND 1)";
 			}
 
+			// Add 'AND 1' to group the 'OR' inside an AND list for OQL parsing
 			return "(({$sRef} IN ('$sInList') OR {$sFilterOnUndefined}) AND 1)";
 		}
 
diff --git a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
index e22c58725..51755fb1e 100644
--- a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
+++ b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
@@ -423,27 +423,20 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 		switch ($sOperator)
 		{
 			case '=':
+				// Same as IN
 				$aCriteria['operator'] = CriterionConversionAbstract::OP_IN;
 				break;
-			case '!=':
-				if (!isset($aCriteria['values'][0]))
-				{
-					$aCriteria['operator'] = CriterionConversionAbstract::OP_NOT_EMPTY;
-				}
-				else
-				{
-					// Same as NOT IN
-					$aCriteria = self::RevertValues($aCriteria, $aFields);
-				}
-				break;
 			case 'NOT IN':
+			case '!=':
+				// Same as NOT IN
 				$aCriteria = self::RevertValues($aCriteria, $aFields);
 				break;
 			case 'IN':
+				// Nothing special to do
 				break;
 			case 'OR':
 			case 'ISNULL':
-				// Special case when undefined and other values are selected
+				// Special case when undefined and/or other values are selected
 				$aCriteria['operator'] = CriterionConversionAbstract::OP_IN;
 				if (isset($aCriteria['has_undefined']) && $aCriteria['has_undefined'])
 				{
@@ -451,6 +444,7 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 					{
 						$aCriteria['values'] = array();
 					}
+					// Convention for 'undefined' enums
 					$aCriteria['values'][] = array('value' => 'null', 'label' => 'null');
 				}
 				break;

From 440dd903167721e70bd2c77e79b6fdf90ff14b02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Fri, 23 Mar 2018 16:57:10 +0000
Subject: [PATCH 127/202] Advanced Search: Merge enums and external keys

SVN:b1162[5523]
---
 .../criteriontosearchform.class.inc.php       | 97 ++++++++++++-------
 1 file changed, 61 insertions(+), 36 deletions(-)

diff --git a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
index 51755fb1e..1cb65d16e 100644
--- a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
+++ b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
@@ -110,6 +110,8 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 			AttributeDefinition::SEARCH_WIDGET_TYPE_DATE => 'MergeDate',
 			AttributeDefinition::SEARCH_WIDGET_TYPE_DATE_TIME => 'MergeDateTime',
 			AttributeDefinition::SEARCH_WIDGET_TYPE_NUMERIC => 'MergeNumeric',
+			AttributeDefinition::SEARCH_WIDGET_TYPE_ENUM => 'MergeEnumExtKeys',
+			AttributeDefinition::SEARCH_WIDGET_TYPE_EXTERNAL_KEY => 'MergeEnumExtKeys',
 		);
 
 		$aPrevCriterion = null;
@@ -203,41 +205,6 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 		return null;
 	}
 
-	/**
-	 * @param $aPrevCriterion
-	 * @param $aCurrCriterion
-	 * @param $aMergedCriterion
-	 *
-	 * @return Current criteria or null if merged
-	 * @throws \Exception
-	 */
-	protected static function MergeNumeric($aPrevCriterion, $aCurrCriterion, &$aMergedCriterion)
-	{
-		$sPrevOperator = $aPrevCriterion['operator'];
-		$sCurrOperator = $aCurrCriterion['operator'];
-		if (($sPrevOperator != '<=') || ($sCurrOperator != '>='))
-		{
-			$aMergedCriterion[] = $aPrevCriterion;
-
-			return $aCurrCriterion;
-		}
-
-		// Merge into 'between' operation.
-		$sLastNum = $aPrevCriterion['values'][0]['value'];
-		$sFirstNum = $aCurrCriterion['values'][0]['value'];
-		$aCurrCriterion['values'] = array();
-		$aCurrCriterion['values'][] = array('value' => $sFirstNum, 'label' => $sFirstNum);
-		$aCurrCriterion['values'][] = array('value' => $sLastNum, 'label' => $sLastNum);
-
-		$aCurrCriterion['oql'] = "({$aPrevCriterion['oql']} AND {$aCurrCriterion['oql']})";
-		$aCurrCriterion['label'] = $aPrevCriterion['label'].' '.Dict::S('Expression:Operator:AND', 'AND').' '.$aCurrCriterion['label'];
-		$aCurrCriterion['operator'] = 'between';
-
-		$aMergedCriterion[] = $aCurrCriterion;
-
-		return null;
-	}
-
 	/**
 	 * @param $aPrevCriterion
 	 * @param $aCurrCriterion
@@ -287,13 +254,71 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 		$aCurrCriterion['values'][] = array('value' => $sLastDateValue, 'label' => $sLastDateLabel);
 
 		$aCurrCriterion['oql'] = "({$aPrevCriterion['oql']} AND {$aCurrCriterion['oql']})";
-		$aCurrCriterion['label'] = $aPrevCriterion['label'].' '.Dict::S('Expression:Operator:AND', 'AND').' '.$aCurrCriterion['label'];
+		$aCurrCriterion['label'] = $aPrevCriterion['label'].' '.Dict::S('Expression:Operator:AND',
+				'AND').' '.$aCurrCriterion['label'];
 
 		$aMergedCriterion[] = $aCurrCriterion;
 
 		return null;
 	}
 
+	/**
+	 * @param $aPrevCriterion
+	 * @param $aCurrCriterion
+	 * @param $aMergedCriterion
+	 *
+	 * @return Current criteria or null if merged
+	 * @throws \Exception
+	 */
+	protected static function MergeNumeric($aPrevCriterion, $aCurrCriterion, &$aMergedCriterion)
+	{
+		$sPrevOperator = $aPrevCriterion['operator'];
+		$sCurrOperator = $aCurrCriterion['operator'];
+		if (($sPrevOperator != '<=') || ($sCurrOperator != '>='))
+		{
+			$aMergedCriterion[] = $aPrevCriterion;
+
+			return $aCurrCriterion;
+		}
+
+		// Merge into 'between' operation.
+		$sLastNum = $aPrevCriterion['values'][0]['value'];
+		$sFirstNum = $aCurrCriterion['values'][0]['value'];
+		$aCurrCriterion['values'] = array();
+		$aCurrCriterion['values'][] = array('value' => $sFirstNum, 'label' => $sFirstNum);
+		$aCurrCriterion['values'][] = array('value' => $sLastNum, 'label' => $sLastNum);
+
+		$aCurrCriterion['oql'] = "({$aPrevCriterion['oql']} AND {$aCurrCriterion['oql']})";
+		$aCurrCriterion['label'] = $aPrevCriterion['label'].' '.Dict::S('Expression:Operator:AND', 'AND').' '.$aCurrCriterion['label'];
+		$aCurrCriterion['operator'] = 'between';
+
+		$aMergedCriterion[] = $aCurrCriterion;
+
+		return null;
+	}
+
+	private static function SerializeValues($aValues)
+	{
+		$aSerializedValues = array();
+		foreach($aValues as $aValue)
+		{
+			$aSerializedValues[] = serialize($aValue);
+		}
+
+		return $aSerializedValues;
+	}
+
+	protected static function MergeEnumExtKeys($aPrevCriterion, $aCurrCriterion, &$aMergedCriterion)
+	{
+		$aFirstValues = self::SerializeValues($aPrevCriterion['values']);
+		$aNextValues = self::SerializeValues($aCurrCriterion['values']);
+
+		// Keep only the common values
+		$aCurrCriterion['values'] = array_map("unserialize", array_intersect($aFirstValues, $aNextValues));
+
+		$aMergedCriterion[] = $aCurrCriterion;
+		return null;
+	}
 
 	protected static function TextToSearchForm($aCriteria, $aFields)
 	{

From 8b0d9670f9bddf803d191da1969478bcb1c95958 Mon Sep 17 00:00:00 2001
From: Guillaume Lajarige <guillaume.lajarige@combodo.com>
Date: Sun, 25 Mar 2018 12:21:26 +0000
Subject: [PATCH 128/202] Advanced search: UI/UX WIP.

SVN:b1162[5524]
---
 css/css-variables.scss                 | 16 +++--
 css/light-grey.css                     | 40 ++++++++---
 css/light-grey.scss                    | 56 +++++++++++-----
 dictionaries/en.dictionary.itop.ui.php |  1 +
 js/search/search_form_handler.js       | 93 ++++++++++++++++++++++----
 5 files changed, 160 insertions(+), 46 deletions(-)

diff --git a/css/css-variables.scss b/css/css-variables.scss
index ba5dfddd8..72388464f 100644
--- a/css/css-variables.scss
+++ b/css/css-variables.scss
@@ -27,11 +27,17 @@ $text-color: #000;
 $box-radius: 0px;
 $box-shadow-regular: 0 1px 1px rgba(0, 0, 0, 0.15);
 // - Boxes
-$box-blue-color: #2D2D2D;
-$box-blue-bg-color: #f0f3f5;
-$box-blue-border-color: #3f7294;
-$box-blue-border: 1px solid $box-blue-border-color;
-$box-blue-radius: 1px;
+//$search-criteria-box-color: #2D2D2D;
+//$search-criteria-box-bg-color: #f0f3f5;
+//$search-criteria-box-border-color: #3f7294;
+//$search-criteria-box-border: 1px solid $search-criteria-box-border-color;
+//$search-criteria-box-radius: 1px;
+$search-criteria-box-color: #2D2D2D;
+$search-criteria-box-picto-color: #E87C1E;
+$search-criteria-box-bg-color: #EEEEEE;
+$search-criteria-box-border-color: #CCCCCC;
+$search-criteria-box-border: 1px solid $search-criteria-box-border-color;
+$search-criteria-box-radius: 1px;
 
 // Beware the version number MUST be enclosed with quotes otherwise v2.3.0 becomes v2 0.3 .0
 $version: "v2.4.0";
diff --git a/css/light-grey.css b/css/light-grey.css
index bc8ac9d7e..0e4c47ac1 100644
--- a/css/light-grey.css
+++ b/css/light-grey.css
@@ -741,6 +741,7 @@ input.dp-applied {
   margin: 0;
   color: #fff;
   background-color: #3f7294;
+  cursor: pointer;
   /* Pictogram */
 }
 .search_form_handler .sf_title .sft_picto {
@@ -792,9 +793,9 @@ input.dp-applied {
 .search_form_handler .sf_criterion_area .search_form_criteria > *, .search_form_handler .sf_criterion_area .sf_more_criterion > * {
   padding: 7px 8px;
   vertical-align: top;
-  background-color: #f0f3f5;
+  background-color: #eee;
   color: #2d2d2d;
-  border: 1px solid #3f7294;
+  border: 1px solid #ccc;
   border-radius: 1px;
   box-shadow: 0 1px 1px rgba(0, 0, 0, 0.15);
 }
@@ -839,7 +840,7 @@ input.dp-applied {
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_close, .search_form_handler .sf_criterion_area .search_form_criteria .sfc_toggle {
   position: absolute;
   top: 7px;
-  color: #3f7294;
+  color: #e87c1e;
 }
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_close {
   right: 7px;
@@ -913,7 +914,7 @@ input.dp-applied {
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_opc_multichoices .sfc_opc_mc_items .sfc_opc_mc_item:hover {
   background-color: #fff;
   /* TODO: Try with this */
-  /*background-color: $box-blue-border-color;
+  /*background-color: $search-criteria-box-border-color;
    color: $white;*/
 }
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_opc_multichoices .sfc_opc_mc_items .sfc_opc_mc_item label {
@@ -979,6 +980,9 @@ input.dp-applied {
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group:not(.advanced) .hide_on_less {
   display: none;
 }
+.search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_raw > * {
+  border-color: transparent;
+}
 .search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_raw .sfc_title {
   cursor: initial;
 }
@@ -1019,18 +1023,24 @@ input.dp-applied {
   margin-right: 7px;
 }
 .search_form_handler .sf_criterion_area .sf_more_criterion .sfm_toggler .sfm_tg_icon {
-  color: #3f7294;
+  color: #e87c1e;
 }
 .search_form_handler .sf_criterion_area .sf_more_criterion .sfm_content {
   display: none;
+  min-width: 200px;
+  /* To avoid element going to thin on filter, not very slick */
 }
-.search_form_handler .sf_criterion_area .sf_more_criterion .sfm_content .sfm_list {
-  max-height: 420px;
+.search_form_handler .sf_criterion_area .sf_more_criterion .sfm_content .sfm_lists {
+  margin: 0px -8px;
+  padding: 0px 8px;
+  max-height: 460px;
+  overflow-x: hidden;
   overflow-y: auto;
 }
-.search_form_handler .sf_criterion_area .sf_more_criterion .sfm_content .sfm_list .sfm_field {
-  cursor: pointer;
-  white-space: nowrap;
+.search_form_handler .sf_list:not(:first-of-type) .sfl_title {
+  border-top: 1px solid #ddd;
+  padding-top: 8px;
+  margin-top: 5px;
 }
 .search_form_handler .sf_list .sfl_title {
   font-weight: bold;
@@ -1047,6 +1057,10 @@ input.dp-applied {
 .search_form_handler .sf_list .sfl_items > li:hover {
   background-color: #fff;
 }
+.search_form_handler .sf_list .sfl_items > li.sfl_i_placeholder {
+  font-style: italic;
+  opacity: 0.8;
+}
 .search_form_handler .sf_list .sfl_items > li > label {
   display: inline-block;
   width: 100%;
@@ -1083,6 +1097,12 @@ input.dp-applied {
 .sf_results_area .sf_results_placeholder button > span {
   margin-left: 0.5em;
 }
+.hidden {
+  display: none !important;
+}
+.visible {
+  display: initial !important;
+}
 .mandatory {
   border: 1px solid #f00;
 }
diff --git a/css/light-grey.scss b/css/light-grey.scss
index 9be4cbf44..ced27d246 100644
--- a/css/light-grey.scss
+++ b/css/light-grey.scss
@@ -795,7 +795,7 @@ input.dp-applied {
 	position: relative;
 	z-index: 10;
 	font-size: 12px;
-	border: 1px solid $box-blue-border-color;
+	border: 1px solid #3F7294;
 
 	/* Sizing reset */
 	*{
@@ -827,7 +827,8 @@ input.dp-applied {
 		padding: 8px 10px;
 		margin: 0;
 		color: #ffffff;
-		background-color: $box-blue-border-color;
+		background-color: #3F7294;
+		cursor: pointer;
 
 		/* Pictogram */
 		.sft_picto{
@@ -882,10 +883,10 @@ input.dp-applied {
 			> *{
 				padding: 7px 8px;
 				vertical-align: top;
-				background-color: $box-blue-bg-color;
-				color: $box-blue-color;
-				border: $box-blue-border;
-				border-radius: $box-blue-radius;
+				background-color: $search-criteria-box-bg-color;
+				color: $search-criteria-box-color;
+				border: $search-criteria-box-border;
+				border-radius: $search-criteria-box-radius;
 				box-shadow: $box-shadow-regular;
 			}
 			.sfc_form_group,
@@ -941,7 +942,7 @@ input.dp-applied {
 			.sfc_toggle{
 				position: absolute;
 				top: 7px;
-				color: $box-blue-border-color;
+				color: $search-criteria-box-picto-color;
 			}
 			.sfc_close{
 				right: 7px;
@@ -1017,7 +1018,7 @@ input.dp-applied {
 									&:hover{
 										background-color: $white;
 										/* TODO: Try with this */
-										/*background-color: $box-blue-border-color;
+										/*background-color: $search-criteria-box-border-color;
 										color: $white;*/
 
 									}
@@ -1063,7 +1064,7 @@ input.dp-applied {
 					bottom: 4px;
 					right: 0px;
 					cursor: pointer;
-					color: $box-blue-border-color;
+					color: #3F7294;
 					font-size: 10px;
 					font-weight: bold;
 					border: none;
@@ -1122,6 +1123,9 @@ input.dp-applied {
 
 			/* Special criterion processing */
 			&.search_form_criteria_raw{
+				> *{
+					border-color: transparent;
+				}
 				.sfc_title{
 					cursor: initial;
 				}
@@ -1185,21 +1189,20 @@ input.dp-applied {
 					margin-right: 7px;
 				}
 				.sfm_tg_icon{
-					color: $box-blue-border-color;
+					color: $search-criteria-box-picto-color;
 				}
 			}
 
 			.sfm_content{
 				display: none;
+				min-width: 200px; /* To avoid element going to thin on filter, not very slick */
 
-				.sfm_list{
-					max-height: 420px;
+				.sfm_lists{
+					margin: 0px -8px;
+					padding: 0px 8px;
+					max-height: 460px;
+					overflow-x: hidden;
 					overflow-y: auto;
-
-					.sfm_field{
-						cursor: pointer;
-						white-space: nowrap;
-					}
 				}
 			}
 		}
@@ -1207,9 +1210,16 @@ input.dp-applied {
 
 	/* List helpers */
 	.sf_list{
+		&:not(:first-of-type){
+			.sfl_title{
+				border-top: 1px solid $gray-lighter;
+				padding-top: 8px;
+				margin-top: 5px;
+			}
+		}
+
 		.sfl_title{
 			font-weight: bold;
-
 		}
 		.sfl_items{
 			margin: 5px -8px 0px -8px;
@@ -1223,6 +1233,10 @@ input.dp-applied {
 				&:hover{
 					background-color: $white;
 				}
+				&.sfl_i_placeholder{
+					font-style: italic;
+					opacity: 0.8;
+				}
 
 				> label{
 					display: inline-block;
@@ -1270,6 +1284,12 @@ input.dp-applied {
 	}
 }
 
+.hidden{
+	display: none !important;
+}
+.visible{
+	display: initial !important;
+}
 .mandatory {
 	border: 1px solid #f00;
 }
diff --git a/dictionaries/en.dictionary.itop.ui.php b/dictionaries/en.dictionary.itop.ui.php
index a39c8d3a4..0b0e4815f 100644
--- a/dictionaries/en.dictionary.itop.ui.php
+++ b/dictionaries/en.dictionary.itop.ui.php
@@ -1390,6 +1390,7 @@ When associated with a trigger, each action is given an "order" number, specifyi
 	'UI:Search:AddCriteria:List:RecentlyUsed:Title' => 'Recently used',
 	'UI:Search:AddCriteria:List:MostPopular:Title' => 'Most popular',
 	'UI:Search:AddCriteria:List:Others:Title' => 'Others',
+	'UI:Search:AddCriteria:List:RecentlyUsed:Placeholder' => 'None yet.',
 
 	// - Criteria operators
 	//   - Default widget
diff --git a/js/search/search_form_handler.js b/js/search/search_form_handler.js
index deb6b8f25..fcbea37dc 100644
--- a/js/search/search_form_handler.js
+++ b/js/search/search_form_handler.js
@@ -15,6 +15,7 @@ $(function()
 			'submit_button_selector': null,
 			'hide_initial_criterion': false, // TODO: What is that?
 			'endpoint': null,
+			'init_opened': false,
 			'search': {
 				'base_oql': '',
 				'criterion': [
@@ -175,6 +176,8 @@ $(function()
 			// Open more criterion menu
 			// - Open it first
 			this.elements.more_criterion.addClass('opened');
+			// - Focus filter
+			this.elements.more_criterion.find('.sf_filter:first input[type="text"]').focus();
 			// - Then only check if more menu is to close to the right side (otherwise we might not have the right element's position)
 			var iFormWidth = this.element.outerWidth();
 			var iFormLeftPos = this.element.offset().left;
@@ -202,6 +205,18 @@ $(function()
 				this._openMoreCriterion();
 			}
 		},
+		// - Show / hide "add criterions" buttons from more criterion menu
+		_updateMoreCriterionButtons: function()
+		{
+			if(this.elements.more_criterion.find('.sf_list .sfm_field input[type="checkbox"]:checked').length > 0)
+			{
+
+			}
+			else
+			{
+
+			}
+		},
 		// - Close all criterion
 		_closeAllCriterion: function()
 		{
@@ -226,18 +241,24 @@ $(function()
 			this.element.find('.sft_refresh').on('click', function(oEvent){
 				// Prevent anchor
 				oEvent.preventDefault();
+				// Prevent form toggling
+				oEvent.stopPropagation();
 
 				me._submit();
 			});
 			// - Toggle icon
 			// TODO: UX Improvment
 			// Note: Would be better to toggle by clicking on the whole title, but we have an issue with <select> on abstract classes.
-			this.element.find('.sft_toggler').on('click', function(oEvent){
-				// Prevent anchor
+			this.element.find('.sf_title').on('click', function(oEvent){
+				// Prevent anchors
 				oEvent.preventDefault();
 
-				me.element.find('.sf_criterion_area').slideToggle('fast');
-				me.element.toggleClass('opened');
+				// Prevent toggle on <select>
+				if(oEvent.target.nodeName.toLowerCase() !== 'select')
+				{
+					me.element.find('.sf_criterion_area').slideToggle('fast');
+					me.element.toggleClass('opened');
+				}
 			});
 		},
 		// - Prepare criterion area
@@ -303,11 +324,31 @@ $(function()
 				.append('<input type="text" placeholder="' + Dict.S('UI:Search:Value:Filter:Placeholder') + '" /><span class="sff_picto sff_filter fa fa-filter"></span><span class="sff_picto sff_reset fa fa-times"></span>')
 				.appendTo(oContentElem);
 
-			// - Add fields from zlist list
+			// - Lists
+			var oListsElem = $('<div></div>')
+				.addClass('sfm_lists')
+				.appendTo(oContentElem);
+
+			//   - Add recent fields list
+			var oRecentsElem = $('<div></div>')
+				.addClass('sf_list')
+				.addClass('sf_list_recents')
+				.appendTo(oListsElem);
+
+			$('<div class="sfl_title"></div>')
+				.text(Dict.S('UI:Search:AddCriteria:List:RecentlyUsed:Title'))
+				.appendTo(oRecentsElem);
+
+			// TODO: Add elements and remove hidden class if there is some.
+			var oRecentsItemsElem = $('<ul class="sfl_items"></ul>')
+				.append('<li class="sfl_i_placeholder">' + Dict.S('UI:Search:AddCriteria:List:RecentlyUsed:Placeholder') + '</li>')
+				.appendTo(oRecentsElem);
+
+			//   - Add fields from zlist list
 			var oZlistElem = $('<div></div>')
 				.addClass('sf_list')
 				.addClass('sf_list_zlist')
-				.appendTo(oContentElem);
+				.appendTo(oListsElem);
 
 			$('<div class="sfl_title"></div>')
 				.text(Dict.S('UI:Search:AddCriteria:List:MostPopular:Title'))
@@ -319,20 +360,21 @@ $(function()
 			for(var sFieldRef in this.options.search.fields.zlist)
 			{
 				var oField = this.options.search.fields.zlist[sFieldRef];
+				var sFieldTitleAttr = (oField.description !== undefined) ? 'title="' + oField.description + '"' : '';
 				var oFieldElem = $('<li></li>')
 					.addClass('sfm_field')
 					.attr('data-field-ref', sFieldRef)
-					.append('<label><input type="checkbox" value="' + sFieldRef + '" />' + oField.label + '</label>')
+					.append('<label ' + sFieldTitleAttr + '><input type="checkbox" value="' + sFieldRef + '" />' + oField.label + '</label>')
 					.appendTo(oZListItemsElem);
 			}
 
-			// - Add fields remaining
+			//   - Add fields remaining
 			if(this.options.search.fields.others !== undefined)
 			{
 				var oOthersElem = $('<div></div>')
 					.addClass('sf_list')
 					.addClass('sf_list_others')
-					.appendTo(oContentElem);
+					.appendTo(oListsElem);
 
 				$('<div class="sfl_title"></div>')
 					.text(Dict.S('UI:Search:AddCriteria:List:Others:Title'))
@@ -344,14 +386,22 @@ $(function()
 				for(var sFieldRef in this.options.search.fields.others)
 				{
 					var oField = this.options.search.fields.others[sFieldRef];
+					var sFieldTitleAttr = (oField.description !== undefined) ? 'title="' + oField.description + '"' : '';
 					var oFieldElem = $('<li></li>')
 						.addClass('sfm_field')
 						.attr('data-field-ref', sFieldRef)
-						.append('<label><input type="checkbox" value="' + sFieldRef + '" />' + oField.label + '</label>')
+						.append('<label ' + sFieldTitleAttr + '><input type="checkbox" value="' + sFieldRef + '" />' + oField.label + '</label>')
 						.appendTo(oOthersItemsElem);
 				}
 			}
 
+			// - Buttons
+			var oButtons = $('<div></div>')
+				.addClass('sfm_buttons')
+				.append('<button type="button">TOTR: Add</button>')
+				.append('<button type="button">TOTR: Cancel</button>')
+				.appendTo(oContentElem);
+
 			// Bind events
 			// - Close menu on click anywhere else
 			// - Intercept click to avoid propagation (mostly used for closing it when clicking outside of it)
@@ -403,18 +453,20 @@ $(function()
 			// Note: "keyup" event is use instead of "keydown", otherwise, the inpu value would not be set yet.
 			oFilterElem.find('input').on('keyup focus', function(oEvent){
 				// TODO: Move on values with up and down arrow keys; select with space or enter.
+				// TODO: Hide list if no result on filter.
 
 				var sFilter = $(this).val();
 
+				// Show / hide items
 				if(sFilter === '')
 				{
-					oContentElem.find('.sfl_items > li').show();
+					oListsElem.find('.sfl_items > li').show();
 					oFilterElem.find('.sff_filter').show();
 					oFilterElem.find('.sff_reset').hide();
 				}
 				else
 				{
-					oContentElem.find('.sfl_items > li').each(function(){
+					oListsElem.find('.sfl_items > li:not(.sfl_i_placeholder)').each(function(){
 						var oRegExp = new RegExp(sFilter, 'ig');
 						var sValue = $(this).find('input').val();
 						var sLabel = $(this).text();
@@ -431,6 +483,15 @@ $(function()
 					oFilterElem.find('.sff_filter').hide();
 					oFilterElem.find('.sff_reset').show();
 				}
+
+				// Show / hide lists with no visible items
+				oListsElem.find('.sf_list').each(function(){
+					$(this).show();
+					if($(this).find('.sfl_items > li:visible').length === 0)
+					{
+						$(this).hide();
+					}
+				});
 			});
 			oFilterElem.find('.sff_filter').on('click', function(){
 				oFilterElem.find('input').trigger('focus');
@@ -450,12 +511,18 @@ $(function()
 				// Prepare new criterion data (as already opened to increase UX)
 				var oData = {
 					'ref': $(this).attr('data-field-ref'),
-					'init_opened': true,
+					'init_opened': (oEvent.ctrlKey) ? false : true,
 				};
 
 				// Add criteria but don't submit form as the user has not specified the value yet.
 				me._addCriteria(oData);
 			});
+			this.elements.more_criterion.find('.sfm_field input[type="checkbox"]').on('click', function(oEvent){
+				oEvent.stopPropagation();
+
+				// TODO: Show add button
+				console.log($(this).val(), $(this).prop('checked'));
+			});
 		},
 		// - Prepare results area
 		_prepareResultsArea: function()

From 6ea0ba52d1bb30dc4851c0ebaac3a31dd1f8a4b5 Mon Sep 17 00:00:00 2001
From: Guillaume Lajarige <guillaume.lajarige@combodo.com>
Date: Mon, 26 Mar 2018 06:52:43 +0000
Subject: [PATCH 129/202] Advanced search: UI/UX WIP.

SVN:b1162[5525]
---
 css/light-grey.css                            | 16 +++-
 css/light-grey.scss                           | 17 +++-
 js/search/search_form_handler.js              | 77 +++++++++++++------
 .../search/searchform.class.inc.php           |  2 +-
 4 files changed, 86 insertions(+), 26 deletions(-)

diff --git a/css/light-grey.css b/css/light-grey.css
index 0e4c47ac1..b934f465d 100644
--- a/css/light-grey.css
+++ b/css/light-grey.css
@@ -745,6 +745,8 @@ input.dp-applied {
   /* Pictogram */
 }
 .search_form_handler .sf_title .sft_picto {
+  display: none;
+  /* TODO: Remove this class and the correspondig DOM element if this option is kept. */
   margin-right: 10px;
 }
 .search_form_handler .sf_title .sft_refresh, .search_form_handler .sf_title .sft_toggler {
@@ -1033,10 +1035,22 @@ input.dp-applied {
 .search_form_handler .sf_criterion_area .sf_more_criterion .sfm_content .sfm_lists {
   margin: 0px -8px;
   padding: 0px 8px;
-  max-height: 460px;
+  max-height: 400px;
   overflow-x: hidden;
   overflow-y: auto;
 }
+.search_form_handler .sf_criterion_area .sf_more_criterion .sfm_content .sfm_buttons {
+  display: none;
+}
+.search_form_handler .sf_criterion_area .sf_more_criterion .sfm_content .sfm_buttons button {
+  margin-top: 8px;
+  margin-right: 5px;
+  padding: 3px 6px;
+  font-size: 11px;
+}
+.search_form_handler .sf_criterion_area .sf_more_criterion .sfm_content .sfm_buttons button:last-of-type {
+  margin-right: 0px;
+}
 .search_form_handler .sf_list:not(:first-of-type) .sfl_title {
   border-top: 1px solid #ddd;
   padding-top: 8px;
diff --git a/css/light-grey.scss b/css/light-grey.scss
index ced27d246..fccb46b2e 100644
--- a/css/light-grey.scss
+++ b/css/light-grey.scss
@@ -832,6 +832,7 @@ input.dp-applied {
 
 		/* Pictogram */
 		.sft_picto{
+			display: none; /* TODO: Remove this class and the correspondig DOM element if this option is kept. */
 			margin-right: 10px;
 		}
 
@@ -1200,10 +1201,24 @@ input.dp-applied {
 				.sfm_lists{
 					margin: 0px -8px;
 					padding: 0px 8px;
-					max-height: 460px;
+					max-height: 400px;
 					overflow-x: hidden;
 					overflow-y: auto;
 				}
+				.sfm_buttons{
+					display: none;
+
+					button{
+						margin-top: 8px;
+						margin-right: 5px;
+						padding: 3px 6px;
+						font-size: 11px;
+
+						&:last-of-type{
+							margin-right: 0px;
+						}
+					}
+				}
 			}
 		}
 	}
diff --git a/js/search/search_form_handler.js b/js/search/search_form_handler.js
index fcbea37dc..b08479284 100644
--- a/js/search/search_form_handler.js
+++ b/js/search/search_form_handler.js
@@ -205,18 +205,6 @@ $(function()
 				this._openMoreCriterion();
 			}
 		},
-		// - Show / hide "add criterions" buttons from more criterion menu
-		_updateMoreCriterionButtons: function()
-		{
-			if(this.elements.more_criterion.find('.sf_list .sfm_field input[type="checkbox"]:checked').length > 0)
-			{
-
-			}
-			else
-			{
-
-			}
-		},
 		// - Close all criterion
 		_closeAllCriterion: function()
 		{
@@ -320,16 +308,18 @@ $(function()
 				.appendTo(this.elements.more_criterion);
 
 			// - Filter
-			var oFilterElem = $('<div class="sf_filter"></div>')
+			var oFilterElem = $('<div></div>')
+				.addClass('sf_filter')
+				.addClass('sfm_filter')
 				.append('<input type="text" placeholder="' + Dict.S('UI:Search:Value:Filter:Placeholder') + '" /><span class="sff_picto sff_filter fa fa-filter"></span><span class="sff_picto sff_reset fa fa-times"></span>')
 				.appendTo(oContentElem);
 
-			// - Lists
+			// - Lists container
 			var oListsElem = $('<div></div>')
 				.addClass('sfm_lists')
 				.appendTo(oContentElem);
 
-			//   - Add recent fields list
+			// - Recently used list
 			var oRecentsElem = $('<div></div>')
 				.addClass('sf_list')
 				.addClass('sf_list_recents')
@@ -344,7 +334,7 @@ $(function()
 				.append('<li class="sfl_i_placeholder">' + Dict.S('UI:Search:AddCriteria:List:RecentlyUsed:Placeholder') + '</li>')
 				.appendTo(oRecentsElem);
 
-			//   - Add fields from zlist list
+			// - Search zlist list
 			var oZlistElem = $('<div></div>')
 				.addClass('sf_list')
 				.addClass('sf_list_zlist')
@@ -368,7 +358,7 @@ $(function()
 					.appendTo(oZListItemsElem);
 			}
 
-			//   - Add fields remaining
+			// - Remaining fields list
 			if(this.options.search.fields.others !== undefined)
 			{
 				var oOthersElem = $('<div></div>')
@@ -396,10 +386,10 @@ $(function()
 			}
 
 			// - Buttons
-			var oButtons = $('<div></div>')
+			var oButtonsElem = $('<div></div>')
 				.addClass('sfm_buttons')
-				.append('<button type="button">TOTR: Add</button>')
-				.append('<button type="button">TOTR: Cancel</button>')
+				.append('<button type="button" name="apply">' + Dict.S('UI:Button:Apply') + '</button>')
+				.append('<button type="button" name="cancel">' + Dict.S('UI:Button:Cancel') + '</button>')
 				.appendTo(oContentElem);
 
 			// Bind events
@@ -443,12 +433,15 @@ $(function()
 					}
 				}
 			});
+
+			// - More criteria toggling
 			this.elements.more_criterion.find('.sfm_header').on('click', function(oEvent){
 				// Prevent anchor
 				oEvent.preventDefault();
 
 				me._toggleMoreCriterion();
 			});
+
 			// - Filter
 			// Note: "keyup" event is use instead of "keydown", otherwise, the inpu value would not be set yet.
 			oFilterElem.find('input').on('keyup focus', function(oEvent){
@@ -501,7 +494,8 @@ $(function()
 					.val('')
 					.trigger('focus');
 			});
-			// - Add criteria
+
+			// - Add one criteria
 			this.elements.more_criterion.find('.sfm_field').on('click', function(oEvent){
 				// Prevent anchor
 				oEvent.preventDefault();
@@ -517,11 +511,47 @@ $(function()
 				// Add criteria but don't submit form as the user has not specified the value yet.
 				me._addCriteria(oData);
 			});
+
+			// - Add several criterion
 			this.elements.more_criterion.find('.sfm_field input[type="checkbox"]').on('click', function(oEvent){
+				// Prevent propagation to field and instant add of the criteria
 				oEvent.stopPropagation();
 
-				// TODO: Show add button
-				console.log($(this).val(), $(this).prop('checked'));
+				if(me.elements.more_criterion.find('.sfm_field input[type="checkbox"]:checked').length === 0)
+				{
+					oButtonsElem.hide();
+				}
+				else
+				{
+					oButtonsElem.show();
+				}
+
+				// Put focus back to filter to improve UX.
+				oFilterElem.find('input').trigger('focus');
+			});
+			oButtonsElem.find('button').on('click', function(){
+				// Add criterion on apply
+				if($(this).attr('name') === 'apply')
+				{
+					me.elements.more_criterion.find('.sfm_field input[type="checkbox"]:checked').each(function(iIdx, oElem){
+						var oData = {
+							'ref': $(oElem).closest('.sfm_field').attr('data-field-ref'),
+							'init_opened': false,
+						};
+						me._addCriteria(oData);
+					});
+				}
+
+				// Clear all
+				// - Checkboxes
+				me.elements.more_criterion.find('.sfm_field input[type="checkbox"]:checked').prop('checked', false);
+				// - Filter
+				oFilterElem.find('input')
+					.val('')
+					.trigger('focus');
+
+				// Hide buttons
+				oButtonsElem.hide();
 			});
 		},
 		// - Prepare results area
@@ -557,6 +587,7 @@ $(function()
 				// TODO: Translate sentence.
 				oResultAreaElem.html('<div class="sf_results_placeholder"><p>Add some criterion on the search box or click the search button to view the objects.</p><p><button type="button">Search<span class="fa fa-search"></span></button></p></div>');
 				oResultAreaElem.find('button').on('click', function(){
+					// TODO: Bug: Open "Search for CI", change child classe in the dropdown, click the search button. It submit the search for the original child classe, not the current one; whereas a click on the upper right pictogram does. This might be due to the form reloading.
 					me._onSubmitClick();
 				});
 			}
diff --git a/sources/application/search/searchform.class.inc.php b/sources/application/search/searchform.class.inc.php
index 7a69715fe..b27daf8b3 100644
--- a/sources/application/search/searchform.class.inc.php
+++ b/sources/application/search/searchform.class.inc.php
@@ -117,7 +117,7 @@ class SearchForm
 		$sAction = (isset($aExtraParams['action'])) ? $aExtraParams['action'] : utils::GetAbsoluteUrlAppRoot().'pages/UI.php';
 		$sStyle = (isset($aExtraParams['open']) && ($aExtraParams['open'] == 'true')) ? 'opened' : '';
 		$sHtml .= "<form id=\"fs_{$sSearchFormId}\" action=\"{$sAction}\" class=\"{$sStyle}\">\n"; // Don't use $_SERVER['SCRIPT_NAME'] since the form may be called asynchronously (from ajax.php)
-		$sHtml .= "<h2 class=\"sf_title\"><span class=\"sft_picto fa fa-search\"></span>" . Dict::Format('UI:SearchFor_Class_Objects', $sClassesCombo) . "<a class=\"sft_toggler fa fa-caret-down pull-right\" href=\"#\" title=\"" . Dict::S('UI:Search:Toggle') . "\"></a><a class=\"sft_refresh fa fa-refresh pull-right\" href=\"#\" title=\"" . Dict::S('UI:Button:Refresh') . "\"></a></h2>\n";
+		$sHtml .= "<h2 class=\"sf_title\"><span class=\"sft_picto fa fa-search\"></span>" . Dict::Format('UI:SearchFor_Class_Objects', $sClassesCombo) . "<a class=\"sft_toggler fa fa-caret-down pull-right\" href=\"#\" title=\"" . Dict::S('UI:Search:Toggle') . "\"></a><a class=\"sft_refresh fa fa-search pull-right\" href=\"#\" title=\"" . Dict::S('UI:Button:Refresh') . "\"></a></h2>\n";
 		$sHtml .= "<div id=\"fs_{$sSearchFormId}_message\" class=\"sf_message header_message\"></div>\n";
 		$sHtml .= "<div id=\"fs_{$sSearchFormId}_criterion_outer\">\n</div>\n";
 		$sHtml .= "</form>\n";

From e78f8c803efd8b6b87654925aac6e2ca86852d09 Mon Sep 17 00:00:00 2001
From: Bruno Da Silva <bruno.dasilva@combodo.com>
Date: Mon, 26 Mar 2018 09:10:33 +0000
Subject: [PATCH 130/202] search widget : between operator bugfixes

SVN:b1162[5526]
---
 dictionaries/en.dictionary.itop.ui.php        |   7 +
 .../search_form_criteria_date_abstract.js     | 176 ++++++++++++------
 js/search/search_form_criteria_numeric.js     |  95 +++++++++-
 3 files changed, 209 insertions(+), 69 deletions(-)

diff --git a/dictionaries/en.dictionary.itop.ui.php b/dictionaries/en.dictionary.itop.ui.php
index 0b0e4815f..5b7e78511 100644
--- a/dictionaries/en.dictionary.itop.ui.php
+++ b/dictionaries/en.dictionary.itop.ui.php
@@ -1427,6 +1427,9 @@ When associated with a trigger, each action is given an "order" number, specifyi
 	'UI:Search:Criteria:Title:Default:BetweenDates:All' => '%1$s All',
 	'UI:Search:Criteria:Title:Default:BetweenDates:From' => '%1$s From %2$s',
 	'UI:Search:Criteria:Title:Default:BetweenDates:Until' => '%1$s Until %2$s',
+	'UI:Search:Criteria:Title:Default:Between:All' => '%1$s All',
+	'UI:Search:Criteria:Title:Default:Between:From' => '%1$s From %2$s',
+	'UI:Search:Criteria:Title:Default:Between:Until' => '%1$s Until %2$s',
 	'UI:Search:Criteria:Title:Default:BetweenDays' => '%1$s [%2$s]',
 	//   - String widget
 	'UI:Search:Criteria:Title:String:Contains' => '%1$s contains %2$s',
@@ -1453,6 +1456,10 @@ When associated with a trigger, each action is given an "order" number, specifyi
 	'UI:Search:Value:Toggler:CheckAllNone' => 'Check all / none',
 
 	// - Widget other translations
+	'UI:Search:Criteria:Numeric:From' => 'From',
+	'UI:Search:Criteria:Numeric:Until' => 'Until',
+	'UI:Search:Criteria:Numeric:PlaceholderFrom' => 'Any',
+	'UI:Search:Criteria:Numeric:PlaceholderUntil' => 'Any',
 	'UI:Search:Criteria:DateTime:From' => 'From',
 	'UI:Search:Criteria:DateTime:FromTime' => 'From',
 	'UI:Search:Criteria:DateTime:Until' => 'Until',
diff --git a/js/search/search_form_criteria_date_abstract.js b/js/search/search_form_criteria_date_abstract.js
index 76f14ce4b..16920add2 100644
--- a/js/search/search_form_criteria_date_abstract.js
+++ b/js/search/search_form_criteria_date_abstract.js
@@ -71,7 +71,7 @@ $(function()
 				var oInputElem = oOpContentElem
 					.find('input')
 					.uniqueId()
-					.attr('data-no-auto-focus', true)
+					//.attr('data-no-auto-focus', true)
 				;
 				oOpContentElem
 					.find('label')
@@ -87,14 +87,7 @@ $(function()
 			}
 
 
-			// // Events
-			// // - Focus input on click (radio, label, ...)
-			// oOpElem.on('click', function(oEvent){
-			// 	if ($(oEvent.target).is('input[type="text"], select')) {
-			// 		return;
-			// 	}
-			// 	oOpElem.find('input:visible:first').filter('[data-no-auto-focus]').focus();
-			// });
+
 			// - Apply on "enter" key hit
 			//todo: this could be refactored
 			oOpContentElem.on('keyup', function(oEvent){
@@ -129,66 +122,122 @@ $(function()
 				buttonImage: GetAbsoluteUrlAppRoot()+"/images/calendar.png",
 				buttonImageOnly: true,
 				buttonText: "",
-				showOn:'both'
+				showOn:'button',
+				changeMonth:true,
+				changeYear:true lF
 			};
 			for (var i = 0; i < aInputsParamLength; i++) {
 				var oInputParam = aInputsParam[i];
 
-				var odatetimepickerOptions = $.extend({}, odatetimepickerOptionsDefault, {
-					onClose: function(dateText, inst) {
-						var selectElem 				= $(this);
-						var sOnCLoseShow 			= selectElem.data('onclose_show');
+				var fHandleSynchCallback = function(select, bSetDate) {
+					var selectElem 				= $(select);
+					var sSyncedWith 			= selectElem.data('synced_with');
+					var oInputParam 			= selectElem.data('oInputParam');
 
-						// if (typeof oInputParam.onclose_show != 'undefined')
-						// {
-						// 	oOpElem.find('input[name="'+oInputParam.onclose_show+'"]')
-						// 		[oInputParam.x_picker]('show')
-						// 	;
-						// }
+					if (bSetDate)
+					{
+						selectElem[oInputParam.x_picker]('setDate', null);
+					}
 
-						// if (sOnCLoseShow != undefined && selectElem.is(':visible'))
-						// {
-						// 	var oOnCLoseShowInputElem = oOpElem.find('input[name="'+sOnCLoseShow+'"]');
-						// 	oOnCLoseShowInputElem[oInputParam.x_picker]('show');
-						// }
+					if (sSyncedWith != undefined)
+					{
+						var sCode 				= selectElem.data('code');
+						var oInputParam 		= aInputsParam[oInputsParamIndexByCode[sCode]];
+						var oSyncedInputParam 	= aInputsParam[oInputsParamIndexByCode[sSyncedWith]];
+						var oSyncedInputElem 	= oOpElem.find('input[name="'+sSyncedWith+'"]');
 
-					},
-					onSelect: function(sDateText, oXPicker) {
-						var selectElem 				= $(this);
-						var sSyncedWith 			= selectElem.data('synced_with');
+						var dSyncedDate 		= selectElem[oInputParam.x_picker]('getDate');
 
-
-						if (sSyncedWith != undefined)
+						if (null == dSyncedDate)
 						{
-							var sCode 				= selectElem.data('code');
-							var oInputParam 		= aInputsParam[oInputsParamIndexByCode[sCode]];
-							var oSyncedInputParam 	= aInputsParam[oInputsParamIndexByCode[sSyncedWith]];
-							var oSyncedInputElem 	= oOpElem.find('input[name="'+sSyncedWith+'"]');
-
-							var dSyncedDate 		= selectElem[oInputParam.x_picker]('getDate');
-
-							if (null == dSyncedDate)
+							// oSyncedInputElem.val('');
+							oSyncedInputElem[oSyncedInputParam.x_picker]('setDate', null);
+						}
+						else
+						{
+							if (typeof oSyncedInputParam.default_time_add != 'undefined' && oSyncedInputParam.default_time_add)
 							{
-								oSyncedInputElem.val('');
+								dSyncedDate.setSeconds(dSyncedDate.getSeconds() + oSyncedInputParam.default_time_add);
 							}
-							else
-							{
-								if (typeof oSyncedInputParam.default_time_add != 'undefined' && oSyncedInputParam.default_time_add)
-								{
-									dSyncedDate.setSeconds(dSyncedDate.getSeconds() + oSyncedInputParam.default_time_add);
-								}
-								oSyncedInputElem[oSyncedInputParam.x_picker]('setDate', dSyncedDate);
-							}
-
+							oSyncedInputElem[oSyncedInputParam.x_picker]('setDate', dSyncedDate);
 						}
 
-						me._apply();
 					}
+
+					//me._apply();
+					selectElem[oInputParam.x_picker]('hide');
+				};
+
+				var odatetimepickerOptions = $.extend({}, odatetimepickerOptionsDefault, {
+					onSelect: function() {
+						fHandleSynchCallback(this, false);
+						$(this).focus();
+					}
+					// onClose: function(dateText, inst) {
+					// 	var selectElem 				= $(this);
+					// 	var sOnCLoseShow 			= selectElem.data('onclose_show');
+					//
+					// 	// if (typeof oInputParam.onclose_show != 'undefined')
+					// 	// {
+					// 	// 	oOpElem.find('input[name="'+oInputParam.onclose_show+'"]')
+					// 	// 		[oInputParam.x_picker]('show')
+					// 	// 	;
+					// 	// }
+					//
+					// 	// if (sOnCLoseShow != undefined && selectElem.is(':visible'))
+					// 	// {
+					// 	// 	var oOnCLoseShowInputElem = oOpElem.find('input[name="'+sOnCLoseShow+'"]');
+					// 	// 	oOnCLoseShowInputElem[oInputParam.x_picker]('show');
+					// 	// }
+					//
+					// },
+					// onSelect: function(sDateText, oXPicker) {
+					// 	var selectElem 				= $(this);
+					// 	var sSyncedWith 			= selectElem.data('synced_with');
+					//
+					//
+					// 	if (sSyncedWith != undefined)
+					// 	{
+					// 		var sCode 				= selectElem.data('code');
+					// 		var oInputParam 		= aInputsParam[oInputsParamIndexByCode[sCode]];
+					// 		var oSyncedInputParam 	= aInputsParam[oInputsParamIndexByCode[sSyncedWith]];
+					// 		var oSyncedInputElem 	= oOpElem.find('input[name="'+sSyncedWith+'"]');
+					//
+					// 		var dSyncedDate 		= selectElem[oInputParam.x_picker]('getDate');
+					//
+					// 		if (null == dSyncedDate)
+					// 		{
+					// 			oSyncedInputElem.val('');
+					// 		}
+					// 		else
+					// 		{
+					// 			if (typeof oSyncedInputParam.default_time_add != 'undefined' && oSyncedInputParam.default_time_add)
+					// 			{
+					// 				dSyncedDate.setSeconds(dSyncedDate.getSeconds() + oSyncedInputParam.default_time_add);
+					// 			}
+					// 			oSyncedInputElem[oSyncedInputParam.x_picker]('setDate', dSyncedDate);
+					// 		}
+					//
+					// 	}
+					//
+					// 	//me._apply();
+					// 	selectElem[oInputParam.x_picker]('hide');
+					// }
 				});
 
+
+
 				var oInputElem = oOpElem.find('input[name="'+oInputParam.code+'"]');
 				oInputElem.data('code', oInputParam.code);
 				oInputElem.data('onclose_show', oInputParam.onclose_show);
+				oInputElem.data('oInputParam', oInputParam);
+				oInputElem.on('keydown', function(oEvent) {
+					// Synch if "enter" key
+					if(oEvent.key === 'Enter')
+					{
+						fHandleSynchCallback(this, true);
+					}
+				});
 				oInputElem[oInputParam.x_picker](odatetimepickerOptions);
 
 				if (typeof aInputsParam[oInputsParamIndexByCode[oInputParam.synced_with]] != 'undefined')
@@ -243,14 +292,15 @@ $(function()
 				if (typeof aValues[oInputParam.value_index] != 'undefined' && typeof aValues[oInputParam.value_index].value != 'undefined')
 				{
 					var sDate = aValues[oInputParam.value_index].value;
-					var oDate = new Date(aValues[oInputParam.value_index].value);
-					// switch (true)
-					// {
-					// 	case (i == 0 && sDate.search(/(\s\d{2}:\d{2}:\d{2})/) === -1):
-					// 		//if there is no given hour, the GMT offset is appended by javascript, so we need to remove it (if not, we would have our GMT offset add, ie GMT +1 would become "00:01:00"
-					// 		oDate = new Date(oDate.valueOf() + oDate.getTimezoneOffset() * 60000);
-					// }
-					oInputElem[oInputParam.x_picker]('setDate', oDate);
+					if (sDate.trim() != '')
+					{
+						var oDate = new Date(sDate);
+						oInputElem[oInputParam.x_picker]('setDate', oDate);
+					}
+					else
+					{
+						oInputElem[oInputParam.x_picker]('setDate', sDate);
+					}
 				}
 			}
 		},
@@ -269,7 +319,6 @@ $(function()
 			var me = this;
 			if (sTitle === undefined && me.options.operator == 'between_dates')
 			{
-				var oActiveOpElem = me.element.find('.sfc_op_radio:checked').closest('.sfc_fg_operator');
 				var aValues = me._getValues();
 				switch (true)
 				{
@@ -315,11 +364,14 @@ $(function()
 		_getValuesAsText: function(aRawValues)
 		{
 			var me = this;
-			var aRawValues = undefined;
+
+			if (aRawValues == undefined)
+			{
+				aRawValues = me._getValues();
+			}
 			if (me.options.operator == 'between_dates')
 			{
-				var oActiveOpElem = this.element.find('.sfc_op_radio[value="'+me.options.operator+'"]').closest('.sfc_fg_operator'); // me.element.find('.sfc_op_radio:checked').closest('.sfc_fg_operator');
-				aRawValues = me._getValues();
+				aRawValues = aRawValues.slice();//clone
 
 				if (typeof aRawValues[1] == 'undefined' || typeof aRawValues[1].label == 'undefined' || aRawValues[1].label == '')
 				{
diff --git a/js/search/search_form_criteria_numeric.js b/js/search/search_form_criteria_numeric.js
index 543d4ace8..8015e90e3 100644
--- a/js/search/search_form_criteria_numeric.js
+++ b/js/search/search_form_criteria_numeric.js
@@ -103,20 +103,23 @@ $(function()
 			aValues = me._getValues();//TODO : tenir compte du refactoring de la structure
 
 			// DOM elements
-			var oOpContentElemFrom = $('<input type="text" name="from" />').uniqueId();
-			if (0 in aValues && typeof aValues[0].value != 'undefined')
+			var oOpContentOuterElemFrom = $('<span class="sfc_op_content_from_outer"><label class="sfc_op_content_from_label" for=""> '+Dict.S('UI:Search:Criteria:Numeric:From')+'</label><input type="text" name="from" placeholder="'+Dict.S('UI:Search:Criteria:Numeric:PlaceholderFrom')+'"/></span>');
+			var oOpContentElemFrom = oOpContentOuterElemFrom.find('input').uniqueId();
+			oOpContentOuterElemFrom.find('label').attr('for', oOpContentElemFrom.attr('id'));
+			if (typeof aValues[0] != 'undefined' && typeof aValues[0].value != 'undefined')
 			{
 				oOpContentElemFrom.val(aValues[0].value);
 			}
-
-			var oOpContentElemUntil = $('<input type="text" name="until" />').uniqueId();
-			if (1 in aValues && typeof aValues[1].value != 'undefined')
+			var oOpContentOuterElemUntil = $('<span class="sfc_op_content_until_outer"><label class="sfc_op_content_until_label" for=""> '+Dict.S('UI:Search:Criteria:Numeric:Until')+'</label><input type="text" name="until" placeholder="'+Dict.S('UI:Search:Criteria:Numeric:PlaceholderUntil')+'"/></span>');
+			var oOpContentElemUntil = oOpContentOuterElemUntil.find('input').uniqueId();
+			oOpContentOuterElemUntil.find('label').attr('for', oOpContentElemUntil.attr('id'));
+			if (typeof aValues[1] != 'undefined' && typeof aValues[1].value != 'undefined')
 			{
 				oOpContentElemUntil.val(aValues[1].value);
 			}
 
 
-			oOpContentElem = $().add(oOpContentElemFrom).add(oOpContentElemUntil);
+			oOpContentElem = $().add(oOpContentOuterElemFrom).add(oOpContentOuterElemUntil);
 
 			// Events
 			// - Focus input on click (radio, label, ...)
@@ -132,7 +135,12 @@ $(function()
 				me._markAsDraft();
 			});
 
-			oOpElem.find('.sfc_op_content').append(oOpContentElem);
+			oOpElem
+				.find('.sfc_op_name')
+					.remove()
+				.end()
+				.find('.sfc_op_content')
+					.append(oOpContentElem);
 		},
 
 		_getBetweenOperatorValues: function(oOpElem)
@@ -176,6 +184,79 @@ $(function()
 		//------------------
 
 
+		_setTitle: function(sTitle)
+		{
+			var me = this;
+			if (sTitle === undefined && me.options.operator == 'between')
+			{
+				var aValues = me._getValues();
+				switch (true)
+				{
+					case (typeof aValues[0] == 'undefined' && typeof aValues[1] == 'undefined'):
+					case (typeof aValues[0].label == 'undefined' && typeof aValues[1].label == 'undefined'):
+					case (aValues[0].label.trim() == '' && aValues[1].label.trim() == ''):
+						var sDictEntrySuffix = ':All';
+						break;
+					case (typeof aValues[0] == 'undefined' ):
+					case (typeof aValues[0].label == 'undefined' ):
+					case (aValues[0].label.trim() == '' ):
+						var sDictEntrySuffix = ':Until';
+						break;
+					case (typeof aValues[1] == 'undefined'):
+					case (typeof aValues[1].label == 'undefined' ):
+					case (aValues[1].label.trim() == ''):
+						var sDictEntrySuffix = ':From';
+						break;
+					default:
+						var sDictEntrySuffix = undefined;
+						break;
+				}
+
+				if (sDictEntrySuffix != undefined)
+				{
+					var sDictEntry = 'UI:Search:Criteria:Title:' + this._toCamelCase(this.options.field.widget) + ':' + this._toCamelCase(me.options.operator) + sDictEntrySuffix ;
+					// Fallback to default widget dict entry if none exists for the current widget
+					if(Dict.S(sDictEntry) === sDictEntry)
+					{
+						sDictEntry = 'UI:Search:Criteria:Title:Default:' + this._toCamelCase(me.options.operator) + sDictEntrySuffix;
+					}
+
+					sTitle = Dict.Format(sDictEntry, this.options.field.label, this._getValuesAsText());
+				}
+
+			}
+
+			return me._super(sTitle);
+		},
+
+
+		// - Convert values to a standard string
+		_getValuesAsText: function(aRawValues)
+		{
+			var me = this;
+
+			if (aRawValues == undefined)
+			{
+				aRawValues = me._getValues();
+			}
+			if (me.options.operator == 'between')
+			{
+				aRawValues = aRawValues.slice(); //clone
+				if (typeof aRawValues[1] == 'undefined' || typeof aRawValues[1].label == 'undefined' || aRawValues[1].label == '')
+				{
+					aRawValues.splice(1, 1);
+				}
+				if (typeof aRawValues[0] == 'undefined' || typeof aRawValues[0].label == 'undefined' || aRawValues[0].label == '')
+				{
+					aRawValues.splice(0, 1);
+				}
+			}
+			return me._super(aRawValues);
+		},
+
+
+
+
 		// Prepare operator's DOM element
 		// - Base preparation, always called
 		_prepareOperator: function(oOpElem, sOpIdx, oOp)

From a60a8c0c4f3abc105fffd1dfd5f649a9b07458ef Mon Sep 17 00:00:00 2001
From: Bruno Da Silva <bruno.dasilva@combodo.com>
Date: Mon, 26 Mar 2018 09:12:48 +0000
Subject: [PATCH 131/202] search widget : I was cleaning my keyboard ...

SVN:b1162[5527]
---
 js/search/search_form_criteria_date_abstract.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/search/search_form_criteria_date_abstract.js b/js/search/search_form_criteria_date_abstract.js
index 16920add2..d498b5c66 100644
--- a/js/search/search_form_criteria_date_abstract.js
+++ b/js/search/search_form_criteria_date_abstract.js
@@ -124,7 +124,7 @@ $(function()
 				buttonText: "",
 				showOn:'button',
 				changeMonth:true,
-				changeYear:true lF
+				changeYear:true
 			};
 			for (var i = 0; i < aInputsParamLength; i++) {
 				var oInputParam = aInputsParam[i];

From e8a37ff0afb1eea2efe3c2698ad9517ec79e35b5 Mon Sep 17 00:00:00 2001
From: Bruno Da Silva <bruno.dasilva@combodo.com>
Date: Mon, 26 Mar 2018 11:55:10 +0000
Subject: [PATCH 132/202] search widget : widget numeric bugfix for between

SVN:b1162[5528]
---
 js/search/search_form_criteria_numeric.js | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/js/search/search_form_criteria_numeric.js b/js/search/search_form_criteria_numeric.js
index 8015e90e3..a85520ccb 100644
--- a/js/search/search_form_criteria_numeric.js
+++ b/js/search/search_form_criteria_numeric.js
@@ -193,17 +193,29 @@ $(function()
 				switch (true)
 				{
 					case (typeof aValues[0] == 'undefined' && typeof aValues[1] == 'undefined'):
-					case (typeof aValues[0].label == 'undefined' && typeof aValues[1].label == 'undefined'):
-					case (aValues[0].label.trim() == '' && aValues[1].label.trim() == ''):
 						var sDictEntrySuffix = ':All';
 						break;
 					case (typeof aValues[0] == 'undefined' ):
-					case (typeof aValues[0].label == 'undefined' ):
-					case (aValues[0].label.trim() == '' ):
 						var sDictEntrySuffix = ':Until';
 						break;
 					case (typeof aValues[1] == 'undefined'):
+						var sDictEntrySuffix = ':From';
+						break;
+					case (typeof aValues[0].label == 'undefined' && typeof aValues[1].label == 'undefined'):
+						var sDictEntrySuffix = ':All';
+						break;
+					case (typeof aValues[0].label == 'undefined' ):
+						var sDictEntrySuffix = ':Until';
+						break;
 					case (typeof aValues[1].label == 'undefined' ):
+						var sDictEntrySuffix = ':From';
+						break;
+					case (aValues[0].label.trim() == '' && aValues[1].label.trim() == ''):
+						var sDictEntrySuffix = ':All';
+						break;
+					case (aValues[0].label.trim() == '' ):
+						var sDictEntrySuffix = ':Until';
+						break;
 					case (aValues[1].label.trim() == ''):
 						var sDictEntrySuffix = ':From';
 						break;

From ac5d24a848604d4016fd1c8d6cca2440d7468e92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Mon, 26 Mar 2018 14:33:31 +0000
Subject: [PATCH 133/202] Advanced Search: reorder criterion by label ('raw' in
 front) Fix non-string labels

SVN:b1162[5529]
---
 .../criteriontosearchform.class.inc.php       | 39 ++++++++++++++-----
 1 file changed, 30 insertions(+), 9 deletions(-)

diff --git a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
index 1cb65d16e..703714108 100644
--- a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
+++ b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
@@ -147,6 +147,27 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 			$aMergedCriterion[] = $aPrevCriterion;
 		}
 
+		// Sort by label criterion by variable name (no ref first)
+		usort($aMergedCriterion, function ($a, $b) {
+			if (($a['widget'] === AttributeDefinition::SEARCH_WIDGET_TYPE_RAW) ||
+				($b['widget'] === AttributeDefinition::SEARCH_WIDGET_TYPE_RAW))
+			{
+				if (($a['widget'] === AttributeDefinition::SEARCH_WIDGET_TYPE_RAW) &&
+					($b['widget'] === AttributeDefinition::SEARCH_WIDGET_TYPE_RAW))
+				{
+					return strcmp($a['label'], $b['label']);
+				}
+				if ($a['widget'] === AttributeDefinition::SEARCH_WIDGET_TYPE_RAW)
+				{
+					return -1;
+				}
+
+				return 1;
+			}
+
+			return strcmp($a['label'], $b['label']);
+		});
+
 		return $aMergedCriterion;
 	}
 
@@ -285,8 +306,8 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 		$sLastNum = $aPrevCriterion['values'][0]['value'];
 		$sFirstNum = $aCurrCriterion['values'][0]['value'];
 		$aCurrCriterion['values'] = array();
-		$aCurrCriterion['values'][] = array('value' => $sFirstNum, 'label' => $sFirstNum);
-		$aCurrCriterion['values'][] = array('value' => $sLastNum, 'label' => $sLastNum);
+		$aCurrCriterion['values'][] = array('value' => $sFirstNum, 'label' => "$sFirstNum");
+		$aCurrCriterion['values'][] = array('value' => $sLastNum, 'label' => "$sLastNum");
 
 		$aCurrCriterion['oql'] = "({$aPrevCriterion['oql']} AND {$aCurrCriterion['oql']})";
 		$aCurrCriterion['label'] = $aPrevCriterion['label'].' '.Dict::S('Expression:Operator:AND', 'AND').' '.$aCurrCriterion['label'];
@@ -340,19 +361,19 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 				$aCriteria['operator'] = CriterionConversionAbstract::OP_CONTAINS;
 				$sValue = substr($sValue, 1, -1);
 				$aCriteria['values'][0]['value'] = $sValue;
-				$aCriteria['values'][0]['label'] = $sValue;
+				$aCriteria['values'][0]['label'] = "$sValue";
 				break;
 			case ($sOperator == 'LIKE' && $bStartWithPercent):
 				$aCriteria['operator'] = CriterionConversionAbstract::OP_ENDS_WITH;
 				$sValue = substr($sValue, 1);
 				$aCriteria['values'][0]['value'] = $sValue;
-				$aCriteria['values'][0]['label'] = $sValue;
+				$aCriteria['values'][0]['label'] = "$sValue";
 				break;
 			case ($sOperator == 'LIKE' && $bEndWithPercent):
 				$aCriteria['operator'] = CriterionConversionAbstract::OP_STARTS_WITH;
 				$sValue = substr($sValue, 0, -1);
 				$aCriteria['values'][0]['value'] = $sValue;
-				$aCriteria['values'][0]['label'] = $sValue;
+				$aCriteria['values'][0]['label'] = "$sValue";
 				break;
 		}
 
@@ -384,7 +405,7 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 
 					$sFirstDateValue = $oDate->format(AttributeDateTime::GetSQLFormat());
 					$sFirstDateLabel = AttributeDateTime::GetFormat()->Format($sFirstDateValue);
-					$aCriteria['values'][0] = array('value' => $sFirstDateValue, 'label' => $sFirstDateLabel);
+					$aCriteria['values'][0] = array('value' => $sFirstDateValue, 'label' => "$sFirstDateLabel");
 
 
 					$oDate->add(DateInterval::createFromDateString('1 day'));
@@ -392,7 +413,7 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 
 					$sLastDateValue = $oDate->format(AttributeDateTime::GetSQLFormat());
 					$sLastDateLabel = AttributeDateTime::GetFormat()->Format($sLastDateValue);
-					$aCriteria['values'][1] = array('value' => $sLastDateValue, 'label' => $sLastDateLabel);
+					$aCriteria['values'][1] = array('value' => $sLastDateValue, 'label' => "$sLastDateLabel");
 				}
 			}
 
@@ -418,7 +439,7 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 			{
 				$sLabel .= Dict::S('Expression:Unit:Short:'.$aCriteria['unit'], $aCriteria['unit']);
 			}
-			$aCriteria['values'][0]['label'] = $sLabel;
+			$aCriteria['values'][0]['label'] = "$sLabel";
 		}
 
 		// Temporary until the JS widget support relative dates
@@ -517,7 +538,7 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 
 			foreach($aAllowedValues as $sValue => $sLabel)
 			{
-				$aValue = array('value' => $sValue, 'label' => $sLabel);
+				$aValue = array('value' => $sValue, 'label' => "$sLabel");
 				$aCriteria['values'][] = $aValue;
 			}
 			$aCriteria['operator'] = 'IN';

From f0c8b348c6e994401de96c422a562a00d8675832 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Mon, 26 Mar 2018 15:02:24 +0000
Subject: [PATCH 134/202] Unit tests

SVN:b1162[5530]
---
 test/ItopDataTestCase.php            | 13 ++++++++-----
 test/itop-tickets/itopTicketTest.php |  5 ++---
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/test/ItopDataTestCase.php b/test/ItopDataTestCase.php
index 51be8c1c1..9a7ec5d35 100644
--- a/test/ItopDataTestCase.php
+++ b/test/ItopDataTestCase.php
@@ -37,7 +37,6 @@ use Hypervisor;
 use lnkContactToFunctionalCI;
 use MetaModel;
 use Person;
-use PHPUnit\Framework\TestCase;
 use Server;
 use Ticket;
 use URP_UserProfile;
@@ -144,7 +143,7 @@ class ItopDataTestCase extends ItopTestCase
         $oTicket = self::createObject('UserRequest', array(
             'ref' => 'Ticket_'.$iNum,
             'title' => 'BUG 789_'.$iNum,
-            'request_type' => 'incident',
+	        //'request_type' => 'incident',
             'description' => 'method UpdateImpactedItems() reconstruit le lnkContactToTicket donc impossible de rajouter des champs dans cette classe',
             'org_id' => $this->getTestOrgId(),
         ));
@@ -168,7 +167,7 @@ class ItopDataTestCase extends ItopTestCase
 		$oTicket = self::createObject('UserRequest', array(
 			'ref' => 'Ticket_'.$iNum,
 			'title' => 'BUG 1161_'.$iNum,
-			'request_type' => 'incident',
+			//'request_type' => 'incident',
 			'description' => 'Add aggregate functions',
 			'time_spent' => $iTimeSpent,
 			'caller_id' => $iCallerId,
@@ -180,16 +179,20 @@ class ItopDataTestCase extends ItopTestCase
 
 	/**
 	 * Create a Server in database
+	 *
 	 * @param int $iNum
+	 * @param null $iRackUnit
+	 *
 	 * @return Server
-	 * @throws Exception
+	 * @throws \Exception
 	 */
-	protected function CreateServer($iNum)
+	protected function CreateServer($iNum, $iRackUnit = null)
 	{
 		/** @var Server $oServer */
 		$oServer = self::createObject('Server', array(
 			'name' => 'Server_'.$iNum,
 			'org_id' => $this->getTestOrgId(),
+			'nb_u' => $iRackUnit,
 		));
 		$this->debug("Created {$oServer->GetName()} ({$oServer->GetKey()})");
 		return $oServer;
diff --git a/test/itop-tickets/itopTicketTest.php b/test/itop-tickets/itopTicketTest.php
index 8c1350b24..1c157d843 100644
--- a/test/itop-tickets/itopTicketTest.php
+++ b/test/itop-tickets/itopTicketTest.php
@@ -28,7 +28,6 @@ namespace Combodo\iTop\Test\UnitTest\iTopTickets;
 
 use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
 use Exception;
-use PHPUnit\Framework\TestCase;
 
 
 /**
@@ -799,7 +798,7 @@ class ItopTicketTest extends ItopDataTestCase
             $oServer2->GetKey() => 'manual');
         $this->CheckFunctionalCIList($oTicket2, $aWaitedCIList);
         $this->CheckContactList($oTicket2);
-        $this->assertEquals(5, $oTicket2->Get('functionalcis_list')->Count());
+	    $this->assertEquals(2, $oTicket2->Get('functionalcis_list')->Count());
         $this->assertEquals(1, $oTicket2->Get('contacts_list')->Count());
 
         // The first ticket is not impacted
@@ -910,7 +909,7 @@ class ItopTicketTest extends ItopDataTestCase
             $oServer2->GetKey() => 'manual');
         $this->CheckFunctionalCIList($oTicket2, $aWaitedCIList);
         $this->CheckContactList($oTicket2);
-        $this->assertEquals(6, $oTicket2->Get('functionalcis_list')->Count());
+	    $this->assertEquals(3, $oTicket2->Get('functionalcis_list')->Count());
         $this->assertEquals(1, $oTicket2->Get('contacts_list')->Count());
 
         // The first ticket is not impacted

From e01f48303b6c594d4bba92de7045950491a85074 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Mon, 26 Mar 2018 15:13:19 +0000
Subject: [PATCH 135/202] Advanced Search: Fix labels for starts with and
 contains

SVN:b1162[5531]
---
 core/oql/expression.class.inc.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/core/oql/expression.class.inc.php b/core/oql/expression.class.inc.php
index c6ab22fb4..c2e486f62 100644
--- a/core/oql/expression.class.inc.php
+++ b/core/oql/expression.class.inc.php
@@ -661,11 +661,6 @@ class ScalarExpression extends UnaryExpression
 	 */
 	public function Display($oSearch, &$aArgs = null, $oAttDef = null)
 	{
-		if (strpos($this->m_value, '%') === 0)
-		{
-			return '';
-		}
-
 		if (!is_null($oAttDef))
 		{
 			if ($oAttDef->IsExternalKey())
@@ -682,7 +677,15 @@ class ScalarExpression extends UnaryExpression
 				}
 			}
 
-			return $oAttDef->GetAsPlainText($this->m_value);
+			if (!($oAttDef instanceof AttributeDateTime))
+			{
+				return $oAttDef->GetAsPlainText($this->m_value);
+			}
+		}
+
+		if (strpos($this->m_value, '%') === 0)
+		{
+			return '';
 		}
 
 		return $this->Render($aArgs);

From cfe892d35e6d10ad315e25de0130bbde4878cb16 Mon Sep 17 00:00:00 2001
From: Guillaume Lajarige <guillaume.lajarige@combodo.com>
Date: Mon, 26 Mar 2018 15:23:34 +0000
Subject: [PATCH 136/202] Advanced search: UI/UX, moving "Add criteria" to the
 left and separating criterion with "and"s for a better understanding.

SVN:b1162[5532]
---
 css/css-variables.scss           |  6 +++++
 css/light-grey.css               | 32 +++++++++++++++++-----
 css/light-grey.scss              | 46 +++++++++++++++++++++++---------
 js/search/search_form_handler.js |  4 ++-
 4 files changed, 68 insertions(+), 20 deletions(-)

diff --git a/css/css-variables.scss b/css/css-variables.scss
index 72388464f..975555e61 100644
--- a/css/css-variables.scss
+++ b/css/css-variables.scss
@@ -32,12 +32,18 @@ $box-shadow-regular: 0 1px 1px rgba(0, 0, 0, 0.15);
 //$search-criteria-box-border-color: #3f7294;
 //$search-criteria-box-border: 1px solid $search-criteria-box-border-color;
 //$search-criteria-box-radius: 1px;
+//
 $search-criteria-box-color: #2D2D2D;
 $search-criteria-box-picto-color: #E87C1E;
 $search-criteria-box-bg-color: #EEEEEE;
+$search-criteria-box-hover-color: $white;
 $search-criteria-box-border-color: #CCCCCC;
 $search-criteria-box-border: 1px solid $search-criteria-box-border-color;
 $search-criteria-box-radius: 1px;
+//
+$search-add-criteria-box-color: $search-criteria-box-color;
+$search-add-criteria-box-bg-color: $white;
+$search-add-criteria-box-hover-color: $gray-extra-light;
 
 // Beware the version number MUST be enclosed with quotes otherwise v2.3.0 becomes v2 0.3 .0
 $version: "v2.4.0";
diff --git a/css/light-grey.css b/css/light-grey.css
index b934f465d..d762ab8fe 100644
--- a/css/light-grey.css
+++ b/css/light-grey.css
@@ -795,8 +795,6 @@ input.dp-applied {
 .search_form_handler .sf_criterion_area .search_form_criteria > *, .search_form_handler .sf_criterion_area .sf_more_criterion > * {
   padding: 7px 8px;
   vertical-align: top;
-  background-color: #eee;
-  color: #2d2d2d;
   border: 1px solid #ccc;
   border-radius: 1px;
   box-shadow: 0 1px 1px rgba(0, 0, 0, 0.15);
@@ -809,7 +807,7 @@ input.dp-applied {
   margin-top: -1px;
 }
 .search_form_handler .sf_criterion_area .search_form_criteria {
-  margin-right: 5px;
+  margin-right: 30px;
   /* Non editable criteria */
   /* Draft criteria (modifications not applied) */
   /* Opened criteria (form group displayed) */
@@ -839,6 +837,21 @@ input.dp-applied {
   left: auto;
   right: 0px;
 }
+.search_form_handler .sf_criterion_area .search_form_criteria:not(:last-of-type)::after {
+  /* TODO: Find an elegant way to do this, without hardcoding the content (could be a <style> in the markup) and margin. Note, only a few languages (hawaiian and stuff like this have more than 4 letters in for "and" word. */
+  content: "and";
+  position: absolute;
+  top: 8px;
+  left: calc(100% + 0px);
+  margin-right: 5px;
+  margin-left: 5px;
+  text-align: center;
+  color: #808080;
+}
+.search_form_handler .sf_criterion_area .search_form_criteria > * {
+  background-color: #eee;
+  color: #2d2d2d;
+}
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_close, .search_form_handler .sf_criterion_area .search_form_criteria .sfc_toggle {
   position: absolute;
   top: 7px;
@@ -915,9 +928,6 @@ input.dp-applied {
 }
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_opc_multichoices .sfc_opc_mc_items .sfc_opc_mc_item:hover {
   background-color: #fff;
-  /* TODO: Try with this */
-  /*background-color: $search-criteria-box-border-color;
-   color: $white;*/
 }
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_opc_multichoices .sfc_opc_mc_items .sfc_opc_mc_item label {
   display: inline-block;
@@ -1010,6 +1020,9 @@ input.dp-applied {
 .search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_numeric .sfc_fg_operator_between input {
   width: 88px;
 }
+.search_form_handler .sf_criterion_area .sf_more_criterion {
+  margin-right: 5px;
+}
 .search_form_handler .sf_criterion_area .sf_more_criterion.opened {
   z-index: 2;
   /* To be over criterion */
@@ -1021,6 +1034,10 @@ input.dp-applied {
   left: auto;
   right: 0px;
 }
+.search_form_handler .sf_criterion_area .sf_more_criterion > * {
+  background-color: #fff;
+  color: #2d2d2d;
+}
 .search_form_handler .sf_criterion_area .sf_more_criterion .sfm_toggler .sfm_tg_title {
   margin-right: 7px;
 }
@@ -1039,6 +1056,9 @@ input.dp-applied {
   overflow-x: hidden;
   overflow-y: auto;
 }
+.search_form_handler .sf_criterion_area .sf_more_criterion .sfm_content .sfm_lists .sfl_items > li:hover {
+  background-color: #f1f1f1;
+}
 .search_form_handler .sf_criterion_area .sf_more_criterion .sfm_content .sfm_buttons {
   display: none;
 }
diff --git a/css/light-grey.scss b/css/light-grey.scss
index fccb46b2e..8f9d7fb49 100644
--- a/css/light-grey.scss
+++ b/css/light-grey.scss
@@ -884,8 +884,6 @@ input.dp-applied {
 			> *{
 				padding: 7px 8px;
 				vertical-align: top;
-				background-color: $search-criteria-box-bg-color;
-				color: $search-criteria-box-color;
 				border: $search-criteria-box-border;
 				border-radius: $search-criteria-box-radius;
 				box-shadow: $box-shadow-regular;
@@ -902,8 +900,7 @@ input.dp-applied {
 
 		/* Criteria tags */
 		.search_form_criteria{
-			margin-right: 5px;
-
+			margin-right: 30px;
 
 			/* Non editable criteria */
 			&.locked{
@@ -938,6 +935,23 @@ input.dp-applied {
 				}
 			}
 
+			&:not(:last-of-type)::after{
+				/* TODO: Find an elegant way to do this, without hardcoding the content (could be a <style> in the markup) and margin. Note, only a few languages (hawaiian and stuff like this have more than 4 letters in for "and" word. */
+				content: "and";
+				position: absolute;
+				top: 8px;
+				left: calc(100% + 0px);
+				margin-right: 5px;
+				margin-left: 5px;
+				text-align: center;
+				color: $gray-light;
+			}
+
+			> *{
+				background-color: $search-criteria-box-bg-color;
+				color: $search-criteria-box-color;
+			}
+
 			/* Top left corner icons */
 			.sfc_close,
 			.sfc_toggle{
@@ -1017,11 +1031,7 @@ input.dp-applied {
 									padding: 4px 8px; /* Putting back the padding remove by .sfc_opc_mc_items */
 
 									&:hover{
-										background-color: $white;
-										/* TODO: Try with this */
-										/*background-color: $search-criteria-box-border-color;
-										color: $white;*/
-
+										background-color: $search-criteria-box-hover-color;
 									}
 
 									label{
@@ -1164,13 +1174,12 @@ input.dp-applied {
 					}
 				}
 			}
-
-
-
 		}
 
 		/* More criterion */
 		.sf_more_criterion{
+			margin-right: 5px;
+
 			&.opened{
 				z-index: 2; /* To be over criterion */
 
@@ -1185,6 +1194,10 @@ input.dp-applied {
 				}
 			}
 
+			> *{
+				background-color: $search-add-criteria-box-bg-color;
+				color: $search-add-criteria-box-color;
+			}
 			.sfm_toggler{
 				.sfm_tg_title{
 					margin-right: 7px;
@@ -1193,7 +1206,6 @@ input.dp-applied {
 					color: $search-criteria-box-picto-color;
 				}
 			}
-
 			.sfm_content{
 				display: none;
 				min-width: 200px; /* To avoid element going to thin on filter, not very slick */
@@ -1204,6 +1216,14 @@ input.dp-applied {
 					max-height: 400px;
 					overflow-x: hidden;
 					overflow-y: auto;
+
+					.sfl_items{
+						> li{
+							&:hover{
+								background-color: $search-add-criteria-box-hover-color;
+							}
+						}
+					}
 				}
 				.sfm_buttons{
 					display: none;
diff --git a/js/search/search_form_handler.js b/js/search/search_form_handler.js
index b08479284..dd93dbd80 100644
--- a/js/search/search_form_handler.js
+++ b/js/search/search_form_handler.js
@@ -540,6 +540,7 @@ $(function()
 						};
 						me._addCriteria(oData);
 					});
+					me._closeMoreCriterion();
 				}
 
 				// Clear all
@@ -626,7 +627,8 @@ $(function()
 				// Create DOM element
 				var oCriteriaElem = $('<div></div>')
 					.addClass('sf_criteria')
-					.insertBefore(this.elements.more_criterion);
+					//.insertBefore(this.elements.more_criterion);
+					.appendTo(this.elements.criterion_area);
 
 				// Instanciate widget
 				$.itop[sWidgetName](oData, oCriteriaElem);

From 592792dd7a5d28c46930d3f7d732b7314f77569a Mon Sep 17 00:00:00 2001
From: Bruno Da Silva <bruno.dasilva@combodo.com>
Date: Mon, 26 Mar 2018 15:23:49 +0000
Subject: [PATCH 137/202] search widget : widget datetime : open in advanced
 mode by default if a time is given

SVN:b1162[5533]
---
 js/search/search_form_criteria_date_time.js | 40 ++++++++++++++++++---
 1 file changed, 36 insertions(+), 4 deletions(-)

diff --git a/js/search/search_form_criteria_date_time.js b/js/search/search_form_criteria_date_time.js
index e80997556..c823a18ec 100644
--- a/js/search/search_form_criteria_date_time.js
+++ b/js/search/search_form_criteria_date_time.js
@@ -71,19 +71,51 @@ $(function()
 		{
 			var me = this;
 
-			this._super();
-			this.element.addClass('search_form_criteria_date_time');
+			me._super();
+			me.element.addClass('search_form_criteria_date_time');
 		},
 
 		// events bound via _bind are removed automatically
 		// revert other modifications here
 		_destroy: function()
 		{
-			this.element.removeClass('search_form_criteria_date_time');
-			this._super();
+			var me = this;
+
+			me.element.removeClass('search_form_criteria_date_time');
+			me._super();
 		},
 
+		_prepareBetweenDaysOperator: function(oOpElem, sOpIdx, oOp)
+		{
+			var me = this;
+			var showAvancedOnInit = false;
 
+			me._super(oOpElem, sOpIdx, oOp);
+			for (i = 0; i <= 1; i++) {
+				if (typeof me.options.values[i] != 'undefined' && typeof me.options.values[i].value != 'undefined')
+				{
+					if (me.options.values[i].value.length > 10)
+					{
+						if (i == 0 && me.options.values[i].value.indexOf(' 00:00:00') == 10)
+						{
+							continue;
+						}
+						if (i == 1 && me.options.values[i].value.indexOf(' 23:59:59') == 10)
+						{
+							continue;
+						}
+
+						showAvancedOnInit = true;
+					}
+				}
+			}
+
+			if (showAvancedOnInit)
+			{
+				this.element.find('.sfc_form_group').addClass('advanced');
+			}
+
+		}
 
 
 

From cd5dd043520c9c679cb8addae1057cb613a0d7c0 Mon Sep 17 00:00:00 2001
From: Bruno Da Silva <bruno.dasilva@combodo.com>
Date: Mon, 26 Mar 2018 15:24:22 +0000
Subject: [PATCH 138/202] search widget : widget date bugfix when enter key is
 used to submit

SVN:b1162[5534]
---
 js/search/search_form_criteria_date_abstract.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/js/search/search_form_criteria_date_abstract.js b/js/search/search_form_criteria_date_abstract.js
index d498b5c66..51074890b 100644
--- a/js/search/search_form_criteria_date_abstract.js
+++ b/js/search/search_form_criteria_date_abstract.js
@@ -102,6 +102,7 @@ $(function()
 				// Apply if enter key
 				if(oEvent.key === 'Enter')
 				{
+					me.val(me.val().trim());
 					me._apply();
 				}
 			});
@@ -136,7 +137,14 @@ $(function()
 
 					if (bSetDate)
 					{
-						selectElem[oInputParam.x_picker]('setDate', null);
+						var sDate = selectElem.val().trim();
+						if ('' == sDate)
+						{
+							selectElem[oInputParam.x_picker]('setDate', null);
+						} else
+						{
+							selectElem[oInputParam.x_picker]('setDate', sDate);
+						}
 					}
 
 					if (sSyncedWith != undefined)

From 40dbb2ce17f6b4bcb9c7a3802dd2afa0ed7a29f5 Mon Sep 17 00:00:00 2001
From: Bruno Da Silva <bruno.dasilva@combodo.com>
Date: Mon, 26 Mar 2018 15:28:33 +0000
Subject: [PATCH 139/202] search widget : widget numeric various modifications

- bugfix: when the value is given by the backen and is typed as an integer some strin operations failed, a switch has to be broken in several sub cases to handle this
- enhancement: the input is now typed as numeric so the browser prevent some miss-typing (like space and alpha)

SVN:b1162[5535]
---
 js/search/search_form_criteria_numeric.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/js/search/search_form_criteria_numeric.js b/js/search/search_form_criteria_numeric.js
index a85520ccb..1281f835f 100644
--- a/js/search/search_form_criteria_numeric.js
+++ b/js/search/search_form_criteria_numeric.js
@@ -103,14 +103,14 @@ $(function()
 			aValues = me._getValues();//TODO : tenir compte du refactoring de la structure
 
 			// DOM elements
-			var oOpContentOuterElemFrom = $('<span class="sfc_op_content_from_outer"><label class="sfc_op_content_from_label" for=""> '+Dict.S('UI:Search:Criteria:Numeric:From')+'</label><input type="text" name="from" placeholder="'+Dict.S('UI:Search:Criteria:Numeric:PlaceholderFrom')+'"/></span>');
+			var oOpContentOuterElemFrom = $('<span class="sfc_op_content_from_outer"><label class="sfc_op_content_from_label" for=""> '+Dict.S('UI:Search:Criteria:Numeric:From')+'</label><input type="number" step="any" name="from" placeholder="'+Dict.S('UI:Search:Criteria:Numeric:PlaceholderFrom')+'"/></span>');
 			var oOpContentElemFrom = oOpContentOuterElemFrom.find('input').uniqueId();
 			oOpContentOuterElemFrom.find('label').attr('for', oOpContentElemFrom.attr('id'));
 			if (typeof aValues[0] != 'undefined' && typeof aValues[0].value != 'undefined')
 			{
 				oOpContentElemFrom.val(aValues[0].value);
 			}
-			var oOpContentOuterElemUntil = $('<span class="sfc_op_content_until_outer"><label class="sfc_op_content_until_label" for=""> '+Dict.S('UI:Search:Criteria:Numeric:Until')+'</label><input type="text" name="until" placeholder="'+Dict.S('UI:Search:Criteria:Numeric:PlaceholderUntil')+'"/></span>');
+			var oOpContentOuterElemUntil = $('<span class="sfc_op_content_until_outer"><label class="sfc_op_content_until_label" for=""> '+Dict.S('UI:Search:Criteria:Numeric:Until')+'</label><input type="number" step="any" name="until" placeholder="'+Dict.S('UI:Search:Criteria:Numeric:PlaceholderUntil')+'"/></span>');
 			var oOpContentElemUntil = oOpContentOuterElemUntil.find('input').uniqueId();
 			oOpContentOuterElemUntil.find('label').attr('for', oOpContentElemUntil.attr('id'));
 			if (typeof aValues[1] != 'undefined' && typeof aValues[1].value != 'undefined')
@@ -140,7 +140,9 @@ $(function()
 					.remove()
 				.end()
 				.find('.sfc_op_content')
-					.append(oOpContentElem);
+					.append(oOpContentElem)
+			;
+
 		},
 
 		_getBetweenOperatorValues: function(oOpElem)
@@ -210,13 +212,13 @@ $(function()
 					case (typeof aValues[1].label == 'undefined' ):
 						var sDictEntrySuffix = ':From';
 						break;
-					case (aValues[0].label.trim() == '' && aValues[1].label.trim() == ''):
+					case (aValues[0].label == '' && aValues[1].label == ''):
 						var sDictEntrySuffix = ':All';
 						break;
-					case (aValues[0].label.trim() == '' ):
+					case (aValues[0].label == '' ):
 						var sDictEntrySuffix = ':Until';
 						break;
-					case (aValues[1].label.trim() == ''):
+					case (aValues[1].label == ''):
 						var sDictEntrySuffix = ':From';
 						break;
 					default:

From 070ac49d1bd74a8597032759fa7b647a1998f66f Mon Sep 17 00:00:00 2001
From: Guillaume Lajarige <guillaume.lajarige@combodo.com>
Date: Mon, 26 Mar 2018 15:58:03 +0000
Subject: [PATCH 140/202] Advanced search: UI/UX, improve "Add criteria"
 cinematic.

SVN:b1162[5536]
---
 js/search/search_form_handler.js | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/js/search/search_form_handler.js b/js/search/search_form_handler.js
index dd93dbd80..391b252e3 100644
--- a/js/search/search_form_handler.js
+++ b/js/search/search_form_handler.js
@@ -177,7 +177,9 @@ $(function()
 			// - Open it first
 			this.elements.more_criterion.addClass('opened');
 			// - Focus filter
-			this.elements.more_criterion.find('.sf_filter:first input[type="text"]').focus();
+			this.elements.more_criterion.find('.sf_filter:first input[type="text"]')
+				.val('')
+				.focus();
 			// - Then only check if more menu is to close to the right side (otherwise we might not have the right element's position)
 			var iFormWidth = this.element.outerWidth();
 			var iFormLeftPos = this.element.offset().left;
@@ -502,14 +504,22 @@ $(function()
 				// Prevent propagation to not close the opening criteria
 				oEvent.stopPropagation();
 
-				// Prepare new criterion data (as already opened to increase UX)
-				var oData = {
-					'ref': $(this).attr('data-field-ref'),
-					'init_opened': (oEvent.ctrlKey) ? false : true,
-				};
+				// If no checkbox checked, add criteria right away, otherwise we "queue" it we other checkboxed.
+				if(me.elements.more_criterion.find('.sfm_field input[type="checkbox"]:checked').length === 0)
+				{
+					// Prepare new criterion data (as already opened to increase UX)
+					var oData = {
+						'ref': $(this).attr('data-field-ref'),
+						'init_opened': (oEvent.ctrlKey) ? false : true,
+					};
 
-				// Add criteria but don't submit form as the user has not specified the value yet.
-				me._addCriteria(oData);
+					// Add criteria but don't submit form as the user has not specified the value yet.
+					me._addCriteria(oData);
+				}
+				else
+				{
+					$(this).find('input[type="checkbox"]').prop('checked', !$(this).find('input[type="checkbox"]').prop('checked'));
+				}
 			});
 
 			// - Add several criterion

From 389e8f2de6754e44ec31e5a67f68fba95fc02b3b Mon Sep 17 00:00:00 2001
From: Bruno Da Silva <bruno.dasilva@combodo.com>
Date: Mon, 26 Mar 2018 15:59:44 +0000
Subject: [PATCH 141/202] search widget : widget datetime the "advanced"
 (datetime) mode and the "less" (date only) modes are now less linked over
 each other

if you choose a date, you loose the time. Previously, the time was keeped hiddenly.

SVN:b1162[5537]
---
 .../search_form_criteria_date_abstract.js     | 22 ++++++++++++++-----
 js/search/search_form_criteria_date_time.js   |  6 +++--
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/js/search/search_form_criteria_date_abstract.js b/js/search/search_form_criteria_date_abstract.js
index 51074890b..b812388ad 100644
--- a/js/search/search_form_criteria_date_abstract.js
+++ b/js/search/search_form_criteria_date_abstract.js
@@ -40,7 +40,9 @@ $(function()
 					//  "show_on_advanced": true,		=> is the input displaye on "more" or "less" mode advanced is an lais for "more" in the css
 					//  "synced_with": "from_time",		=> from and until has both two input (datepicker and datetimepicker). each time one input change, the other one has to change
 					//  "getter_code":"from_time"		=> iTop expect datetime to always provide time, so we must always use the datetimepicker in order to compute the value to be sent to iTop event if whe are in the display mode "less" with datepicker visible
+					//  "getter_suffix": " 00:00:00",	=> iTop expect datetime to always provide time, so either we use the "getter_code" or we add a suffix to force the time
 					//  "title_getter_code":"from",		=> if present, the title will be computed base on the given input code. Because the datetime widget title area is not large enought, so we remove the time info, in order to do so we use this.
+
 				}
 			]
 		},
@@ -264,22 +266,32 @@ $(function()
 			var aValues = [];
 			var aInputsParam = me.options.aInputsParam;
 			var aInputsParamLength = aInputsParam.length;
-			var bAdvancedMode = (oOpElem.find('adanced').length > 0);
+			var bAdvancedMode = (me.element.find('.sfc_form_group.advanced').length > 0);
+
+			var sValue = '';
+			var sLabel = '';
+
 			for (var i = 0; i < aInputsParamLength; i++) {
 				var oInputParam = aInputsParam[i];
-				var oInputElemForLabel = oOpElem.find('input[name="'+oInputParam.code+'"]');
+
+				sLabel = oOpElem.find('input[name="'+oInputParam.code+'"]').val();
+
 				if (typeof oInputParam.show_on_advanced == 'undefined' || bAdvancedMode == oInputParam.show_on_advanced)
 				{
 					if (typeof oInputParam.getter_code != 'undefined')
 					{
-						oInputElemForValue = oOpElem.find('input[name="'+oInputParam.getter_code+'"]');
+						sValue = oOpElem.find('input[name="'+oInputParam.getter_code+'"]').val();
+					}
+					else if (typeof oInputParam.getter_suffix != 'undefined')
+					{
+						sValue = sLabel + oInputParam.getter_suffix;
 					}
 					else
 					{
-						oInputElemForValue = oInputElemForLabel;
+						sValue = sLabel;
 					}
 
-					aValues[oInputParam.value_index] = {value: oInputElemForValue.val(), label: oInputElemForLabel.val()};
+					aValues[oInputParam.value_index] = {value: sValue, label: sLabel};
 				}
 			}
 
diff --git a/js/search/search_form_criteria_date_time.js b/js/search/search_form_criteria_date_time.js
index c823a18ec..e849f50d3 100644
--- a/js/search/search_form_criteria_date_time.js
+++ b/js/search/search_form_criteria_date_time.js
@@ -25,7 +25,8 @@ $(function()
 					"value_index": 0,
 					"onclose_show" : "until",
 					"synced_with": "from_time",
-					"getter_code":"from_time",
+					//"getter_code":"from_time",
+					"getter_suffix":" 00:00:00",
 				},
 				{
 					"code": "from_time",
@@ -46,7 +47,8 @@ $(function()
 					"show_on_advanced": false,
 					"value_index": 1,
 					"synced_with": "until_time",
-					"getter_code":"until_time",
+					//"getter_code":"until_time",
+					"getter_suffix":" 23:59:59",
 				},
 				{
 					"code": "until_time",

From edcc211988a1621ac0eceee91f2405e2ab89e00d Mon Sep 17 00:00:00 2001
From: Guillaume Lajarige <guillaume.lajarige@combodo.com>
Date: Mon, 26 Mar 2018 17:58:06 +0000
Subject: [PATCH 142/202] Advanced search: UI/UX WIP.

SVN:b1162[5538]
---
 js/search/search_form_criteria_string.js | 28 ------------------------
 1 file changed, 28 deletions(-)

diff --git a/js/search/search_form_criteria_string.js b/js/search/search_form_criteria_string.js
index 7359ce2f0..b659c6cb1 100644
--- a/js/search/search_form_criteria_string.js
+++ b/js/search/search_form_criteria_string.js
@@ -68,33 +68,5 @@ $(function()
 		//------------------
 		// Inherited methods
 		//------------------
-
-		// DOM element helpers
-		// TODO: Remove this function after UX tests
-		_prepareOperators: function()
-		{
-			this._super();
-
-			if(this.options.ref === 'UserRequest.ref')
-			{
-				// Remove starts/ends_with
-				this.element.find('.sfc_fg_operator[data-operator-code*="with"]').remove();
-
-				// Modify contains with a dropdown
-				this.element.find('.sfc_fg_operator[data-operator-code="contains"] .sfc_op_name')
-					.html('<select style="    padding: 1px 0px;"><option>Contains</option><option>Starts with</option><option>Ends with</option></select>')
-					.css('margin-right', '5px');
-
-				// Remove click event on dropdown
-				this.element.find('.sfc_fg_operator[data-operator-code="contains"] .sfc_op_name').on('click', function(oEvent){
-					oEvent.preventDefault();
-					oEvent.stopPropagation();
-				});
-
-				this.element.find('.sfc_fg_operator[data-operator-code="contains"] .sfc_op_name select').on('change', function(){
-					$(this).closest('.sfc_fg_operator').find('.sfc_op_content input:first').trigger('focus');
-				});
-			}
-		},
 	});
 });

From 7664633f1858fabc6125f5fa314497cc6e6b5c65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Tue, 27 Mar 2018 08:13:48 +0000
Subject: [PATCH 143/202] Advanced Search: Hierarchical keys & unit tests

SVN:b1162[5539]
---
 core/oql/expression.class.inc.php             | 37 +++++++++++++++++--
 dictionaries/fr.dictionary.itop.ui.php        |  7 ++++
 .../criteriontosearchform.class.inc.php       |  1 +
 .../search/CriterionConversionTest.php        | 30 ++++++++++-----
 4 files changed, 62 insertions(+), 13 deletions(-)

diff --git a/core/oql/expression.class.inc.php b/core/oql/expression.class.inc.php
index c2e486f62..ef764955a 100644
--- a/core/oql/expression.class.inc.php
+++ b/core/oql/expression.class.inc.php
@@ -1006,6 +1006,20 @@ class FieldExpression extends UnaryExpression
 		if (!is_null($oAttDef))
 		{
 			$sSearchType = $oAttDef->GetSearchType();
+			try
+			{
+				if ($sSearchType == AttributeDefinition::SEARCH_WIDGET_TYPE_EXTERNAL_KEY)
+				{
+					// TODO Check the type of external key ? (EXTKEY_ABSOLUTE or EXTKEY_RELATIVE)
+					if (MetaModel::IsHierarchicalClass($oAttDef->GetTargetClass()))
+					{
+						$sSearchType = AttributeDefinition::SEARCH_WIDGET_TYPE_HIERARCHICAL_KEY;
+					}
+				}
+			}
+			catch (CoreException $e)
+			{
+			}
 		}
 		else
 		{
@@ -1569,16 +1583,17 @@ class FunctionExpression extends Expression
 	public function Display($oSearch, &$aArgs = null, $oAttDef = null)
 	{
 		$sOperation = '';
+		$sVerb = '';
 		switch ($this->m_sVerb)
 		{
 			case 'NOW':
-				$sOperation = '';
+				$sVerb = $this->VerbToNaturalLanguage();
 				break;
 			case 'DATE_SUB':
-				$sOperation = '-';
+				$sVerb = ' -';
 				break;
 			case 'DATE_ADD':
-				$sOperation = '+';
+				$sVerb = ' +';
 				break;
 			case 'DATE_FORMAT':
 				break;
@@ -1588,12 +1603,26 @@ class FunctionExpression extends Expression
 
 		foreach($this->m_aArgs as $oExpression)
 		{
+			if ($oExpression instanceof IntervalExpression)
+			{
+				$sOperation .= $sVerb;
+				$sVerb = '';
+			}
 			$sOperation .= $oExpression->Display($oSearch, $aArgs, $oAttDef);
 		}
 
+		if (!empty($sVerb))
+		{
+			$sOperation .= $sVerb;
+		}
 		return $sOperation;
 	}
 
+	private function VerbToNaturalLanguage()
+	{
+		return Dict::S('Expression:Verb:'.$this->m_sVerb, " {$this->m_sVerb} ");
+	}
+
 	public function GetCriterion($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
 	{
 		$aCriteria = array();
@@ -1728,7 +1757,7 @@ class IntervalExpression extends Expression
 
 	public function Display($oSearch, &$aArgs = null, $oAttDef = null)
 	{
-		return $this->m_oValue->Render($aArgs) . ' ' . $this->m_sUnit;
+		return $this->m_oValue->Render($aArgs).' '.Dict::S('Expression:Unit:Long:'.$this->m_sUnit, $this->m_sUnit);
 	}
 }
 
diff --git a/dictionaries/fr.dictionary.itop.ui.php b/dictionaries/fr.dictionary.itop.ui.php
index 68763f5af..4fe055726 100644
--- a/dictionaries/fr.dictionary.itop.ui.php
+++ b/dictionaries/fr.dictionary.itop.ui.php
@@ -1243,8 +1243,15 @@ Lors de l\'association à un déclencheur, on attribue à chaque action un numé
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Expression:Operator:AND' => ' ET ',
 	'Expression:Operator:OR' => ' OU ',
+
 	'Expression:Unit:Short:DAY' => 'j',
 	'Expression:Unit:Short:WEEK' => 's',
 	'Expression:Unit:Short:MONTH' => 'm',
 	'Expression:Unit:Short:YEAR' => 'a',
+
+	'Expression:Unit:Long:DAY' => 'jour(s)',
+	'Expression:Unit:Long:HOUR' => 'heure(s)',
+	'Expression:Unit:Long:MINUTE' => 'minute(s)',
+
+	'Expression:Verb:NOW' => 'maintenant',
 ));
diff --git a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
index 703714108..3a657b207 100644
--- a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
+++ b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
@@ -62,6 +62,7 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 			AttributeDefinition::SEARCH_WIDGET_TYPE_DATE_TIME => 'DateTimeToSearchForm',
 			AttributeDefinition::SEARCH_WIDGET_TYPE_NUMERIC => 'NumericToSearchForm',
 			AttributeDefinition::SEARCH_WIDGET_TYPE_EXTERNAL_KEY => 'ExternalKeyToSearchForm',
+			AttributeDefinition::SEARCH_WIDGET_TYPE_HIERARCHICAL_KEY => 'ExternalKeyToSearchForm',
 		);
 
 		foreach($aAndCriterionRaw as $aCriteria)
diff --git a/test/application/search/CriterionConversionTest.php b/test/application/search/CriterionConversionTest.php
index 8c914b3b8..aa4d4740e 100644
--- a/test/application/search/CriterionConversionTest.php
+++ b/test/application/search/CriterionConversionTest.php
@@ -322,12 +322,15 @@ class CriterionConversionTest extends ItopDataTestCase
 				{
 					$aField = $aFields['zlist'][$aCriteria['ref']];
 				}
-				else
+				elseif (isset($aFields['others'][$aCriteria['ref']]))
 				{
 					$aField = $aFields['others'][$aCriteria['ref']];
 				}
-				$aCriteria['code'] = $aField['code'];
-				$aCriteria['class'] = $aField['class'];
+				if (isset($aField))
+				{
+					$aCriteria['code'] = $aField['code'];
+					$aCriteria['class'] = $aField['class'];
+				}
 			}
 
 			$aNewCriterion[] = $aCriteria;
@@ -347,20 +350,27 @@ class CriterionConversionTest extends ItopDataTestCase
 	function OqlProvider()
 	{
 		return array(
+			'no criteria' => array('OQL' => 'SELECT WebApplication'),
 			'string starts' => array('OQL' => "SELECT Contact WHERE name LIKE 'toto%'"),
 			'string ends' => array('OQL' => "SELECT Contact WHERE name LIKE '%toto'"),
-			'string contains' => array('OQL' => "SELECT Contact WHERE name LIKE '%toto%'"),
+			'string contains 1' => array('OQL' => "SELECT Contact WHERE name LIKE '%toto%'"),
+			'string contains 2' => array('OQL' => "SELECT Person AS B WHERE B.name LIKE '%A%'"),
+			'string regexp' => array('OQL' => "SELECT Server WHERE name REGEXP '^dbserver[0-9]+\\\\\\\\..+\\\\\\\\.[a-z]{2,3}$'"),
 			'enum + key =' => array('OQL' => "SELECT Contact WHERE status = 'active' AND org_id = 3"),
 			'enum =' => array('OQL' => "SELECT Contact WHERE status = 'active'"),
 			'enum IN' => array('OQL' => "SELECT Contact WHERE status IN ('active', 'inactive')"),
-			'enum NOT IN' => array('OQL' => "SELECT Contact WHERE status NOT IN ('active')"),
-			'enum undefined' => array('OQL' => "SELECT FunctionalCI WHERE ((business_criticity = 'high') OR ISNULL(business_criticity)) AND 1"),
-			'enum undefined1' => array('OQL' => "SELECT FunctionalCI WHERE ((business_criticity IN ('high', 'medium')) OR ISNULL(business_criticity)) AND 1"),
-			'enum undefined2' => array('OQL' => "SELECT FunctionalCI WHERE ISNULL(business_criticity)"),
+			'enum NOT IN 1' => array('OQL' => "SELECT Contact WHERE status NOT IN ('active')"),
+			'enum NOT IN 2' => array('OQL' => "SELECT Person AS p JOIN UserRequest AS u ON u.agent_id = p.id WHERE u.status != 'closed'"),
+			'enum undefined 1' => array('OQL' => "SELECT FunctionalCI WHERE ((business_criticity = 'high') OR ISNULL(business_criticity)) AND 1"),
+			'enum undefined 2' => array('OQL' => "SELECT FunctionalCI WHERE ((business_criticity IN ('high', 'medium')) OR ISNULL(business_criticity)) AND 1"),
+			'enum undefined 3' => array('OQL' => "SELECT FunctionalCI WHERE ISNULL(business_criticity)"),
 			'key NOT IN' => array('OQL' => "SELECT Contact WHERE org_id NOT IN ('1')"),
 			'key IN' => array('OQL' => "SELECT Contact WHERE org_id IN ('1')"),
 			'key empty' => array('OQL' => "SELECT Person WHERE location_id = '0'"),
-			'Date relative' => array('OQL' => "SELECT UserRequest WHERE DATE_SUB(NOW(), INTERVAL 14 DAY) < start_date"),
+			'Date relative 1' => array('OQL' => "SELECT UserRequest WHERE DATE_SUB(NOW(), INTERVAL 14 DAY) < start_date"),
+			'Date relative 2' => array('OQL' => "SELECT Contract AS c WHERE c.end_date > NOW() AND c.end_date < DATE_ADD(NOW(), INTERVAL 30 DAY)"),
+			'Date relative 3' => array('OQL' => "SELECT UserRequest AS u WHERE u.close_date > DATE_ADD(u.start_date, INTERVAL 8 HOUR)"),
+			'Date relative 4' => array('OQL' => "SELECT UserRequest AS u WHERE u.start_date < DATE_SUB(NOW(), INTERVAL 60 MINUTE) AND u.status = 'new'"),
 			'Date between 1' => array('OQL' => "SELECT UserRequest WHERE start_date > '2017-01-01 00:00:00' AND '2018-01-01 00:00:00' >= start_date"),
 			'Date between 2' => array('OQL' => "SELECT UserRequest WHERE start_date > '2017-01-01 00:00:00' AND status = 'active' AND org_id = 3 AND '2018-01-01 00:00:00' >= start_date"),
 			'Date between 3' => array('OQL' => "SELECT UserRequest WHERE start_date >= '2017-01-01 00:00:00' AND '2017-01-01 00:00:00' >= start_date"),
@@ -372,6 +382,8 @@ class CriterionConversionTest extends ItopDataTestCase
 			'Date =2' => array('OQL' => "SELECT UserRequest WHERE (DATE_FORMAT(start_date, '%Y-%m-%d') = '2018-03-21')"),
 			'Num between 1' => array('OQL' => "SELECT Server WHERE nb_u >= 0 AND 1 >= nb_u"),
 			'Num ISNULL' => array('OQL' => "SELECT Server WHERE ISNULL(nb_u)"),
+			'Hierarchical below' => array('OQL' => "SELECT Person AS P JOIN Organization AS Node ON P.org_id = Node.id JOIN Organization AS Root ON Node.parent_id BELOW Root.id WHERE Root.id=1"),
+			'IP range' => array('OQL' => "SELECT DatacenterDevice AS dev WHERE INET_ATON(dev.managementip) > INET_ATON('10.22.32.224') AND INET_ATON(dev.managementip) < INET_ATON('10.22.32.255')"),
 		);
 	}
 }

From ba04725ee3c7f83d5be4fbfea2398c6e4aa5c216 Mon Sep 17 00:00:00 2001
From: Guillaume Lajarige <guillaume.lajarige@combodo.com>
Date: Tue, 27 Mar 2018 08:18:42 +0000
Subject: [PATCH 144/202] Advanced search: UI/UX WIP.

SVN:b1162[5540]
---
 application/nicewebpage.class.inc.php         |  1 +
 css/light-grey.css                            |  2 +-
 css/light-grey.scss                           |  2 +-
 .../search_form_criteria_hierarchical_key.js  | 52 +++++++++++++++++++
 4 files changed, 55 insertions(+), 2 deletions(-)
 create mode 100644 js/search/search_form_criteria_hierarchical_key.js

diff --git a/application/nicewebpage.class.inc.php b/application/nicewebpage.class.inc.php
index d0b4fa44b..d14de2c64 100644
--- a/application/nicewebpage.class.inc.php
+++ b/application/nicewebpage.class.inc.php
@@ -58,6 +58,7 @@ class NiceWebPage extends WebPage
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_numeric.js');
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_enum.js');
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_external_key.js');
+	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_hierarchical_key.js');
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_date_abstract.js');
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_date.js');
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_date_time.js');
diff --git a/css/light-grey.css b/css/light-grey.css
index d762ab8fe..1f62c493b 100644
--- a/css/light-grey.css
+++ b/css/light-grey.css
@@ -1021,7 +1021,7 @@ input.dp-applied {
   width: 88px;
 }
 .search_form_handler .sf_criterion_area .sf_more_criterion {
-  margin-right: 5px;
+  margin-right: 10px;
 }
 .search_form_handler .sf_criterion_area .sf_more_criterion.opened {
   z-index: 2;
diff --git a/css/light-grey.scss b/css/light-grey.scss
index 8f9d7fb49..4c7bd9209 100644
--- a/css/light-grey.scss
+++ b/css/light-grey.scss
@@ -1178,7 +1178,7 @@ input.dp-applied {
 
 		/* More criterion */
 		.sf_more_criterion{
-			margin-right: 5px;
+			margin-right: 10px;
 
 			&.opened{
 				z-index: 2; /* To be over criterion */
diff --git a/js/search/search_form_criteria_hierarchical_key.js b/js/search/search_form_criteria_hierarchical_key.js
new file mode 100644
index 000000000..40f993c82
--- /dev/null
+++ b/js/search/search_form_criteria_hierarchical_key.js
@@ -0,0 +1,52 @@
+//iTop Search form criteria hierarchical key
+;
+$(function()
+{
+	// the widget definition, where 'itop' is the namespace,
+	// 'search_form_criteria_hierarchical_key' the widget name
+	$.widget( 'itop.search_form_criteria_hierarchical_key', $.itop.search_form_criteria_enum,
+	{
+		// default options
+		options:
+		{
+		},
+
+   
+		// the constructor
+		_create: function()
+		{
+			var me = this;
+
+			this._super();
+			this.element.addClass('search_form_criteria_hierarchical_key');
+		},
+		// called when created, and later when changing options
+		_refresh: function()
+		{
+
+		},
+		// events bound via _bind are removed automatically
+		// revert other modifications here
+		_destroy: function()
+		{
+			this.element.removeClass('search_form_criteria_hierarchical_key');
+			this._super();
+		},
+		// _setOptions is called with a hash of all options that are changing
+		// always refresh when changing options
+		_setOptions: function()
+		{
+			this._superApply(arguments);
+		},
+		// _setOption is called for each individual option that is changing
+		_setOption: function( key, value )
+		{
+			this._super( key, value );
+		},
+
+		//------------------
+		// Inherited methods
+		//------------------
+
+	});
+});

From d8354c6666b9de12dbda901b32426736d1e2b3e4 Mon Sep 17 00:00:00 2001
From: Denis Flaven <denis.flaven@combodo.com>
Date: Tue, 27 Mar 2018 08:19:14 +0000
Subject: [PATCH 145/202] IE compatibility: polyfill implementation of
 Array.from().

SVN:b1162[5541]
---
 js/utils.js | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 80 insertions(+)

diff --git a/js/utils.js b/js/utils.js
index aded8c386..a1a0c522a 100644
--- a/js/utils.js
+++ b/js/utils.js
@@ -37,6 +37,86 @@ if (!Array.prototype.indexOf) {
 		}
 	}
 }
+// Polyfill for Array.from for IE
+// Copied from https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/from
+if (!Array.from) {
+  Array.from = (function () {
+    var toStr = Object.prototype.toString;
+    var isCallable = function (fn) {
+      return typeof fn === 'function' || toStr.call(fn) === '[object Function]';
+    };
+    var toInteger = function (value) {
+      var number = Number(value);
+      if (isNaN(number)) { return 0; }
+      if (number === 0 || !isFinite(number)) { return number; }
+      return (number > 0 ? 1 : -1) * Math.floor(Math.abs(number));
+    };
+    var maxSafeInteger = Math.pow(2, 53) - 1;
+    var toLength = function (value) {
+      var len = toInteger(value);
+      return Math.min(Math.max(len, 0), maxSafeInteger);
+    };
+
+    // The length property of the from method is 1.
+    return function from(arrayLike/*, mapFn, thisArg */) {
+      // 1. Let C be the this value.
+      var C = this;
+
+      // 2. Let items be ToObject(arrayLike).
+      var items = Object(arrayLike);
+
+      // 3. ReturnIfAbrupt(items).
+      if (arrayLike == null) {
+        throw new TypeError('Array.from requires an array-like object - not null or undefined');
+      }
+
+      // 4. If mapfn is undefined, then let mapping be false.
+      var mapFn = arguments.length > 1 ? arguments[1] : void undefined;
+      var T;
+      if (typeof mapFn !== 'undefined') {
+        // 5. else
+        // 5. a If IsCallable(mapfn) is false, throw a TypeError exception.
+        if (!isCallable(mapFn)) {
+          throw new TypeError('Array.from: when provided, the second argument must be a function');
+        }
+
+        // 5. b. If thisArg was supplied, let T be thisArg; else let T be undefined.
+        if (arguments.length > 2) {
+          T = arguments[2];
+        }
+      }
+
+      // 10. Let lenValue be Get(items, "length").
+      // 11. Let len be ToLength(lenValue).
+      var len = toLength(items.length);
+
+      // 13. If IsConstructor(C) is true, then
+      // 13. a. Let A be the result of calling the [[Construct]] internal method 
+      // of C with an argument list containing the single item len.
+      // 14. a. Else, Let A be ArrayCreate(len).
+      var A = isCallable(C) ? Object(new C(len)) : new Array(len);
+
+      // 16. Let k be 0.
+      var k = 0;
+      // 17. Repeat, while k < len… (also steps a - h)
+      var kValue;
+      while (k < len) {
+        kValue = items[k];
+        if (mapFn) {
+          A[k] = typeof T === 'undefined' ? mapFn(kValue, k) : mapFn.call(T, kValue, k);
+        } else {
+          A[k] = kValue;
+        }
+        k += 1;
+      }
+      // 18. Let putStatus be Put(A, "length", len, true).
+      A.length = len;
+      // 20. Return A.
+      return A;
+    };
+  }());
+}
+
 /**
  * Reload a truncated list
  */

From 2a2a9ab8b74c54cc677ce63c1e8b74a4dd8e3940 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Tue, 27 Mar 2018 08:27:49 +0000
Subject: [PATCH 146/202] Advanced Search: translations

SVN:b1162[5542]
---
 dictionaries/en.dictionary.itop.ui.php | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/dictionaries/en.dictionary.itop.ui.php b/dictionaries/en.dictionary.itop.ui.php
index 5b7e78511..25e9975dc 100644
--- a/dictionaries/en.dictionary.itop.ui.php
+++ b/dictionaries/en.dictionary.itop.ui.php
@@ -1469,3 +1469,22 @@ When associated with a trigger, each action is given an "order" number, specifyi
 	'UI:Search:Criteria:DateTime:PlaceholderUntil' => 'Any date',
 	'UI:Search:Criteria:DateTime:PlaceholderUntilTime' => 'Any date',
 ));
+
+//
+// Expression to Natural language
+//
+Dict::Add('EN US', 'English', 'English', array(
+	'Expression:Operator:AND' => ' AND ',
+	'Expression:Operator:OR' => ' OR ',
+
+	'Expression:Unit:Short:DAY' => 'd',
+	'Expression:Unit:Short:WEEK' => 'w',
+	'Expression:Unit:Short:MONTH' => 'm',
+	'Expression:Unit:Short:YEAR' => 'y',
+
+	'Expression:Unit:Long:DAY' => 'day(s)',
+	'Expression:Unit:Long:HOUR' => 'hour(s)',
+	'Expression:Unit:Long:MINUTE' => 'minute(s)',
+
+	'Expression:Verb:NOW' => 'now',
+));

From 7672858d6bec6799539491c769fdb802b67114cd Mon Sep 17 00:00:00 2001
From: Guillaume Lajarige <guillaume.lajarige@combodo.com>
Date: Tue, 27 Mar 2018 09:36:21 +0000
Subject: [PATCH 147/202] Advanced search: UI/UX WIP, integration with
 endpoint.

SVN:b1162[5543]
---
 js/search/search_form_criteria.js      | 31 ++++++++++++++++++++++++++
 js/search/search_form_criteria_enum.js | 12 +++++-----
 2 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/js/search/search_form_criteria.js b/js/search/search_form_criteria.js
index 6822b8726..c2ecfede0 100644
--- a/js/search/search_form_criteria.js
+++ b/js/search/search_form_criteria.js
@@ -476,6 +476,12 @@ $(function()
 				}
 
 				sTitle = Dict.Format(sDictEntry, this.options.field.label, this._getValuesAsText());
+
+				// Last chande fallback
+				if(sTitle === sDictEntry)
+				{
+					sTitle = this.options.label;
+				}
 			}
 			this.element.find('.sfc_title')
 				.html(sTitle)
@@ -589,6 +595,26 @@ $(function()
 
 
 		// Values helpers
+		// - Check if criteria has allowed values
+		_hasAllowedValues: function()
+		{
+			return ( (this.options.field.allowed_values !== undefined) && (this.options.field.allowed_values !== null) );
+		},
+		// - Check if criteria has preloaded allowed values (as opposed to autocomplete)
+		_hasPreloadedAllowedValues: function()
+		{
+			if(this._hasAllowedValues() && (this.options.field.allowed_values.values !== undefined) && (this.options.field.allowed_values.values !== null))
+			{
+				return true;
+			}
+
+			return false;
+		},
+		// - Return the preloaded allowed values (not coming from autocomplete)
+		_getPreloadedAllowedValues: function()
+		{
+			return (this._hasPreloadedAllowedValues()) ? this.options.field.allowed_values.values : {};
+		},
 		// - Return current values
 		_getValues: function()
 		{
@@ -631,6 +657,11 @@ $(function()
 		// - Converts a snake_case string to CamelCase
 		_toCamelCase: function(sString)
 		{
+			if( (sString === undefined) || (sString === null) )
+			{
+				return sString;
+			}
+
 			var aParts = sString.split('_');
 
 			for(var i in aParts)
diff --git a/js/search/search_form_criteria_enum.js b/js/search/search_form_criteria_enum.js
index 48018c5ca..a3699bc2e 100644
--- a/js/search/search_form_criteria_enum.js
+++ b/js/search/search_form_criteria_enum.js
@@ -118,20 +118,20 @@ $(function()
 			}
 
 			//   - Regular allowed values
-			if(this.options.field.allowed_values.values !== undefined)
+			if (this._hasPreloadedAllowedValues())
 			{
-				var aSortedValues = this._sortValuesByLabel(this.options.field.allowed_values.values);
-				for(var i in aSortedValues)
+				var aSortedValues = this._sortValuesByLabel(this._getPreloadedAllowedValues());
+				for (var i in aSortedValues)
 				{
 					var sValCode = aSortedValues[i][0];
 					var sValLabel = aSortedValues[i][1];
 					var oValueElem = $('<div></div>')
 						.addClass('sfc_opc_mc_item')
 						.attr('data-value-code', sValCode)
-						.append('<label><input type="checkbox" value="' + sValCode + '"/>' + sValLabel + '</label>')
+						.append('<label><input type="checkbox" value="'+sValCode+'"/>'+sValLabel+'</label>')
 						.appendTo(oAllowedValuesElem);
 
-					if(this._isSelectedValues(sValCode))
+					if (this._isSelectedValues(sValCode))
 					{
 						oValueElem.find(':checkbox').prop('checked', true);
 					}
@@ -210,7 +210,7 @@ $(function()
 		{
 			var iValLimit = 3;
 			var iValCount = Object.keys(this.options.values).length;
-			var iAllowedValuesCount = (this.options.field.allowed_values.values !== undefined) ? Object.keys(this.options.field.allowed_values.values).length : 0;
+			var iAllowedValuesCount = Object.keys(this._getPreloadedAllowedValues()).length;
 
 			// Manually increase allowed values count if null is allowed
 			if(this.options.field.is_null_allowed === true)

From bc9e1b1d9448fab699ff61f605debc3d8b291400 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Tue, 27 Mar 2018 10:14:27 +0000
Subject: [PATCH 148/202] Advanced Search: code hardening and unit tests

SVN:b1162[5544]
---
 .../criteriontosearchform.class.inc.php       |  18 ++-
 .../search/searchform.class.inc.php           | 116 +++++++++++-------
 .../search/CriterionConversionTest.php        |  12 +-
 test/application/search/SearchFormTest.php    |   6 +
 4 files changed, 88 insertions(+), 64 deletions(-)

diff --git a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
index 3a657b207..650bbf768 100644
--- a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
+++ b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
@@ -57,16 +57,21 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 		$aAndCriterion = array();
 		$aMappingOperatorToFunction = array(
 			AttributeDefinition::SEARCH_WIDGET_TYPE_STRING => 'TextToSearchForm',
-			AttributeDefinition::SEARCH_WIDGET_TYPE_ENUM => 'EnumToSearchForm',
-			AttributeDefinition::SEARCH_WIDGET_TYPE_DATE => 'DateToSearchForm',
+			AttributeDefinition::SEARCH_WIDGET_TYPE_DATE => 'DateTimeToSearchForm',
 			AttributeDefinition::SEARCH_WIDGET_TYPE_DATE_TIME => 'DateTimeToSearchForm',
 			AttributeDefinition::SEARCH_WIDGET_TYPE_NUMERIC => 'NumericToSearchForm',
 			AttributeDefinition::SEARCH_WIDGET_TYPE_EXTERNAL_KEY => 'ExternalKeyToSearchForm',
 			AttributeDefinition::SEARCH_WIDGET_TYPE_HIERARCHICAL_KEY => 'ExternalKeyToSearchForm',
+			AttributeDefinition::SEARCH_WIDGET_TYPE_ENUM => 'ExternalKeyToSearchForm',
 		);
 
 		foreach($aAndCriterionRaw as $aCriteria)
 		{
+			// Check criteria validity
+			if (!array_key_exists('ref', $aCriteria) || !array_key_exists($aCriteria['ref'], $aAllFields))
+			{
+				$aCriteria['widget'] = AttributeDefinition::SEARCH_WIDGET_TYPE_RAW;
+			}
 			if (array_key_exists('widget', $aCriteria))
 			{
 				if (array_key_exists($aCriteria['widget'], $aMappingOperatorToFunction))
@@ -381,11 +386,6 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 		return $aCriteria;
 	}
 
-	protected static function DateToSearchForm($aCriteria, $aFields)
-	{
-		return self::DateTimeToSearchForm($aCriteria, $aFields);
-	}
-
 	protected static function DateTimeToSearchForm($aCriteria, $aFields)
 	{
 		if (!array_key_exists('is_relative', $aCriteria) || !$aCriteria['is_relative'])
@@ -459,10 +459,6 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 		return $aCriteria;
 	}
 
-	protected static function EnumToSearchForm($aCriteria, $aFields)
-	{
-		return self::ExternalKeyToSearchForm($aCriteria, $aFields);
-	}
 
 	protected static function ExternalKeyToSearchForm($aCriteria, $aFields)
 	{
diff --git a/sources/application/search/searchform.class.inc.php b/sources/application/search/searchform.class.inc.php
index b27daf8b3..ff91671ef 100644
--- a/sources/application/search/searchform.class.inc.php
+++ b/sources/application/search/searchform.class.inc.php
@@ -42,7 +42,6 @@ use WebPage;
 
 class SearchForm
 {
-	private $aLabels = array();
 
 	/**
 	 * @param \WebPage $oPage
@@ -56,7 +55,6 @@ class SearchForm
 	public function GetSearchForm(WebPage $oPage, CMDBObjectSet $oSet, $aExtraParams = array())
 	{
 		$sHtml = '';
-		$this->aLabels = array();
 		$oAppContext = new ApplicationContext();
 		$sClassName = $oSet->GetFilter()->GetClass();
 		$aListParams = array();
@@ -195,59 +193,85 @@ class SearchForm
 	public function GetFields($oSet)
 	{
 		$oSearch = $oSet->GetFilter();
-		$aSelectedClasses = $oSearch->GetSelectedClasses();
+		// TODO: Later consider all the fields including the joined classes
+		//$aAllClasses = $oSearch->GetJoinedClasses();
+		$aAllClasses = $oSearch->GetSelectedClasses();
 		$aAuthorizedClasses = array();
-		foreach($aSelectedClasses as $sAlias => $sClassName)
+		foreach($aAllClasses as $sAlias => $sClassName)
 		{
 			if (\UserRights::IsActionAllowed($sClassName, UR_ACTION_READ, $oSet) != UR_ALLOWED_NO)
 			{
 				$aAuthorizedClasses[$sAlias] = $sClassName;
 			}
 		}
-		$aAllFields = array();
+		$aAllFields = array('zlist' => array(), 'others' => array());
 		try
 		{
 			foreach($aAuthorizedClasses as $sAlias => $sClass)
 			{
-				$aAttributeDefs = MetaModel::ListAttributeDefs($sClass);
-				$aList = MetaModel::GetZListItems($sClass, 'standard_search');
 				$aZList = array();
-				foreach($aList as $sAttCode)
-				{
-					if (array_key_exists($sAttCode, $aAttributeDefs))
-					{
-						$oAttDef = $aAttributeDefs[$sAttCode];
-						$aZList = $this->AppendField($sClass, $sAlias, $sAttCode, $oAttDef, $aZList);
-						unset($aAttributeDefs[$sAttCode]);
-					}
-				}
-				uasort($aZList, function ($aItem1, $aItem2) {
-					return strcmp($aItem1['label'], $aItem2['label']);
-				});
-				$aZList = $this->AppendId($sClass, $sAlias, $aZList);
-				$aAllFields['zlist'] = $aZList;
-
 				$aOthers = array();
-				foreach($aAttributeDefs as $sAttCode => $oAttDef)
-				{
-					if ($this->IsSubAttribute($oAttDef)) continue;
 
-					$aOthers = $this->AppendField($sClass, $sAlias, $sAttCode, $oAttDef, $aOthers);
-				}
-				uasort($aOthers, function ($aItem1, $aItem2) {
-					return strcmp($aItem1['label'], $aItem2['label']);
-				});
+				$this->PopulateFiledList($sClass, $sAlias, $aZList, $aOthers);
 
-				$aAllFields['others'] = $aOthers;
+				$aAllFields[$sAlias.'_zlist'] = $aZList;
+				$aAllFields[$sAlias.'_others'] = $aOthers;
 			}
-		} catch (CoreException $e)
+		}
+		catch (CoreException $e)
 		{
 			IssueLog::Error($e->getMessage());
 		}
+		$aSelectedClasses = $oSearch->GetSelectedClasses();
+		foreach($aSelectedClasses as $sAlias => $sClassName)
+		{
+			$aAllFields['zlist'] = array_merge($aAllFields['zlist'], $aAllFields[$sAlias.'_zlist']);
+			unset($aAllFields[$sAlias.'_zlist']);
+			$aAllFields['others'] = array_merge($aAllFields['others'], $aAllFields[$sAlias.'_others']);
+			unset($aAllFields[$sAlias.'_others']);
+
+		}
 
 		return $aAllFields;
 	}
 
+	/**
+	 * @param $sClass
+	 * @param $sAlias
+	 * @param $aZList
+	 * @param $aOthers
+	 *
+	 * @throws \CoreException
+	 */
+	protected function PopulateFiledList($sClass, $sAlias, &$aZList, &$aOthers)
+	{
+		$aAttributeDefs = MetaModel::ListAttributeDefs($sClass);
+		$aList = MetaModel::GetZListItems($sClass, 'standard_search');
+		foreach($aList as $sAttCode)
+		{
+			if (array_key_exists($sAttCode, $aAttributeDefs))
+			{
+				$oAttDef = $aAttributeDefs[$sAttCode];
+				$aZList = $this->AppendField($sClass, $sAlias, $sAttCode, $oAttDef, $aZList);
+				unset($aAttributeDefs[$sAttCode]);
+			}
+		}
+		uasort($aZList, function ($aItem1, $aItem2) {
+			return strcmp($aItem1['label'], $aItem2['label']);
+		});
+		$aZList = $this->AppendId($sClass, $sAlias, $aZList);
+
+		foreach($aAttributeDefs as $sAttCode => $oAttDef)
+		{
+			if ($this->IsSubAttribute($oAttDef)) continue;
+
+			$aOthers = $this->AppendField($sClass, $sAlias, $sAttCode, $oAttDef, $aOthers);
+		}
+		uasort($aOthers, function ($aItem1, $aItem2) {
+			return strcmp($aItem1['label'], $aItem2['label']);
+		});
+	}
+
 	protected function IsSubAttribute($oAttDef)
 	{
 		return (($oAttDef instanceof AttributeFriendlyName) || ($oAttDef instanceof AttributeExternalField) || ($oAttDef instanceof AttributeSubItem));
@@ -324,7 +348,7 @@ class SearchForm
 			$aAndExpressions = Expression::Split($oORSubExpr, 'AND');
 			foreach($aAndExpressions as $oAndSubExpr)
 			{
-				if ($oAndSubExpr instanceof TrueExpression)
+				if (($oAndSubExpr instanceof TrueExpression) || ($oAndSubExpr->Render() == 1))
 				{
 					continue;
 				}
@@ -355,7 +379,6 @@ class SearchForm
 		$aField['is_null_allowed'] = false;
 		$aNewFields = array($sClassAlias.'.id' => $aField);
 		$aFields = array_merge($aNewFields, $aFields);
-		$this->aLabels['Id'] = true;
 		return $aFields;
 	}
 	/**
@@ -372,19 +395,16 @@ class SearchForm
 		if (!is_null($oAttDef) && ($oAttDef->GetSearchType() != AttributeDefinition::SEARCH_WIDGET_TYPE_RAW))
 		{
 			$sLabel = $oAttDef->GetLabel();
-			if (!array_key_exists($sLabel, $this->aLabels))
-			{
-				$aField = array();
-				$aField['code'] = $sFilterCode;
-				$aField['class'] = $sClass;
-				$aField['class_alias'] = $sClassAlias;
-				$aField['label'] = $sLabel;
-				$aField['widget'] = $oAttDef->GetSearchType();
-				$aField['allowed_values'] = self::GetFieldAllowedValues($oAttDef);
-				$aField['is_null_allowed'] = $oAttDef->IsNullAllowed();
-				$aFields[$sClassAlias.'.'.$sFilterCode] = $aField;
-				$this->aLabels[$sLabel] = true;
-			}
+
+			$aField = array();
+			$aField['code'] = $sFilterCode;
+			$aField['class'] = $sClass;
+			$aField['class_alias'] = $sClassAlias;
+			$aField['label'] = $sLabel;
+			$aField['widget'] = $oAttDef->GetSearchType();
+			$aField['allowed_values'] = self::GetFieldAllowedValues($oAttDef);
+			$aField['is_null_allowed'] = $oAttDef->IsNullAllowed();
+			$aFields[$sClassAlias.'.'.$sFilterCode] = $aField;
 
 			// Sub items
 			//
@@ -405,4 +425,6 @@ class SearchForm
 
 		return $aFields;
 	}
+
+
 }
\ No newline at end of file
diff --git a/test/application/search/CriterionConversionTest.php b/test/application/search/CriterionConversionTest.php
index aa4d4740e..11b3eb614 100644
--- a/test/application/search/CriterionConversionTest.php
+++ b/test/application/search/CriterionConversionTest.php
@@ -318,13 +318,13 @@ class CriterionConversionTest extends ItopDataTestCase
 			if ($aCriteria['widget'] != \AttributeDefinition::SEARCH_WIDGET_TYPE_RAW)
 			{
 				unset($aCriteria['oql']);
-				if (isset($aFields['zlist'][$aCriteria['ref']]))
+				foreach($aFields as $aCatFields)
 				{
-					$aField = $aFields['zlist'][$aCriteria['ref']];
-				}
-				elseif (isset($aFields['others'][$aCriteria['ref']]))
-				{
-					$aField = $aFields['others'][$aCriteria['ref']];
+					if (isset($aCatFields[$aCriteria['ref']]))
+					{
+						$aField = $aCatFields[$aCriteria['ref']];
+						break;
+					}
 				}
 				if (isset($aField))
 				{
diff --git a/test/application/search/SearchFormTest.php b/test/application/search/SearchFormTest.php
index d3b3c42c5..851cac15e 100644
--- a/test/application/search/SearchFormTest.php
+++ b/test/application/search/SearchFormTest.php
@@ -48,6 +48,7 @@ class SearchFormTest extends ItopDataTestCase
 		$oSearchForm = new SearchForm();
 		$oSearch = \DBSearch::FromOQL($sOQL);
 		$aFields = $oSearchForm->GetFields(new \DBObjectSet($oSearch));
+		$this->debug($sOQL);
 		$this->debug(json_encode($aFields, JSON_PRETTY_PRINT));
 		$this->assertCount($iNum, $aFields[$sList]);
 
@@ -59,6 +60,11 @@ class SearchFormTest extends ItopDataTestCase
 			array("SELECT Contact", 8, 'zlist'),
 			array("SELECT Contact AS C WHERE C.status = 'active'", 4, 'others'),
 			array("SELECT Person", 12, 'zlist'),
+			array(
+				"SELECT Person AS p JOIN UserRequest AS u ON u.agent_id = p.id WHERE u.status != 'closed'",
+				12,
+				'zlist'
+			),
 		);
 	}
 

From 9550ec6efd9e84d27549940978dc92394498c78e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Tue, 27 Mar 2018 12:33:01 +0000
Subject: [PATCH 149/202] Advanced Search: unit tests

SVN:b1162[5545]
---
 test/application/search/SearchFormTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/application/search/SearchFormTest.php b/test/application/search/SearchFormTest.php
index 851cac15e..4a70c87d5 100644
--- a/test/application/search/SearchFormTest.php
+++ b/test/application/search/SearchFormTest.php
@@ -58,7 +58,7 @@ class SearchFormTest extends ItopDataTestCase
 	{
 		return array(
 			array("SELECT Contact", 8, 'zlist'),
-			array("SELECT Contact AS C WHERE C.status = 'active'", 4, 'others'),
+			array("SELECT Contact AS C WHERE C.status = 'active'", 5, 'others'),
 			array("SELECT Person", 12, 'zlist'),
 			array(
 				"SELECT Person AS p JOIN UserRequest AS u ON u.agent_id = p.id WHERE u.status != 'closed'",

From 9e66ef5460c759e1df4233a1a63da4f6521f4b0c Mon Sep 17 00:00:00 2001
From: Bruno Da Silva <bruno.dasilva@combodo.com>
Date: Tue, 27 Mar 2018 13:19:30 +0000
Subject: [PATCH 150/202] search widget : widget datetime and numeric => fine
 tuning the UI

SVN:b1162[5546]
---
 css/light-grey.css                            |  30 +++-
 css/light-grey.scss                           |  64 +++++++-
 dictionaries/en.dictionary.itop.ui.php        |  12 +-
 .../search_form_criteria_date_abstract.js     | 142 ++++++------------
 js/search/search_form_criteria_numeric.js     |  27 ++--
 5 files changed, 157 insertions(+), 118 deletions(-)

diff --git a/css/light-grey.css b/css/light-grey.css
index 1f62c493b..a9b815c01 100644
--- a/css/light-grey.css
+++ b/css/light-grey.css
@@ -1017,8 +1017,36 @@ input.dp-applied {
 .search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_numeric .sfc_fg_operator_dropdown_group select {
   width: 88px;
 }
+.search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_numeric .sfc_form_group.advanced .sfc_fg_operator_between {
+  margin-bottom: 5px;
+}
+.search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_numeric .sfc_fg_operator_between label.sfc_op_content_from_label, .search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_numeric .sfc_fg_operator_between label.sfc_op_content_until_label {
+  width: 90px;
+  display: inline-block;
+}
 .search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_numeric .sfc_fg_operator_between input {
-  width: 88px;
+  width: 130px;
+}
+.search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_numeric .sfc_fg_operator_equals .sfc_op_name, .search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_numeric .sfc_fg_operator_greater_than .sfc_op_name, .search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_numeric .sfc_fg_operator_greater_than_or_equals .sfc_op_name, .search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_numeric .sfc_fg_operator_less_than .sfc_op_name, .search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_numeric .sfc_fg_operator_less_than_or_equals .sfc_op_name, .search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_numeric .sfc_fg_operator_different .sfc_op_name {
+  width: 90px;
+}
+.search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_numeric .sfc_fg_operator_equals .sfc_op_content input, .search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_numeric .sfc_fg_operator_greater_than .sfc_op_content input, .search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_numeric .sfc_fg_operator_greater_than_or_equals .sfc_op_content input, .search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_numeric .sfc_fg_operator_less_than .sfc_op_content input, .search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_numeric .sfc_fg_operator_less_than_or_equals .sfc_op_content input, .search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_numeric .sfc_fg_operator_different .sfc_op_content input {
+  width: 130px;
+}
+.search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_date_time .sfc_form_group.advanced .sfc_fg_operator_between, .search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_date .sfc_form_group.advanced .sfc_fg_operator_between {
+  margin-bottom: 5px;
+}
+.search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_date_time .sfc_fg_operator_between_days input, .search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_date .sfc_fg_operator_between_days input {
+  width: 135px;
+}
+.search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_date_time button.ui-datepicker-trigger, .search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_date button.ui-datepicker-trigger {
+  background: none;
+  border: none;
+  height: 100%;
+  padding: 2px;
+}
+.search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_date_time button.ui-datepicker-trigger img, .search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_date button.ui-datepicker-trigger img {
+  vertical-align: middle;
 }
 .search_form_handler .sf_criterion_area .sf_more_criterion {
   margin-right: 10px;
diff --git a/css/light-grey.scss b/css/light-grey.scss
index 4c7bd9209..b45822a47 100644
--- a/css/light-grey.scss
+++ b/css/light-grey.scss
@@ -1046,7 +1046,7 @@ input.dp-applied {
 						&.sfc_fg_operator_equals,
 						&.sfc_fg_operator_contains,
 						&.sfc_fg_operator_starts_with,
-						&.sfc_fg_operator_ends_with{
+						&.sfc_fg_operator_ends_with {
 							.sfc_op_name{
 								width: 90px;
 							}
@@ -1123,8 +1123,11 @@ input.dp-applied {
 					.hide_on_advanced {
 						display: none;
 					}
+
 				}
 
+
+
 				&:not(.advanced) {
 					.hide_on_less {
 						display: none;
@@ -1168,9 +1171,66 @@ input.dp-applied {
 						width: 88px;
 					}
 				}
+				.sfc_form_group.advanced {
+					.sfc_fg_operator_between {
+						margin-bottom: 5px;
+					}
+				}
 				.sfc_fg_operator_between {
+					label {
+						&.sfc_op_content_from_label, &.sfc_op_content_until_label {
+							width: 90px;
+							display: inline-block;
+						}
+					}
 					input {
-						width: 88px;
+						width: 130px;
+					}
+				}
+				.sfc_fg_operator_equals,
+				.sfc_fg_operator_greater_than,
+				.sfc_fg_operator_greater_than_or_equals,
+				.sfc_fg_operator_less_than,
+				.sfc_fg_operator_less_than_or_equals,
+				.sfc_fg_operator_different {
+					.sfc_op_name{
+						width: 90px;
+					}
+					.sfc_op_content{
+						input{
+							width: 130px;
+						}
+					}
+				}
+			}
+
+			&.search_form_criteria_date_time, &.search_form_criteria_date {
+				.sfc_form_group.advanced {
+					.sfc_fg_operator_between {
+						margin-bottom: 5px;
+					}
+				}
+				.sfc_fg_operator_between_days {
+					//label {
+					//	&.sfc_op_content_from_time_label,
+					//	&.sfc_op_content_until_time_label,
+					//	&.sfc_op_content_from_label,
+                     //   &.sfc_op_content_until_label {
+					//		width: 90px;
+					//		display: inline-block;
+					//	}
+					//}
+					input {
+						width: 135px;
+					}
+				}
+				button.ui-datepicker-trigger {
+					background: none;
+					border: none;
+					height: 100%;
+					padding: 2px;
+					img {
+						vertical-align: middle;
 					}
 				}
 			}
diff --git a/dictionaries/en.dictionary.itop.ui.php b/dictionaries/en.dictionary.itop.ui.php
index 25e9975dc..97450768c 100644
--- a/dictionaries/en.dictionary.itop.ui.php
+++ b/dictionaries/en.dictionary.itop.ui.php
@@ -1403,12 +1403,12 @@ When associated with a trigger, each action is given an "order" number, specifyi
 	'UI:Search:Criteria:Operator:String:StartsWith' => 'Starts with:',
 	'UI:Search:Criteria:Operator:String:EndsWith' => 'Ends with:',
 	//   - Numeric widget
-	'UI:Search:Criteria:Operator:Numeric:Equals' => '=',
-	'UI:Search:Criteria:Operator:Numeric:GreaterThan' => '>',
-	'UI:Search:Criteria:Operator:Numeric:GreaterThanOrEquals' => '>=',
-	'UI:Search:Criteria:Operator:Numeric:LessThan' => '<',
-	'UI:Search:Criteria:Operator:Numeric:LessThanOrEquals' => '<=',
-	'UI:Search:Criteria:Operator:Numeric:Different' => '≠',
+	'UI:Search:Criteria:Operator:Numeric:Equals' => 'Equals',  // => '=',
+	'UI:Search:Criteria:Operator:Numeric:GreaterThan' => 'Greater',  // => '>',
+	'UI:Search:Criteria:Operator:Numeric:GreaterThanOrEquals' => 'Greater / equals',  // > '>=',
+	'UI:Search:Criteria:Operator:Numeric:LessThan' => 'Less',  // => '<',
+	'UI:Search:Criteria:Operator:Numeric:LessThanOrEquals' => 'Less / equals',  // > '<=',
+	'UI:Search:Criteria:Operator:Numeric:Different' => 'Different',  // => '≠',
 
 
 
diff --git a/js/search/search_form_criteria_date_abstract.js b/js/search/search_form_criteria_date_abstract.js
index b812388ad..f54958ac1 100644
--- a/js/search/search_form_criteria_date_abstract.js
+++ b/js/search/search_form_criteria_date_abstract.js
@@ -69,7 +69,7 @@ $(function()
 
 			for (var i = 0; i < aInputsParamLength; i++) {
 				var oInputParam = aInputsParam[i];
-				var oOpContentElem = $('<span class="sfc_op_content_'+oInputParam.code+'_outer '+(oInputParam.show_on_advanced ? 'hide_on_less' : 'hide_on_advanced')+'"><label class="sfc_op_content_'+oInputParam.code+'_label" for=""> '+Dict.S('UI:Search:Criteria:DateTime:'+oInputParam.code_uc_first)+'</label><input type="text" name="'+oInputParam.code+'" placeholder="'+Dict.S('UI:Search:Criteria:DateTime:Placeholder'+oInputParam.code_uc_first)+'"/></span>');
+				var oOpContentElem = $('<span class="sfc_op_content_'+oInputParam.code+'_outer '+(oInputParam.show_on_advanced ? 'hide_on_less' : 'hide_on_advanced')+'"><label class="sfc_op_content_'+oInputParam.code+'_label" for=""> '+Dict.S('UI:Search:Criteria:DateTime:'+oInputParam.code_uc_first)+' </label><input type="text" name="'+oInputParam.code+'" placeholder="'+Dict.S('UI:Search:Criteria:DateTime:Placeholder'+oInputParam.code_uc_first)+'"/></span>');
 				var oInputElem = oOpContentElem
 					.find('input')
 					.uniqueId()
@@ -119,11 +119,55 @@ $(function()
 
 
 			// once the inputs are appended into the DOM we can safely use jQuery UI
+			var fHandleSynchCallback = function(select, bSetDate) {
+				var selectElem 				= $(select);
+				var sSyncedWith 			= selectElem.data('synced_with');
+				var oInputParam 			= selectElem.data('oInputParam');
+
+				if (bSetDate)
+				{
+					var sDate = selectElem.val().trim();
+					if ('' == sDate)
+					{
+						selectElem[oInputParam.x_picker]('setDate', null);
+					} else
+					{
+						selectElem[oInputParam.x_picker]('setDate', sDate);
+					}
+				}
+
+				if (sSyncedWith != undefined)
+				{
+					var sCode 				= selectElem.data('code');
+					var oInputParam 		= aInputsParam[oInputsParamIndexByCode[sCode]];
+					var oSyncedInputParam 	= aInputsParam[oInputsParamIndexByCode[sSyncedWith]];
+					var oSyncedInputElem 	= oOpElem.find('input[name="'+sSyncedWith+'"]');
+
+					var dSyncedDate 		= selectElem[oInputParam.x_picker]('getDate');
+
+					if (null == dSyncedDate)
+					{
+						// oSyncedInputElem.val('');
+						oSyncedInputElem[oSyncedInputParam.x_picker]('setDate', null);
+					}
+					else
+					{
+						if (typeof oSyncedInputParam.default_time_add != 'undefined' && oSyncedInputParam.default_time_add)
+						{
+							dSyncedDate.setSeconds(dSyncedDate.getSeconds() + oSyncedInputParam.default_time_add);
+						}
+						oSyncedInputElem[oSyncedInputParam.x_picker]('setDate', dSyncedDate);
+					}
+
+				}
+
+			};
+
 			var odatetimepickerOptionsDefault = {
 				dateFormat: 'yy-mm-dd',
 				timeFormat: 'HH:mm:ss',
 				buttonImage: GetAbsoluteUrlAppRoot()+"/images/calendar.png",
-				buttonImageOnly: true,
+				// buttonImageOnly: true,
 				buttonText: "",
 				showOn:'button',
 				changeMonth:true,
@@ -132,107 +176,13 @@ $(function()
 			for (var i = 0; i < aInputsParamLength; i++) {
 				var oInputParam = aInputsParam[i];
 
-				var fHandleSynchCallback = function(select, bSetDate) {
-					var selectElem 				= $(select);
-					var sSyncedWith 			= selectElem.data('synced_with');
-					var oInputParam 			= selectElem.data('oInputParam');
 
-					if (bSetDate)
-					{
-						var sDate = selectElem.val().trim();
-						if ('' == sDate)
-						{
-							selectElem[oInputParam.x_picker]('setDate', null);
-						} else
-						{
-							selectElem[oInputParam.x_picker]('setDate', sDate);
-						}
-					}
-
-					if (sSyncedWith != undefined)
-					{
-						var sCode 				= selectElem.data('code');
-						var oInputParam 		= aInputsParam[oInputsParamIndexByCode[sCode]];
-						var oSyncedInputParam 	= aInputsParam[oInputsParamIndexByCode[sSyncedWith]];
-						var oSyncedInputElem 	= oOpElem.find('input[name="'+sSyncedWith+'"]');
-
-						var dSyncedDate 		= selectElem[oInputParam.x_picker]('getDate');
-
-						if (null == dSyncedDate)
-						{
-							// oSyncedInputElem.val('');
-							oSyncedInputElem[oSyncedInputParam.x_picker]('setDate', null);
-						}
-						else
-						{
-							if (typeof oSyncedInputParam.default_time_add != 'undefined' && oSyncedInputParam.default_time_add)
-							{
-								dSyncedDate.setSeconds(dSyncedDate.getSeconds() + oSyncedInputParam.default_time_add);
-							}
-							oSyncedInputElem[oSyncedInputParam.x_picker]('setDate', dSyncedDate);
-						}
-
-					}
-
-					//me._apply();
-					selectElem[oInputParam.x_picker]('hide');
-				};
 
 				var odatetimepickerOptions = $.extend({}, odatetimepickerOptionsDefault, {
 					onSelect: function() {
 						fHandleSynchCallback(this, false);
 						$(this).focus();
 					}
-					// onClose: function(dateText, inst) {
-					// 	var selectElem 				= $(this);
-					// 	var sOnCLoseShow 			= selectElem.data('onclose_show');
-					//
-					// 	// if (typeof oInputParam.onclose_show != 'undefined')
-					// 	// {
-					// 	// 	oOpElem.find('input[name="'+oInputParam.onclose_show+'"]')
-					// 	// 		[oInputParam.x_picker]('show')
-					// 	// 	;
-					// 	// }
-					//
-					// 	// if (sOnCLoseShow != undefined && selectElem.is(':visible'))
-					// 	// {
-					// 	// 	var oOnCLoseShowInputElem = oOpElem.find('input[name="'+sOnCLoseShow+'"]');
-					// 	// 	oOnCLoseShowInputElem[oInputParam.x_picker]('show');
-					// 	// }
-					//
-					// },
-					// onSelect: function(sDateText, oXPicker) {
-					// 	var selectElem 				= $(this);
-					// 	var sSyncedWith 			= selectElem.data('synced_with');
-					//
-					//
-					// 	if (sSyncedWith != undefined)
-					// 	{
-					// 		var sCode 				= selectElem.data('code');
-					// 		var oInputParam 		= aInputsParam[oInputsParamIndexByCode[sCode]];
-					// 		var oSyncedInputParam 	= aInputsParam[oInputsParamIndexByCode[sSyncedWith]];
-					// 		var oSyncedInputElem 	= oOpElem.find('input[name="'+sSyncedWith+'"]');
-					//
-					// 		var dSyncedDate 		= selectElem[oInputParam.x_picker]('getDate');
-					//
-					// 		if (null == dSyncedDate)
-					// 		{
-					// 			oSyncedInputElem.val('');
-					// 		}
-					// 		else
-					// 		{
-					// 			if (typeof oSyncedInputParam.default_time_add != 'undefined' && oSyncedInputParam.default_time_add)
-					// 			{
-					// 				dSyncedDate.setSeconds(dSyncedDate.getSeconds() + oSyncedInputParam.default_time_add);
-					// 			}
-					// 			oSyncedInputElem[oSyncedInputParam.x_picker]('setDate', dSyncedDate);
-					// 		}
-					//
-					// 	}
-					//
-					// 	//me._apply();
-					// 	selectElem[oInputParam.x_picker]('hide');
-					// }
 				});
 
 
diff --git a/js/search/search_form_criteria_numeric.js b/js/search/search_form_criteria_numeric.js
index 1281f835f..20cd5340d 100644
--- a/js/search/search_form_criteria_numeric.js
+++ b/js/search/search_form_criteria_numeric.js
@@ -10,9 +10,14 @@ $(function()
 		options:
 		{
 			// Overload default operator
-			'operator': '=',
+			'operator': 'between',
 			// Available operators
 			'available_operators': {
+				'between': {
+					'label': Dict.S('UI:Search:Criteria:Operator:Numeric:Between'),
+					'code': 'between',
+					'rank': 0,
+				},
 				'=': {
 					'label': Dict.S('UI:Search:Criteria:Operator:Numeric:Equals'),//pre-existing, label changed
 					// 'dropdown_group':1,
@@ -47,11 +52,7 @@ $(function()
 					'rank': 500,
 					// 'dropdown_group':1,
 				},
-				'between': {
-					'label': Dict.S('UI:Search:Criteria:Operator:Numeric:Between'),
-					'code': 'between',
-					'rank': 600,
-				},
+
 				'empty': {
 					'rank': 700,//pre-existing, reordered
 				},
@@ -103,14 +104,14 @@ $(function()
 			aValues = me._getValues();//TODO : tenir compte du refactoring de la structure
 
 			// DOM elements
-			var oOpContentOuterElemFrom = $('<span class="sfc_op_content_from_outer"><label class="sfc_op_content_from_label" for=""> '+Dict.S('UI:Search:Criteria:Numeric:From')+'</label><input type="number" step="any" name="from" placeholder="'+Dict.S('UI:Search:Criteria:Numeric:PlaceholderFrom')+'"/></span>');
+			var oOpContentOuterElemFrom = $('<div class="sfc_op_content_from_outer"><label class="sfc_op_content_from_label" for=""> '+Dict.S('UI:Search:Criteria:Numeric:From')+' </label><input type="text"  name="from" placeholder="'+Dict.S('UI:Search:Criteria:Numeric:PlaceholderFrom')+'"/></div>');
 			var oOpContentElemFrom = oOpContentOuterElemFrom.find('input').uniqueId();
 			oOpContentOuterElemFrom.find('label').attr('for', oOpContentElemFrom.attr('id'));
 			if (typeof aValues[0] != 'undefined' && typeof aValues[0].value != 'undefined')
 			{
 				oOpContentElemFrom.val(aValues[0].value);
 			}
-			var oOpContentOuterElemUntil = $('<span class="sfc_op_content_until_outer"><label class="sfc_op_content_until_label" for=""> '+Dict.S('UI:Search:Criteria:Numeric:Until')+'</label><input type="number" step="any" name="until" placeholder="'+Dict.S('UI:Search:Criteria:Numeric:PlaceholderUntil')+'"/></span>');
+			var oOpContentOuterElemUntil = $('<div class="sfc_op_content_until_outer"><label class="sfc_op_content_until_label" for=""> '+Dict.S('UI:Search:Criteria:Numeric:Until')+' </label><input type="text"  name="until" placeholder="'+Dict.S('UI:Search:Criteria:Numeric:PlaceholderUntil')+'"/></div>');
 			var oOpContentElemUntil = oOpContentOuterElemUntil.find('input').uniqueId();
 			oOpContentOuterElemUntil.find('label').attr('for', oOpContentElemUntil.attr('id'));
 			if (typeof aValues[1] != 'undefined' && typeof aValues[1].value != 'undefined')
@@ -212,13 +213,13 @@ $(function()
 					case (typeof aValues[1].label == 'undefined' ):
 						var sDictEntrySuffix = ':From';
 						break;
-					case (aValues[0].label == '' && aValues[1].label == ''):
+					case ((typeof aValues[0].label == 'string' && aValues[0].label.trim() == '') && (typeof aValues[1].label == 'string' && aValues[1].label.trim() == '')):
 						var sDictEntrySuffix = ':All';
 						break;
-					case (aValues[0].label == '' ):
+					case (typeof aValues[0].label == 'string' && aValues[0].label.trim() == ''):
 						var sDictEntrySuffix = ':Until';
 						break;
-					case (aValues[1].label == ''):
+					case (typeof aValues[1].label == 'string' && aValues[1].label.trim() == ''):
 						var sDictEntrySuffix = ':From';
 						break;
 					default:
@@ -256,11 +257,11 @@ $(function()
 			if (me.options.operator == 'between')
 			{
 				aRawValues = aRawValues.slice(); //clone
-				if (typeof aRawValues[1] == 'undefined' || typeof aRawValues[1].label == 'undefined' || aRawValues[1].label == '')
+				if (typeof aRawValues[1] == 'undefined' || typeof aRawValues[1].label == 'undefined' || (typeof aRawValues[1].label  == 'string' && aRawValues[1].label.trim() == ''))
 				{
 					aRawValues.splice(1, 1);
 				}
-				if (typeof aRawValues[0] == 'undefined' || typeof aRawValues[0].label == 'undefined' || aRawValues[0].label == '')
+				if (typeof aRawValues[0] == 'undefined' || typeof aRawValues[0].label == 'undefined' || (typeof aRawValues[0].label == 'string' && aRawValues[0].label.trim() == ''))
 				{
 					aRawValues.splice(0, 1);
 				}

From d553fad58ddf846c2b220a2aa71e14bbec3ae1ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Tue, 27 Mar 2018 13:43:22 +0000
Subject: [PATCH 151/202] Advanced Search: Fix hidden filter on direct links

SVN:b1162[5547]
---
 application/ui.linksdirectwidget.class.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/ui.linksdirectwidget.class.inc.php b/application/ui.linksdirectwidget.class.inc.php
index d8e3deffa..20e0d2092 100644
--- a/application/ui.linksdirectwidget.class.inc.php
+++ b/application/ui.linksdirectwidget.class.inc.php
@@ -304,7 +304,7 @@ class UILinksWidgetDirect
 			$oHiddenFilter->AddCondition('id', $aAlreadyLinked, 'NOTIN');
 		}
 		$oHiddenCriteria = $oHiddenFilter->GetCriteria();
-		$sHiddenCriteria = $oHiddenCriteria->Render();
+		$sHiddenCriteria = $oHiddenCriteria->Render($oHiddenFilter->GetInternalParams());
 
 		$oLinkSetDef = MetaModel::GetAttributeDef($this->sClass, $this->sAttCode);
 		$valuesDef = $oLinkSetDef->GetValuesDef();

From 736838474ab1ea1a957133ba6fda318953d3ce5d Mon Sep 17 00:00:00 2001
From: Bruno Da Silva <bruno.dasilva@combodo.com>
Date: Tue, 27 Mar 2018 13:57:33 +0000
Subject: [PATCH 152/202] search widget : widget date/datetime => i18n

SVN:b1162[5548]
---
 js/search/search_form_criteria_date_abstract.js   |  2 +-
 js/search/search_form_handler.js                  | 11 +++++++++++
 .../application/search/searchform.class.inc.php   | 15 ++++++++++++++-
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/js/search/search_form_criteria_date_abstract.js b/js/search/search_form_criteria_date_abstract.js
index f54958ac1..9d2e1757e 100644
--- a/js/search/search_form_criteria_date_abstract.js
+++ b/js/search/search_form_criteria_date_abstract.js
@@ -178,7 +178,7 @@ $(function()
 
 
 
-				var odatetimepickerOptions = $.extend({}, odatetimepickerOptionsDefault, {
+				var odatetimepickerOptions = $.extend({}, odatetimepickerOptionsDefault, me.options.datepicker, {
 					onSelect: function() {
 						fHandleSynchCallback(this, false);
 						$(this).focus();
diff --git a/js/search/search_form_handler.js b/js/search/search_form_handler.js
index 391b252e3..c9a5fecf2 100644
--- a/js/search/search_form_handler.js
+++ b/js/search/search_form_handler.js
@@ -16,6 +16,12 @@ $(function()
 			'hide_initial_criterion': false, // TODO: What is that?
 			'endpoint': null,
 			'init_opened': false,
+			"datepicker":
+			{
+				"dayNamesMin": ["Su","Mo","Tu","We","Th","Fr","Sa"],
+				"monthNamesShort": ["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],
+				"firstDay": 0
+			},
 			'search': {
 				'base_oql': '',
 				'criterion': [
@@ -634,6 +640,11 @@ $(function()
 					};
 				}
 
+				if ('date' == sType || 'date_time' == sType)
+				{
+					oData.datepicker = this.options.datepicker;
+				}
+
 				// Create DOM element
 				var oCriteriaElem = $('<div></div>')
 					.addClass('sf_criteria')
diff --git a/sources/application/search/searchform.class.inc.php b/sources/application/search/searchform.class.inc.php
index ff91671ef..38562eade 100644
--- a/sources/application/search/searchform.class.inc.php
+++ b/sources/application/search/searchform.class.inc.php
@@ -24,6 +24,7 @@ namespace Combodo\iTop\Application\Search;
 
 
 use ApplicationContext;
+use AttributeDate;
 use AttributeDateTime;
 use AttributeDefinition;
 use CMDBObjectSet;
@@ -164,13 +165,25 @@ class SearchForm
 		{
 			$bOpen = $aExtraParams['open'];
 		}
+
+		$aDaysMin = array(Dict::S('DayOfWeek-Sunday-Min'), Dict::S('DayOfWeek-Monday-Min'), Dict::S('DayOfWeek-Tuesday-Min'), Dict::S('DayOfWeek-Wednesday-Min'),
+			Dict::S('DayOfWeek-Thursday-Min'), Dict::S('DayOfWeek-Friday-Min'), Dict::S('DayOfWeek-Saturday-Min'));
+		$aMonthsShort = array(Dict::S('Month-01-Short'), Dict::S('Month-02-Short'), Dict::S('Month-03-Short'), Dict::S('Month-04-Short'), Dict::S('Month-05-Short'), Dict::S('Month-06-Short'),
+			Dict::S('Month-07-Short'), Dict::S('Month-08-Short'), Dict::S('Month-09-Short'), Dict::S('Month-10-Short'), Dict::S('Month-11-Short'), Dict::S('Month-12-Short'));
+
 		$aSearchParams = array(
 			'criterion_outer_selector' => "#fs_{$sSearchFormId}_criterion_outer",
             'result_list_outer_selector' => "#{$aExtraParams['table_id']}",
 			'data_config_list_selector' => "#{$sDataConfigListSelector}",
 			'endpoint' => utils::GetAbsoluteUrlAppRoot().'pages/ajax.searchform.php',
 			'init_opened' => $bOpen,
-			'date_format' => AttributeDateTime::GetFormat()->ToMomentJS(),
+			'datepicker' => array(
+				'dayNamesMin' => $aDaysMin,
+				'monthNamesShort' => $aMonthsShort,
+				'firstDay' => (int) Dict::S('Calendar-FirstDayOfWeek'),
+//				'date_format' => AttributeDate::GetFormat()->ToDatePicker(),
+//				'date_time_format' => AttributeDateTime::GetFormat()->ToMomentJS(),
+			),
 			'list_params' => $aListParams,
 			'search' => array(
 				'has_hidden_criteria' => (array_key_exists('hidden_criteria', $aListParams) && !empty($aListParams['hidden_criteria'])),

From 7bccfef3bdd5b1ed93693ff9ba28ec381c010d45 Mon Sep 17 00:00:00 2001
From: Bruno Da Silva <bruno.dasilva@combodo.com>
Date: Tue, 27 Mar 2018 16:02:58 +0000
Subject: [PATCH 153/202] search widget : widget search history draft

SVN:b1162[5549]
---
 js/search/search_form_handler_history.js | 130 +++++++++++++++++++++++
 1 file changed, 130 insertions(+)
 create mode 100644 js/search/search_form_handler_history.js

diff --git a/js/search/search_form_handler_history.js b/js/search/search_form_handler_history.js
new file mode 100644
index 000000000..64530b719
--- /dev/null
+++ b/js/search/search_form_handler_history.js
@@ -0,0 +1,130 @@
+/**
+ *
+ * iTop Search form history handler
+ *
+ * the widget exposes
+ *
+ * $(cssSelector).search_form_handler_history({"itop_root_class":"FooBarClass"}) : constructor
+ * $(cssSelector).search_form_handler_history("getHistory") : history array getter
+ * $(cssSelector).search_form_handler_history("historyUnshift", "field.ref") : prepend the field ref to the beginning of the history array
+ *
+ *
+ * please take a look at the options for custom constructor values
+ *
+ *
+ * The persistence layer rely on these two core iTop's JS functions :
+ *  - GetUserPreference(sPreferenceCode, sDefaultValue)
+ *  - SetUserPreference(sPreferenceCode, sPrefValue, bPersistent)
+ *
+ */
+;
+$(function()
+{
+	// the widget definition, where 'itop' is the namespace,
+	// 'search_form_handler_history' the widget name
+	$.widget( 'itop.search_form_handler_history',
+	{
+		// default options
+		options:
+		{
+			"itop_root_class": null,
+			"preference_code": undefined, 			// if undefined, it is computed on _create
+			"history_max_length": 10,				// if the history is longer, the older entries are removed
+			"history_backend_store_timeout": 5000,	// wait for this time before storing the new history in the backend
+		},
+
+		aHistory : [],
+		
+		iStoreHistoryTimeoutHandler : undefined,
+
+		getHistory: function()
+		{
+			return me.aHistory;
+		},
+
+		historyUnshift: function(sFieldRef)
+		{
+			var me = this;
+
+			var iIndexInHistory = me.aHistory.indexOf(sFieldRef);
+
+			//if present, delete
+			if (iIndexInHistory > -1)
+			{
+				me.aHistory.splice(iIndexInHistory, 1);
+			}
+
+			//add to the begining
+			me.aHistory.unshift(sFieldRef);
+
+			//restrain the length to me.options.history_max_length
+			var iDeleteCount = me.aHistory.length - me.options.history_max_length;
+			if (iDeleteCount > 0)
+			{
+				me.aHistory.splice(0, iDeleteCount);
+			}
+
+			me._storeHistory();
+
+			//setter should never return a value!
+			return;
+		},
+
+		/**
+		 * the constructor, called by the widget factory
+		 * @private
+		 */
+		_create: function()
+		{
+			var me = this;
+
+			if (me.options.preference_code == undefined)
+			{
+				me.options.preference_code = me.options.itop_root_class + '|search_history';
+			}
+
+
+			me.aHistory = GetUserPreference(me._getPreferenceCode(), []);
+		},
+
+		/**
+		 * @returns String
+		 * @private
+		 */
+		_getPreferenceCode: function()
+		{
+			return me.options.preference_code;
+		},
+
+
+		/**
+		 * should only be called by historyUnshift in order to store the updated history
+		 * @private
+		 */
+		_storeHistory: function()
+		{
+			var me = this;
+
+			if (undefined != me.iStoreHistoryTimeoutHandler)
+			{
+				clearTimeout(me.iStoreHistoryTimeoutHandler);
+			}
+
+			me.iStoreHistoryTimeoutHandler = setTimeout(me._storeHistoryTimeoutFunction, me.options.history_backend_store_timeout);
+		},
+
+		/**
+		 * should only be called by _storeHistory using a timeout
+		 * @private
+		 */
+		_storeHistoryTimeoutFunction: function()
+		{
+			var me = this;
+
+			SetUserPreference(me._getPreferenceCode(), me.getHistory(), true);
+
+			me.iStoreHistoryTimeoutHandler = undefined;
+		}
+
+	});
+});

From 7868a3813712245403f9e6daf246a51ffd73e070 Mon Sep 17 00:00:00 2001
From: Bruno Da Silva <bruno.dasilva@combodo.com>
Date: Tue, 27 Mar 2018 16:09:21 +0000
Subject: [PATCH 154/202] search widget : widget search history draft

SVN:b1162[5550]
---
 js/search/search_form_handler_history.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/search/search_form_handler_history.js b/js/search/search_form_handler_history.js
index 64530b719..6a564b1d6 100644
--- a/js/search/search_form_handler_history.js
+++ b/js/search/search_form_handler_history.js
@@ -46,9 +46,8 @@ $(function()
 		{
 			var me = this;
 
-			var iIndexInHistory = me.aHistory.indexOf(sFieldRef);
-
 			//if present, delete
+			var iIndexInHistory = me.aHistory.indexOf(sFieldRef);
 			if (iIndexInHistory > -1)
 			{
 				me.aHistory.splice(iIndexInHistory, 1);
@@ -64,6 +63,7 @@ $(function()
 				me.aHistory.splice(0, iDeleteCount);
 			}
 
+			//store it in the backend (with a delay in the hope to wait long enough to make bulk modifications
 			me._storeHistory();
 
 			//setter should never return a value!

From 5772042dd3f532e4b666ac2c053430bd97327e60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Wed, 28 Mar 2018 07:46:47 +0000
Subject: [PATCH 155/202] Advanced Search: generic title for raw filters on
 joined classes

SVN:b1162[5551]
---
 core/oql/expression.class.inc.php             | 15 +++++++++++++
 dictionaries/en.dictionary.itop.ui.php        |  3 +++
 dictionaries/fr.dictionary.itop.ui.php        |  3 +++
 .../criteriontosearchform.class.inc.php       | 22 ++++++++++++++++++-
 .../search/searchform.class.inc.php           |  6 ++---
 .../search/CriterionConversionTest.php        |  2 +-
 6 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/core/oql/expression.class.inc.php b/core/oql/expression.class.inc.php
index ef764955a..b4b0b827b 100644
--- a/core/oql/expression.class.inc.php
+++ b/core/oql/expression.class.inc.php
@@ -871,6 +871,21 @@ class FieldExpression extends UnaryExpression
 			{
 				return $aAttDefs[$this->m_sName];
 			}
+			else
+			{
+				if ($this->m_sName == 'id')
+				{
+					$aParams = array(
+						'default_value' => 0,
+						'is_null_allowed' => false,
+						'allowed_values' => null,
+						'depends_on' => null,
+						'sql' => 'id',
+					);
+
+					return new AttributeInteger($this->m_sName, $aParams);
+				}
+			}
 		}
 
 		return null;
diff --git a/dictionaries/en.dictionary.itop.ui.php b/dictionaries/en.dictionary.itop.ui.php
index 97450768c..f3aba9a90 100644
--- a/dictionaries/en.dictionary.itop.ui.php
+++ b/dictionaries/en.dictionary.itop.ui.php
@@ -1468,6 +1468,9 @@ When associated with a trigger, each action is given an "order" number, specifyi
 	'UI:Search:Criteria:DateTime:PlaceholderFromTime' => 'Any date',
 	'UI:Search:Criteria:DateTime:PlaceholderUntil' => 'Any date',
 	'UI:Search:Criteria:DateTime:PlaceholderUntilTime' => 'Any date',
+
+	'UI:Search:Criteria:Raw:Filtered' => 'Filtered',
+	'UI:Search:Criteria:Raw:FilteredOn' => 'Filtered on %1$s',
 ));
 
 //
diff --git a/dictionaries/fr.dictionary.itop.ui.php b/dictionaries/fr.dictionary.itop.ui.php
index 4fe055726..e7eef61d3 100644
--- a/dictionaries/fr.dictionary.itop.ui.php
+++ b/dictionaries/fr.dictionary.itop.ui.php
@@ -1234,6 +1234,9 @@ Lors de l\'association à un déclencheur, on attribue à chaque action un numé
 	// -
 	'UI:Search:Value:Filter:Placeholder' => 'Filter...',
 	'UI:Search:Value:Toggler:CheckAllNone' => 'Check all / none',
+
+	'UI:Search:Criteria:Raw:Filtered' => 'Filtré',
+	'UI:Search:Criteria:Raw:FilteredOn' => 'Filtré sur %1$s',
 ));
 
 
diff --git a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
index 650bbf768..2f83619e3 100644
--- a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
+++ b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
@@ -32,6 +32,8 @@ use Combodo\iTop\Application\Search\CriterionConversionAbstract;
 use DateInterval;
 use DateTime;
 use Dict;
+use Exception;
+use MetaModel;
 
 class CriterionToSearchForm extends CriterionConversionAbstract
 {
@@ -40,9 +42,11 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 	 * @param array $aAndCriterionRaw
 	 * @param array $aFieldsByCategory
 	 *
+	 * @param array $aClasses all the classes of the filter
+	 *
 	 * @return array
 	 */
-	public static function Convert($aAndCriterionRaw, $aFieldsByCategory)
+	public static function Convert($aAndCriterionRaw, $aFieldsByCategory, $aClasses)
 	{
 		$aAllFields = array();
 		foreach($aFieldsByCategory as $aFields)
@@ -71,6 +75,22 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 			if (!array_key_exists('ref', $aCriteria) || !array_key_exists($aCriteria['ref'], $aAllFields))
 			{
 				$aCriteria['widget'] = AttributeDefinition::SEARCH_WIDGET_TYPE_RAW;
+				$aCriteria['label'] = Dict::S('UI:Search:Criteria:Raw:Filtered');
+				if (array_key_exists('ref', $aCriteria))
+				{
+					$aRef = explode('.', $aCriteria['ref']);
+					if (isset($aClasses[$aRef[0]]))
+					{
+						$sClass = $aClasses[$aRef[0]];
+						try
+						{
+							$aCriteria['label'] = Dict::Format('UI:Search:Criteria:Raw:FilteredOn', MetaModel::GetName($sClass));
+						}
+						catch (Exception $e)
+						{
+						}
+					}
+				}
 			}
 			if (array_key_exists('widget', $aCriteria))
 			{
diff --git a/sources/application/search/searchform.class.inc.php b/sources/application/search/searchform.class.inc.php
index 38562eade..1555fc858 100644
--- a/sources/application/search/searchform.class.inc.php
+++ b/sources/application/search/searchform.class.inc.php
@@ -206,8 +206,6 @@ class SearchForm
 	public function GetFields($oSet)
 	{
 		$oSearch = $oSet->GetFilter();
-		// TODO: Later consider all the fields including the joined classes
-		//$aAllClasses = $oSearch->GetJoinedClasses();
 		$aAllClasses = $oSearch->GetSelectedClasses();
 		$aAuthorizedClasses = array();
 		foreach($aAllClasses as $sAlias => $sClassName)
@@ -334,7 +332,7 @@ class SearchForm
 	}
 
 	/**
-	 * @param \DBSearch $oSearch
+	 * @param \DBObjectSearch $oSearch
 	 * @param array $aFields
 	 *
 	 * @param array $aArgs
@@ -367,7 +365,7 @@ class SearchForm
 				}
 				$aAndCriterion[] = $oAndSubExpr->GetCriterion($oSearch);
 			}
-			$aAndCriterion = CriterionToSearchForm::Convert($aAndCriterion, $aFields);
+			$aAndCriterion = CriterionToSearchForm::Convert($aAndCriterion, $aFields, $oSearch->GetJoinedClasses());
 			$aOrCriterion[] = array('and' => $aAndCriterion);
 		}
 
diff --git a/test/application/search/CriterionConversionTest.php b/test/application/search/CriterionConversionTest.php
index 11b3eb614..0112ee318 100644
--- a/test/application/search/CriterionConversionTest.php
+++ b/test/application/search/CriterionConversionTest.php
@@ -165,7 +165,7 @@ class CriterionConversionTest extends ItopDataTestCase
 		$oSearchForm = new SearchForm();
 		$oSearch = \DBSearch::FromOQL("SELECT Contact");
 		$aFields = $oSearchForm->GetFields(new \DBObjectSet($oSearch));
-		$aRes = CriterionToSearchForm::Convert($aCriterion, $aFields);
+		$aRes = CriterionToSearchForm::Convert($aCriterion, $aFields, $oSearch->GetJoinedClasses());
 		$this->debug($aRes);
 		$this->assertEquals($sExpectedOperator, $aRes[0]['operator']);
 	}

From 678821d54d972e7d294b95a4558d21fd8b103c8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Wed, 28 Mar 2018 07:47:20 +0000
Subject: [PATCH 156/202] Advanced Search: generic title for raw filters on
 joined classes

SVN:b1162[5552]
---
 sources/application/search/searchform.class.inc.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/sources/application/search/searchform.class.inc.php b/sources/application/search/searchform.class.inc.php
index 1555fc858..668957dfa 100644
--- a/sources/application/search/searchform.class.inc.php
+++ b/sources/application/search/searchform.class.inc.php
@@ -24,8 +24,6 @@ namespace Combodo\iTop\Application\Search;
 
 
 use ApplicationContext;
-use AttributeDate;
-use AttributeDateTime;
 use AttributeDefinition;
 use CMDBObjectSet;
 use Combodo\iTop\Application\Search\CriterionConversion\CriterionToSearchForm;

From 573b5fc879f7f43d4e72fae460892d1da16ac37c Mon Sep 17 00:00:00 2001
From: Denis Flaven <denis.flaven@combodo.com>
Date: Wed, 28 Mar 2018 11:29:18 +0000
Subject: [PATCH 157/202] Fallback to the default language, for missing entries
 in the current language, in the dictionary passed client-side.

SVN:b1162[5553]
---
 core/dict.class.inc.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/core/dict.class.inc.php b/core/dict.class.inc.php
index 0e2cdd466..b792660e8 100644
--- a/core/dict.class.inc.php
+++ b/core/dict.class.inc.php
@@ -359,14 +359,27 @@ class Dict
 	
 	/**
 	 * Export all the dictionary entries - of the given language - whose code matches the given prefix
+	 * missing entries in the current language will be replaced by entries in the default language
 	 * @param string $sStartingWith
 	 * @return string[]
 	 */
 	public static function ExportEntries($sStartingWith)
 	{
 		self::InitLangIfNeeded(self::GetUserLanguage());
+		self::InitLangIfNeeded(self::$m_sDefaultLanguage);
 		$aEntries = array();
 		$iLength = strlen($sStartingWith);
+		
+		// First prefill the array with entries from the default language
+		foreach(self::$m_aData[self::$m_sDefaultLanguage] as $sCode => $sEntry)
+		{
+			if (substr($sCode, 0, $iLength) == $sStartingWith)
+			{
+				$aEntries[$sCode] = $sEntry;
+			}
+		}
+		
+		// Now put (overwrite) the entries for the user language
 		foreach(self::$m_aData[self::GetUserLanguage()] as $sCode => $sEntry)
 		{
 			if (substr($sCode, 0, $iLength) == $sStartingWith)

From e33bdab4e90392a0bf81eb4b61a6c3f4fe97ce60 Mon Sep 17 00:00:00 2001
From: Bruno Da Silva <bruno.dasilva@combodo.com>
Date: Wed, 28 Mar 2018 11:57:10 +0000
Subject: [PATCH 158/202] search widget : widget search history handling

new parameter "class_name"

SVN:b1162[5554]
---
 sources/application/search/searchform.class.inc.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sources/application/search/searchform.class.inc.php b/sources/application/search/searchform.class.inc.php
index 668957dfa..631f82ea7 100644
--- a/sources/application/search/searchform.class.inc.php
+++ b/sources/application/search/searchform.class.inc.php
@@ -187,6 +187,7 @@ class SearchForm
 				'has_hidden_criteria' => (array_key_exists('hidden_criteria', $aListParams) && !empty($aListParams['hidden_criteria'])),
 				'fields' => $aFields,
 				'criterion' => $aCriterion,
+				'class_name' => $sClassName,
 				'base_oql' => $sBaseOQL,
 			),
 		);

From 9b0ccb8943fa52d30306affb492c165a0d886267 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Wed, 28 Mar 2018 12:53:46 +0000
Subject: [PATCH 159/202] Advanced Search: Unit tests and some fixes

SVN:b1162[5555]
---
 core/oql/expression.class.inc.php             |  12 +-
 .../search/searchform.class.inc.php           |  21 +-
 .../search/CriterionConversionTest.php        | 255 +++++++++++++++---
 3 files changed, 241 insertions(+), 47 deletions(-)

diff --git a/core/oql/expression.class.inc.php b/core/oql/expression.class.inc.php
index b4b0b827b..c302998a8 100644
--- a/core/oql/expression.class.inc.php
+++ b/core/oql/expression.class.inc.php
@@ -510,11 +510,6 @@ class BinaryExpression extends Expression
 		$bReverseOperator = false;
 		$oLeftExpr = $this->GetLeftExpr();
 		$oRightExpr = $this->GetRightExpr();
-		if ($oLeftExpr instanceof FieldExpression && $oRightExpr instanceof FieldExpression)
-		{
-			// Default criterion (Field OPE Field) is not supported
-			return parent::GetCriterion($oSearch, $aArgs, $bRetrofitParams, $oAttDef);
-		}
 
 		$oAttDef = $oLeftExpr->GetAttDef($oSearch->GetJoinedClasses());
 
@@ -532,7 +527,6 @@ class BinaryExpression extends Expression
 		$aCriteriaLeft = $oLeftExpr->GetCriterion($oSearch, $aArgs, $bRetrofitParams, $oAttDef);
 		$aCriteriaRight = $oRightExpr->GetCriterion($oSearch, $aArgs, $bRetrofitParams, $oAttDef);
 
-
 		if ($bReverseOperator)
 		{
 			$aCriteria = array_merge($aCriteriaRight, $aCriteriaLeft);
@@ -565,6 +559,12 @@ class BinaryExpression extends Expression
 		$aCriteria['oql'] = $this->Render($aArgs, $bRetrofitParams);
 		$aCriteria['label'] = $this->Display($oSearch, $aArgs, $oAttDef);
 
+		if (isset($aCriteriaLeft['ref']) && isset($aCriteriaRight['ref']) && ($aCriteriaLeft['ref'] != $aCriteriaRight['ref']))
+		{
+			// Only one Field is supported in the expressions
+			$aCriteria['widget'] = AttributeDefinition::SEARCH_WIDGET_TYPE_RAW;
+		}
+
 		return $aCriteria;
 	}
 }
diff --git a/sources/application/search/searchform.class.inc.php b/sources/application/search/searchform.class.inc.php
index 631f82ea7..12ec3b973 100644
--- a/sources/application/search/searchform.class.inc.php
+++ b/sources/application/search/searchform.class.inc.php
@@ -294,6 +294,11 @@ class SearchForm
 	 */
 	public static function GetFieldAllowedValues($oAttrDef)
 	{
+		// better than MetaModel::GetConfig()->Get('max_combo_length')
+		// changing this value can introduce weird behaviour
+		static $iMaxComboLength = 50;
+		$aValues = array();
+
 		if ($oAttrDef->IsExternalKey(EXTKEY_ABSOLUTE))
 		{
 			$sTargetClass = $oAttrDef->GetTargetClass();
@@ -308,26 +313,34 @@ class SearchForm
 			}
 			$oSearch->SetModifierProperty('UserRightsGetSelectFilter', 'bSearchMode', true);
 			$oSet = new DBObjectSet($oSearch);
-			if ($oSet->Count() > MetaModel::GetConfig()->Get('max_combo_length'))
+			if ($oSet->Count() > $iMaxComboLength)
 			{
 				return array('autocomplete' => true);
 			}
+			if ($oSet->Count() > MetaModel::GetConfig()->Get('max_combo_length'))
+			{
+				$aValues['autocomplete'] = true;
+			}
 		}
 		else
 		{
 			if (method_exists($oAttrDef, 'GetAllowedValuesAsObjectSet'))
 			{
 				$oSet = $oAttrDef->GetAllowedValuesAsObjectSet();
-				if ($oSet->Count() > MetaModel::GetConfig()->Get('max_combo_length'))
+				if ($oSet->Count() > $iMaxComboLength)
 				{
 					return array('autocomplete' => true);
 				}
+				if ($oSet->Count() > MetaModel::GetConfig()->Get('max_combo_length'))
+				{
+					$aValues['autocomplete'] = true;
+				}
 			}
 		}
 
-		$aAllowedValues = $oAttrDef->GetAllowedValues();
+		$aValues['values'] = $oAttrDef->GetAllowedValues();
 
-		return array('values' => $aAllowedValues);
+		return $aValues;
 	}
 
 	/**
diff --git a/test/application/search/CriterionConversionTest.php b/test/application/search/CriterionConversionTest.php
index 0112ee318..dcdf33e7f 100644
--- a/test/application/search/CriterionConversionTest.php
+++ b/test/application/search/CriterionConversionTest.php
@@ -300,14 +300,19 @@ class CriterionConversionTest extends ItopDataTestCase
 	 *
 	 * @param $sOQL
 	 *
+	 * @param $sExpectedOQL
+	 *
+	 * @param $aExpectedCriterion
+	 *
 	 * @throws \OQLException
 	 */
-	function testOqlToForSearchToOql($sOQL)
+	function testOqlToForSearchToOql($sOQL, $sExpectedOQL, $aExpectedCriterion)
 	{
 		$this->debug($sOQL);
 		$oSearchForm = new SearchForm();
 		$oSearch = \DBSearch::FromOQL($sOQL);
 		$aFields = $oSearchForm->GetFields(new \DBObjectSet($oSearch));
+		/** @var \DBObjectSearch $oSearch */
 		$aCriterion = $oSearchForm->GetCriterion($oSearch, $aFields);
 
 		$aAndCriterion = $aCriterion['or'][0]['and'];
@@ -337,53 +342,229 @@ class CriterionConversionTest extends ItopDataTestCase
 		}
 		$this->debug($aNewCriterion);
 
+		$this->assertFalse($this->array_diff_assoc_recursive($aExpectedCriterion, $aNewCriterion));
+
 		$aCriterion['or'][0]['and'] = $aNewCriterion;
 
 		$oSearch->ResetCondition();
 		$oFilter = CriterionParser::Parse($oSearch->ToOQL(), $aCriterion);
 
-		$this->debug($oFilter->ToOQL());
+		$sResultOQL = $oFilter->ToOQL();
+		$this->debug($sResultOQL);
 
-		$this->assertTrue(true);
+		$this->assertEquals($sExpectedOQL, $sResultOQL);
 	}
 
 	function OqlProvider()
 	{
 		return array(
-			'no criteria' => array('OQL' => 'SELECT WebApplication'),
-			'string starts' => array('OQL' => "SELECT Contact WHERE name LIKE 'toto%'"),
-			'string ends' => array('OQL' => "SELECT Contact WHERE name LIKE '%toto'"),
-			'string contains 1' => array('OQL' => "SELECT Contact WHERE name LIKE '%toto%'"),
-			'string contains 2' => array('OQL' => "SELECT Person AS B WHERE B.name LIKE '%A%'"),
-			'string regexp' => array('OQL' => "SELECT Server WHERE name REGEXP '^dbserver[0-9]+\\\\\\\\..+\\\\\\\\.[a-z]{2,3}$'"),
-			'enum + key =' => array('OQL' => "SELECT Contact WHERE status = 'active' AND org_id = 3"),
-			'enum =' => array('OQL' => "SELECT Contact WHERE status = 'active'"),
-			'enum IN' => array('OQL' => "SELECT Contact WHERE status IN ('active', 'inactive')"),
-			'enum NOT IN 1' => array('OQL' => "SELECT Contact WHERE status NOT IN ('active')"),
-			'enum NOT IN 2' => array('OQL' => "SELECT Person AS p JOIN UserRequest AS u ON u.agent_id = p.id WHERE u.status != 'closed'"),
-			'enum undefined 1' => array('OQL' => "SELECT FunctionalCI WHERE ((business_criticity = 'high') OR ISNULL(business_criticity)) AND 1"),
-			'enum undefined 2' => array('OQL' => "SELECT FunctionalCI WHERE ((business_criticity IN ('high', 'medium')) OR ISNULL(business_criticity)) AND 1"),
-			'enum undefined 3' => array('OQL' => "SELECT FunctionalCI WHERE ISNULL(business_criticity)"),
-			'key NOT IN' => array('OQL' => "SELECT Contact WHERE org_id NOT IN ('1')"),
-			'key IN' => array('OQL' => "SELECT Contact WHERE org_id IN ('1')"),
-			'key empty' => array('OQL' => "SELECT Person WHERE location_id = '0'"),
-			'Date relative 1' => array('OQL' => "SELECT UserRequest WHERE DATE_SUB(NOW(), INTERVAL 14 DAY) < start_date"),
-			'Date relative 2' => array('OQL' => "SELECT Contract AS c WHERE c.end_date > NOW() AND c.end_date < DATE_ADD(NOW(), INTERVAL 30 DAY)"),
-			'Date relative 3' => array('OQL' => "SELECT UserRequest AS u WHERE u.close_date > DATE_ADD(u.start_date, INTERVAL 8 HOUR)"),
-			'Date relative 4' => array('OQL' => "SELECT UserRequest AS u WHERE u.start_date < DATE_SUB(NOW(), INTERVAL 60 MINUTE) AND u.status = 'new'"),
-			'Date between 1' => array('OQL' => "SELECT UserRequest WHERE start_date > '2017-01-01 00:00:00' AND '2018-01-01 00:00:00' >= start_date"),
-			'Date between 2' => array('OQL' => "SELECT UserRequest WHERE start_date > '2017-01-01 00:00:00' AND status = 'active' AND org_id = 3 AND '2018-01-01 00:00:00' >= start_date"),
-			'Date between 3' => array('OQL' => "SELECT UserRequest WHERE start_date >= '2017-01-01 00:00:00' AND '2017-01-01 00:00:00' >= start_date"),
-			'Date between 4' => array('OQL' => "SELECT UserRequest WHERE start_date >= '2017-01-01 00:00:00' AND '2017-01-01 01:00:00' > start_date"),
-			'Date between 5' => array('OQL' => "SELECT UserRequest WHERE start_date >= '2017-01-01 00:00:00' AND '2017-01-02 00:00:00' > start_date"),
-			'Date between 6' => array('OQL' => "SELECT UserRequest WHERE start_date >= '2017-01-01' AND '2017-01-02' >= start_date"),
-			'Date between 7' => array('OQL' => "SELECT CustomerContract WHERE ((start_date >= '2018-03-01') AND (start_date < '2018-04-01'))"),
-			'Date =' => array('OQL' => "SELECT CustomerContract WHERE (start_date = '2018-03-01')"),
-			'Date =2' => array('OQL' => "SELECT UserRequest WHERE (DATE_FORMAT(start_date, '%Y-%m-%d') = '2018-03-21')"),
-			'Num between 1' => array('OQL' => "SELECT Server WHERE nb_u >= 0 AND 1 >= nb_u"),
-			'Num ISNULL' => array('OQL' => "SELECT Server WHERE ISNULL(nb_u)"),
-			'Hierarchical below' => array('OQL' => "SELECT Person AS P JOIN Organization AS Node ON P.org_id = Node.id JOIN Organization AS Root ON Node.parent_id BELOW Root.id WHERE Root.id=1"),
-			'IP range' => array('OQL' => "SELECT DatacenterDevice AS dev WHERE INET_ATON(dev.managementip) > INET_ATON('10.22.32.224') AND INET_ATON(dev.managementip) < INET_ATON('10.22.32.255')"),
+			'no criteria' => array(
+				'OQL' => 'SELECT WebApplication',
+				'ExpectedOQL' => "SELECT `WebApplication` FROM WebApplication AS `WebApplication` WHERE 1",
+				'ExpectedCriterion' => array(),
+			),
+			'string starts' => array(
+				'OQL' => "SELECT Contact WHERE name LIKE 'toto%'",
+				'ExpectedOQL' => "SELECT `Contact` FROM Contact AS `Contact` WHERE (`Contact`.`name` LIKE 'toto%')",
+				'ExpectedCriterion' => array(array('widget' => 'string', 'operator' => 'starts_with', 'values' => array(array('value' => 'toto')))),
+			),
+			'string ends' => array(
+				'OQL' => "SELECT Contact WHERE name LIKE '%toto'",
+				'ExpectedOQL' => "SELECT `Contact` FROM Contact AS `Contact` WHERE (`Contact`.`name` LIKE '%toto')",
+				'ExpectedCriterion' => array(array('widget' => 'string', 'operator' => 'ends_with', 'values' => array(array('value' => 'toto')))),
+			),
+			'string contains 1' => array(
+				'OQL' => "SELECT Contact WHERE name LIKE '%toto%'",
+				'ExpectedOQL' => "SELECT `Contact` FROM Contact AS `Contact` WHERE (`Contact`.`name` LIKE '%toto%')",
+				'ExpectedCriterion' => array(array('widget' => 'string', 'operator' => 'contains', 'values' => array(array('value' => 'toto')))),
+			),
+			'string contains 2' => array(
+				'OQL' => "SELECT Person AS B WHERE B.name LIKE '%A%'",
+				'ExpectedOQL' => "SELECT `B` FROM Person AS `B` WHERE (`B`.`name` LIKE '%A%')",
+				'ExpectedCriterion' => array(array('widget' => 'string', 'operator' => 'contains', 'values' => array(array('value' => 'A')))),
+			),
+			'string regexp' => array(
+				'OQL' => "SELECT Server WHERE name REGEXP '^dbserver[0-9]+\\\\\\\\..+\\\\\\\\.[a-z]{2,3}$'",
+				'ExpectedOQL' => "SELECT `Server` FROM Server AS `Server` WHERE (`Server`.`name` REGEXP '^dbserver[0-9]+\\\\..+\\\\.[a-z]{2,3}$')",
+				'ExpectedCriterion' => array(array('widget' => 'string', 'operator' => 'REGEXP')),
+			),
+			'enum + key =' => array(
+				'OQL' => "SELECT Contact WHERE status = 'active' AND org_id = 3",
+				'ExpectedOQL' => "SELECT `Contact` FROM Contact AS `Contact` WHERE ((`Contact`.`org_id` = '3') AND (`Contact`.`status` = 'active'))",
+				'ExpectedCriterion' => array(array('widget' => 'hierarchical_key', 'operator' => 'IN'), array('widget' => 'enum', 'operator' => 'IN')),
+			),
+			'enum =' => array(
+				'OQL' => "SELECT Contact WHERE status = 'active'",
+				'ExpectedOQL' => "SELECT `Contact` FROM Contact AS `Contact` WHERE (`Contact`.`status` = 'active')",
+				'ExpectedCriterion' => array(array('widget' => 'enum', 'operator' => 'IN', 'values' => array(array('value' => 'active')))),
+			),
+			'enum IN' => array(
+				'OQL' => "SELECT Contact WHERE status IN ('active', 'inactive')",
+				'ExpectedOQL' => "SELECT `Contact` FROM Contact AS `Contact` WHERE 1",
+				'ExpectedCriterion' => array(array('widget' => 'enum', 'operator' => 'IN', 'values' => array(array('value' => 'active'), array('value' => 'inactive')))),
+			),
+			'enum NOT IN 1' => array(
+				'OQL' => "SELECT Contact WHERE status NOT IN ('active')",
+				'ExpectedOQL' => "SELECT `Contact` FROM Contact AS `Contact` WHERE (`Contact`.`status` = 'inactive')",
+				'ExpectedCriterion' => array(array('widget' => 'enum', 'operator' => 'IN', 'values' => array(array('value' => 'inactive')))),
+			),
+			'enum NOT IN 2' => array(
+				'OQL' => "SELECT Person AS p JOIN UserRequest AS u ON u.agent_id = p.id WHERE u.status != 'closed'",
+				'ExpectedOQL' => "SELECT `p` FROM Person AS `p` JOIN UserRequest AS `u` ON `u`.agent_id = `p`.id WHERE (`u`.`status` != 'closed')",
+				'ExpectedCriterion' => array(array('widget' => 'raw')),
+			),
+			'enum undefined 1' => array(
+				'OQL' => "SELECT FunctionalCI WHERE ((business_criticity = 'high') OR ISNULL(business_criticity)) AND 1",
+				'ExpectedOQL' => "SELECT `FunctionalCI` FROM FunctionalCI AS `FunctionalCI` WHERE (((`FunctionalCI`.`business_criticity` = 'high') OR ISNULL(`FunctionalCI`.`business_criticity`)) AND 1)",
+				'ExpectedCriterion' => array(array('widget' => 'enum', 'has_undefined' => true, 'operator' => 'IN', 'values' => array(array('value' => 'high'), array('value' => 'null')))),
+			),
+			'enum undefined 2' => array(
+				'OQL' => "SELECT FunctionalCI WHERE ((business_criticity IN ('high', 'medium')) OR ISNULL(business_criticity)) AND 1",
+				'ExpectedOQL' => "SELECT `FunctionalCI` FROM FunctionalCI AS `FunctionalCI` WHERE (((`FunctionalCI`.`business_criticity` IN ('high', 'medium')) OR ISNULL(`FunctionalCI`.`business_criticity`)) AND 1)",
+				'ExpectedCriterion' => array(array('widget' => 'enum', 'has_undefined' => true, 'operator' => 'IN', 'values' => array(array('value' => 'high'), array('value' => 'medium'), array('value' => 'null')))),
+			),
+			'enum undefined 3' => array(
+				'OQL' => "SELECT FunctionalCI WHERE ISNULL(business_criticity)",
+				'ExpectedOQL' => "SELECT `FunctionalCI` FROM FunctionalCI AS `FunctionalCI` WHERE ISNULL(`FunctionalCI`.`business_criticity`)",
+				'ExpectedCriterion' => array(array('widget' => 'enum', 'has_undefined' => true, 'operator' => 'IN', 'values' => array(array('value' => 'null')))),
+			),
+			'key NOT IN' => array(
+				'OQL' => "SELECT Contact WHERE org_id NOT IN ('1')",
+				'ExpectedOQL' => "SELECT `Contact` FROM Contact AS `Contact` WHERE (`Contact`.`org_id` NOT IN ('1'))",
+				'ExpectedCriterion' => array(array('widget' => 'hierarchical_key', 'operator' => 'IN')),
+			),
+			'key IN' => array(
+				'OQL' => "SELECT Contact WHERE org_id IN ('1')",
+				'ExpectedOQL' => "SELECT `Contact` FROM Contact AS `Contact` WHERE (`Contact`.`org_id` = '1')",
+				'ExpectedCriterion' => array(array('widget' => 'hierarchical_key', 'operator' => 'IN')),
+			),
+			'key empty' => array(
+				'OQL' => "SELECT Person WHERE location_id = '0'",
+				'ExpectedOQL' => "SELECT `Person` FROM Person AS `Person` WHERE (`Person`.`location_id` = '0')",
+				'ExpectedCriterion' => array(array('widget' => 'external_key', 'operator' => 'IN', 'values' => array(array('value' => '0')))),
+			),
+			'Double field' => array(
+				'OQL' => "SELECT UserRequest AS u WHERE u.close_date > u.start_date",
+				'ExpectedOQL' => "SELECT `u` FROM UserRequest AS `u` WHERE (`u`.`close_date` > `u`.`start_date`)",
+				'ExpectedCriterion' => array(array('widget' => 'raw')),
+			),
+			'Date relative 1' => array(
+				'OQL' => "SELECT UserRequest WHERE DATE_SUB(NOW(), INTERVAL 14 DAY) < start_date",
+				'ExpectedOQL' => "SELECT `UserRequest` FROM UserRequest AS `UserRequest` WHERE (DATE_SUB(NOW(), INTERVAL 14 DAY) < `UserRequest`.`start_date`)",
+				'ExpectedCriterion' => array(array('widget' => 'raw')),
+			),
+			'Date relative 2' => array(
+				'OQL' => "SELECT Contract AS c WHERE c.end_date > NOW() AND c.end_date < DATE_ADD(NOW(), INTERVAL 30 DAY)",
+				'ExpectedOQL' => "SELECT `c` FROM Contract AS `c` WHERE ((`c`.`end_date` < DATE_ADD(NOW(), INTERVAL 30 DAY)) AND (`c`.`end_date` > NOW()))",
+				'ExpectedCriterion' => array(array('widget' => 'raw'), array('widget' => 'raw')),
+			),
+			'Date relative 3' => array(
+				'OQL' => "SELECT UserRequest AS u WHERE u.close_date > DATE_ADD(u.start_date, INTERVAL 8 HOUR)",
+				'ExpectedOQL' => "SELECT `u` FROM UserRequest AS `u` WHERE (`u`.`close_date` > DATE_ADD(`u`.`start_date`, INTERVAL 8 HOUR))",
+				'ExpectedCriterion' => array(),
+			),
+			'Date relative 4' => array(
+				'OQL' => "SELECT UserRequest AS u WHERE u.start_date < DATE_SUB(NOW(), INTERVAL 60 MINUTE) AND u.status = 'new'",
+				'ExpectedOQL' => "SELECT `u` FROM UserRequest AS `u` WHERE ((`u`.`start_date` < DATE_SUB(NOW(), INTERVAL 60 MINUTE)) AND (`u`.`status` = 'new'))",
+				'ExpectedCriterion' => array(array('widget' => 'raw')),
+			),
+			'Date between 1' => array(
+				'OQL' => "SELECT UserRequest WHERE start_date > '2017-01-01 00:00:00' AND '2018-01-01 00:00:00' >= start_date",
+				'ExpectedOQL' => "SELECT `UserRequest` FROM UserRequest AS `UserRequest` WHERE ((`UserRequest`.`start_date` >= '2017-01-01 00:00:01') AND (`UserRequest`.`start_date` <= '2018-01-01 00:00:00'))",
+				'ExpectedCriterion' => array(array('widget' => 'date_time', 'operator' => 'between_dates')),
+			),
+			'Date between 2' => array(
+				'OQL' => "SELECT UserRequest WHERE start_date > '2017-01-01 00:00:00' AND status = 'active' AND org_id = 3 AND '2018-01-01 00:00:00' >= start_date",
+				'ExpectedOQL' => "SELECT `UserRequest` FROM UserRequest AS `UserRequest` WHERE ((((`UserRequest`.`org_id` = '3') AND (`UserRequest`.`start_date` >= '2017-01-01 00:00:01')) AND (`UserRequest`.`start_date` <= '2018-01-01 00:00:00')) AND (`UserRequest`.`status` = 'active'))",
+				'ExpectedCriterion' => array(array('widget' => 'hierarchical_key', 'operator' => 'IN'), array('widget' => 'date_time', 'operator' => 'between_dates'), array('widget' => 'enum', 'operator' => 'IN')),
+			),
+			'Date between 3' => array(
+				'OQL' => "SELECT UserRequest WHERE start_date >= '2017-01-01 00:00:00' AND '2017-01-01 00:00:00' >= start_date",
+				'ExpectedOQL' => "SELECT `UserRequest` FROM UserRequest AS `UserRequest` WHERE ((`UserRequest`.`start_date` >= '2017-01-01 00:00:00') AND (`UserRequest`.`start_date` <= '2017-01-01 00:00:00'))",
+				'ExpectedCriterion' => array(array('widget' => 'date_time', 'operator' => 'between_dates')),
+			),
+			'Date between 4' => array(
+				'OQL' => "SELECT UserRequest WHERE start_date >= '2017-01-01 00:00:00' AND '2017-01-01 01:00:00' > start_date",
+				'ExpectedOQL' => "SELECT `UserRequest` FROM UserRequest AS `UserRequest` WHERE ((`UserRequest`.`start_date` >= '2017-01-01 00:00:00') AND (`UserRequest`.`start_date` <= '2017-01-01 00:59:59'))",
+				'ExpectedCriterion' => array(array('widget' => 'date_time', 'operator' => 'between_dates')),
+			),
+			'Date between 5' => array(
+				'OQL' => "SELECT UserRequest WHERE start_date >= '2017-01-01 00:00:00' AND '2017-01-02 00:00:00' > start_date",
+				'ExpectedOQL' => "SELECT `UserRequest` FROM UserRequest AS `UserRequest` WHERE ((`UserRequest`.`start_date` >= '2017-01-01 00:00:00') AND (`UserRequest`.`start_date` <= '2017-01-01 23:59:59'))",
+				'ExpectedCriterion' => array(array('widget' => 'date_time', 'operator' => 'between_dates')),
+			),
+			'Date between 6' => array(
+				'OQL' => "SELECT UserRequest WHERE start_date >= '2017-01-01' AND '2017-01-02' >= start_date",
+				'ExpectedOQL' => "SELECT `UserRequest` FROM UserRequest AS `UserRequest` WHERE ((`UserRequest`.`start_date` >= '2017-01-01 00:00:00') AND (`UserRequest`.`start_date` <= '2017-01-02 00:00:00'))",
+				'ExpectedCriterion' => array(array('widget' => 'date_time', 'operator' => 'between_dates')),
+			),
+			'Date between 7' => array(
+				'OQL' => "SELECT CustomerContract WHERE ((start_date >= '2018-03-01') AND (start_date < '2018-04-01'))",
+				'ExpectedOQL' => "SELECT `CustomerContract` FROM CustomerContract AS `CustomerContract` WHERE ((`CustomerContract`.`start_date` >= '2018-03-01') AND (`CustomerContract`.`start_date` <= '2018-03-31'))",
+				'ExpectedCriterion' => array(array('widget' => 'date', 'operator' => 'between_dates')),
+			),
+			'Date =' => array(
+				'OQL' => "SELECT CustomerContract WHERE (start_date = '2018-03-01')",
+				'ExpectedOQL' => "SELECT `CustomerContract` FROM CustomerContract AS `CustomerContract` WHERE ((`CustomerContract`.`start_date` >= '2018-03-01') AND (`CustomerContract`.`start_date` <= '2018-03-01'))",
+				'ExpectedCriterion' => array(array('widget' => 'date', 'operator' => 'between_dates')),
+			),
+			'Date =2' => array(
+				'OQL' => "SELECT UserRequest WHERE (DATE_FORMAT(start_date, '%Y-%m-%d') = '2018-03-21')",
+				'ExpectedOQL' => "SELECT `UserRequest` FROM UserRequest AS `UserRequest` WHERE ((`UserRequest`.`start_date` >= '2018-03-21 00:00:00') AND (`UserRequest`.`start_date` <= '2018-03-21 23:59:59'))",
+				'ExpectedCriterion' => array(array('widget' => 'date_time', 'operator' => 'between_dates')),
+			),
+			'Num between 1' => array(
+				'OQL' => "SELECT Server WHERE nb_u >= 0 AND 1 >= nb_u",
+				'ExpectedOQL' => "SELECT `Server` FROM Server AS `Server` WHERE ((`Server`.`nb_u` >= '0') AND (`Server`.`nb_u` <= '1'))",
+				'ExpectedCriterion' => array(array('widget' => 'numeric', 'operator' => 'between')),
+			),
+			'Num ISNULL' => array(
+				'OQL' => "SELECT Server WHERE ISNULL(nb_u)",
+				'ExpectedOQL' => "SELECT `Server` FROM Server AS `Server` WHERE ISNULL(`Server`.`nb_u`)",
+				'ExpectedCriterion' => array(array('widget' => 'numeric', 'operator' => 'empty')),
+			),
+			'Hierarchical below' => array(
+				'OQL' => "SELECT Person AS P JOIN Organization AS Node ON P.org_id = Node.id JOIN Organization AS Root ON Node.parent_id BELOW Root.id WHERE Root.id=1",
+				'ExpectedOQL' => "SELECT `P` FROM Person AS `P` JOIN Organization AS `Node` ON `P`.org_id = `Node`.id JOIN Organization AS `Root` ON `Node`.parent_id BELOW `Root`.id WHERE (`Root`.`id` = 1)",
+				'ExpectedCriterion' => array(array('widget' => 'raw')),
+			),
+			'IP range' => array(
+				'OQL' => "SELECT DatacenterDevice AS dev WHERE INET_ATON(dev.managementip) > INET_ATON('10.22.32.224') AND INET_ATON(dev.managementip) < INET_ATON('10.22.32.255')",
+				'ExpectedOQL' => "SELECT `dev` FROM DatacenterDevice AS `dev` WHERE ((INET_ATON(`dev`.`managementip`) < INET_ATON('10.22.32.255')) AND (INET_ATON(`dev`.`managementip`) > INET_ATON('10.22.32.224')))",
+				'ExpectedCriterion' => array(array('widget' => 'raw')),
+			),
 		);
 	}
+
+	function array_diff_assoc_recursive($array1, $array2)
+	{
+		foreach($array1 as $key => $value)
+		{
+			if (is_array($value))
+			{
+				if (!isset($array2[$key]))
+				{
+					$difference[$key] = $value;
+				}
+				elseif (!is_array($array2[$key]))
+				{
+					$difference[$key] = $value;
+				}
+				else
+				{
+					$new_diff = $this->array_diff_assoc_recursive($value, $array2[$key]);
+					if ($new_diff !== false)
+					{
+						$difference[$key] = $new_diff;
+					}
+				}
+			}
+			elseif (!array_key_exists($key, $array2) || $array2[$key] != $value)
+			{
+				$difference[$key] = $value;
+			}
+		}
+
+		return !isset($difference) ? false : $difference;
+	}
 }

From 2811eb66c59446b380aa3bd17dccd356d45b33b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Wed, 28 Mar 2018 13:38:21 +0000
Subject: [PATCH 160/202] Advanced Search: Removed external fields from the
 attribute list

SVN:b1162[5556]
---
 core/attributedef.class.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/attributedef.class.inc.php b/core/attributedef.class.inc.php
index 44b1222e9..489178940 100644
--- a/core/attributedef.class.inc.php
+++ b/core/attributedef.class.inc.php
@@ -4949,7 +4949,7 @@ class AttributeHierarchicalKey extends AttributeExternalKey
 class AttributeExternalField extends AttributeDefinition
 {
 
-	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_EXTERNAL_FIELD;
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
 
 	static public function ListExpectedParams()
 	{

From 26ec1269a5d2df584fb0830b34069f55d6d1e12d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Wed, 28 Mar 2018 14:57:54 +0000
Subject: [PATCH 161/202] Advanced Search: read-only selection criteria to add
 an object

SVN:b1162[5557]
---
 .../criteriontosearchform.class.inc.php       | 13 ++++++++++--
 .../search/searchform.class.inc.php           | 21 +++++++++++++------
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
index 2f83619e3..a1f12b401 100644
--- a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
+++ b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
@@ -44,9 +44,11 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 	 *
 	 * @param array $aClasses all the classes of the filter
 	 *
+	 * @param bool $bIsRemovable
+	 *
 	 * @return array
 	 */
-	public static function Convert($aAndCriterionRaw, $aFieldsByCategory, $aClasses)
+	public static function Convert($aAndCriterionRaw, $aFieldsByCategory, $aClasses, $bIsRemovable = true)
 	{
 		$aAllFields = array();
 		foreach($aFieldsByCategory as $aFields)
@@ -71,10 +73,17 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 
 		foreach($aAndCriterionRaw as $aCriteria)
 		{
+			$aCriteria['label'] = trim($aCriteria['label'], "()");
+			$aCriteria['is_removable'] = $bIsRemovable;
+			if (!$bIsRemovable)
+			{
+				$aCriteria['widget'] = AttributeDefinition::SEARCH_WIDGET_TYPE_RAW;
+			}
+
 			// Check criteria validity
 			if (!array_key_exists('ref', $aCriteria) || !array_key_exists($aCriteria['ref'], $aAllFields))
 			{
-				$aCriteria['widget'] = AttributeDefinition::SEARCH_WIDGET_TYPE_RAW;
+
 				$aCriteria['label'] = Dict::S('UI:Search:Criteria:Raw:Filtered');
 				if (array_key_exists('ref', $aCriteria))
 				{
diff --git a/sources/application/search/searchform.class.inc.php b/sources/application/search/searchform.class.inc.php
index 12ec3b973..469f37744 100644
--- a/sources/application/search/searchform.class.inc.php
+++ b/sources/application/search/searchform.class.inc.php
@@ -128,9 +128,16 @@ class SearchForm
 			$aArgs = array();
 		}
 
+		$bIsRemovable = true;
+		if (isset($aExtraParams['selection_mode']) && $aExtraParams['selection_mode'])
+		{
+			// Mark all criterion as read-only and non-removable
+			$bIsRemovable = false;
+		}
 		$aFields = $this->GetFields($oSet);
 		$oSearch = $oSet->GetFilter();
-		$aCriterion = $this->GetCriterion($oSearch, $aFields, $aArgs);
+		$aCriterion = $this->GetCriterion($oSearch, $aFields, $aArgs, $bIsRemovable);
+
 
 		$oBaseSearch = $oSearch->DeepClone();
 		$oBaseSearch->ResetCondition();
@@ -149,17 +156,17 @@ class SearchForm
 		{
 			$aExtraParams['table_id'] = "search_form_result_{$sSearchFormId}";
 		}
-		if (!array_key_exists('table_inner_id', $aExtraParams))
+		if (!isset($aExtraParams['table_inner_id']))
 		{
 			$aListParams['table_inner_id'] = "table_inner_id_{$sSearchFormId}";
 		}
 		// When table_id is different of result_list_outer_selector
-		if (array_key_exists('table_id2', $aExtraParams))
+		if (isset($aExtraParams['table_id2']))
 		{
 			$aListParams['table_id'] = $aExtraParams['table_id2'];
 		}
 		$bOpen = false;
-		if (array_key_exists('open', $aExtraParams))
+		if (isset($aExtraParams['open']))
 		{
 			$bOpen = $aExtraParams['open'];
 		}
@@ -349,9 +356,11 @@ class SearchForm
 	 *
 	 * @param array $aArgs
 	 *
+	 * @param bool $bIsRemovable
+	 *
 	 * @return array
 	 */
-	public function GetCriterion($oSearch, $aFields, $aArgs = array())
+	public function GetCriterion($oSearch, $aFields, $aArgs = array(), $bIsRemovable = true)
 	{
 		$oExpression = $oSearch->GetCriteria();
 
@@ -377,7 +386,7 @@ class SearchForm
 				}
 				$aAndCriterion[] = $oAndSubExpr->GetCriterion($oSearch);
 			}
-			$aAndCriterion = CriterionToSearchForm::Convert($aAndCriterion, $aFields, $oSearch->GetJoinedClasses());
+			$aAndCriterion = CriterionToSearchForm::Convert($aAndCriterion, $aFields, $oSearch->GetJoinedClasses(), $bIsRemovable);
 			$aOrCriterion[] = array('and' => $aAndCriterion);
 		}
 

From f3a2a24ee4fc320b0e9a708afb1574b56fa809f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Wed, 28 Mar 2018 15:03:53 +0000
Subject: [PATCH 162/202] Advanced Search: read-only selection criteria to add
 an object

SVN:b1162[5558]
---
 .../criterionconversion/criteriontosearchform.class.inc.php   | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
index a1f12b401..f27595b36 100644
--- a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
+++ b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
@@ -75,10 +75,6 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 		{
 			$aCriteria['label'] = trim($aCriteria['label'], "()");
 			$aCriteria['is_removable'] = $bIsRemovable;
-			if (!$bIsRemovable)
-			{
-				$aCriteria['widget'] = AttributeDefinition::SEARCH_WIDGET_TYPE_RAW;
-			}
 
 			// Check criteria validity
 			if (!array_key_exists('ref', $aCriteria) || !array_key_exists($aCriteria['ref'], $aAllFields))

From 14c073394906a68e051bdd89498b4c34d175a394 Mon Sep 17 00:00:00 2001
From: Guillaume Lajarige <guillaume.lajarige@combodo.com>
Date: Wed, 28 Mar 2018 19:38:08 +0000
Subject: [PATCH 163/202] Advanced search: UI/UX WIP.

SVN:b1162[5559]
---
 css/light-grey.css                            | 47 +++++++++--
 css/light-grey.scss                           | 69 ++++++++++++---
 dictionaries/en.dictionary.itop.ui.php        |  1 +
 js/search/search_form_criteria.js             | 17 +++-
 js/search/search_form_criteria_enum.js        | 83 +++++++++++++++++--
 .../search_form_criteria_external_key.js      |  5 +-
 .../search_form_criteria_hierarchical_key.js  | 20 +++++
 js/search/search_form_handler.js              | 80 ++++++++++--------
 8 files changed, 258 insertions(+), 64 deletions(-)

diff --git a/css/light-grey.css b/css/light-grey.css
index a9b815c01..5b9e87631 100644
--- a/css/light-grey.css
+++ b/css/light-grey.css
@@ -852,19 +852,24 @@ input.dp-applied {
   background-color: #eee;
   color: #2d2d2d;
 }
-.search_form_handler .sf_criterion_area .search_form_criteria .sfc_close, .search_form_handler .sf_criterion_area .search_form_criteria .sfc_toggle {
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_toggle, .search_form_handler .sf_criterion_area .search_form_criteria .sfc_close {
   position: absolute;
   top: 7px;
   color: #e87c1e;
 }
-.search_form_handler .sf_criterion_area .search_form_criteria .sfc_close {
-  right: 7px;
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_locked {
+  position: absolute;
+  top: 9px;
+  color: #808080;
 }
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_toggle {
   display: inline-block;
   right: 23px;
   transition: all 0.3s ease-in-out;
 }
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_close, .search_form_handler .sf_criterion_area .search_form_criteria .sfc_locked {
+  right: 7px;
+}
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_title {
   max-width: 240px;
   padding-right: 30px;
@@ -997,6 +1002,8 @@ input.dp-applied {
 }
 .search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_raw .sfc_title {
   cursor: initial;
+  padding-right: 20px;
+  /* Less than regular as there is no toggle icon */
 }
 .search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_raw .sfc_form_group {
   display: none;
@@ -1139,19 +1146,47 @@ input.dp-applied {
   margin-top: 8px;
   margin-bottom: 8px;
 }
+.search_form_handler .sf_filter input, .search_form_handler .sf_filter button, .search_form_handler .sf_filter .sff_picto {
+  vertical-align: middle;
+  height: 22px;
+}
+.search_form_handler .sf_filter input, .search_form_handler .sf_filter button {
+  border: 1px solid #ababab;
+}
 .search_form_handler .sf_filter input {
   width: 100%;
 }
-.search_form_handler .sf_filter .sff_picto {
+.search_form_handler .sf_filter button {
+  width: 23px;
+  /* Must be equals to .sf_filter > *:height */
+  background-color: #fff;
+  color: #ea7d1e;
+  font-size: 10px;
+}
+.search_form_handler .sf_filter button:first-of-type {
+  margin-left: 5px;
+}
+.search_form_handler .sf_filter button:not(:first-of-type) {
+  border-left: transparent;
+}
+.search_form_handler .sf_filter .sff_input_wrapper {
+  position: relative;
+}
+.search_form_handler .sf_filter .sff_input_wrapper .sff_picto {
   position: absolute;
   right: 5px;
-  top: 5px;
+  top: 2px;
   opacity: 0.6;
   user-select: none;
 }
-.search_form_handler .sf_filter .sff_reset {
+.search_form_handler .sf_filter .sff_input_wrapper .sff_reset {
   display: none;
 }
+.search_form_handler .sf_filter.sf_with_buttons input {
+  width: initial;
+  /* Reset the 100% */
+  min-width: 120px;
+}
 .sf_results_area .sf_results_placeholder {
   margin-top: 100px;
   text-align: center;
diff --git a/css/light-grey.scss b/css/light-grey.scss
index b45822a47..f1b1b7412 100644
--- a/css/light-grey.scss
+++ b/css/light-grey.scss
@@ -953,20 +953,26 @@ input.dp-applied {
 			}
 
 			/* Top left corner icons */
-			.sfc_close,
-			.sfc_toggle{
+			.sfc_toggle,
+			.sfc_close{
 				position: absolute;
 				top: 7px;
 				color: $search-criteria-box-picto-color;
 			}
-			.sfc_close{
-				right: 7px;
+			.sfc_locked{
+				position: absolute;
+				top: 9px;
+				color: $gray-light;
 			}
 			.sfc_toggle{
 				display: inline-block;
 				right: 23px;
 				transition: all 0.3s ease-in-out;
 			}
+			.sfc_close,
+			.sfc_locked{
+				right: 7px;
+			}
 
 			.sfc_title{
 				max-width: 240px;
@@ -1142,6 +1148,7 @@ input.dp-applied {
 				}
 				.sfc_title{
 					cursor: initial;
+					padding-right: 20px; /* Less than regular as there is no toggle icon */
 				}
 				.sfc_form_group{
 					display: none;
@@ -1204,7 +1211,8 @@ input.dp-applied {
 				}
 			}
 
-			&.search_form_criteria_date_time, &.search_form_criteria_date {
+			&.search_form_criteria_date_time,
+			&.search_form_criteria_date {
 				.sfc_form_group.advanced {
 					.sfc_fg_operator_between {
 						margin-bottom: 5px;
@@ -1353,18 +1361,53 @@ input.dp-applied {
 		margin-top: 8px;
 		margin-bottom: 8px;
 
+		input,
+		button,
+		.sff_picto{
+			vertical-align: middle;
+			height: 22px;
+		}
+
+		input,
+		button{
+			border: 1px solid #ABABAB;
+		}
 		input{
 			width: 100%;
 		}
-		.sff_picto{
-			position: absolute;
-			right: 5px;
-			top: 5px;
-			opacity: 0.6;
-			user-select: none;
+		button{
+			width: 23px; /* Must be equals to .sf_filter > *:height */
+			background-color: $white;
+			color: $combodo-orange;
+			font-size: 10px;
+
+			&:first-of-type{
+				margin-left: 5px;
+			}
+			&:not(:first-of-type){
+				border-left: transparent;
+			}
 		}
-		.sff_reset{
-			display: none;
+		.sff_input_wrapper{
+			position: relative;
+
+			.sff_picto{
+				position: absolute;
+				right: 5px;
+				top: 2px;
+				opacity: 0.6;
+				user-select: none;
+			}
+			.sff_reset{
+				display: none;
+			}
+		}
+
+		&.sf_with_buttons{
+			input{
+				width: initial; /* Reset the 100% */
+				min-width: 120px;
+			}
 		}
 	}
 }
diff --git a/dictionaries/en.dictionary.itop.ui.php b/dictionaries/en.dictionary.itop.ui.php
index f3aba9a90..14e3262d9 100644
--- a/dictionaries/en.dictionary.itop.ui.php
+++ b/dictionaries/en.dictionary.itop.ui.php
@@ -1453,6 +1453,7 @@ When associated with a trigger, each action is given an "order" number, specifyi
 
 	// - Other translations
 	'UI:Search:Value:Filter:Placeholder' => 'Filter...',
+	'UI:Search:Value:Search:Placeholder' => 'Search...',
 	'UI:Search:Value:Toggler:CheckAllNone' => 'Check all / none',
 
 	// - Widget other translations
diff --git a/js/search/search_form_criteria.js b/js/search/search_form_criteria.js
index c2ecfede0..407b1bc3e 100644
--- a/js/search/search_form_criteria.js
+++ b/js/search/search_form_criteria.js
@@ -595,7 +595,7 @@ $(function()
 
 
 		// Values helpers
-		// - Check if criteria has allowed values
+		// - Check if criteria has allowed values either preloaded or through autocomplete
 		_hasAllowedValues: function()
 		{
 			return ( (this.options.field.allowed_values !== undefined) && (this.options.field.allowed_values !== null) );
@@ -615,6 +615,21 @@ $(function()
 		{
 			return (this._hasPreloadedAllowedValues()) ? this.options.field.allowed_values.values : {};
 		},
+		// - Check if criteria has allowed values that should be loaded through autocomplete
+		_hasAutocompleteAllowedValues: function()
+		{
+			if(this._hasAllowedValues() && (this.options.field.allowed_values.autocomplete === true) )
+			{
+				return true;
+			}
+
+			return false;
+		},
+		// - Return the allowed values from the autocomplete
+		_getAutocompleteAllowedValues: function()
+		{
+			console.log('TODO: Retrieve allowed values through autocomplete (get needle in the input)');
+		},
 		// - Return current values
 		_getValues: function()
 		{
diff --git a/js/search/search_form_criteria_enum.js b/js/search/search_form_criteria_enum.js
index a3699bc2e..641aeb17d 100644
--- a/js/search/search_form_criteria_enum.js
+++ b/js/search/search_form_criteria_enum.js
@@ -95,12 +95,20 @@ $(function()
 
 			// - Filter
 			var sFilterId = 'filter_' + sOpId;
+			var sFilterPlaceholder = (this._hasAutocompleteAllowedValues()) ? Dict.S('UI:Search:Value:Search:Placeholder') : Dict.S('UI:Search:Value:Filter:Placeholder');
 			var oFilterElem = $('<div class="sf_filter"></div>')
-				.append('<input type="text" id="' + sFilterId + '" placeholder="' + Dict.S('UI:Search:Value:Filter:Placeholder') + '" /><span class="sff_picto sff_filter fa fa-filter"></span><span class="sff_picto sff_reset fa fa-times"></span>')
+				.append('<span class="sff_input_wrapper"><input type="text" id="' + sFilterId + '" placeholder="' + sFilterPlaceholder + '" /><span class="sff_picto sff_filter fa fa-filter"></span><span class="sff_picto sff_reset fa fa-times"></span></span>')
 				.appendTo(oOpContentElem);
 
 			// - Allowed values
-			var oAllowedValuesElem = $('<div class="sfc_opc_mc_items"></div>');
+			var oAllowedValuesElem = $('<div class="sfc_opc_mc_items"></div>')
+				.appendTo(oOpContentElem);
+			// - Static values: Always there no matter the field constraints
+			var oStaticValuesElem = $('<div class="sfc_opc_mc_items_list sfc_opc_mc_items_static"></div>')
+				.appendTo(oAllowedValuesElem);
+			// - Dynamic values: Depends on the field constraints
+			var oDynamicValuesElem = $('<div class="sfc_opc_mc_items_list sfc_opc_mc_items_dynamic"></div>')
+				.appendTo(oAllowedValuesElem);
 
 			//   - Null value if allowed
 			//   Note: null values is NOT put among the allowed values for two reasons:
@@ -114,7 +122,7 @@ $(function()
 					.addClass('sfc_opc_mc_item')
 					.attr('data-value-code', sValCode)
 					.append('<label><input type="checkbox" value="' + sValCode + '"/>' + sValLabel + '</label>')
-					.appendTo(oAllowedValuesElem);
+					.appendTo(oStaticValuesElem);
 			}
 
 			//   - Regular allowed values
@@ -129,7 +137,7 @@ $(function()
 						.addClass('sfc_opc_mc_item')
 						.attr('data-value-code', sValCode)
 						.append('<label><input type="checkbox" value="'+sValCode+'"/>'+sValLabel+'</label>')
-						.appendTo(oAllowedValuesElem);
+						.appendTo(oDynamicValuesElem);
 
 					if (this._isSelectedValues(sValCode))
 					{
@@ -137,7 +145,20 @@ $(function()
 					}
 				}
 			}
-			oAllowedValuesElem.appendTo(oOpContentElem);
+
+			// - Specific to autocomplete mode
+			if(this._hasAutocompleteAllowedValues())
+			{
+				// Remove filter picto from input
+				oFilterElem.find('.sff_filter').remove();
+
+				// Add search dialog button
+				oFilterElem
+					.append('<button type="button" class="sff_search_dialog"><span class=" fa fa-search"></span></button>')
+					.addClass('sf_with_buttons');
+
+				// Prepare "selected" values area
+			}
 
 			// Events
 			// - Check / Uncheck all toggler
@@ -151,7 +172,7 @@ $(function()
 			});
 
 			// - Filter
-			// Note: "keyup" event is use instead of "keydown", otherwise, the inpu value would not be set yet.
+			// Note: "keyup" event is use instead of "keydown", otherwise, the input value would not be set yet.
 			oFilterElem.find('input').on('keyup focus', function(oEvent){
 				// TODO: Move on values with up and down arrow keys; select with space or enter.
 
@@ -204,6 +225,56 @@ $(function()
 				me._apply();
 			});
 
+			// - Specific to autocomplete mode
+			// TODO: We NEED to refactor all of this for a better integration. Most might be in the main widget as any widget could use XHR helpers.
+			if(this._hasAutocompleteAllowedValues())
+			{
+				// // Autocomplete
+				// var oACXHR = null;
+				// var oACTimeout = null;
+				// oFilterElem.find('input').off('keyup focus').on('keyup focus', function(oEvent){
+				// 	// TODO: Move on values with up and down arrow keys; select with space or enter.
+				//
+				// 	var sFilter = $(this).val();
+				//
+				// 	if(sFilter === '')
+				// 	{
+				// 		oOpContentElem.find('.sfc_opc_mc_item').html('');
+				// 		oFilterElem.find('.sff_reset').hide();
+				// 	}
+				// 	else
+				// 	{
+				// 		oOpContentElem.find('.sfc_opc_mc_item').html('TOTR: Wait');
+				// 		if(oACXHR !== null)
+				// 		{
+				// 			oACXHR.abort();
+				// 		}
+				// 		oACXHR = $.post(
+				// 			AddAppContext(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php'),
+				// 			{
+				// 				sTargetClass: me.options.field.class,
+				// 				//iInputId: me.id,
+				// 				//iObjectId: iObjectId,
+				// 				sAttCode: me.options.field.code,
+				// 				bSearchMode: true,
+				// 				operation: 'getObjectName'
+				// 			}
+				// 		)
+				// 			.done(function(oResponse, sStatus, oXHR){ console.log('ok', oResponse); })
+				// 			.fail(function(oResponse, sStatus, oXHR){ console.log('fail', oResponse); })
+				// 			.always(function(oResponse, sStatus, oXHR){ console.log('always', oResponse); });
+				//
+				// 		oFilterElem.find('.sff_reset').show();
+				// 	}
+				// });
+				//
+				// // Open search dialog
+				// oFilterElem.find('.sff_search_dialog').on('click', function(){
+				// 	// TODO: Open search dialog with right params
+				// 	alert('Not implemented yet');
+				// });
+			}
+
 			oOpElem.find('.sfc_op_content').append(oOpContentElem);
 		},
 		_setTitle: function(sTitle)
diff --git a/js/search/search_form_criteria_external_key.js b/js/search/search_form_criteria_external_key.js
index 2d148befe..03150329a 100644
--- a/js/search/search_form_criteria_external_key.js
+++ b/js/search/search_form_criteria_external_key.js
@@ -9,11 +9,13 @@ $(function()
 		// default options
 		options:
 		{
+			'endpoint': AddAppContext(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php'),
+
 			// Null value
 			'null_value': {
 				'code': 0,
 				'label': Dict.S('UI:UndefinedObject'),
-			}
+			},
 		},
 
    
@@ -52,6 +54,5 @@ $(function()
 		//------------------
 		// Inherited methods
 		//------------------
-
 	});
 });
diff --git a/js/search/search_form_criteria_hierarchical_key.js b/js/search/search_form_criteria_hierarchical_key.js
index 40f993c82..c8ba54307 100644
--- a/js/search/search_form_criteria_hierarchical_key.js
+++ b/js/search/search_form_criteria_hierarchical_key.js
@@ -48,5 +48,25 @@ $(function()
 		// Inherited methods
 		//------------------
 
+		// DOM element helpers
+		prepareInOperator: function(oOpElem, sOpIdx, oOp)
+		{
+			var me = this;
+
+			this._super();
+
+			// DOM elements
+			// - Add search dialog button
+			this.element.find('.sf_filter')
+				.append('<button type="button" class="sff_hierarchy_dialog"><span class=" fa fa-sitemap"></span></button>')
+				.addClass('sf_with_buttons');
+
+			// Events
+			// - Open hierarchy dialog
+			this.element.find('.sff_hierarchy_dialog').on('click', function(){
+				// TODO: Open hierarchy dialog with right params
+				alert('Not implemented yet');
+			});
+		},
 	});
 });
diff --git a/js/search/search_form_handler.js b/js/search/search_form_handler.js
index c9a5fecf2..394c6fd19 100644
--- a/js/search/search_form_handler.js
+++ b/js/search/search_form_handler.js
@@ -319,7 +319,7 @@ $(function()
 			var oFilterElem = $('<div></div>')
 				.addClass('sf_filter')
 				.addClass('sfm_filter')
-				.append('<input type="text" placeholder="' + Dict.S('UI:Search:Value:Filter:Placeholder') + '" /><span class="sff_picto sff_filter fa fa-filter"></span><span class="sff_picto sff_reset fa fa-times"></span>')
+				.append('<span class="sff_input_wrapper"><input type="text" placeholder="' + Dict.S('UI:Search:Value:Filter:Placeholder') + '" /><span class="sff_picto sff_filter fa fa-filter"></span><span class="sff_picto sff_reset fa fa-times"></span></span>')
 				.appendTo(oContentElem);
 
 			// - Lists container
@@ -618,46 +618,54 @@ $(function()
 		_addCriteria: function(oData)
 		{
 			var sRef = oData.ref;
-			var sType = (oData.widget !== undefined) ? oData.widget : this._getCriteriaTypeFromFieldRef(sRef);
+			var sType = sType = (oData.widget !== undefined) ? oData.widget : this._getCriteriaTypeFromFieldRef(sRef);
 
-			if(sType !== null)
+			// Force to raw for non removable criteria
+			if( (oData.is_removable !== undefined) && (oData.is_removable === false) )
 			{
-				// Retrieve widget class
-				var sWidgetName = this._getCriteriaWidgetNameFromType(sType);
-
-				// Add some informations from the field
-				if(this._hasFieldDefinition(sRef))
-				{
-					var oFieldDef = this._getFieldDefinition(sRef);
-					oData.field = {
-						label: oFieldDef.label,
-						class: oFieldDef.class,
-						class_alias: oFieldDef.class_alias,
-						code: oFieldDef.code,
-						widget: oFieldDef.widget,
-						allowed_values: oFieldDef.allowed_values,
-						is_null_allowed: oFieldDef.is_null_allowed,
-					};
-				}
-
-				if ('date' == sType || 'date_time' == sType)
-				{
-					oData.datepicker = this.options.datepicker;
-				}
-
-				// Create DOM element
-				var oCriteriaElem = $('<div></div>')
-					.addClass('sf_criteria')
-					//.insertBefore(this.elements.more_criterion);
-					.appendTo(this.elements.criterion_area);
-
-				// Instanciate widget
-				$.itop[sWidgetName](oData, oCriteriaElem);
+				sType = 'raw';
 			}
-			else
+
+			// Protection against bad initialization data
+			if(sType === null)
 			{
-				this._trace('Could not add criteria as we could not retrieve type for ref "' + sRef + '".');
+				this._trace('Could not add criteria as we could not retrieve type for ref "'+sRef+'".');
+				return false;
 			}
+
+			// Retrieve widget class
+			var sWidgetName = this._getCriteriaWidgetNameFromType(sType);
+
+			// Add some informations from the field
+			if(this._hasFieldDefinition(sRef))
+			{
+				var oFieldDef = this._getFieldDefinition(sRef);
+				oData.field = {
+					label: oFieldDef.label,
+					class: oFieldDef.class,
+					class_alias: oFieldDef.class_alias,
+					code: oFieldDef.code,
+					widget: oFieldDef.widget,
+					allowed_values: oFieldDef.allowed_values,
+					is_null_allowed: oFieldDef.is_null_allowed,
+				};
+			}
+
+			if ('date' == sType || 'date_time' == sType)
+			{
+				oData.datepicker = this.options.datepicker;
+			}
+
+			// Create DOM element
+			var oCriteriaElem = $('<div></div>')
+				.addClass('sf_criteria')
+				//.insertBefore(this.elements.more_criterion);
+				.appendTo(this.elements.criterion_area);
+
+			// Instanciate widget
+			$.itop[sWidgetName](oData, oCriteriaElem);
+
+			return true;
 		},
 		// - Find a criteria's type from a field's ref (usually <CLASS_ALIAS>.<ATT_CODE>)
 		_getCriteriaTypeFromFieldRef: function(sRef)

From 18ee7b194d1d3795688b783dc4f419d9fd6b9ecc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Thu, 29 Mar 2018 07:02:03 +0000
Subject: [PATCH 164/202] Advanced Search: Display of raw titles enhanced

SVN:b1162[5560]
---
 .../criterionconversion/criteriontosearchform.class.inc.php    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
index f27595b36..bf67fd100 100644
--- a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
+++ b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
@@ -73,7 +73,8 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 
 		foreach($aAndCriterionRaw as $aCriteria)
 		{
-			$aCriteria['label'] = trim($aCriteria['label'], "()");
+			$aCriteria['label'] = preg_replace("@^\(@", '', $aCriteria['label']);
+			$aCriteria['label'] = preg_replace("@\)$@", '', $aCriteria['label']);
 			$aCriteria['is_removable'] = $bIsRemovable;
 
 			// Check criteria validity

From c12a5cc98b7b61404b19fa8fcd3186a2f91ebe54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Thu, 29 Mar 2018 07:12:31 +0000
Subject: [PATCH 165/202] Advanced Search: Fix missing label

SVN:b1162[5561]
---
 .../criteriontosearchform.class.inc.php                    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
index bf67fd100..82fdb1e5f 100644
--- a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
+++ b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
@@ -73,8 +73,11 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 
 		foreach($aAndCriterionRaw as $aCriteria)
 		{
-			$aCriteria['label'] = preg_replace("@^\(@", '', $aCriteria['label']);
-			$aCriteria['label'] = preg_replace("@\)$@", '', $aCriteria['label']);
+			if (isset($aCriteria['label']))
+			{
+				$aCriteria['label'] = preg_replace("@\)$@", '', $aCriteria['label']);
+				$aCriteria['label'] = preg_replace("@^\(@", '', $aCriteria['label']);
+			}
 			$aCriteria['is_removable'] = $bIsRemovable;
 
 			// Check criteria validity

From 3246c36984dbf0ed2396f4348b645f8874dd4af2 Mon Sep 17 00:00:00 2001
From: Bruno Da Silva <bruno.dasilva@combodo.com>
Date: Thu, 29 Mar 2018 08:03:47 +0000
Subject: [PATCH 166/202] search widget : widget search history

SVN:b1162[5562]
---
 application/nicewebpage.class.inc.php    |   1 +
 js/search/search_form_handler.js         | 102 ++++++++++++++++++-----
 js/search/search_form_handler_history.js |  52 ++++++------
 3 files changed, 111 insertions(+), 44 deletions(-)

diff --git a/application/nicewebpage.class.inc.php b/application/nicewebpage.class.inc.php
index d14de2c64..2a622f9bd 100644
--- a/application/nicewebpage.class.inc.php
+++ b/application/nicewebpage.class.inc.php
@@ -52,6 +52,7 @@ class NiceWebPage extends WebPage
 		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.positionBy.js');
 		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.popupmenu.js');
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_handler.js');
+	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_handler_history.js');
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria.js');
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_raw.js');
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_string.js');
diff --git a/js/search/search_form_handler.js b/js/search/search_form_handler.js
index 394c6fd19..3d34357a3 100644
--- a/js/search/search_form_handler.js
+++ b/js/search/search_form_handler.js
@@ -24,6 +24,7 @@ $(function()
 			},
 			'search': {
 				'base_oql': '',
+				'class_name': null,
 				'criterion': [
 					// Structure
 					// {
@@ -90,6 +91,9 @@ $(function()
 			
 			this.element.addClass('search_form_handler');
 
+			//init others widgets :
+			this.element.search_form_handler_history({"itop_root_class":me.options.search.class_name});
+
 			// Prepare DOM elements
 			this._prepareFormArea();
 			this._prepareCriterionArea();
@@ -337,11 +341,12 @@ $(function()
 				.text(Dict.S('UI:Search:AddCriteria:List:RecentlyUsed:Title'))
 				.appendTo(oRecentsElem);
 
-			// TODO: Add elements and remove hidden class if there is some.
 			var oRecentsItemsElem = $('<ul class="sfl_items"></ul>')
 				.append('<li class="sfl_i_placeholder">' + Dict.S('UI:Search:AddCriteria:List:RecentlyUsed:Placeholder') + '</li>')
 				.appendTo(oRecentsElem);
 
+			me._refreshRecentlyUsed();
+
 			// - Search zlist list
 			var oZlistElem = $('<div></div>')
 				.addClass('sf_list')
@@ -357,13 +362,8 @@ $(function()
 
 			for(var sFieldRef in this.options.search.fields.zlist)
 			{
-				var oField = this.options.search.fields.zlist[sFieldRef];
-				var sFieldTitleAttr = (oField.description !== undefined) ? 'title="' + oField.description + '"' : '';
-				var oFieldElem = $('<li></li>')
-					.addClass('sfm_field')
-					.attr('data-field-ref', sFieldRef)
-					.append('<label ' + sFieldTitleAttr + '><input type="checkbox" value="' + sFieldRef + '" />' + oField.label + '</label>')
-					.appendTo(oZListItemsElem);
+				var oFieldElem = me._getHtmlLiFromFieldRef(me, sFieldRef, ['zlist']);
+				oFieldElem.appendTo(oZListItemsElem);
 			}
 
 			// - Remaining fields list
@@ -383,13 +383,8 @@ $(function()
 
 				for(var sFieldRef in this.options.search.fields.others)
 				{
-					var oField = this.options.search.fields.others[sFieldRef];
-					var sFieldTitleAttr = (oField.description !== undefined) ? 'title="' + oField.description + '"' : '';
-					var oFieldElem = $('<li></li>')
-						.addClass('sfm_field')
-						.attr('data-field-ref', sFieldRef)
-						.append('<label ' + sFieldTitleAttr + '><input type="checkbox" value="' + sFieldRef + '" />' + oField.label + '</label>')
-						.appendTo(oOthersItemsElem);
+					var oFieldElem = me._getHtmlLiFromFieldRef(me, sFieldRef, ['others']);
+					oFieldElem.appendTo(oOthersItemsElem);
 				}
 			}
 
@@ -504,7 +499,7 @@ $(function()
 			});
 
 			// - Add one criteria
-			this.elements.more_criterion.find('.sfm_field').on('click', function(oEvent){
+			this.elements.more_criterion.on('click', '.sfm_field', function(oEvent){
 				// Prevent anchor
 				oEvent.preventDefault();
 				// Prevent propagation to not close the opening criteria
@@ -513,13 +508,17 @@ $(function()
 				// If no checkbox checked, add criteria right away, otherwise we "queue" it we other checkboxed.
 				if(me.elements.more_criterion.find('.sfm_field input[type="checkbox"]:checked').length === 0)
 				{
+					var sFieldRef = $(this).attr('data-field-ref');
+
 					// Prepare new criterion data (as already opened to increase UX)
 					var oData = {
-						'ref': $(this).attr('data-field-ref'),
+						'ref': sFieldRef,
 						'init_opened': (oEvent.ctrlKey) ? false : true,
 					};
 
 					// Add criteria but don't submit form as the user has not specified the value yet.
+					me.element.search_form_handler_history('setLatest', sFieldRef);
+					me._refreshRecentlyUsed();
 					me._addCriteria(oData);
 				}
 				else
@@ -529,7 +528,7 @@ $(function()
 			});
 
 			// - Add several criterion
-			this.elements.more_criterion.find('.sfm_field input[type="checkbox"]').on('click', function(oEvent){
+			this.elements.more_criterion.on('click', '.sfm_field input[type="checkbox"]', function(oEvent){
 				// Prevent propagation to field and instant add of the criteria
 				oEvent.stopPropagation();
 
@@ -550,12 +549,17 @@ $(function()
 				if($(this).attr('name') === 'apply')
 				{
 					me.elements.more_criterion.find('.sfm_field input[type="checkbox"]:checked').each(function(iIdx, oElem){
+						var sFieldRef = $(oElem).closest('.sfm_field').attr('data-field-ref');
 						var oData = {
-							'ref': $(oElem).closest('.sfm_field').attr('data-field-ref'),
+							'ref': sFieldRef,
 							'init_opened': false,
 						};
+
+						me.element.search_form_handler_history('setLatest', sFieldRef);
 						me._addCriteria(oData);
 					});
+
+					me._refreshRecentlyUsed();
 					me._closeMoreCriterion();
 				}
 
@@ -571,6 +575,66 @@ $(function()
 				oButtonsElem.hide();
 			});
 		},
+
+		/**
+		 *  "add new criteria" <li /> markup
+		 *   - with checkbox, label, data-* ...
+		 *   - without event binding
+		 *
+		 * @private
+		 *
+		 * @param sFieldRef
+		 * @param aFieldCollectionsEligible
+		 *
+		 * @return jQuery detached <li />
+		 */
+		_getHtmlLiFromFieldRef: function(me, sFieldRef, aFieldCollectionsEligible) {
+			var oFieldElem = undefined;
+
+			aFieldCollectionsEligible.forEach(function (sFieldCollection) {
+				if (typeof me.options.search.fields[sFieldCollection][sFieldRef] == 'undefined')
+				{
+					return true;//if this field is not present in the Collection, let's try the next
+				}
+
+				var oField = me.options.search.fields[sFieldCollection][sFieldRef];
+				var sFieldTitleAttr = (oField.description !== undefined) ? 'title="' + oField.description + '"' : '';
+				oFieldElem = $('<li></li>')
+					.addClass('sfm_field')
+					.attr('data-field-ref', sFieldRef)
+					.append('<label ' + sFieldTitleAttr + '><input type="checkbox" value="' + sFieldRef + '" />' + oField.label + '</label>')
+			});
+
+			if (undefined == oFieldElem)
+			{
+				me._trace('no sFieldRef in given collection', {"sFieldRef":sFieldRef, "aFieldCollectionsEligible":aFieldCollectionsEligible});
+				return $('<!-- no sFieldRef in given collection -->');
+			}
+
+			return oFieldElem;
+		},
+
+		_refreshRecentlyUsed: function()
+		{
+			me = this;
+
+			var aHistory = me.element.search_form_handler_history("getHistory");
+			var oRecentsItemsElem = me.element.find('.sf_list_recents .sfl_items');
+
+			if (aHistory.length == 0)
+			{
+				return;
+			}
+			oRecentsItemsElem.empty();
+
+
+			aHistory.forEach(function(sFieldRef) {
+				var oFieldElem = me._getHtmlLiFromFieldRef(me, sFieldRef, ['zlist', 'others']);
+				oRecentsItemsElem.append(oFieldElem);
+			});
+
+		},
+
 		// - Prepare results area
 		_prepareResultsArea: function()
 		{
diff --git a/js/search/search_form_handler_history.js b/js/search/search_form_handler_history.js
index 6a564b1d6..fc7c58165 100644
--- a/js/search/search_form_handler_history.js
+++ b/js/search/search_form_handler_history.js
@@ -6,7 +6,7 @@
  *
  * $(cssSelector).search_form_handler_history({"itop_root_class":"FooBarClass"}) : constructor
  * $(cssSelector).search_form_handler_history("getHistory") : history array getter
- * $(cssSelector).search_form_handler_history("historyUnshift", "field.ref") : prepend the field ref to the beginning of the history array
+ * $(cssSelector).search_form_handler_history("setLatest", "field.ref") : prepend the field ref to the beginning of the history array
  *
  *
  * please take a look at the options for custom constructor values
@@ -37,12 +37,31 @@ $(function()
 		
 		iStoreHistoryTimeoutHandler : undefined,
 
+		/**
+		 * the constructor, called by the widget factory
+		 * @private
+		 */
+		_create: function()
+		{
+			var me = this;
+
+			if (me.options.preference_code == undefined)
+			{
+				me.options.preference_code = me.options.itop_root_class + '__search_history';
+			}
+
+
+			me.aHistory = JSON.parse(GetUserPreference(me._getPreferenceCode(), "[]"));
+		},
+
 		getHistory: function()
 		{
+			var me = this;
+
 			return me.aHistory;
 		},
 
-		historyUnshift: function(sFieldRef)
+		setLatest: function(sFieldRef)
 		{
 			var me = this;
 
@@ -60,7 +79,7 @@ $(function()
 			var iDeleteCount = me.aHistory.length - me.options.history_max_length;
 			if (iDeleteCount > 0)
 			{
-				me.aHistory.splice(0, iDeleteCount);
+				me.aHistory.splice(-iDeleteCount, iDeleteCount);
 			}
 
 			//store it in the backend (with a delay in the hope to wait long enough to make bulk modifications
@@ -70,22 +89,7 @@ $(function()
 			return;
 		},
 
-		/**
-		 * the constructor, called by the widget factory
-		 * @private
-		 */
-		_create: function()
-		{
-			var me = this;
 
-			if (me.options.preference_code == undefined)
-			{
-				me.options.preference_code = me.options.itop_root_class + '|search_history';
-			}
-
-
-			me.aHistory = GetUserPreference(me._getPreferenceCode(), []);
-		},
 
 		/**
 		 * @returns String
@@ -93,12 +97,12 @@ $(function()
 		 */
 		_getPreferenceCode: function()
 		{
-			return me.options.preference_code;
+			return this.options.preference_code;
 		},
 
 
 		/**
-		 * should only be called by historyUnshift in order to store the updated history
+		 * should only be called by setLatest in order to store the updated history
 		 * @private
 		 */
 		_storeHistory: function()
@@ -110,18 +114,16 @@ $(function()
 				clearTimeout(me.iStoreHistoryTimeoutHandler);
 			}
 
-			me.iStoreHistoryTimeoutHandler = setTimeout(me._storeHistoryTimeoutFunction, me.options.history_backend_store_timeout);
+			me.iStoreHistoryTimeoutHandler = setTimeout(me._storeHistoryTimeoutFunction(me), me.options.history_backend_store_timeout);
 		},
 
 		/**
 		 * should only be called by _storeHistory using a timeout
 		 * @private
 		 */
-		_storeHistoryTimeoutFunction: function()
+		_storeHistoryTimeoutFunction: function(me)
 		{
-			var me = this;
-
-			SetUserPreference(me._getPreferenceCode(), me.getHistory(), true);
+			SetUserPreference(me._getPreferenceCode(), JSON.stringify(me.getHistory()), true);
 
 			me.iStoreHistoryTimeoutHandler = undefined;
 		}

From 11af11b3be63758ea533321c5b91c4401c52056b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Thu, 29 Mar 2018 08:06:16 +0000
Subject: [PATCH 167/202] Advanced Search: add class alias in criterion

SVN:b1162[5563]
---
 core/oql/expression.class.inc.php             |  1 +
 .../criteriontosearchform.class.inc.php       | 34 +++++++++++--------
 .../search/searchform.class.inc.php           |  8 ++++-
 3 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/core/oql/expression.class.inc.php b/core/oql/expression.class.inc.php
index c302998a8..0a36c106a 100644
--- a/core/oql/expression.class.inc.php
+++ b/core/oql/expression.class.inc.php
@@ -1043,6 +1043,7 @@ class FieldExpression extends UnaryExpression
 		return array(
 			'widget' => $sSearchType,
 			'ref' => $this->GetParent().'.'.$this->GetName(),
+			'class_alias' => $this->GetParent(),
 		);
 	}
 }
diff --git a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
index 82fdb1e5f..88779f228 100644
--- a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
+++ b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
@@ -80,24 +80,28 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 			}
 			$aCriteria['is_removable'] = $bIsRemovable;
 
-			// Check criteria validity
-			if (!array_key_exists('ref', $aCriteria) || !array_key_exists($aCriteria['ref'], $aAllFields))
+			if (isset($aCriteria['ref']))
 			{
-
-				$aCriteria['label'] = Dict::S('UI:Search:Criteria:Raw:Filtered');
-				if (array_key_exists('ref', $aCriteria))
+				$aRef = explode('.', $aCriteria['ref']);
+				if (isset($aClasses[$aRef[0]]))
 				{
-					$aRef = explode('.', $aCriteria['ref']);
-					if (isset($aClasses[$aRef[0]]))
+					$sClass = $aClasses[$aRef[0]];
+					$aCriteria['class'] = $sClass;
+				}
+			}
+
+			// Check criteria validity
+			if (!isset($aCriteria['ref']) || !isset($aAllFields[$aCriteria['ref']]))
+			{
+				$aCriteria['label'] = Dict::S('UI:Search:Criteria:Raw:Filtered');
+				if (isset($aCriteria['ref']))
+				{
+					try
+					{
+						$aCriteria['label'] = Dict::Format('UI:Search:Criteria:Raw:FilteredOn', MetaModel::GetName($sClass));
+					}
+					catch (Exception $e)
 					{
-						$sClass = $aClasses[$aRef[0]];
-						try
-						{
-							$aCriteria['label'] = Dict::Format('UI:Search:Criteria:Raw:FilteredOn', MetaModel::GetName($sClass));
-						}
-						catch (Exception $e)
-						{
-						}
 					}
 				}
 			}
diff --git a/sources/application/search/searchform.class.inc.php b/sources/application/search/searchform.class.inc.php
index 469f37744..db0f086b9 100644
--- a/sources/application/search/searchform.class.inc.php
+++ b/sources/application/search/searchform.class.inc.php
@@ -137,7 +137,12 @@ class SearchForm
 		$aFields = $this->GetFields($oSet);
 		$oSearch = $oSet->GetFilter();
 		$aCriterion = $this->GetCriterion($oSearch, $aFields, $aArgs, $bIsRemovable);
-
+		$aClasses = $oSearch->GetSelectedClasses();
+		$sClassAlias = '';
+		foreach($aClasses as $sAlias => $sClass)
+		{
+			$sClassAlias = $sAlias;
+		}
 
 		$oBaseSearch = $oSearch->DeepClone();
 		$oBaseSearch->ResetCondition();
@@ -195,6 +200,7 @@ class SearchForm
 				'fields' => $aFields,
 				'criterion' => $aCriterion,
 				'class_name' => $sClassName,
+				'class_alias' => $sClassAlias,
 				'base_oql' => $sBaseOQL,
 			),
 		);

From 155034092f99b28e29fd753a024eb61a1f9bc280 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Thu, 29 Mar 2018 08:45:46 +0000
Subject: [PATCH 168/202] Advanced Search: remove the conversion IN <=> NOT IN
 for external keys

SVN:b1162[5564]
---
 .../criteriontooql.class.inc.php              | 58 ++++++++++---------
 .../criteriontosearchform.class.inc.php       | 28 ++++++++-
 .../search/CriterionConversionTest.php        |  2 +-
 3 files changed, 57 insertions(+), 31 deletions(-)

diff --git a/sources/application/search/criterionconversion/criteriontooql.class.inc.php b/sources/application/search/criterionconversion/criteriontooql.class.inc.php
index 4171538d6..6c237df07 100644
--- a/sources/application/search/criterionconversion/criteriontooql.class.inc.php
+++ b/sources/application/search/criterionconversion/criteriontooql.class.inc.php
@@ -26,6 +26,7 @@ namespace Combodo\iTop\Application\Search\CriterionConversion;
 use AttributeDate;
 use AttributeDateTime;
 use AttributeDefinition;
+use AttributeEnum;
 use Combodo\iTop\Application\Search\AjaxSearchException;
 use Combodo\iTop\Application\Search\CriterionConversionAbstract;
 use Combodo\iTop\Application\Search\SearchForm;
@@ -155,42 +156,45 @@ class CriterionToOQL extends CriterionConversionAbstract
 			if (array_key_exists($sAttCode, $aAttributeDefs))
 			{
 				$oAttDef = $aAttributeDefs[$sAttCode];
-				$aAllowedValues = SearchForm::GetFieldAllowedValues($oAttDef);
-				if (array_key_exists('values', $aAllowedValues))
+				if ($oAttDef instanceof AttributeEnum)
 				{
-					// Can't invert the test if NULL is allowed
-					if (!$oAttDef->IsNullAllowed())
+					$aAllowedValues = SearchForm::GetFieldAllowedValues($oAttDef);
+					if (array_key_exists('values', $aAllowedValues))
 					{
-						$aAllowedValues = $aAllowedValues['values'];
-						if (count($aValues) == count($aAllowedValues))
+						// Can't invert the test if NULL is allowed
+						if (!$oAttDef->IsNullAllowed())
 						{
-							// All entries are selected
-							return "1";
-						}
-						// more selected values than remaining so use NOT IN
-						else
-						{
-							if (count($aValues) > (count($aAllowedValues) / 2))
+							$aAllowedValues = $aAllowedValues['values'];
+							if (count($aValues) == count($aAllowedValues))
 							{
-								foreach($aValues as $aValue)
+								// All entries are selected
+								return "1";
+							}
+							// more selected values than remaining so use NOT IN
+							else
+							{
+								if (count($aValues) > (count($aAllowedValues) / 2))
 								{
-									unset($aAllowedValues[$aValue['value']]);
-								}
-								$sInList = implode("','", array_keys($aAllowedValues));
+									foreach($aValues as $aValue)
+									{
+										unset($aAllowedValues[$aValue['value']]);
+									}
+									$sInList = implode("','", array_keys($aAllowedValues));
 
-								return "({$sRef} NOT IN ('$sInList'))";
+									return "({$sRef} NOT IN ('$sInList'))";
+								}
 							}
 						}
-					}
-					// search for "undefined"
-					for ($i = 0; $i < count($aValues); $i++)
-					{
-						$aValue = $aValues[$i];
-						if (isset($aValue['value']) && ($aValue['value'] === 'null'))
+						// search for "undefined"
+						for($i = 0; $i < count($aValues); $i++)
 						{
-							$bFilterOnUndefined = true;
-							unset($aValues[$i]);
-							break;
+							$aValue = $aValues[$i];
+							if (isset($aValue['value']) && ($aValue['value'] === 'null'))
+							{
+								$bFilterOnUndefined = true;
+								unset($aValues[$i]);
+								break;
+							}
 						}
 					}
 				}
diff --git a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
index 88779f228..666538b28 100644
--- a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
+++ b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
@@ -68,7 +68,7 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 			AttributeDefinition::SEARCH_WIDGET_TYPE_NUMERIC => 'NumericToSearchForm',
 			AttributeDefinition::SEARCH_WIDGET_TYPE_EXTERNAL_KEY => 'ExternalKeyToSearchForm',
 			AttributeDefinition::SEARCH_WIDGET_TYPE_HIERARCHICAL_KEY => 'ExternalKeyToSearchForm',
-			AttributeDefinition::SEARCH_WIDGET_TYPE_ENUM => 'ExternalKeyToSearchForm',
+			AttributeDefinition::SEARCH_WIDGET_TYPE_ENUM => 'EnumToSearchForm',
 		);
 
 		foreach($aAndCriterionRaw as $aCriteria)
@@ -93,6 +93,7 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 			// Check criteria validity
 			if (!isset($aCriteria['ref']) || !isset($aAllFields[$aCriteria['ref']]))
 			{
+				$aCriteria['widget'] = AttributeDefinition::SEARCH_WIDGET_TYPE_RAW;
 				$aCriteria['label'] = Dict::S('UI:Search:Criteria:Raw:Filtered');
 				if (isset($aCriteria['ref']))
 				{
@@ -492,8 +493,7 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 		return $aCriteria;
 	}
 
-
-	protected static function ExternalKeyToSearchForm($aCriteria, $aFields)
+	protected static function EnumToSearchForm($aCriteria, $aFields)
 	{
 		$sOperator = $aCriteria['operator'];
 		switch ($sOperator)
@@ -503,6 +503,7 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 				$aCriteria['operator'] = CriterionConversionAbstract::OP_IN;
 				break;
 			case 'NOT IN':
+			case 'NOTIN':
 			case '!=':
 				// Same as NOT IN
 				$aCriteria = self::RevertValues($aCriteria, $aFields);
@@ -533,6 +534,27 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 		return $aCriteria;
 	}
 
+	protected static function ExternalKeyToSearchForm($aCriteria, $aFields)
+	{
+		$sOperator = $aCriteria['operator'];
+		switch ($sOperator)
+		{
+			case '=':
+				// Same as IN
+				$aCriteria['operator'] = CriterionConversionAbstract::OP_IN;
+				break;
+			case 'IN':
+				// Nothing special to do
+				break;
+			default:
+				// Unknown operator
+				$aCriteria['widget'] = AttributeDefinition::SEARCH_WIDGET_TYPE_RAW;
+				break;
+		}
+
+		return $aCriteria;
+	}
+
 	/**
 	 * @param $aCriteria
 	 * @param $aFields
diff --git a/test/application/search/CriterionConversionTest.php b/test/application/search/CriterionConversionTest.php
index dcdf33e7f..777f3e2f9 100644
--- a/test/application/search/CriterionConversionTest.php
+++ b/test/application/search/CriterionConversionTest.php
@@ -431,7 +431,7 @@ class CriterionConversionTest extends ItopDataTestCase
 			'key NOT IN' => array(
 				'OQL' => "SELECT Contact WHERE org_id NOT IN ('1')",
 				'ExpectedOQL' => "SELECT `Contact` FROM Contact AS `Contact` WHERE (`Contact`.`org_id` NOT IN ('1'))",
-				'ExpectedCriterion' => array(array('widget' => 'hierarchical_key', 'operator' => 'IN')),
+				'ExpectedCriterion' => array(array('widget' => 'raw', 'operator' => 'NOT IN')),
 			),
 			'key IN' => array(
 				'OQL' => "SELECT Contact WHERE org_id IN ('1')",

From 06f648b7147b96ede1b10e0210bf070e366996a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Thu, 29 Mar 2018 08:54:03 +0000
Subject: [PATCH 169/202] Advanced Search: back to max_combo_length for the
 external keys

SVN:b1162[5565]
---
 .../search/searchform.class.inc.php           | 21 +++----------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/sources/application/search/searchform.class.inc.php b/sources/application/search/searchform.class.inc.php
index db0f086b9..e2d23790f 100644
--- a/sources/application/search/searchform.class.inc.php
+++ b/sources/application/search/searchform.class.inc.php
@@ -307,11 +307,6 @@ class SearchForm
 	 */
 	public static function GetFieldAllowedValues($oAttrDef)
 	{
-		// better than MetaModel::GetConfig()->Get('max_combo_length')
-		// changing this value can introduce weird behaviour
-		static $iMaxComboLength = 50;
-		$aValues = array();
-
 		if ($oAttrDef->IsExternalKey(EXTKEY_ABSOLUTE))
 		{
 			$sTargetClass = $oAttrDef->GetTargetClass();
@@ -326,13 +321,9 @@ class SearchForm
 			}
 			$oSearch->SetModifierProperty('UserRightsGetSelectFilter', 'bSearchMode', true);
 			$oSet = new DBObjectSet($oSearch);
-			if ($oSet->Count() > $iMaxComboLength)
-			{
-				return array('autocomplete' => true);
-			}
 			if ($oSet->Count() > MetaModel::GetConfig()->Get('max_combo_length'))
 			{
-				$aValues['autocomplete'] = true;
+				return array('autocomplete' => true);
 			}
 		}
 		else
@@ -340,20 +331,14 @@ class SearchForm
 			if (method_exists($oAttrDef, 'GetAllowedValuesAsObjectSet'))
 			{
 				$oSet = $oAttrDef->GetAllowedValuesAsObjectSet();
-				if ($oSet->Count() > $iMaxComboLength)
-				{
-					return array('autocomplete' => true);
-				}
 				if ($oSet->Count() > MetaModel::GetConfig()->Get('max_combo_length'))
 				{
-					$aValues['autocomplete'] = true;
+					return array('autocomplete' => true);
 				}
 			}
 		}
 
-		$aValues['values'] = $oAttrDef->GetAllowedValues();
-
-		return $aValues;
+		return array('values' => $oAttrDef->GetAllowedValues());
 	}
 
 	/**

From 73d9ea42f03b3e566eb8847a5158585b50d02ffd Mon Sep 17 00:00:00 2001
From: Bruno Da Silva <bruno.dasilva@combodo.com>
Date: Thu, 29 Mar 2018 09:14:28 +0000
Subject: [PATCH 170/202] search widget : widget numeric => default operator is
 now equals

because of the id field who will be almost the only numeric field, searching by id is the most common use case

SVN:b1162[5566]
---
 js/search/search_form_criteria_numeric.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/js/search/search_form_criteria_numeric.js b/js/search/search_form_criteria_numeric.js
index 20cd5340d..0137bfaa1 100644
--- a/js/search/search_form_criteria_numeric.js
+++ b/js/search/search_form_criteria_numeric.js
@@ -10,18 +10,18 @@ $(function()
 		options:
 		{
 			// Overload default operator
-			'operator': 'between',
+			'operator': '=',
 			// Available operators
 			'available_operators': {
-				'between': {
-					'label': Dict.S('UI:Search:Criteria:Operator:Numeric:Between'),
-					'code': 'between',
-					'rank': 0,
-				},
 				'=': {
 					'label': Dict.S('UI:Search:Criteria:Operator:Numeric:Equals'),//pre-existing, label changed
 					// 'dropdown_group':1,
 				},
+				'between': {
+					'label': Dict.S('UI:Search:Criteria:Operator:Numeric:Between'),
+					'code': 'between',
+					'rank': 50,
+				},
 				'>': {
 					'label': Dict.S('UI:Search:Criteria:Operator:Numeric:GreaterThan'),
 					'code': 'greater_than',

From 6e9fab849c2666bfdc55f05828ee4632badb640f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Thu, 29 Mar 2018 09:18:40 +0000
Subject: [PATCH 171/202] Advanced Search: add target_class for the external
 keys

SVN:b1162[5569]
---
 .../application/search/searchform.class.inc.php    | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/sources/application/search/searchform.class.inc.php b/sources/application/search/searchform.class.inc.php
index e2d23790f..2cf17be9a 100644
--- a/sources/application/search/searchform.class.inc.php
+++ b/sources/application/search/searchform.class.inc.php
@@ -323,7 +323,7 @@ class SearchForm
 			$oSet = new DBObjectSet($oSearch);
 			if ($oSet->Count() > MetaModel::GetConfig()->Get('max_combo_length'))
 			{
-				return array('autocomplete' => true);
+				return array('autocomplete' => true, 'target_class' => $sTargetClass);
 			}
 		}
 		else
@@ -333,7 +333,17 @@ class SearchForm
 				$oSet = $oAttrDef->GetAllowedValuesAsObjectSet();
 				if ($oSet->Count() > MetaModel::GetConfig()->Get('max_combo_length'))
 				{
-					return array('autocomplete' => true);
+
+					if (method_exists($oAttrDef, 'GetTargetClass'))
+					{
+						$sTargetClass = $oAttrDef->GetTargetClass();
+					}
+					else
+					{
+						$sTargetClass = $oAttrDef->GetHostClass();
+					}
+
+					return array('autocomplete' => true, 'target_class' => $sTargetClass);
 				}
 			}
 		}

From 04154fa40ca10fae296c8db5e5e0859b85bc58e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Thu, 29 Mar 2018 09:21:43 +0000
Subject: [PATCH 172/202] Advanced Search: add target_class for the external
 keys

SVN:b1162[5570]
---
 .../search/searchform.class.inc.php           | 24 +++++++++----------
 test/application/search/SearchFormTest.php    |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/sources/application/search/searchform.class.inc.php b/sources/application/search/searchform.class.inc.php
index 2cf17be9a..140011dac 100644
--- a/sources/application/search/searchform.class.inc.php
+++ b/sources/application/search/searchform.class.inc.php
@@ -323,7 +323,7 @@ class SearchForm
 			$oSet = new DBObjectSet($oSearch);
 			if ($oSet->Count() > MetaModel::GetConfig()->Get('max_combo_length'))
 			{
-				return array('autocomplete' => true, 'target_class' => $sTargetClass);
+				return array('autocomplete' => true);
 			}
 		}
 		else
@@ -333,17 +333,7 @@ class SearchForm
 				$oSet = $oAttrDef->GetAllowedValuesAsObjectSet();
 				if ($oSet->Count() > MetaModel::GetConfig()->Get('max_combo_length'))
 				{
-
-					if (method_exists($oAttrDef, 'GetTargetClass'))
-					{
-						$sTargetClass = $oAttrDef->GetTargetClass();
-					}
-					else
-					{
-						$sTargetClass = $oAttrDef->GetHostClass();
-					}
-
-					return array('autocomplete' => true, 'target_class' => $sTargetClass);
+					return array('autocomplete' => true);
 				}
 			}
 		}
@@ -429,10 +419,20 @@ class SearchForm
 		{
 			$sLabel = $oAttDef->GetLabel();
 
+			if (method_exists($oAttDef, 'GetTargetClass'))
+			{
+				$sTargetClass = $oAttDef->GetTargetClass();
+			}
+			else
+			{
+				$sTargetClass = $oAttDef->GetHostClass();
+			}
+
 			$aField = array();
 			$aField['code'] = $sFilterCode;
 			$aField['class'] = $sClass;
 			$aField['class_alias'] = $sClassAlias;
+			$aField['target_class'] = $sTargetClass;
 			$aField['label'] = $sLabel;
 			$aField['widget'] = $oAttDef->GetSearchType();
 			$aField['allowed_values'] = self::GetFieldAllowedValues($oAttDef);
diff --git a/test/application/search/SearchFormTest.php b/test/application/search/SearchFormTest.php
index 4a70c87d5..abeb95d02 100644
--- a/test/application/search/SearchFormTest.php
+++ b/test/application/search/SearchFormTest.php
@@ -58,7 +58,7 @@ class SearchFormTest extends ItopDataTestCase
 	{
 		return array(
 			array("SELECT Contact", 8, 'zlist'),
-			array("SELECT Contact AS C WHERE C.status = 'active'", 5, 'others'),
+			array("SELECT Contact AS C WHERE C.status = 'active'", 2, 'others'),
 			array("SELECT Person", 12, 'zlist'),
 			array(
 				"SELECT Person AS p JOIN UserRequest AS u ON u.agent_id = p.id WHERE u.status != 'closed'",

From dfab460478fdf703473c585deca6aea3555506a5 Mon Sep 17 00:00:00 2001
From: Bruno Da Silva <bruno.dasilva@combodo.com>
Date: Thu, 29 Mar 2018 10:12:20 +0000
Subject: [PATCH 173/202] search widget : bugfix

if the selected operator is not the default one, open in "advanced" mode in order to be able to see the operator

SVN:b1162[5571]
---
 js/search/search_form_criteria.js | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/js/search/search_form_criteria.js b/js/search/search_form_criteria.js
index 407b1bc3e..1becbc9a5 100644
--- a/js/search/search_form_criteria.js
+++ b/js/search/search_form_criteria.js
@@ -189,16 +189,14 @@ $(function()
 			}
 
 			// Focus on right input
-			var oOpElemToFocus;
-			if(this.element.find('.sfc_form_group').hasClass('advanced'))
+			var oOpElemRadioChecked = this.element.find('.sfc_fg_operator .sfc_op_radio:checked');
+
+			if (!oOpElemRadioChecked.is(':visible'))
 			{
-				oOpElemToFocus = this.element.find('.sfc_fg_operator .sfc_op_radio:checked').closest('.sfc_fg_operator');
+				this.element.find('.sfc_form_group').addClass('advanced');
 			}
-			else
-			{
-				oOpElemToFocus = this.element.find('.sfc_fg_operator:first');
-			}
-			oOpElemToFocus.find('.sfc_op_content input[type="text"]:first').filter(':not([data-no-auto-focus])').trigger('click').trigger('focus');
+
+			oOpElemRadioChecked.closest('.sfc_fg_operator').find('.sfc_op_content input[type="text"]:first').filter(':not([data-no-auto-focus])').trigger('click').trigger('focus');
 		},
 		_close: function()
 		{

From 456f8be6e5d0e684215a00deca9b15ca65296c14 Mon Sep 17 00:00:00 2001
From: Bruno Da Silva <bruno.dasilva@combodo.com>
Date: Thu, 29 Mar 2018 10:13:07 +0000
Subject: [PATCH 174/202] search widget : numeric => between after the basic
 operators

SVN:b1162[5572]
---
 js/search/search_form_criteria_numeric.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/js/search/search_form_criteria_numeric.js b/js/search/search_form_criteria_numeric.js
index 0137bfaa1..11b99eb58 100644
--- a/js/search/search_form_criteria_numeric.js
+++ b/js/search/search_form_criteria_numeric.js
@@ -17,11 +17,6 @@ $(function()
 					'label': Dict.S('UI:Search:Criteria:Operator:Numeric:Equals'),//pre-existing, label changed
 					// 'dropdown_group':1,
 				},
-				'between': {
-					'label': Dict.S('UI:Search:Criteria:Operator:Numeric:Between'),
-					'code': 'between',
-					'rank': 50,
-				},
 				'>': {
 					'label': Dict.S('UI:Search:Criteria:Operator:Numeric:GreaterThan'),
 					'code': 'greater_than',
@@ -53,6 +48,12 @@ $(function()
 					// 'dropdown_group':1,
 				},
 
+				'between': {
+					'label': Dict.S('UI:Search:Criteria:Operator:Numeric:Between'),
+					'code': 'between',
+					'rank': 600,
+				},
+
 				'empty': {
 					'rank': 700,//pre-existing, reordered
 				},

From 24c7ff4cfa4f7d46c6a0bde8d2008f952bc2a8d7 Mon Sep 17 00:00:00 2001
From: Bruno Da Silva <bruno.dasilva@combodo.com>
Date: Thu, 29 Mar 2018 10:14:33 +0000
Subject: [PATCH 175/202] search widget : numeric => between has a little
 margin on top and bottom

SVN:b1162[5573]
---
 css/light-grey.css  | 1 +
 css/light-grey.scss | 1 +
 2 files changed, 2 insertions(+)

diff --git a/css/light-grey.css b/css/light-grey.css
index 5b9e87631..43c2d6491 100644
--- a/css/light-grey.css
+++ b/css/light-grey.css
@@ -1025,6 +1025,7 @@ input.dp-applied {
   width: 88px;
 }
 .search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_numeric .sfc_form_group.advanced .sfc_fg_operator_between {
+  margin-top: 5px;
   margin-bottom: 5px;
 }
 .search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_numeric .sfc_fg_operator_between label.sfc_op_content_from_label, .search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_numeric .sfc_fg_operator_between label.sfc_op_content_until_label {
diff --git a/css/light-grey.scss b/css/light-grey.scss
index f1b1b7412..5f0ba2a2d 100644
--- a/css/light-grey.scss
+++ b/css/light-grey.scss
@@ -1180,6 +1180,7 @@ input.dp-applied {
 				}
 				.sfc_form_group.advanced {
 					.sfc_fg_operator_between {
+						margin-top: 5px;
 						margin-bottom: 5px;
 					}
 				}

From 7e884dc69f4f104732bcc3e3c56f624e43aeb43f Mon Sep 17 00:00:00 2001
From: Bruno Da Silva <bruno.dasilva@combodo.com>
Date: Thu, 29 Mar 2018 12:27:30 +0000
Subject: [PATCH 176/202] search widget : bugfix

if the selected operator is not the default one, open in "advanced" mode in order to be able to see the operator

SVN:b1162[5574]
---
 js/search/search_form_criteria.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/js/search/search_form_criteria.js b/js/search/search_form_criteria.js
index 1becbc9a5..712dd32c7 100644
--- a/js/search/search_form_criteria.js
+++ b/js/search/search_form_criteria.js
@@ -190,13 +190,17 @@ $(function()
 
 			// Focus on right input
 			var oOpElemRadioChecked = this.element.find('.sfc_fg_operator .sfc_op_radio:checked');
+			var oOpElemInputFirst = oOpElemRadioChecked.closest('.sfc_fg_operator').find('.sfc_op_content input[type="text"]:first');
 
-			if (!oOpElemRadioChecked.is(':visible'))
+			oOpElemInputFirst.filter(':not([data-no-auto-focus])').trigger('click').trigger('focus');
+
+			this.element.find('.sfc_form_group').removeClass('advanced');
+
+			if (!oOpElemInputFirst.is(':visible'))
 			{
 				this.element.find('.sfc_form_group').addClass('advanced');
 			}
 
-			oOpElemRadioChecked.closest('.sfc_fg_operator').find('.sfc_op_content input[type="text"]:first').filter(':not([data-no-auto-focus])').trigger('click').trigger('focus');
 		},
 		_close: function()
 		{

From e9444d30552a28b3241ab0e4cfd9ee3a6cffbf74 Mon Sep 17 00:00:00 2001
From: Guillaume Lajarige <guillaume.lajarige@combodo.com>
Date: Thu, 29 Mar 2018 15:15:43 +0000
Subject: [PATCH 177/202] Advanced search: UI/UX, remove [not_]empty operators
 on fields that can't be null.

SVN:b1162[5575]
---
 js/search/search_form_criteria.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/js/search/search_form_criteria.js b/js/search/search_form_criteria.js
index 712dd32c7..d2f5ae21d 100644
--- a/js/search/search_form_criteria.js
+++ b/js/search/search_form_criteria.js
@@ -97,9 +97,16 @@ $(function()
 		//   Note: A null operator or an operator with a rank "false" will be removed.
 		_initOperators: function()
 		{
-			// Reset oprators
+			// Reset operators
 			this.operators = {};
 
+			// Cancel empty/not_empty operators if field can't be null
+			if(this.options.field.is_null_allowed === false)
+			{
+				this.options.available_operators.empty = null;
+				this.options.available_operators.not_empty = null;
+			}
+
 			// Temp array to sort operators
 			var aSortable = [];
 			for(var sOpIdx in this.options.available_operators)

From 0ca2e33e7cbd4124da5488c234a766f68b994ee5 Mon Sep 17 00:00:00 2001
From: Guillaume Lajarige <guillaume.lajarige@combodo.com>
Date: Thu, 29 Mar 2018 15:50:18 +0000
Subject: [PATCH 178/202] Advanced search: UI/UX, ext. key autocomplete no UI.

SVN:b1162[5578]
---
 application/ui.extkeywidget.class.inc.php |  24 +-
 css/light-grey.css                        |   2 +-
 css/light-grey.scss                       |   2 +-
 js/search/search_form_criteria_enum.js    | 310 ++++++++++++++--------
 js/search/search_form_handler.js          |   1 +
 pages/ajax.render.php                     |   3 +-
 6 files changed, 220 insertions(+), 122 deletions(-)

diff --git a/application/ui.extkeywidget.class.inc.php b/application/ui.extkeywidget.class.inc.php
index d16fb0242..34f7ed506 100644
--- a/application/ui.extkeywidget.class.inc.php
+++ b/application/ui.extkeywidget.class.inc.php
@@ -63,6 +63,9 @@ require_once(APPROOT.'/application/displayblock.class.inc.php');
 
 class UIExtKeyWidget
 {
+	const ENUM_OUTPUT_FORMAT_CSV = 'csv';
+	const ENUM_OUTPUT_FORMAT_JSON = 'json';
+
 	protected $iId;
 	protected $sTargetClass;
 	protected $sAttCode;
@@ -407,7 +410,7 @@ EOF
 	 * @param DBObject $oObj The current object for the OQL context
 	 * @param string $sContains The text of the autocomplete to filter the results
 	 */
-	public function AutoComplete(WebPage $oP, $sFilter, $oObj = null, $sContains)
+	public function AutoComplete(WebPage $oP, $sFilter, $oObj = null, $sContains, $sOutputFormat = self::ENUM_OUTPUT_FORMAT_CSV)
 	{
 		if (is_null($sFilter))
 		{
@@ -420,9 +423,24 @@ EOF
 		$oValuesSet = new ValueSetObjects($sFilter, 'friendlyname'); // Bypass GetName() to avoid the encoding by htmlentities
 		$oValuesSet->SetModifierProperty('UserRightsGetSelectFilter', 'bSearchMode', $this->bSearchMode);
 		$aValues = $oValuesSet->GetValues(array('this' => $oObj, 'current_extkey_id' => $iCurrentExtKeyId), $sContains);
-		foreach($aValues as $sKey => $sFriendlyName)
+
+		switch($sOutputFormat)
 		{
-			$oP->add(trim($sFriendlyName)."\t".$sKey."\n");
+			case static::ENUM_OUTPUT_FORMAT_JSON:
+				// Array flip to preserve values order on the label, otherwise the JS will re-order regarding the keys.
+				$oP->SetContentType('application/json');
+				$oP->add(json_encode(array_flip($aValues)));
+				break;
+
+			case static::ENUM_OUTPUT_FORMAT_CSV:
+				foreach($aValues as $sKey => $sFriendlyName)
+				{
+					$oP->add(trim($sFriendlyName)."\t".$sKey."\n");
+				}
+				break;
+			default:
+				throw new Exception('Invalid output format, "'.$sOutputFormat.'" given.');
+				break;
 		}
 	}
 
diff --git a/css/light-grey.css b/css/light-grey.css
index 43c2d6491..8a8528ef4 100644
--- a/css/light-grey.css
+++ b/css/light-grey.css
@@ -942,7 +942,7 @@ input.dp-applied {
   width: 90px;
 }
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator.sfc_fg_operator_equals .sfc_op_content input, .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator.sfc_fg_operator_contains .sfc_op_content input, .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator.sfc_fg_operator_starts_with .sfc_op_content input, .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator.sfc_fg_operator_ends_with .sfc_op_content input {
-  width: 130px;
+  width: 160px;
 }
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_apply, .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_cancel {
   margin-top: 8px;
diff --git a/css/light-grey.scss b/css/light-grey.scss
index 5f0ba2a2d..c995efd94 100644
--- a/css/light-grey.scss
+++ b/css/light-grey.scss
@@ -1058,7 +1058,7 @@ input.dp-applied {
 							}
 							.sfc_op_content{
 								input{
-									width: 130px;
+									width: 160px;
 								}
 							}
 						}
diff --git a/js/search/search_form_criteria_enum.js b/js/search/search_form_criteria_enum.js
index 641aeb17d..a0910d262 100644
--- a/js/search/search_form_criteria_enum.js
+++ b/js/search/search_form_criteria_enum.js
@@ -28,6 +28,11 @@ $(function()
 				'code': null,
 				'label': Dict.S('Enum:Undefined'),
 			},
+
+			// Autocomplete
+			'autocomplete': {
+				'xhr_throttle': 200,
+			},
 		},
 
    
@@ -85,29 +90,37 @@ $(function()
 
 			// DOM elements
 			var sOpId = oOpElem.attr('id');
-			var oOpContentElem = $('<div class="sfc_opc_multichoices"></div>');
+			var oOpContentElem = $('<div></div>')
+				.addClass('sfc_opc_multichoices');
 
 			// - Check / Uncheck all togglers
 			var sTogglerId = 'toggle_' + sOpId;
-			var oTogglersElem = $('<div class="sfc_opc_mc_toggler"></div>')
+			var oTogglersElem = $('<div></div>')
+				.addClass('sfc_opc_mc_toggler')
 				.append('<label for="' + sTogglerId + '"><input type="checkbox" id="' + sTogglerId + '" />' + Dict.S('UI:Search:Value:Toggler:CheckAllNone') + '</label>')
 				.appendTo(oOpContentElem);
 
 			// - Filter
 			var sFilterId = 'filter_' + sOpId;
 			var sFilterPlaceholder = (this._hasAutocompleteAllowedValues()) ? Dict.S('UI:Search:Value:Search:Placeholder') : Dict.S('UI:Search:Value:Filter:Placeholder');
-			var oFilterElem = $('<div class="sf_filter"></div>')
-				.append('<span class="sff_input_wrapper"><input type="text" id="' + sFilterId + '" placeholder="' + sFilterPlaceholder + '" /><span class="sff_picto sff_filter fa fa-filter"></span><span class="sff_picto sff_reset fa fa-times"></span></span>')
+			var oFilterElem = $('<div></div>')
+				.addClass('sf_filter')
+				.append('<span class="sff_input_wrapper"><input type="text" id="' + sFilterId + '" placeholder="' + sFilterPlaceholder + '" autocomplete="off" /><span class="sff_picto sff_reset fa fa-times"></span></span>')
 				.appendTo(oOpContentElem);
 
 			// - Allowed values
-			var oAllowedValuesElem = $('<div class="sfc_opc_mc_items"></div>')
+			var oAllowedValuesElem = $('<div></div>')
+				.addClass('sfc_opc_mc_items')
 				.appendTo(oOpContentElem);
 			// - Static values: Always there no matter the field constraints
-			var oStaticValuesElem = $('<div class="sfc_opc_mc_items_list sfc_opc_mc_items_static"></div>')
+			var oStaticListElem = $('<div></div>')
+				.addClass('sfc_opc_mc_items_list')
+				.addClass('sfc_opc_mc_items_static')
 				.appendTo(oAllowedValuesElem);
 			// - Dynamic values: Depends on the field constraints
-			var oDynamicValuesElem = $('<div class="sfc_opc_mc_items_list sfc_opc_mc_items_dynamic"></div>')
+			var oDynamicListElem = $('<div></div>')
+				.addClass('sfc_opc_mc_items_list')
+				.addClass('sfc_opc_mc_items_dynamic')
 				.appendTo(oAllowedValuesElem);
 
 			//   - Null value if allowed
@@ -118,49 +131,18 @@ $(function()
 			{
 				var sValCode = this.options.null_value.code;
 				var sValLabel = this.options.null_value.label;
-				var oValueElem = $('<div></div>')
-					.addClass('sfc_opc_mc_item')
-					.attr('data-value-code', sValCode)
-					.append('<label><input type="checkbox" value="' + sValCode + '"/>' + sValLabel + '</label>')
-					.appendTo(oStaticValuesElem);
-			}
-
-			//   - Regular allowed values
-			if (this._hasPreloadedAllowedValues())
-			{
-				var aSortedValues = this._sortValuesByLabel(this._getPreloadedAllowedValues());
-				for (var i in aSortedValues)
-				{
-					var sValCode = aSortedValues[i][0];
-					var sValLabel = aSortedValues[i][1];
-					var oValueElem = $('<div></div>')
-						.addClass('sfc_opc_mc_item')
-						.attr('data-value-code', sValCode)
-						.append('<label><input type="checkbox" value="'+sValCode+'"/>'+sValLabel+'</label>')
-						.appendTo(oDynamicValuesElem);
-
-					if (this._isSelectedValues(sValCode))
-					{
-						oValueElem.find(':checkbox').prop('checked', true);
-					}
-				}
-			}
-
-			// - Specific to autocomplete mode
-			if(this._hasAutocompleteAllowedValues())
-			{
-				// Remove filter picto from input
-				oFilterElem.find('.sff_filter').remove();
-
-				// Add search dialog button
-				oFilterElem
-					.append('<button type="button" class="sff_search_dialog"><span class=" fa fa-search"></span></button>')
-					.addClass('sf_with_buttons');
-
-				// Prepare "selected" values area
+				var oValueElem = this._makeListItemElement(sValLabel, sValCode);
+				oValueElem.appendTo(oStaticListElem);
 			}
 
 			// Events
+			// - Filter
+			oFilterElem.find('.sff_reset').on('click', function(){
+				oFilterElem.find('input')
+					.val('')
+					.trigger('focus');
+			});
+
 			// - Check / Uncheck all toggler
 			oTogglersElem.on('click', function(oEvent){
 				// Check / uncheck all allowed values
@@ -171,14 +153,65 @@ $(function()
 				me._apply();
 			});
 
+			// - Apply on check
+			oAllowedValuesElem.on('click', '.sfc_opc_mc_item input', function(oEvent){
+				// Prevent propagation, otherwise there will be multiple "_apply()"
+				oEvent.stopPropagation();
+
+				// Uncheck toggler
+				oTogglersElem.find('input:checkbox').prop('checked', false);
+
+				// Apply criteria
+				me._apply();
+			});
+
+			oOpElem.find('.sfc_op_content').append(oOpContentElem);
+
+			this._prepareInOperatorWithoutAutocomplete(oOpElem, sOpIdx, oOp);
+			this._prepareInOperatorWithAutocomplete(oOpElem, sOpIdx, oOp);
+		},
+		_prepareInOperatorWithoutAutocomplete: function(oOpElem, sOpIdx, oOp)
+		{
+			var me = this;
+
+			if(this._hasAutocompleteAllowedValues())
+			{
+				return false;
+			}
+
+			var oOpContentElem = oOpElem.find('.sfc_opc_multichoices');
+			var oDynamicListElem = oOpElem.find('.sfc_opc_mc_items_dynamic');
+			var oFilterElem = oOpElem.find('.sf_filter');
+
+			// DOM elements
+			// - Filter
+			oFilterElem.find('.sff_input_wrapper')
+				.append('<span class="sff_picto sff_filter fa fa-filter"></span>');
+
+			// - Allowed values
+			var aSortedValues = this._sortValuesByLabel(this._getPreloadedAllowedValues());
+			for (var i in aSortedValues)
+			{
+				var sValCode = aSortedValues[i][0];
+				var sValLabel = aSortedValues[i][1];
+				var oValueElem = this._makeListItemElement(sValLabel, sValCode);
+				oValueElem.appendTo(oDynamicListElem);
+
+				if (this._isSelectedValues(sValCode))
+				{
+					oValueElem.find(':checkbox').prop('checked', true);
+				}
+			}
+
+			// Events
 			// - Filter
 			// Note: "keyup" event is use instead of "keydown", otherwise, the input value would not be set yet.
 			oFilterElem.find('input').on('keyup focus', function(oEvent){
 				// TODO: Move on values with up and down arrow keys; select with space or enter.
 
-				var sFilter = $(this).val();
+				var sQuery = $(this).val();
 
-				if(sFilter === '')
+				if(sQuery === '')
 				{
 					oOpContentElem.find('.sfc_opc_mc_item').show();
 					oFilterElem.find('.sff_filter').show();
@@ -187,7 +220,7 @@ $(function()
 				else
 				{
 					oOpContentElem.find('.sfc_opc_mc_item').each(function(){
-						var oRegExp = new RegExp(sFilter, 'ig');
+						var oRegExp = new RegExp(sQuery, 'ig');
 						var sValue = $(this).find('input').val();
 						var sLabel = $(this).text();
 
@@ -207,75 +240,84 @@ $(function()
 			oFilterElem.find('.sff_filter').on('click', function(){
 				oFilterElem.find('input').trigger('focus');
 			});
-			oFilterElem.find('.sff_reset').on('click', function(){
-				oFilterElem.find('input')
-					.val('')
-					.trigger('focus');
-			});
+		},
+		_prepareInOperatorWithAutocomplete: function(oOpElem, sOpIdx, oOp)
+		{
+			var me = this;
 
-			// - Apply on check
-			oAllowedValuesElem.find('.sfc_opc_mc_item input').on('click', function(oEvent){
-				// Prevent propagation, otherwise there will be multiple "_apply()"
-				oEvent.stopPropagation();
-
-				// Uncheck toggler
-				oTogglersElem.find('input:checkbox').prop('checked', false);
-
-				// Apply criteria
-				me._apply();
-			});
-
-			// - Specific to autocomplete mode
-			// TODO: We NEED to refactor all of this for a better integration. Most might be in the main widget as any widget could use XHR helpers.
-			if(this._hasAutocompleteAllowedValues())
+			if(!this._hasAutocompleteAllowedValues())
 			{
-				// // Autocomplete
-				// var oACXHR = null;
-				// var oACTimeout = null;
-				// oFilterElem.find('input').off('keyup focus').on('keyup focus', function(oEvent){
-				// 	// TODO: Move on values with up and down arrow keys; select with space or enter.
-				//
-				// 	var sFilter = $(this).val();
-				//
-				// 	if(sFilter === '')
-				// 	{
-				// 		oOpContentElem.find('.sfc_opc_mc_item').html('');
-				// 		oFilterElem.find('.sff_reset').hide();
-				// 	}
-				// 	else
-				// 	{
-				// 		oOpContentElem.find('.sfc_opc_mc_item').html('TOTR: Wait');
-				// 		if(oACXHR !== null)
-				// 		{
-				// 			oACXHR.abort();
-				// 		}
-				// 		oACXHR = $.post(
-				// 			AddAppContext(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php'),
-				// 			{
-				// 				sTargetClass: me.options.field.class,
-				// 				//iInputId: me.id,
-				// 				//iObjectId: iObjectId,
-				// 				sAttCode: me.options.field.code,
-				// 				bSearchMode: true,
-				// 				operation: 'getObjectName'
-				// 			}
-				// 		)
-				// 			.done(function(oResponse, sStatus, oXHR){ console.log('ok', oResponse); })
-				// 			.fail(function(oResponse, sStatus, oXHR){ console.log('fail', oResponse); })
-				// 			.always(function(oResponse, sStatus, oXHR){ console.log('always', oResponse); });
-				//
-				// 		oFilterElem.find('.sff_reset').show();
-				// 	}
-				// });
-				//
-				// // Open search dialog
-				// oFilterElem.find('.sff_search_dialog').on('click', function(){
-				// 	// TODO: Open search dialog with right params
-				// 	alert('Not implemented yet');
-				// });
+				return false;
 			}
 
-			oOpElem.find('.sfc_op_content').append(oOpContentElem);
+			var oOpContentElem = oOpElem.find('.sfc_opc_multichoices');
+			var oDynamicListElem = oOpElem.find('.sfc_opc_mc_items_dynamic');
+			var oFilterElem = oOpElem.find('.sf_filter');
+
+			// DOM
+			// - Add search dialog button
+			oFilterElem
+				.append('<button type="button" class="sff_search_dialog"><span class=" fa fa-search"></span></button>')
+				.addClass('sf_with_buttons');
+
+			// - Prepare "selected" values area
+			var oSelectedElem = $('<div></div>')
+				.addClass('sfc_opc_mc_items')
+				.addClass('sfc_opc_mc_items_selected')
+				.appendTo(oOpContentElem);
+
+			// Events
+			// Autocomplete
+			var oACXHR = null;
+			var oACTimeout = null;
+			oFilterElem.find('input').on('keyup focus', function(oEvent){
+				// TODO: Move on values with up and down arrow keys; select with space or enter.
+
+				var sQuery = $(this).val();
+
+				if(sQuery === '')
+				{
+					// TODO: Remove items and show placeholder
+					oDynamicListElem.html('TOTR: Start typing for possible values.');
+
+					oFilterElem.find('.sff_reset').hide();
+				}
+				else
+				{
+					clearTimeout(oACTimeout);
+					oACTimeout = setTimeout(function(){
+						// Show loader
+						oDynamicListElem.html('TOTR: Please wait...');
+
+						if(oACXHR !== null)
+						{
+							oACXHR.abort();
+						}
+						oACXHR = $.post(
+							AddAppContext(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php'),
+							{
+								sTargetClass: me.options.field.target_class,
+								sFilter: 'SELECT ' + me.options.field.target_class,
+								q: sQuery,
+								bSearchMode: 'true',
+								sOutputFormat: 'json',
+								operation: 'ac_extkey',
+							}
+							)
+							.done(function(oResponse, sStatus, oXHR){ me._onACSearchSuccess(oResponse, oDynamicListElem); })
+							.fail(function(oResponse, sStatus, oXHR){  me._onACSearchFail(oResponse, sStatus); })
+							.always(function(oResponse, sStatus, oXHR){ me._onACSearchAlways(); });
+
+						oFilterElem.find('.sff_reset').show();
+					}, me.options.autocomplete.xhr_throttle);
+				}
+			});
+			//
+			// // Open search dialog
+			// oFilterElem.find('.sff_search_dialog').on('click', function(){
+			// 	// TODO: Open search dialog with right params
+			// 	alert('Not implemented yet');
+			// });
 		},
 		_setTitle: function(sTitle)
 		{
@@ -352,6 +394,32 @@ $(function()
 		},
 
 
+		// Autocomplete callbacks
+		_onACSearchSuccess: function(oResponse, oListElem)
+		{
+			// TODO: Show results
+			console.log('ok', oResponse);
+			for(var iKey in oResponse)
+			{
+				var oValueElem = this._makeListItemElement(iKey, oResponse[iKey]);
+				oValueElem.appendTo(oListElem);
+			}
+
+		},
+		_onACSearchFail: function(oResponse, sStatus)
+		{
+			if(sStatus !== 'abort')
+			{
+				this.element.find('.sfc_opc_mc_items_dynamic').html('TOTR: Error.');
+			}
+		},
+		_onACSearchAlways: function()
+		{
+			// TODO: Remove loader
+			this._trace('TODO: Remove loader');
+		},
+
+
 		// Value helpers
 		// - Return true if sValue is among the selected values "codes"
 		_isSelectedValues: function(sValue)
@@ -407,6 +475,16 @@ $(function()
 			});
 
 			return aSortable;
-		}
+		},
+		// - Make a jQuery element for a list item
+		_makeListItemElement: function(sLabel, sValue)
+		{
+			var oItemElem = $('<div></div>')
+				.addClass('sfc_opc_mc_item')
+				.attr('data-value-code', sValue)
+				.append('<label><input type="checkbox" value="'+sValue+'"/>'+sLabel+'</label>');
+
+			return oItemElem;
+		},
 	});
 });
diff --git a/js/search/search_form_handler.js b/js/search/search_form_handler.js
index 3d34357a3..129ab6946 100644
--- a/js/search/search_form_handler.js
+++ b/js/search/search_form_handler.js
@@ -709,6 +709,7 @@ $(function()
 					class: oFieldDef.class,
 					class_alias: oFieldDef.class_alias,
 					code: oFieldDef.code,
+					target_class: oFieldDef.target_class,
 					widget: oFieldDef.widget,
 					allowed_values: oFieldDef.allowed_values,
 					is_null_allowed: oFieldDef.is_null_allowed,
diff --git a/pages/ajax.render.php b/pages/ajax.render.php
index 598630070..df3a17236 100644
--- a/pages/ajax.render.php
+++ b/pages/ajax.render.php
@@ -422,6 +422,7 @@ try
 			$sJson = utils::ReadParam('json', '', false, 'raw_data');
 			$sContains = utils::ReadParam('q', '', false, 'raw_data');
 			$bSearchMode = (utils::ReadParam('bSearchMode', 'false') == 'true');
+			$sOutputFormat = utils::ReadParam('sOutputFormat', UIExtKeyWidget::ENUM_OUTPUT_FORMAT_CSV, false, 'raw_data');
 			if ($sContains != '')
 			{
 				if (!empty($sJson))
@@ -435,7 +436,7 @@ try
 					$oObj = null;
 				}
 				$oWidget = new UIExtKeyWidget($sTargetClass, $iInputId, '', $bSearchMode);
-				$oWidget->AutoComplete($oPage, $sFilter, $oObj, $sContains);
+				$oWidget->AutoComplete($oPage, $sFilter, $oObj, $sContains, $sOutputFormat);
 			}
 			break;
 

From 1e80d76383ff2496cda52b497a080cca0eb272fc Mon Sep 17 00:00:00 2001
From: Guillaume Lajarige <guillaume.lajarige@combodo.com>
Date: Thu, 29 Mar 2018 15:50:48 +0000
Subject: [PATCH 179/202] Advanced search: UI/UX, minor dict. updates.

SVN:b1162[5579]
---
 dictionaries/en.dictionary.itop.ui.php | 20 ++++++++++----------
 dictionaries/fr.dictionary.itop.ui.php |  8 ++++----
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/dictionaries/en.dictionary.itop.ui.php b/dictionaries/en.dictionary.itop.ui.php
index 14e3262d9..a7849b8f0 100644
--- a/dictionaries/en.dictionary.itop.ui.php
+++ b/dictionaries/en.dictionary.itop.ui.php
@@ -1396,12 +1396,12 @@ When associated with a trigger, each action is given an "order" number, specifyi
 	//   - Default widget
 	'UI:Search:Criteria:Operator:Default:Empty' => 'Is empty',
 	'UI:Search:Criteria:Operator:Default:NotEmpty' => 'Is not empty',
-	'UI:Search:Criteria:Operator:Default:Equals' => 'Equals:',
-	'UI:Search:Criteria:Operator:Default:Between' => 'Between:',
+	'UI:Search:Criteria:Operator:Default:Equals' => 'Equals',
+	'UI:Search:Criteria:Operator:Default:Between' => 'Between',
 	//   - String widget
-	'UI:Search:Criteria:Operator:String:Contains' => 'Contains:',
-	'UI:Search:Criteria:Operator:String:StartsWith' => 'Starts with:',
-	'UI:Search:Criteria:Operator:String:EndsWith' => 'Ends with:',
+	'UI:Search:Criteria:Operator:String:Contains' => 'Contains',
+	'UI:Search:Criteria:Operator:String:StartsWith' => 'Starts with',
+	'UI:Search:Criteria:Operator:String:EndsWith' => 'Ends with',
 	//   - Numeric widget
 	'UI:Search:Criteria:Operator:Numeric:Equals' => 'Equals',  // => '=',
 	'UI:Search:Criteria:Operator:Numeric:GreaterThan' => 'Greater',  // => '>',
@@ -1425,11 +1425,11 @@ When associated with a trigger, each action is given an "order" number, specifyi
 	'UI:Search:Criteria:Title:Default:Different' => '%1$s ≠ %2$s',
 	'UI:Search:Criteria:Title:Default:Between' => '%1$s between [%2$s]',
 	'UI:Search:Criteria:Title:Default:BetweenDates:All' => '%1$s All',
-	'UI:Search:Criteria:Title:Default:BetweenDates:From' => '%1$s From %2$s',
-	'UI:Search:Criteria:Title:Default:BetweenDates:Until' => '%1$s Until %2$s',
-	'UI:Search:Criteria:Title:Default:Between:All' => '%1$s All',
-	'UI:Search:Criteria:Title:Default:Between:From' => '%1$s From %2$s',
-	'UI:Search:Criteria:Title:Default:Between:Until' => '%1$s Until %2$s',
+	'UI:Search:Criteria:Title:Default:BetweenDates:From' => '%1$s from %2$s',
+	'UI:Search:Criteria:Title:Default:BetweenDates:Until' => '%1$s until %2$s',
+	'UI:Search:Criteria:Title:Default:Between:All' => '%1$s: All',
+	'UI:Search:Criteria:Title:Default:Between:From' => '%1$s from %2$s',
+	'UI:Search:Criteria:Title:Default:Between:Until' => '%1$s until %2$s',
 	'UI:Search:Criteria:Title:Default:BetweenDays' => '%1$s [%2$s]',
 	//   - String widget
 	'UI:Search:Criteria:Title:String:Contains' => '%1$s contains %2$s',
diff --git a/dictionaries/fr.dictionary.itop.ui.php b/dictionaries/fr.dictionary.itop.ui.php
index e7eef61d3..742c4c857 100644
--- a/dictionaries/fr.dictionary.itop.ui.php
+++ b/dictionaries/fr.dictionary.itop.ui.php
@@ -1207,10 +1207,10 @@ Lors de l\'association à un déclencheur, on attribue à chaque action un numé
 	// - Operators
 	'UI:Search:Criteria:Operator:Default:Empty' => 'Vide',
 	'UI:Search:Criteria:Operator:Default:NotEmpty' => 'Non vide',
-	'UI:Search:Criteria:Operator:Default:Equals' => 'Egal :',
-	'UI:Search:Criteria:Operator:String:Contains' => 'Contient :',
-	'UI:Search:Criteria:Operator:String:StartsWith' => 'Commence par :',
-	'UI:Search:Criteria:Operator:String:EndsWith' => 'Fini par :',
+	'UI:Search:Criteria:Operator:Default:Equals' => 'Egal',
+	'UI:Search:Criteria:Operator:String:Contains' => 'Contient',
+	'UI:Search:Criteria:Operator:String:StartsWith' => 'Commence par',
+	'UI:Search:Criteria:Operator:String:EndsWith' => 'Fini par',
 	// - Criteria titles
 	//   - Default widget
 	'UI:Search:Criteria:Title:Default:Empty' => '%1$s vide',

From 7154aa05a6671cb1bab4afbb70b53114616021df Mon Sep 17 00:00:00 2001
From: Guillaume Lajarige <guillaume.lajarige@combodo.com>
Date: Thu, 29 Mar 2018 15:52:01 +0000
Subject: [PATCH 180/202] Advanced search: UI/UX, disable hierarchical search
 on ext. key for now.

SVN:b1162[5580]
---
 .../search_form_criteria_hierarchical_key.js  | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/js/search/search_form_criteria_hierarchical_key.js b/js/search/search_form_criteria_hierarchical_key.js
index c8ba54307..058d2b2ff 100644
--- a/js/search/search_form_criteria_hierarchical_key.js
+++ b/js/search/search_form_criteria_hierarchical_key.js
@@ -55,18 +55,19 @@ $(function()
 
 			this._super();
 
-			// DOM elements
-			// - Add search dialog button
-			this.element.find('.sf_filter')
-				.append('<button type="button" class="sff_hierarchy_dialog"><span class=" fa fa-sitemap"></span></button>')
-				.addClass('sf_with_buttons');
-
-			// Events
-			// - Open hierarchy dialog
-			this.element.find('.sff_hierarchy_dialog').on('click', function(){
-				// TODO: Open hierarchy dialog with right params
-				alert('Not implemented yet');
-			});
+			// Note: Hierarchical key is on stand by for now.
+			// // DOM elements
+			// // - Add search dialog button
+			// this.element.find('.sf_filter')
+			// 	.append('<button type="button" class="sff_hierarchy_dialog"><span class=" fa fa-sitemap"></span></button>')
+			// 	.addClass('sf_with_buttons');
+			//
+			// // Events
+			// // - Open hierarchy dialog
+			// this.element.find('.sff_hierarchy_dialog').on('click', function(){
+			// 	// TODO: Open hierarchy dialog with right params
+			// 	alert('Not implemented yet');
+			// });
 		},
 	});
 });

From 0e4dc43171071d47ef1130fbe6415d3099bd219d Mon Sep 17 00:00:00 2001
From: Guillaume Lajarige <guillaume.lajarige@combodo.com>
Date: Thu, 29 Mar 2018 16:07:11 +0000
Subject: [PATCH 181/202] Advanced search: UI/UX, form submit throttling.

SVN:b1162[5581]
---
 js/search/search_form_criteria_enum.js        | 27 ++++++++-----------
 .../search_form_criteria_external_key.js      |  2 --
 js/search/search_form_handler.js              | 20 +++++++++++---
 3 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/js/search/search_form_criteria_enum.js b/js/search/search_form_criteria_enum.js
index a0910d262..d8ec2074b 100644
--- a/js/search/search_form_criteria_enum.js
+++ b/js/search/search_form_criteria_enum.js
@@ -167,18 +167,20 @@ $(function()
 
 			oOpElem.find('.sfc_op_content').append(oOpContentElem);
 
-			this._prepareInOperatorWithoutAutocomplete(oOpElem, sOpIdx, oOp);
-			this._prepareInOperatorWithAutocomplete(oOpElem, sOpIdx, oOp);
+			if(this._hasAutocompleteAllowedValues())
+			{
+				this._prepareInOperatorWithAutocomplete(oOpElem, sOpIdx, oOp);
+			}
+			else
+			{
+				this._prepareInOperatorWithoutAutocomplete(oOpElem, sOpIdx, oOp);
+			}
+
 		},
 		_prepareInOperatorWithoutAutocomplete: function(oOpElem, sOpIdx, oOp)
 		{
 			var me = this;
 
-			if(this._hasAutocompleteAllowedValues())
-			{
-				return false;
-			}
-
 			var oOpContentElem = oOpElem.find('.sfc_opc_multichoices');
 			var oDynamicListElem = oOpElem.find('.sfc_opc_mc_items_dynamic');
 			var oFilterElem = oOpElem.find('.sf_filter');
@@ -208,7 +210,6 @@ $(function()
 			// Note: "keyup" event is use instead of "keydown", otherwise, the input value would not be set yet.
 			oFilterElem.find('input').on('keyup focus', function(oEvent){
 				// TODO: Move on values with up and down arrow keys; select with space or enter.
-
 				var sQuery = $(this).val();
 
 				if(sQuery === '')
@@ -245,11 +246,6 @@ $(function()
 		{
 			var me = this;
 
-			if(!this._hasAutocompleteAllowedValues())
-			{
-				return false;
-			}
-
 			var oOpContentElem = oOpElem.find('.sfc_opc_multichoices');
 			var oDynamicListElem = oOpElem.find('.sfc_opc_mc_items_dynamic');
 			var oFilterElem = oOpElem.find('.sf_filter');
@@ -267,12 +263,11 @@ $(function()
 				.appendTo(oOpContentElem);
 
 			// Events
-			// Autocomplete
+			// - Autocomplete
 			var oACXHR = null;
 			var oACTimeout = null;
 			oFilterElem.find('input').on('keyup focus', function(oEvent){
 				// TODO: Move on values with up and down arrow keys; select with space or enter.
-
 				var sQuery = $(this).val();
 
 				if(sQuery === '')
@@ -313,7 +308,7 @@ $(function()
 				}
 			});
 			//
-			// // Open search dialog
+			// // - Open search dialog
 			// oFilterElem.find('.sff_search_dialog').on('click', function(){
 			// 	// TODO: Open search dialog with right params
 			// 	alert('Not implemented yet');
diff --git a/js/search/search_form_criteria_external_key.js b/js/search/search_form_criteria_external_key.js
index 03150329a..a8e40f08d 100644
--- a/js/search/search_form_criteria_external_key.js
+++ b/js/search/search_form_criteria_external_key.js
@@ -9,8 +9,6 @@ $(function()
 		// default options
 		options:
 		{
-			'endpoint': AddAppContext(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php'),
-
 			// Null value
 			'null_value': {
 				'code': 0,
diff --git a/js/search/search_form_handler.js b/js/search/search_form_handler.js
index 129ab6946..8391b1b90 100644
--- a/js/search/search_form_handler.js
+++ b/js/search/search_form_handler.js
@@ -84,6 +84,11 @@ $(function()
 			results_area: null,
 		},
 
+		submit: {
+			xhr: null,
+			//timeout: null,
+		},
+
 		// the constructor
 		_create: function()
 		{
@@ -861,12 +866,16 @@ $(function()
 			// TODO: Make a throttle mecanism or cancel previous call when a newer is made.
 
 			// Do submit
-			$.post(
+			if(this.submit.xhr !== null)
+			{
+				this.submit.xhr.abort();
+			}
+			this.submit.xhr = $.post(
 				this.options.endpoint,
 				oData
 			)
 				.done(function(oResponse, sStatus, oXHR){ me._onSubmitSuccess(oResponse); })
-				.fail(function(oResponse, sStatus, oXHR){ me._onSubmitFailure(oResponse); })
+				.fail(function(oResponse, sStatus, oXHR){ me._onSubmitFailure(oResponse, sStatus); })
 				.always(function(oResponse, sStatus, oXHR){ me._onSubmitAlways(oResponse); });
 		},
 		// - Called on form submit successes
@@ -875,8 +884,13 @@ $(function()
 			this.elements.results_area.html(oData);
 		},
 		// - Called on form submit failures
-		_onSubmitFailure: function(oData)
+		_onSubmitFailure: function(oData, sStatus)
 		{
+			if(sStatus === 'abort')
+			{
+				return false;
+			}
+
 			// Fallback message in case the server send back only HTML markup.
 			var oErrorElem = $(oData.responseText);
 			var sErrorMessage = (oErrorElem.text() !== '') ? oErrorElem.text() : Dict.Format('Error:XHR:Fail', '');

From 56566d83fd220f610f3d58a12247e03a0c3c71a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Fri, 30 Mar 2018 08:02:53 +0000
Subject: [PATCH 182/202] Advanced Search: Fix PHP syntax

SVN:b1162[5582]
---
 application/ui.linksdirectwidget.class.inc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/ui.linksdirectwidget.class.inc.php b/application/ui.linksdirectwidget.class.inc.php
index 20e0d2092..00dfdfd49 100644
--- a/application/ui.linksdirectwidget.class.inc.php
+++ b/application/ui.linksdirectwidget.class.inc.php
@@ -281,7 +281,6 @@ class UILinksWidgetDirect
 	 * @param $aAlreadyLinked
 	 *
 	 * @throws \CoreException
-	 * @throws \DictExceptionMissingString
 	 * @throws \Exception
 	 * @throws \OQLException
 	 */
@@ -304,7 +303,8 @@ class UILinksWidgetDirect
 			$oHiddenFilter->AddCondition('id', $aAlreadyLinked, 'NOTIN');
 		}
 		$oHiddenCriteria = $oHiddenFilter->GetCriteria();
-		$sHiddenCriteria = $oHiddenCriteria->Render($oHiddenFilter->GetInternalParams());
+		$aArgs = $oHiddenFilter->GetInternalParams();
+		$sHiddenCriteria = $oHiddenCriteria->Render($aArgs);
 
 		$oLinkSetDef = MetaModel::GetAttributeDef($this->sClass, $this->sAttCode);
 		$valuesDef = $oLinkSetDef->GetValuesDef();

From c56bda2f60fdca0d8dbfb1d569a92874d8df4015 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Fri, 30 Mar 2018 08:44:14 +0000
Subject: [PATCH 183/202] Advanced Search: Support of external fields (as
 strings)

SVN:b1162[5583]
---
 application/nicewebpage.class.inc.php         |  1 +
 core/attributedef.class.inc.php               | 45 ++++++++++++++++++-
 dictionaries/en.dictionary.itop.ui.php        |  7 ++-
 dictionaries/fr.dictionary.itop.ui.php        |  7 ++-
 .../search_form_criteria_external_field.js    | 25 +++++++++++
 .../criteriontooql.class.inc.php              |  9 +++-
 .../criteriontosearchform.class.inc.php       | 42 +++++++++++++++++
 .../search/searchform.class.inc.php           | 11 ++++-
 8 files changed, 134 insertions(+), 13 deletions(-)
 create mode 100644 js/search/search_form_criteria_external_field.js

diff --git a/application/nicewebpage.class.inc.php b/application/nicewebpage.class.inc.php
index 2a622f9bd..a56de6f76 100644
--- a/application/nicewebpage.class.inc.php
+++ b/application/nicewebpage.class.inc.php
@@ -56,6 +56,7 @@ class NiceWebPage extends WebPage
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria.js');
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_raw.js');
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_string.js');
+	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_external_field.js');
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_numeric.js');
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_enum.js');
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_external_key.js');
diff --git a/core/attributedef.class.inc.php b/core/attributedef.class.inc.php
index 489178940..b688c5151 100644
--- a/core/attributedef.class.inc.php
+++ b/core/attributedef.class.inc.php
@@ -4948,8 +4948,34 @@ class AttributeHierarchicalKey extends AttributeExternalKey
  */
 class AttributeExternalField extends AttributeDefinition
 {
+	/**
+	 * Return the search widget type corresponding to this attribute
+	 *
+	 * @return string
+	 */
+	public function GetSearchType()
+	{
+		// Not necessary the external key is already present
+		if ($this->IsFriendlyName())
+		{
+			return self::SEARCH_WIDGET_TYPE_RAW;
+		}
+
+		try
+		{
+			$oRemoteAtt = $this->GetExtAttDef();
+			if ($oRemoteAtt instanceof AttributeString)
+			{
+				return self::SEARCH_WIDGET_TYPE_EXTERNAL_FIELD;
+			}
+		}
+		catch (CoreException $e)
+		{
+		}
+
+		return self::SEARCH_WIDGET_TYPE_RAW;
+	}
 
-	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
 
 	static public function ListExpectedParams()
 	{
@@ -5002,6 +5028,23 @@ class AttributeExternalField extends AttributeDefinition
 		}
 		return $sLabel;
 	}
+
+	public function GetLabelForSearchField()
+	{
+		$sLabel = parent::GetLabel('');
+		if (strlen($sLabel) == 0)
+		{
+			$sKeyAttCode = $this->Get("extkey_attcode");
+			$oExtKeyAttDef = MetaModel::GetAttributeDef($this->GetHostClass(), $sKeyAttCode);
+			$sLabel = $oExtKeyAttDef->GetLabel($this->m_sCode);
+
+			$oRemoteAtt = $this->GetExtAttDef();
+			$sLabel .= '->'.$oRemoteAtt->GetLabel($this->m_sCode);
+		}
+
+		return $sLabel;
+	}
+
 	public function GetDescription($sDefault = null)
 	{
 		$sLabel = parent::GetDescription('');
diff --git a/dictionaries/en.dictionary.itop.ui.php b/dictionaries/en.dictionary.itop.ui.php
index a7849b8f0..476ac03b7 100644
--- a/dictionaries/en.dictionary.itop.ui.php
+++ b/dictionaries/en.dictionary.itop.ui.php
@@ -1431,10 +1431,9 @@ When associated with a trigger, each action is given an "order" number, specifyi
 	'UI:Search:Criteria:Title:Default:Between:From' => '%1$s from %2$s',
 	'UI:Search:Criteria:Title:Default:Between:Until' => '%1$s until %2$s',
 	'UI:Search:Criteria:Title:Default:BetweenDays' => '%1$s [%2$s]',
-	//   - String widget
-	'UI:Search:Criteria:Title:String:Contains' => '%1$s contains %2$s',
-	'UI:Search:Criteria:Title:String:StartsWith' => '%1$s starts with %2$s',
-	'UI:Search:Criteria:Title:String:EndsWith' => '%1$s ends with %2$s',
+	'UI:Search:Criteria:Title:Default:Contains' => '%1$s contains %2$s',
+	'UI:Search:Criteria:Title:Default:StartsWith' => '%1$s starts with %2$s',
+	'UI:Search:Criteria:Title:Default:EndsWith' => '%1$s ends with %2$s',
 	//   - Numeric widget
 //	'UI:Search:Criteria:Title:Numeric:Equals' => '%1$s equals %2$s',
 	//   - DateTime widget
diff --git a/dictionaries/fr.dictionary.itop.ui.php b/dictionaries/fr.dictionary.itop.ui.php
index 742c4c857..9e63d6c0d 100644
--- a/dictionaries/fr.dictionary.itop.ui.php
+++ b/dictionaries/fr.dictionary.itop.ui.php
@@ -1216,10 +1216,9 @@ Lors de l\'association à un déclencheur, on attribue à chaque action un numé
 	'UI:Search:Criteria:Title:Default:Empty' => '%1$s vide',
 	'UI:Search:Criteria:Title:Default:NotEmpty' => '%1$s non vide',
 	'UI:Search:Criteria:Title:Default:Equals' => '%1$s égal %2$s',
-	//   - String widget
-	'UI:Search:Criteria:Title:String:Contains' => '%1$s contient %2$s',
-	'UI:Search:Criteria:Title:String:StartsWith' => '%1$s commence par %2$s',
-	'UI:Search:Criteria:Title:String:EndsWith' => '%1$s fini par %2$s',
+	'UI:Search:Criteria:Title:Default:Contains' => '%1$s contient %2$s',
+	'UI:Search:Criteria:Title:Default:StartsWith' => '%1$s commence par %2$s',
+	'UI:Search:Criteria:Title:Default:EndsWith' => '%1$s fini par %2$s',
 	//   - External key widget
 	'UI:Search:Criteria:Title:ExternalKey:Empty' => '%1$s est renseigné',
 	'UI:Search:Criteria:Title:ExternalKey:NotEmpty' => '%1$s n\'est pas renseigné',
diff --git a/js/search/search_form_criteria_external_field.js b/js/search/search_form_criteria_external_field.js
new file mode 100644
index 000000000..e032e7aac
--- /dev/null
+++ b/js/search/search_form_criteria_external_field.js
@@ -0,0 +1,25 @@
+//iTop Search form criteria external_field
+;
+$(function () {
+	// the widget definition, where 'itop' is the namespace,
+	// 'search_form_criteria_external_field' the widget name
+	$.widget('itop.search_form_criteria_external_field', $.itop.search_form_criteria_string,
+		{
+			// the constructor
+			_create: function () {
+				this._super();
+				this.element.addClass('search_form_criteria_external_field');
+			},
+
+			// events bound via _bind are removed automatically
+			// revert other modifications here
+			_destroy: function () {
+				this.element.removeClass('search_form_criteria_external_field');
+				this._super();
+			},
+
+			//------------------
+			// Inherited methods
+			//------------------
+		});
+});
diff --git a/sources/application/search/criterionconversion/criteriontooql.class.inc.php b/sources/application/search/criterionconversion/criteriontooql.class.inc.php
index 6c237df07..140e2cf2c 100644
--- a/sources/application/search/criterionconversion/criteriontooql.class.inc.php
+++ b/sources/application/search/criterionconversion/criteriontooql.class.inc.php
@@ -124,9 +124,14 @@ class CriterionToOQL extends CriterionConversionAbstract
 
 	protected static function EmptyToOql($sRef, $aCriteria)
 	{
-		if (isset($aCriteria['widget']) && ($aCriteria['widget'] == AttributeDefinition::SEARCH_WIDGET_TYPE_NUMERIC))
+		if (isset($aCriteria['widget']))
 		{
-			return "ISNULL({$sRef})";
+			switch ($aCriteria['widget'])
+			{
+				case AttributeDefinition::SEARCH_WIDGET_TYPE_NUMERIC:
+				case AttributeDefinition::SEARCH_WIDGET_TYPE_EXTERNAL_FIELD:
+					return "ISNULL({$sRef})";
+			}
 		}
 
 		return "({$sRef} = '')";
diff --git a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
index 666538b28..f85dcf9c3 100644
--- a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
+++ b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
@@ -63,6 +63,7 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 		$aAndCriterion = array();
 		$aMappingOperatorToFunction = array(
 			AttributeDefinition::SEARCH_WIDGET_TYPE_STRING => 'TextToSearchForm',
+			AttributeDefinition::SEARCH_WIDGET_TYPE_EXTERNAL_FIELD => 'ExternalFieldToSearchForm',
 			AttributeDefinition::SEARCH_WIDGET_TYPE_DATE => 'DateTimeToSearchForm',
 			AttributeDefinition::SEARCH_WIDGET_TYPE_DATE_TIME => 'DateTimeToSearchForm',
 			AttributeDefinition::SEARCH_WIDGET_TYPE_NUMERIC => 'NumericToSearchForm',
@@ -80,6 +81,7 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 			}
 			$aCriteria['is_removable'] = $bIsRemovable;
 
+			$sClass = '';
 			if (isset($aCriteria['ref']))
 			{
 				$aRef = explode('.', $aCriteria['ref']);
@@ -420,6 +422,46 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 		return $aCriteria;
 	}
 
+	protected static function ExternalFieldToSearchForm($aCriteria, $aFields)
+	{
+		$sOperator = $aCriteria['operator'];
+		$sValue = $aCriteria['values'][0]['value'];
+
+		$bStartWithPercent = substr($sValue, 0, 1) == '%' ? true : false;
+		$bEndWithPercent = substr($sValue, -1) == '%' ? true : false;
+
+		switch (true)
+		{
+			case ($sOperator == 'ISNULL'):
+			case ('' == $sValue and ($sOperator == 'LIKE')):
+				$aCriteria['operator'] = CriterionConversionAbstract::OP_EMPTY;
+				break;
+			case ('' == $sValue and $sOperator == '!='):
+				$aCriteria['operator'] = CriterionConversionAbstract::OP_NOT_EMPTY;
+				break;
+			case ($sOperator == 'LIKE' && $bStartWithPercent && $bEndWithPercent):
+				$aCriteria['operator'] = CriterionConversionAbstract::OP_CONTAINS;
+				$sValue = substr($sValue, 1, -1);
+				$aCriteria['values'][0]['value'] = $sValue;
+				$aCriteria['values'][0]['label'] = "$sValue";
+				break;
+			case ($sOperator == 'LIKE' && $bStartWithPercent):
+				$aCriteria['operator'] = CriterionConversionAbstract::OP_ENDS_WITH;
+				$sValue = substr($sValue, 1);
+				$aCriteria['values'][0]['value'] = $sValue;
+				$aCriteria['values'][0]['label'] = "$sValue";
+				break;
+			case ($sOperator == 'LIKE' && $bEndWithPercent):
+				$aCriteria['operator'] = CriterionConversionAbstract::OP_STARTS_WITH;
+				$sValue = substr($sValue, 0, -1);
+				$aCriteria['values'][0]['value'] = $sValue;
+				$aCriteria['values'][0]['label'] = "$sValue";
+				break;
+		}
+
+		return $aCriteria;
+	}
+
 	protected static function DateTimeToSearchForm($aCriteria, $aFields)
 	{
 		if (!array_key_exists('is_relative', $aCriteria) || !$aCriteria['is_relative'])
diff --git a/sources/application/search/searchform.class.inc.php b/sources/application/search/searchform.class.inc.php
index 140011dac..456317c25 100644
--- a/sources/application/search/searchform.class.inc.php
+++ b/sources/application/search/searchform.class.inc.php
@@ -417,8 +417,15 @@ class SearchForm
 	{
 		if (!is_null($oAttDef) && ($oAttDef->GetSearchType() != AttributeDefinition::SEARCH_WIDGET_TYPE_RAW))
 		{
-			$sLabel = $oAttDef->GetLabel();
-
+			if (method_exists($oAttDef, 'GetLabelForSearchField'))
+			{
+				$sLabel = $oAttDef->GetLabelForSearchField();
+			}
+			else
+			{
+				$sLabel = $oAttDef->GetLabel();
+			}
+			
 			if (method_exists($oAttDef, 'GetTargetClass'))
 			{
 				$sTargetClass = $oAttDef->GetTargetClass();

From e4b308642943e4ede7134fb949044a26c538d1c2 Mon Sep 17 00:00:00 2001
From: Guillaume Lajarige <guillaume.lajarige@combodo.com>
Date: Fri, 30 Mar 2018 09:50:22 +0000
Subject: [PATCH 184/202] Advanced search: UI/UX, WIP.

SVN:b1162[5584]
---
 css/light-grey.css               |   4 +-
 css/light-grey.scss              |   4 +-
 js/search/search_form_handler.js | 132 +++++++++++++++----------------
 3 files changed, 69 insertions(+), 71 deletions(-)

diff --git a/css/light-grey.css b/css/light-grey.css
index 8a8528ef4..76482ef35 100644
--- a/css/light-grey.css
+++ b/css/light-grey.css
@@ -577,7 +577,7 @@ div.actions_menu > ul > li {
   position: absolute;
   display: none;
   border-top: 1px solid white;
-  z-index: 999;
+  z-index: 1500;
 }
 .itop_popup li ul li, #logOffBtn li ul li {
   float: none;
@@ -2151,7 +2151,7 @@ a.summary, a.summary:hover {
   position: absolute;
   display: none;
   border-top: 1px solid white;
-  z-index: 999;
+  z-index: 1500;
 }
 #DashboardMenu li ul li a:hover {
   background: #ea7d1e;
diff --git a/css/light-grey.scss b/css/light-grey.scss
index c995efd94..318409cd5 100644
--- a/css/light-grey.scss
+++ b/css/light-grey.scss
@@ -646,7 +646,7 @@ div.actions_menu > ul > li {
 	position: absolute;
 	display: none;
 	border-top: 1px solid white;
-	z-index: 999;
+	z-index: 1500;
 }
 
 .itop_popup li ul li,  #logOffBtn li ul li {
@@ -2471,7 +2471,7 @@ a.summary,  a.summary:hover {
 	position: absolute;
 	display: none;
 	border-top: 1px solid white;
-	z-index: 999;
+	z-index: 1500;
 }
 #DashboardMenu li ul li a:hover{
 	background: $popup-menu-highlight-color;
diff --git a/js/search/search_form_handler.js b/js/search/search_form_handler.js
index 8391b1b90..76663db88 100644
--- a/js/search/search_form_handler.js
+++ b/js/search/search_form_handler.js
@@ -580,66 +580,6 @@ $(function()
 				oButtonsElem.hide();
 			});
 		},
-
-		/**
-		 *  "add new criteria" <li /> markup
-		 *   - with checkbox, label, data-* ...
-		 *   - without event binding
-		 *
-		 * @private
-		 *
-		 * @param sFieldRef
-		 * @param aFieldCollectionsEligible
-		 *
-		 * @return jQuery detached <li />
-		 */
-		_getHtmlLiFromFieldRef: function(me, sFieldRef, aFieldCollectionsEligible) {
-			var oFieldElem = undefined;
-
-			aFieldCollectionsEligible.forEach(function (sFieldCollection) {
-				if (typeof me.options.search.fields[sFieldCollection][sFieldRef] == 'undefined')
-				{
-					return true;//if this field is not present in the Collection, let's try the next
-				}
-
-				var oField = me.options.search.fields[sFieldCollection][sFieldRef];
-				var sFieldTitleAttr = (oField.description !== undefined) ? 'title="' + oField.description + '"' : '';
-				oFieldElem = $('<li></li>')
-					.addClass('sfm_field')
-					.attr('data-field-ref', sFieldRef)
-					.append('<label ' + sFieldTitleAttr + '><input type="checkbox" value="' + sFieldRef + '" />' + oField.label + '</label>')
-			});
-
-			if (undefined == oFieldElem)
-			{
-				me._trace('no sFieldRef in given collection', {"sFieldRef":sFieldRef, "aFieldCollectionsEligible":aFieldCollectionsEligible});
-				return $('<!-- no sFieldRef in given collection -->');
-			}
-
-			return oFieldElem;
-		},
-
-		_refreshRecentlyUsed: function()
-		{
-			me = this;
-
-			var aHistory = me.element.search_form_handler_history("getHistory");
-			var oRecentsItemsElem = me.element.find('.sf_list_recents .sfl_items');
-
-			if (aHistory.length == 0)
-			{
-				return;
-			}
-			oRecentsItemsElem.empty();
-
-
-			aHistory.forEach(function(sFieldRef) {
-				var oFieldElem = me._getHtmlLiFromFieldRef(me, sFieldRef, ['zlist', 'others']);
-				oRecentsItemsElem.append(oFieldElem);
-			});
-
-		},
-
 		// - Prepare results area
 		_prepareResultsArea: function()
 		{
@@ -681,6 +621,44 @@ $(function()
 			this.elements.results_area = oResultAreaElem;
 		},
 
+		/**
+		 *  "add new criteria" <li /> markup
+		 *   - with checkbox, label, data-* ...
+		 *   - without event binding
+		 *
+		 * @private
+		 *
+		 * @param sFieldRef
+		 * @param aFieldCollectionsEligible
+		 *
+		 * @return jQuery detached <li />
+		 */
+		_getHtmlLiFromFieldRef: function(me, sFieldRef, aFieldCollectionsEligible) {
+			var oFieldElem = undefined;
+
+			aFieldCollectionsEligible.forEach(function (sFieldCollection) {
+				if (typeof me.options.search.fields[sFieldCollection][sFieldRef] == 'undefined')
+				{
+					return true;//if this field is not present in the Collection, let's try the next
+				}
+
+				var oField = me.options.search.fields[sFieldCollection][sFieldRef];
+				var sFieldTitleAttr = (oField.description !== undefined) ? 'title="' + oField.description + '"' : '';
+				oFieldElem = $('<li></li>')
+					.addClass('sfm_field')
+					.attr('data-field-ref', sFieldRef)
+					.append('<label ' + sFieldTitleAttr + '><input type="checkbox" value="' + sFieldRef + '" />' + oField.label + '</label>')
+			});
+
+			if (undefined == oFieldElem)
+			{
+				me._trace('no sFieldRef in given collection', {"sFieldRef":sFieldRef, "aFieldCollectionsEligible":aFieldCollectionsEligible});
+				return $('<!-- no sFieldRef in given collection -->');
+			}
+
+			return oFieldElem;
+		},
+
 
 		// Criteria helpers
 		// - Add a criteria to the form
@@ -859,17 +837,17 @@ $(function()
 			$.extend(oListParams, this.options.list_params);
 			oData.list_params = JSON.stringify(oListParams);
 
-			// Show loader
-			this._showLoader();
-			this._cleanMessageArea();
-
-			// TODO: Make a throttle mecanism or cancel previous call when a newer is made.
-
-			// Do submit
+			// Abort pending request
 			if(this.submit.xhr !== null)
 			{
 				this.submit.xhr.abort();
 			}
+
+			// Show loader
+			this._showLoader();
+			this._cleanMessageArea();
+
+			// Do submit
 			this.submit.xhr = $.post(
 				this.options.endpoint,
 				oData
@@ -905,6 +883,26 @@ $(function()
 
 
 		// Global helpers
+		_refreshRecentlyUsed: function()
+		{
+			me = this;
+
+			var aHistory = me.element.search_form_handler_history("getHistory");
+			var oRecentsItemsElem = me.element.find('.sf_list_recents .sfl_items');
+
+			if (aHistory.length == 0)
+			{
+				return;
+			}
+			oRecentsItemsElem.empty();
+
+
+			aHistory.forEach(function(sFieldRef) {
+				var oFieldElem = me._getHtmlLiFromFieldRef(me, sFieldRef, ['zlist', 'others']);
+				oRecentsItemsElem.append(oFieldElem);
+			});
+
+		},
 		// - Show loader
 		_showLoader: function()
 		{

From 8ec75b9d45553ea049e3a7b4f9b6ca05d50c2253 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Fri, 30 Mar 2018 10:30:08 +0000
Subject: [PATCH 185/202] Advanced Search: Auto-complete search on foreign keys

SVN:b1162[5585]
---
 .../ui.searchformforeignkeys.class.inc.php    | 105 ++++++++++++++++++
 pages/ajax.render.php                         |  22 ++++
 2 files changed, 127 insertions(+)
 create mode 100644 application/ui.searchformforeignkeys.class.inc.php

diff --git a/application/ui.searchformforeignkeys.class.inc.php b/application/ui.searchformforeignkeys.class.inc.php
new file mode 100644
index 000000000..93e511649
--- /dev/null
+++ b/application/ui.searchformforeignkeys.class.inc.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ *
+ * Copyright (C) 2010-2018 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ *  iTop is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  iTop is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with iTop. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+
+require_once(APPROOT.'/application/webpage.class.inc.php');
+require_once(APPROOT.'/application/displayblock.class.inc.php');
+
+class UISearchFormForeignKeys
+{
+	public function __construct($sTargetClass, $iInputId, $sAttCode, $sSuffix)
+	{
+		$this->m_sRemoteClass = $sTargetClass;
+		$this->m_iInputId = $iInputId;
+		$this->sAttCode = $sAttCode;
+		$this->m_sNameSuffix = $sSuffix;
+	}
+
+	/**
+	 * @param WebPage $oPage
+	 *
+	 * @throws \CoreException
+	 * @throws \DictExceptionMissingString
+	 * @throws \Exception
+	 */
+	public function ShowModalSearchForeignKeys($oPage)
+	{
+		$bOpen = MetaModel::GetConfig()->Get('legacy_search_drawer_open');
+		$sHtml = "<div class=\"wizContainer\" style=\"vertical-align:top;\">\n";
+
+		$oFilter = new DBObjectSearch($this->m_sRemoteClass);
+
+		$oBlock = new DisplayBlock($oFilter, 'search', false);
+		$sHtml .= $oBlock->GetDisplay($oPage, "SearchFormToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}",
+			array(
+				'open' => $bOpen,
+				'menu' => false,
+				'table_id' => "SearchResultsToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}",
+				'table_id2' => 'add_'.$this->m_sAttCode,
+				'table_inner_id' => "ResultsToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}",
+				'selection_mode' => true,
+				'cssCount' => '#count_'.$this->m_sAttCode.$this->m_sNameSuffix,
+				'query_params' => $oFilter->GetInternalParams(),
+			));
+		$sHtml .= "<form id=\"ObjectsAddForm_{$this->m_sAttCode}{$this->m_sNameSuffix}\">\n";
+		$sHtml .= "<div id=\"SearchResultsToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}\" style=\"vertical-align:top;background: #fff;height:100%;overflow:auto;padding:0;border:0;\">\n";
+		$sHtml .= "<div style=\"background: #fff; border:0; text-align:center; vertical-align:middle;\"><p>".Dict::S('UI:Message:EmptyList:UseSearchForm')."</p></div>\n";
+		$sHtml .= "</div>\n";
+		$sHtml .= "<input type=\"hidden\" id=\"count_{$this->m_sAttCode}{$this->m_sNameSuffix}\" value=\"0\"/>";
+		$sHtml .= "<input type=\"button\" value=\"".Dict::S('UI:Button:Cancel')."\" onClick=\"$('#dlg_{$this->m_sAttCode}{$this->m_sNameSuffix}').dialog('close');\">&nbsp;&nbsp;<input id=\"btn_ok_{$this->m_sAttCode}{$this->m_sNameSuffix}\" disabled=\"disabled\" type=\"button\" onclick=\"return oWidget{$this->m_iInputId}.DoAddObjects(this.id);\" value=\"".Dict::S('UI:Button:Add')."\">";
+		$sHtml .= "</div>\n";
+		$sHtml .= "</form>\n";
+		$oPage->add($sHtml);
+		$oPage->add_ready_script("$('#dlg_{$this->m_sAttCode}{$this->m_sNameSuffix}').dialog({ width: $(window).width()*0.8, height: $(window).height()*0.8, autoOpen: false, modal: true, resizeStop: oWidget{$this->m_iInputId}.UpdateSizes });");
+		$oPage->add_ready_script("$('#dlg_{$this->m_sAttCode}{$this->m_sNameSuffix}').dialog('option', {title:'".addslashes(Dict::Format('UI:AddObjectsOf_Class_LinkedWith_Class', MetaModel::GetName($this->m_sLinkedClass),
+				MetaModel::GetName($this->m_sClass)))."'});");
+		$oPage->add_ready_script("$('#SearchFormToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix} form').bind('submit.uilinksWizard', oWidget{$this->m_iInputId}.SearchObjectsToAdd);");
+		$oPage->add_ready_script("$('#SearchFormToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}').resize(oWidget{$this->m_iInputId}.UpdateSizes);");
+	}
+
+	/**
+	 * Search for objects to be linked to the current object (i.e "remote" objects)
+	 *
+	 * @param WebPage $oP The page used for the output (usually an AjaxWebPage)
+	 * @param string $sRemoteClass Name of the "remote" class to perform the search on, must be a derived class of m_sRemoteClass
+	 *
+	 * @throws \Exception
+	 */
+	public function ListResultsSearchForeignKeys(WebPage $oP, $sRemoteClass = '')
+	{
+		if ($sRemoteClass != '')
+		{
+			// assert(MetaModel::IsParentClass($this->m_sRemoteClass, $sRemoteClass));
+			$oFilter = new DBObjectSearch($sRemoteClass);
+		}
+		else
+		{
+			// No remote class specified use the one defined in the linkedset
+			$oFilter = new DBObjectSearch($this->m_sRemoteClass);
+		}
+
+		$oBlock = new DisplayBlock($oFilter, 'list', false);
+		$oBlock->Display($oP, "ResultsToAdd_{$this->m_sAttCode}",
+			array('menu' => false, 'cssCount' => '#count_'.$this->m_sAttCode.$this->m_sNameSuffix, 'selection_mode' => true, 'table_id' => 'add_'.$this->m_sAttCode));
+	}
+
+}
\ No newline at end of file
diff --git a/pages/ajax.render.php b/pages/ajax.render.php
index df3a17236..fe99941d7 100644
--- a/pages/ajax.render.php
+++ b/pages/ajax.render.php
@@ -250,6 +250,28 @@ try
 			$oPage->add($bRet ? 'Ok' : 'KO');
 			break;
 
+		// ui.searchformforeignkeys
+		case 'ShowModalSearchForeignKeys':
+			$oPage->SetContentType('text/html');
+			$sAttCode = utils::ReadParam('sAttCode', '');
+			$iInputId = utils::ReadParam('iInputId', '');
+			$sSuffix = utils::ReadParam('sSuffix', '');
+			$oWidget = new UISearchFormForeignKeys($sClass, $iInputId, $sAttCode, $sSuffix);
+			$oWidget->ShowModalSearchForeignKeys($oPage);
+			break;
+
+		// ui.searchformforeignkeys
+		case 'ListResultsSearchForeignKeys':
+			$oPage->SetContentType('text/html');
+			$sTargetClass = utils::ReadParam('sTargetClass', '', false, 'class');
+			$iInputId = utils::ReadParam('iInputId', '');
+			$sTitle = utils::ReadParam('sTitle', '', false, 'raw_data');
+			$sSuffix = utils::ReadParam('sSuffix', '');
+			$sAttCode = utils::ReadParam('sAttCode', '');
+			$oWidget = new UISearchFormForeignKeys($sTargetClass, $iInputId, $sAttCode, $sSuffix);
+			$oWidget->GetSearchDialog($oPage, $sTitle);
+			break;
+
 		// ui.linkswidget
 		case 'addObjects':
 			$oPage->SetContentType('text/html');

From 7dadd6e410bff2a6223b5935ea8315bea63257c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Fri, 30 Mar 2018 12:07:58 +0000
Subject: [PATCH 186/202] Advanced Search: Auto-complete search on foreign keys

SVN:b1162[5586]
---
 application/ui.searchformforeignkeys.class.inc.php | 9 ++++-----
 pages/ajax.render.php                              | 7 ++++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/application/ui.searchformforeignkeys.class.inc.php b/application/ui.searchformforeignkeys.class.inc.php
index 93e511649..2b43e88a9 100644
--- a/application/ui.searchformforeignkeys.class.inc.php
+++ b/application/ui.searchformforeignkeys.class.inc.php
@@ -37,11 +37,11 @@ class UISearchFormForeignKeys
 	/**
 	 * @param WebPage $oPage
 	 *
-	 * @throws \CoreException
-	 * @throws \DictExceptionMissingString
+	 * @param $sTitle
+	 *
 	 * @throws \Exception
 	 */
-	public function ShowModalSearchForeignKeys($oPage)
+	public function ShowModalSearchForeignKeys($oPage, $sTitle)
 	{
 		$bOpen = MetaModel::GetConfig()->Get('legacy_search_drawer_open');
 		$sHtml = "<div class=\"wizContainer\" style=\"vertical-align:top;\">\n";
@@ -70,8 +70,7 @@ class UISearchFormForeignKeys
 		$sHtml .= "</form>\n";
 		$oPage->add($sHtml);
 		$oPage->add_ready_script("$('#dlg_{$this->m_sAttCode}{$this->m_sNameSuffix}').dialog({ width: $(window).width()*0.8, height: $(window).height()*0.8, autoOpen: false, modal: true, resizeStop: oWidget{$this->m_iInputId}.UpdateSizes });");
-		$oPage->add_ready_script("$('#dlg_{$this->m_sAttCode}{$this->m_sNameSuffix}').dialog('option', {title:'".addslashes(Dict::Format('UI:AddObjectsOf_Class_LinkedWith_Class', MetaModel::GetName($this->m_sLinkedClass),
-				MetaModel::GetName($this->m_sClass)))."'});");
+		$oPage->add_ready_script("$('#dlg_{$this->m_sAttCode}{$this->m_sNameSuffix}').dialog('option', {title:'$sTitle'});");
 		$oPage->add_ready_script("$('#SearchFormToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix} form').bind('submit.uilinksWizard', oWidget{$this->m_iInputId}.SearchObjectsToAdd);");
 		$oPage->add_ready_script("$('#SearchFormToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}').resize(oWidget{$this->m_iInputId}.UpdateSizes);");
 	}
diff --git a/pages/ajax.render.php b/pages/ajax.render.php
index fe99941d7..1ecfbb4d3 100644
--- a/pages/ajax.render.php
+++ b/pages/ajax.render.php
@@ -256,8 +256,9 @@ try
 			$sAttCode = utils::ReadParam('sAttCode', '');
 			$iInputId = utils::ReadParam('iInputId', '');
 			$sSuffix = utils::ReadParam('sSuffix', '');
+			$sTitle = utils::ReadParam('sTitle', '', false, 'raw_data');
 			$oWidget = new UISearchFormForeignKeys($sClass, $iInputId, $sAttCode, $sSuffix);
-			$oWidget->ShowModalSearchForeignKeys($oPage);
+			$oWidget->ShowModalSearchForeignKeys($oPage, $sTitle);
 			break;
 
 		// ui.searchformforeignkeys
@@ -265,11 +266,11 @@ try
 			$oPage->SetContentType('text/html');
 			$sTargetClass = utils::ReadParam('sTargetClass', '', false, 'class');
 			$iInputId = utils::ReadParam('iInputId', '');
-			$sTitle = utils::ReadParam('sTitle', '', false, 'raw_data');
 			$sSuffix = utils::ReadParam('sSuffix', '');
 			$sAttCode = utils::ReadParam('sAttCode', '');
+			$sRemoteClass = utils::ReadParam('sRemoteClass', '', false, 'class');
 			$oWidget = new UISearchFormForeignKeys($sTargetClass, $iInputId, $sAttCode, $sSuffix);
-			$oWidget->GetSearchDialog($oPage, $sTitle);
+			$oWidget->ListResultsSearchForeignKeys($oPage, $sRemoteClass);
 			break;
 
 		// ui.linkswidget

From 95b523c2facf16fe585cbb85a0346de542baa370 Mon Sep 17 00:00:00 2001
From: Guillaume Lajarige <guillaume.lajarige@combodo.com>
Date: Fri, 30 Mar 2018 12:24:55 +0000
Subject: [PATCH 187/202] Advanced search: UI/UX, WIP.

SVN:b1162[5587]
---
 css/light-grey.css                     | 14 +++++---
 css/light-grey.scss                    | 25 ++++++++-----
 dictionaries/en.dictionary.itop.ui.php | 50 +++++++++++++-------------
 js/search/search_form_criteria.js      | 12 +++++--
 js/search/search_form_criteria_enum.js | 47 +++++++++++++++++-------
 js/search/search_form_handler.js       |  7 ++++
 6 files changed, 102 insertions(+), 53 deletions(-)

diff --git a/css/light-grey.css b/css/light-grey.css
index 76482ef35..d03dcf729 100644
--- a/css/light-grey.css
+++ b/css/light-grey.css
@@ -802,7 +802,8 @@ input.dp-applied {
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group, .search_form_handler .sf_criterion_area .sf_more_criterion .sfc_form_group, .search_form_handler .sf_criterion_area .search_form_criteria .sfm_content, .search_form_handler .sf_criterion_area .sf_more_criterion .sfm_content {
   position: absolute;
   z-index: -1;
-  min-width: 100%;
+  min-width: 170px;
+  /* 100%; */
   left: 0px;
   margin-top: -1px;
 }
@@ -927,14 +928,19 @@ input.dp-applied {
   margin: 0px -8px;
   /* Compensate .sfc_opc_multichoices side padding so the hover style can take the full with */
 }
-.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_opc_multichoices .sfc_opc_mc_items .sfc_opc_mc_item {
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_opc_multichoices .sfc_opc_mc_items .sfc_opc_mc_items_list .sfc_opc_mc_placeholder {
+  padding: 15px 8px;
+  font-style: italic;
+  text-align: center;
+}
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_opc_multichoices .sfc_opc_mc_items .sfc_opc_mc_items_list .sfc_opc_mc_item {
   padding: 4px 8px;
   /* Putting back the padding remove by .sfc_opc_mc_items */
 }
-.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_opc_multichoices .sfc_opc_mc_items .sfc_opc_mc_item:hover {
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_opc_multichoices .sfc_opc_mc_items .sfc_opc_mc_items_list .sfc_opc_mc_item:hover {
   background-color: #fff;
 }
-.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_opc_multichoices .sfc_opc_mc_items .sfc_opc_mc_item label {
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_opc_multichoices .sfc_opc_mc_items .sfc_opc_mc_items_list .sfc_opc_mc_item label {
   display: inline-block;
   width: 100%;
 }
diff --git a/css/light-grey.scss b/css/light-grey.scss
index 318409cd5..10dbd5c15 100644
--- a/css/light-grey.scss
+++ b/css/light-grey.scss
@@ -892,7 +892,7 @@ input.dp-applied {
 			.sfm_content{
 				position: absolute;
 				z-index: -1;
-				min-width: 100%;
+				min-width: 170px; /* 100%; */
 				left: 0px;
 				margin-top: -1px;
 			}
@@ -1033,16 +1033,23 @@ input.dp-applied {
 								overflow-y: auto;
 								margin: 0px -8px; /* Compensate .sfc_opc_multichoices side padding so the hover style can take the full with */
 
-								.sfc_opc_mc_item{
-									padding: 4px 8px; /* Putting back the padding remove by .sfc_opc_mc_items */
-
-									&:hover{
-										background-color: $search-criteria-box-hover-color;
+								.sfc_opc_mc_items_list{
+									.sfc_opc_mc_placeholder{
+										padding: 15px 8px;
+										font-style: italic;
+										text-align: center;
 									}
+									.sfc_opc_mc_item{
+										padding: 4px 8px; /* Putting back the padding remove by .sfc_opc_mc_items */
 
-									label{
-										display: inline-block;
-										width: 100%;
+										&:hover{
+											background-color: $search-criteria-box-hover-color;
+										}
+
+										label{
+											display: inline-block;
+											width: 100%;
+										}
 									}
 								}
 							}
diff --git a/dictionaries/en.dictionary.itop.ui.php b/dictionaries/en.dictionary.itop.ui.php
index 476ac03b7..8eed44e62 100644
--- a/dictionaries/en.dictionary.itop.ui.php
+++ b/dictionaries/en.dictionary.itop.ui.php
@@ -1392,26 +1392,6 @@ When associated with a trigger, each action is given an "order" number, specifyi
 	'UI:Search:AddCriteria:List:Others:Title' => 'Others',
 	'UI:Search:AddCriteria:List:RecentlyUsed:Placeholder' => 'None yet.',
 
-	// - Criteria operators
-	//   - Default widget
-	'UI:Search:Criteria:Operator:Default:Empty' => 'Is empty',
-	'UI:Search:Criteria:Operator:Default:NotEmpty' => 'Is not empty',
-	'UI:Search:Criteria:Operator:Default:Equals' => 'Equals',
-	'UI:Search:Criteria:Operator:Default:Between' => 'Between',
-	//   - String widget
-	'UI:Search:Criteria:Operator:String:Contains' => 'Contains',
-	'UI:Search:Criteria:Operator:String:StartsWith' => 'Starts with',
-	'UI:Search:Criteria:Operator:String:EndsWith' => 'Ends with',
-	//   - Numeric widget
-	'UI:Search:Criteria:Operator:Numeric:Equals' => 'Equals',  // => '=',
-	'UI:Search:Criteria:Operator:Numeric:GreaterThan' => 'Greater',  // => '>',
-	'UI:Search:Criteria:Operator:Numeric:GreaterThanOrEquals' => 'Greater / equals',  // > '>=',
-	'UI:Search:Criteria:Operator:Numeric:LessThan' => 'Less',  // => '<',
-	'UI:Search:Criteria:Operator:Numeric:LessThanOrEquals' => 'Less / equals',  // > '<=',
-	'UI:Search:Criteria:Operator:Numeric:Different' => 'Different',  // => '≠',
-
-
-
 	// - Criteria titles
 	//   - Default widget
 	'UI:Search:Criteria:Title:Default:Empty' => '%1$s is empty',
@@ -1438,6 +1418,10 @@ When associated with a trigger, each action is given an "order" number, specifyi
 //	'UI:Search:Criteria:Title:Numeric:Equals' => '%1$s equals %2$s',
 	//   - DateTime widget
 	'UI:Search:Criteria:Title:DateTime:Between' => '%2$s <= 1$s <= %3$s',
+	//   - Enum widget
+	'UI:Search:Criteria:Title:Enum:In' => '%1$s: %2$s',
+	'UI:Search:Criteria:Title:Enum:In:Many' => '%1$s: %2$s and %3$s others',
+	'UI:Search:Criteria:Title:Enum:In:All' => '%1$s: Any',
 	//   - External key widget
 	'UI:Search:Criteria:Title:ExternalKey:Empty' => '%1$s is defined',
 	'UI:Search:Criteria:Title:ExternalKey:NotEmpty' => '%1$s is not defined',
@@ -1445,15 +1429,33 @@ When associated with a trigger, each action is given an "order" number, specifyi
 	'UI:Search:Criteria:Title:ExternalKey:In' => '%1$s: %2$s',
 	'UI:Search:Criteria:Title:ExternalKey:In:Many' => '%1$s: %2$s and %3$s others',
 	'UI:Search:Criteria:Title:ExternalKey:In:All' => '%1$s: Any',
-	//   - Enum widget
-	'UI:Search:Criteria:Title:Enum:In' => '%1$s: %2$s',
-	'UI:Search:Criteria:Title:Enum:In:Many' => '%1$s: %2$s and %3$s others',
-	'UI:Search:Criteria:Title:Enum:In:All' => '%1$s: Any',
+
+	// - Criteria operators
+	//   - Default widget
+	'UI:Search:Criteria:Operator:Default:Empty' => 'Is empty',
+	'UI:Search:Criteria:Operator:Default:NotEmpty' => 'Is not empty',
+	'UI:Search:Criteria:Operator:Default:Equals' => 'Equals',
+	'UI:Search:Criteria:Operator:Default:Between' => 'Between',
+	//   - String widget
+	'UI:Search:Criteria:Operator:String:Contains' => 'Contains',
+	'UI:Search:Criteria:Operator:String:StartsWith' => 'Starts with',
+	'UI:Search:Criteria:Operator:String:EndsWith' => 'Ends with',
+	//   - Numeric widget
+	'UI:Search:Criteria:Operator:Numeric:Equals' => 'Equals',  // => '=',
+	'UI:Search:Criteria:Operator:Numeric:GreaterThan' => 'Greater',  // => '>',
+	'UI:Search:Criteria:Operator:Numeric:GreaterThanOrEquals' => 'Greater / equals',  // > '>=',
+	'UI:Search:Criteria:Operator:Numeric:LessThan' => 'Less',  // => '<',
+	'UI:Search:Criteria:Operator:Numeric:LessThanOrEquals' => 'Less / equals',  // > '<=',
+	'UI:Search:Criteria:Operator:Numeric:Different' => 'Different',  // => '≠',
 
 	// - Other translations
 	'UI:Search:Value:Filter:Placeholder' => 'Filter...',
 	'UI:Search:Value:Search:Placeholder' => 'Search...',
+	'UI:Search:Value:Autocomplete:StartTyping' => 'Start typing for possible values.',
+	'UI:Search:Value:Autocomplete:Wait' => 'Please wait...',
+	'UI:Search:Value:Autocomplete:NoResult' => 'No result.',
 	'UI:Search:Value:Toggler:CheckAllNone' => 'Check all / none',
+	'UI:Search:Value:Toggler:CheckAllNoneFiltered' => 'Check all / none filtered',
 
 	// - Widget other translations
 	'UI:Search:Criteria:Numeric:From' => 'From',
diff --git a/js/search/search_form_criteria.js b/js/search/search_form_criteria.js
index d2f5ae21d..6803cdd10 100644
--- a/js/search/search_form_criteria.js
+++ b/js/search/search_form_criteria.js
@@ -46,10 +46,11 @@ $(function()
 
 		// Operators
 		operators: {},
-
 		// Form handler
 		handler: null,
-   
+		// Keys that should not trigger an event in filter/autocomplete inputs
+		filtered_keys: [9, 16, 17, 18, 19, 27, 33, 34, 35, 36, 37, 38, 39, 40], // Tab, Shift, Ctrl, Alt, Pause, Esc, Page Up/Down, Home, End, Left/Up/Right/Down arrows
+
 		// the constructor
 		_create: function()
 		{
@@ -637,7 +638,7 @@ $(function()
 		// - Return the allowed values from the autocomplete
 		_getAutocompleteAllowedValues: function()
 		{
-			console.log('TODO: Retrieve allowed values through autocomplete (get needle in the input)');
+			// Meant for overloading.
 		},
 		// - Return current values
 		_getValues: function()
@@ -695,6 +696,11 @@ $(function()
 
 			return aParts.join('');
 		},
+		// - Return if the given keycode is among filtered
+		_isFilteredKey: function(iKeyCode)
+		{
+			return (this.filtered_keys.indexOf(iKeyCode) >= 0);
+		},
 
 
 		// Debug helpers
diff --git a/js/search/search_form_criteria_enum.js b/js/search/search_form_criteria_enum.js
index d8ec2074b..1914c1d95 100644
--- a/js/search/search_form_criteria_enum.js
+++ b/js/search/search_form_criteria_enum.js
@@ -32,6 +32,7 @@ $(function()
 			// Autocomplete
 			'autocomplete': {
 				'xhr_throttle': 200,
+				'min_autocomplete_chars': 3, // TODO: Pass this through widget instanciation.
 			},
 		},
 
@@ -186,6 +187,8 @@ $(function()
 			var oFilterElem = oOpElem.find('.sf_filter');
 
 			// DOM elements
+			// - Check all / none toggler
+			oOpContentElem.find('.sfc_opc_mc_toggler').remove();
 			// - Filter
 			oFilterElem.find('.sff_input_wrapper')
 				.append('<span class="sff_picto sff_filter fa fa-filter"></span>');
@@ -266,14 +269,18 @@ $(function()
 			// - Autocomplete
 			var oACXHR = null;
 			var oACTimeout = null;
-			oFilterElem.find('input').on('keyup focus', function(oEvent){
+			oFilterElem.find('input').on('keyup', function(oEvent){
 				// TODO: Move on values with up and down arrow keys; select with space or enter.
-				var sQuery = $(this).val();
+				if(me._isFilteredKey(oEvent.keyCode))
+				{
+					return false;
+				}
 
-				if(sQuery === '')
+				var sQuery = $(this).val();
+				if( (sQuery === '') || (sQuery.length <= me.options.autocomplete.min_autocomplete_chars) )
 				{
 					// TODO: Remove items and show placeholder
-					oDynamicListElem.html('TOTR: Start typing for possible values.');
+					oDynamicListElem.html('<div class="sfc_opc_mc_placeholder">' + Dict.S('UI:Search:Value:Autocomplete:StartTyping') + '</div>');
 
 					oFilterElem.find('.sff_reset').hide();
 				}
@@ -282,7 +289,7 @@ $(function()
 					clearTimeout(oACTimeout);
 					oACTimeout = setTimeout(function(){
 						// Show loader
-						oDynamicListElem.html('TOTR: Please wait...');
+						oDynamicListElem.html('<div class="sfc_opc_mc_placeholder">' + Dict.S('UI:Search:Value:Autocomplete:Wait') + '</div>');
 
 						if(oACXHR !== null)
 						{
@@ -389,29 +396,43 @@ $(function()
 		},
 
 
+		// Autocomplete helpers
+
 		// Autocomplete callbacks
 		_onACSearchSuccess: function(oResponse, oListElem)
 		{
-			// TODO: Show results
-			console.log('ok', oResponse);
-			for(var iKey in oResponse)
+			if(typeof oResponse !== 'object')
 			{
-				var oValueElem = this._makeListItemElement(iKey, oResponse[iKey]);
-				oValueElem.appendTo(oListElem);
+				this._onACSearchFail(oResponse, 'unexcepted');
+				return false;
 			}
 
+			oListElem.html('');
+			if(Object.keys(oResponse).length > 0)
+			{
+				for(var iKey in oResponse)
+				{
+					var oValueElem = this._makeListItemElement(iKey, oResponse[iKey]);
+					oValueElem.appendTo(oListElem);
+				}
+			}
+			else
+			{
+				oListElem.append('<div class="sfc_opc_mc_placeholder">' + Dict.S('UI:Search:Value:Autocomplete:NoResult') + '</div>')
+			}
 		},
 		_onACSearchFail: function(oResponse, sStatus)
 		{
 			if(sStatus !== 'abort')
 			{
-				this.element.find('.sfc_opc_mc_items_dynamic').html('TOTR: Error.');
+				var sErrorMessage = Dict.Format('Error:XHR:Fail', '');
+
+				this.element.find('.sfc_opc_mc_items_dynamic').html('<div class="sfc_opc_mc_placeholder">=/</div>');
+				this.handler.triggerHandler('itop.search.criteria.error_occured', sErrorMessage);
 			}
 		},
 		_onACSearchAlways: function()
 		{
-			// TODO: Remove loader
-			this._trace('TODO: Remove loader');
 		},
 
 
diff --git a/js/search/search_form_handler.js b/js/search/search_form_handler.js
index 76663db88..03c42f869 100644
--- a/js/search/search_form_handler.js
+++ b/js/search/search_form_handler.js
@@ -161,6 +161,9 @@ $(function()
 			this.element.on('itop.search.criteria.removed', function(oEvent, oData){
 				me._onCriteriaRemoved(oData);
 			});
+			this.element.on('itop.search.criteria.error_occured', function(oEvent, oData){
+				me._onCriteriaErrorOccured(oData);
+			});
 		},
 		// - Update search option of the widget
 		_updateSearch: function()
@@ -748,6 +751,10 @@ $(function()
 			this._updateSearch();
 			this._submit();
 		},
+		_onCriteriaErrorOccured: function(oData)
+		{
+			this._setErrorMessage(oData);
+		},
 
 		// Field helpers
 		_hasFieldDefinition: function(sRef)

From b447418f0778a32c438ce9fdcfe96deaca877376 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Fri, 30 Mar 2018 12:31:13 +0000
Subject: [PATCH 188/202] Advanced Search: debug mode

SVN:b1162[5588]
---
 pages/ajax.searchform.php                           | 12 +++++++++---
 sources/application/search/searchform.class.inc.php |  6 ++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/pages/ajax.searchform.php b/pages/ajax.searchform.php
index 6094a0a55..faa25a183 100644
--- a/pages/ajax.searchform.php
+++ b/pages/ajax.searchform.php
@@ -63,6 +63,14 @@ try
 		$sHiddenCriteria = '';
 	}
 	$oFilter = CriterionParser::Parse($aParams['base_oql'], $aParams['criterion'], $sHiddenCriteria);
+
+	if (isset($aListParams['debug']))
+	{
+		$sOQL = $oFilter->ToOQL();
+		$oPage->add("<div class=\"header_message message_info\">$sOQL</div>\n");
+	}
+
+	//IssueLog::Info('Search OQL: "'.$oFilter->ToOQL().'"');
 	$oDisplayBlock = new DisplayBlock($oFilter, 'list', false);
 
 	foreach($aListParams as $key => $value)
@@ -90,15 +98,12 @@ try
 			$aExtraParams['query_params'] = array('this' => $oObj);
 		}
 
-
 //        // Current extkey value, so we can display event if it is not available anymore (eg. archived).
 //        $iCurrentExtKeyId = (is_null($oObj)) ? 0 : $oObj->Get($this->sAttCode);
 //        $aExtraParams['current_extkey_id'] = $iCurrentExtKeyId;
 
 	}
 
-
-
 	$aExtraParams['display_limit'] = true;
 	$aExtraParams['truncated'] = true;
 	if (isset($sListId))
@@ -110,6 +115,7 @@ try
 		$oDisplayBlock->RenderContent($oPage, $aExtraParams);
 	}
 
+
 	$oPage->output();
 
 } catch (AjaxSearchException $e)
diff --git a/sources/application/search/searchform.class.inc.php b/sources/application/search/searchform.class.inc.php
index 456317c25..e4ea15ed9 100644
--- a/sources/application/search/searchform.class.inc.php
+++ b/sources/application/search/searchform.class.inc.php
@@ -176,6 +176,12 @@ class SearchForm
 			$bOpen = $aExtraParams['open'];
 		}
 
+		$sDebug = utils::ReadParam('debug', 'false', false, 'parameter');
+		if ($sDebug == 'true')
+		{
+			$aListParams['debug'] = 'true';
+		}
+
 		$aDaysMin = array(Dict::S('DayOfWeek-Sunday-Min'), Dict::S('DayOfWeek-Monday-Min'), Dict::S('DayOfWeek-Tuesday-Min'), Dict::S('DayOfWeek-Wednesday-Min'),
 			Dict::S('DayOfWeek-Thursday-Min'), Dict::S('DayOfWeek-Friday-Min'), Dict::S('DayOfWeek-Saturday-Min'));
 		$aMonthsShort = array(Dict::S('Month-01-Short'), Dict::S('Month-02-Short'), Dict::S('Month-03-Short'), Dict::S('Month-04-Short'), Dict::S('Month-05-Short'), Dict::S('Month-06-Short'),

From f41a80a309b7de3ecf592d7d04b7cf269a3c423f Mon Sep 17 00:00:00 2001
From: Guillaume Lajarige <guillaume.lajarige@combodo.com>
Date: Fri, 30 Mar 2018 13:12:02 +0000
Subject: [PATCH 189/202] Portal: Fix table filter trigger on "tab" key hit.

SVN:b1162[5589]
---
 .../portal/src/views/bricks/browse/mode_list.html.twig          | 2 +-
 .../portal/src/views/bricks/manage/layout.html.twig             | 2 +-
 .../src/views/bricks/object/mode_search_regular.html.twig       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/datamodels/2.x/itop-portal-base/portal/src/views/bricks/browse/mode_list.html.twig b/datamodels/2.x/itop-portal-base/portal/src/views/bricks/browse/mode_list.html.twig
index 3b3e0a84c..db7f29083 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/views/bricks/browse/mode_list.html.twig
+++ b/datamodels/2.x/itop-portal-base/portal/src/views/bricks/browse/mode_list.html.twig
@@ -21,7 +21,7 @@
 		// Used for ajax throttling
 		var iSearchThrottle = 600;
 		var oKeyTimeout;
-		var aKeyTimeoutFilteredKeys = [16, 17, 18, 19, 27, 33, 34, 35, 36, 37, 38, 39, 40]; // Shift, Ctrl, Alt, Pause, Esc, Page Up/Down, Home, End, Left/Up/Right/Down arrows
+		var aKeyTimeoutFilteredKeys = [9, 16, 17, 18, 19, 27, 33, 34, 35, 36, 37, 38, 39, 40]; // Tab, Shift, Ctrl, Alt, Pause, Esc, Page Up/Down, Home, End, Left/Up/Right/Down arrows
 		
 		// Show a loader inside the table
 		var showTableLoader = function(oElem)
diff --git a/datamodels/2.x/itop-portal-base/portal/src/views/bricks/manage/layout.html.twig b/datamodels/2.x/itop-portal-base/portal/src/views/bricks/manage/layout.html.twig
index bbd223499..0cde6ee35 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/views/bricks/manage/layout.html.twig
+++ b/datamodels/2.x/itop-portal-base/portal/src/views/bricks/manage/layout.html.twig
@@ -69,7 +69,7 @@
 		// Used for ajax throttling
 		var iSearchThrottle = 300;
 		var oKeyTimeout;
-		var aKeyTimeoutFilteredKeys = [16, 17, 18, 19, 27, 33, 34, 35, 36, 37, 38, 39, 40]; // Shift, Ctrl, Alt, Pause, Esc, Page Up/Down, Home, End, Left/Up/Right/Down arrows
+		var aKeyTimeoutFilteredKeys = [9, 16, 17, 18, 19, 27, 33, 34, 35, 36, 37, 38, 39, 40]; // Tab, Shift, Ctrl, Alt, Pause, Esc, Page Up/Down, Home, End, Left/Up/Right/Down arrows
 		
 		var columnsProperties = {
 			{% for aAreaData in aGroupingAreasData %}
diff --git a/datamodels/2.x/itop-portal-base/portal/src/views/bricks/object/mode_search_regular.html.twig b/datamodels/2.x/itop-portal-base/portal/src/views/bricks/object/mode_search_regular.html.twig
index cffc20cbd..bde847b52 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/views/bricks/object/mode_search_regular.html.twig
+++ b/datamodels/2.x/itop-portal-base/portal/src/views/bricks/object/mode_search_regular.html.twig
@@ -31,7 +31,7 @@
 	// Used for ajax throttling
 	var iSearchThrottle = 600;
 	var oKeyTimeout;
-	var aKeyTimeoutFilteredKeys = [16, 17, 18, 19, 27, 33, 34, 35, 36, 37, 38, 39, 40]; // Shift, Ctrl, Alt, Pause, Esc, Page Up/Down, Home, End, Left/Up/Right/Down arrows
+	var aKeyTimeoutFilteredKeys = [9, 16, 17, 18, 19, 27, 33, 34, 35, 36, 37, 38, 39, 40]; // Tab, Shift, Ctrl, Alt, Pause, Esc, Page Up/Down, Home, End, Left/Up/Right/Down arrows
 	// Used for form
 	var oSelectedItems = {};
 

From e1243532bac3ecc234beec2f847bb2aa26fe612c Mon Sep 17 00:00:00 2001
From: Bruno Da Silva <bruno.dasilva@combodo.com>
Date: Fri, 30 Mar 2018 14:24:33 +0000
Subject: [PATCH 190/202] search widget : SearchFormForeignKeys (modal with
 search for foreign keys)

SVN:b1162[5590]
---
 application/nicewebpage.class.inc.php         |   1 +
 .../ui.searchformforeignkeys.class.inc.php    |  24 +-
 js/search/search_form_criteria_enum.js        |  35 +-
 js/searchformforeignkeys.js                   | 474 ++++++++++++++++++
 pages/ajax.render.php                         |   4 +-
 5 files changed, 521 insertions(+), 17 deletions(-)
 create mode 100644 js/searchformforeignkeys.js

diff --git a/application/nicewebpage.class.inc.php b/application/nicewebpage.class.inc.php
index a56de6f76..61c2bdcaf 100644
--- a/application/nicewebpage.class.inc.php
+++ b/application/nicewebpage.class.inc.php
@@ -51,6 +51,7 @@ class NiceWebPage extends WebPage
 		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/datatable.js');
 		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.positionBy.js');
 		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.popupmenu.js');
+	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/searchformforeignkeys.js');
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_handler.js');
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_handler_history.js');
 	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria.js');
diff --git a/application/ui.searchformforeignkeys.class.inc.php b/application/ui.searchformforeignkeys.class.inc.php
index 2b43e88a9..92d67d0d7 100644
--- a/application/ui.searchformforeignkeys.class.inc.php
+++ b/application/ui.searchformforeignkeys.class.inc.php
@@ -30,7 +30,7 @@ class UISearchFormForeignKeys
 	{
 		$this->m_sRemoteClass = $sTargetClass;
 		$this->m_iInputId = $iInputId;
-		$this->sAttCode = $sAttCode;
+		$this->m_sAttCode = $sAttCode;
 		$this->m_sNameSuffix = $sSuffix;
 	}
 
@@ -49,30 +49,30 @@ class UISearchFormForeignKeys
 		$oFilter = new DBObjectSearch($this->m_sRemoteClass);
 
 		$oBlock = new DisplayBlock($oFilter, 'search', false);
-		$sHtml .= $oBlock->GetDisplay($oPage, "SearchFormToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}",
+		$sHtml .= $oBlock->GetDisplay($oPage, "SearchFormToAdd_{$this->m_iInputId}",
 			array(
 				'open' => $bOpen,
 				'menu' => false,
-				'table_id' => "SearchResultsToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}",
+				'table_id' => "SearchResultsToAdd_{$this->m_iInputId}",
 				'table_id2' => 'add_'.$this->m_sAttCode,
-				'table_inner_id' => "ResultsToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}",
+				'table_inner_id' => "ResultsToAdd_{$this->m_iInputId}",
 				'selection_mode' => true,
 				'cssCount' => '#count_'.$this->m_sAttCode.$this->m_sNameSuffix,
 				'query_params' => $oFilter->GetInternalParams(),
 			));
-		$sHtml .= "<form id=\"ObjectsAddForm_{$this->m_sAttCode}{$this->m_sNameSuffix}\">\n";
-		$sHtml .= "<div id=\"SearchResultsToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}\" style=\"vertical-align:top;background: #fff;height:100%;overflow:auto;padding:0;border:0;\">\n";
+		$sHtml .= "<form id=\"ObjectsAddForm_{$this->m_iInputId}\">\n";
+		$sHtml .= "<div id=\"SearchResultsToAdd_{$this->m_iInputId}\" style=\"vertical-align:top;background: #fff;height:100%;overflow:auto;padding:0;border:0;\">\n";
 		$sHtml .= "<div style=\"background: #fff; border:0; text-align:center; vertical-align:middle;\"><p>".Dict::S('UI:Message:EmptyList:UseSearchForm')."</p></div>\n";
 		$sHtml .= "</div>\n";
-		$sHtml .= "<input type=\"hidden\" id=\"count_{$this->m_sAttCode}{$this->m_sNameSuffix}\" value=\"0\"/>";
-		$sHtml .= "<input type=\"button\" value=\"".Dict::S('UI:Button:Cancel')."\" onClick=\"$('#dlg_{$this->m_sAttCode}{$this->m_sNameSuffix}').dialog('close');\">&nbsp;&nbsp;<input id=\"btn_ok_{$this->m_sAttCode}{$this->m_sNameSuffix}\" disabled=\"disabled\" type=\"button\" onclick=\"return oWidget{$this->m_iInputId}.DoAddObjects(this.id);\" value=\"".Dict::S('UI:Button:Add')."\">";
+		$sHtml .= "<input type=\"hidden\" id=\"count_{$this->m_iInputId}\" value=\"0\"/>";
+		$sHtml .= "<input type=\"button\" value=\"".Dict::S('UI:Button:Cancel')."\" onClick=\"$('#dlg_{$this->m_iInputId}').dialog('close');\">&nbsp;&nbsp;<input id=\"btn_ok_{$this->m_iInputId}\" disabled=\"disabled\" type=\"button\" onclick=\"return oWForeignKeysWidget{$this->m_iInputId}.DoAddObjects(this.id);\" value=\"".Dict::S('UI:Button:Add')."\">";
 		$sHtml .= "</div>\n";
 		$sHtml .= "</form>\n";
 		$oPage->add($sHtml);
-		$oPage->add_ready_script("$('#dlg_{$this->m_sAttCode}{$this->m_sNameSuffix}').dialog({ width: $(window).width()*0.8, height: $(window).height()*0.8, autoOpen: false, modal: true, resizeStop: oWidget{$this->m_iInputId}.UpdateSizes });");
-		$oPage->add_ready_script("$('#dlg_{$this->m_sAttCode}{$this->m_sNameSuffix}').dialog('option', {title:'$sTitle'});");
-		$oPage->add_ready_script("$('#SearchFormToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix} form').bind('submit.uilinksWizard', oWidget{$this->m_iInputId}.SearchObjectsToAdd);");
-		$oPage->add_ready_script("$('#SearchFormToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}').resize(oWidget{$this->m_iInputId}.UpdateSizes);");
+		$oPage->add_ready_script("$('#dlg_{$this->m_iInputId}').dialog({ width: $(window).width()*0.8, height: $(window).height()*0.8, autoOpen: false, modal: true, resizeStop: oWForeignKeysWidget{$this->m_iInputId}.UpdateSizes });");
+		$oPage->add_ready_script("$('#dlg_{$this->m_iInputId}').dialog('option', {title:'$sTitle'});");
+		$oPage->add_ready_script("$('#SearchFormToAdd_{$this->m_iInputId} form').bind('submit.uilinksWizard', oWForeignKeysWidget{$this->m_iInputId}.SearchObjectsToAdd);");
+		$oPage->add_ready_script("$('#SearchFormToAdd_{$this->m_iInputId}').resize(oWForeignKeysWidget{$this->m_iInputId}.UpdateSizes);");
 	}
 
 	/**
diff --git a/js/search/search_form_criteria_enum.js b/js/search/search_form_criteria_enum.js
index 1914c1d95..f22464604 100644
--- a/js/search/search_form_criteria_enum.js
+++ b/js/search/search_form_criteria_enum.js
@@ -208,6 +208,8 @@ $(function()
 				}
 			}
 
+
+
 			// Events
 			// - Filter
 			// Note: "keyup" event is use instead of "keydown", otherwise, the input value would not be set yet.
@@ -244,6 +246,8 @@ $(function()
 			oFilterElem.find('.sff_filter').on('click', function(){
 				oFilterElem.find('input').trigger('focus');
 			});
+
+
 		},
 		_prepareInOperatorWithAutocomplete: function(oOpElem, sOpIdx, oOp)
 		{
@@ -265,6 +269,27 @@ $(function()
 				.addClass('sfc_opc_mc_items_selected')
 				.appendTo(oOpContentElem);
 
+
+			// External classes
+			var oFilterIconElem = oFilterElem.find('.sff_search_dialog').uniqueId();
+			oFilterIconElem.attr('id', oFilterIconElem.attr('id').replace(/-/g, '_'));
+			var oWForeignKeysWidgetCurrent = new SearchFormForeignKeys(
+				oFilterIconElem.attr('id'), 	// id
+				me.options.field.target_class, 	// sTargetClass
+				me.options.field.code,			// sAttCode
+				'',								// sFilter  //TODO
+				me.options.field.label			// sTitle
+			);
+			window['oWForeignKeysWidget' + oFilterIconElem.attr('id')] = oWForeignKeysWidgetCurrent;
+			oWForeignKeysWidgetCurrent.Init();
+
+			// model of similar code found in UIExtKeyWidget (you can find another on in UILinksWidget for example)
+			// oACWidget_{$this->iId} = new ExtKeyWidget('{$this->iId}', '{$this->sTargetClass}', '$sFilter', '$sTitle', true, $sWizHelper, '{$this->sAttCode}', $sJSSearchMode);
+			// $sMessage = Dict::S('UI:Message:EmptyList:UseSearchForm');
+			// oACWidget_{$this->iId}.emptyHtml = "<div style=\"background: #fff; border:0; text-align:center; vertical-align:middle;\"><p>$sMessage</p></div>";
+			// $('#$this->iId').bind('update', function() { oACWidget_{$this->iId}.Update(); } );
+			// $('#$this->iId').bind('change', function() { $(this).trigger('extkeychange') } );
+
 			// Events
 			// - Autocomplete
 			var oACXHR = null;
@@ -316,10 +341,12 @@ $(function()
 			});
 			//
 			// // - Open search dialog
-			// oFilterElem.find('.sff_search_dialog').on('click', function(){
-			// 	// TODO: Open search dialog with right params
-			// 	alert('Not implemented yet');
-			// });
+			oFilterElem.find('.sff_search_dialog').on('click', function(){
+				oWForeignKeysWidgetCurrent.ShowModalSearchForeignKeys();
+			});
+
+
+
 		},
 		_setTitle: function(sTitle)
 		{
diff --git a/js/searchformforeignkeys.js b/js/searchformforeignkeys.js
new file mode 100644
index 000000000..74d3178f2
--- /dev/null
+++ b/js/searchformforeignkeys.js
@@ -0,0 +1,474 @@
+// Copyright (C) 2010-2018 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+/**
+ *
+ * @param id String the dom identifier of the source input
+ * @param sTargetClass
+ * @param sAttCode
+ * @param sFilter
+ * @param sTitle
+ * @constructor
+ */
+function SearchFormForeignKeys(id, sTargetClass, sAttCode, sFilter, sTitle)
+{
+	this.id = id;
+	this.sOriginalTargetClass = sTargetClass;
+	this.sTargetClass = sTargetClass;
+	this.sFilter = sFilter;
+	this.sTitle = sTitle;
+	this.sAttCode = sAttCode;
+	this.emptyHtml = ''; // content to be displayed when the search results are empty (when opening the dialog)
+	this.emptyOnClose = true; // Workaround for the JQuery dialog being very slow when opening and closing if the content contains many INPUT tags
+	this.ajax_request = null;
+	// this.bSelectMode = bSelectMode; // true if the edited field is a SELECT, false if it's an autocomplete
+	// this.bSearchMode = bSearchMode; // true if selecting a value in the context of a search form
+	var me = this;
+
+	this.Init = function()
+	{
+		// make sure that the form is clean
+		$('#linkedset_'+this.id+' .selection').each( function() { this.checked = false; });
+		$('#'+this.id+'_btnRemove').prop('disabled', false);
+
+
+		var dialog = $('<div id="dlg_'+me.id+'"></div>').appendTo(document.body);
+
+		// me.trace(dialog);
+
+		//TODO : check and remove all unneded code bellow this line!!
+
+		$('#'+this.id+'_linksToRemove').val('');
+
+		$('#linkedset_'+me.id).on('remove', function() {
+			// prevent having the dlg div twice
+			$('#dlg_'+me.id).remove();
+		});
+
+		// $('#linkedset_'+me.id+' :input').off('change').on('change', function() {
+		// 	if (!($(this).hasClass('selection')) && !($(this).hasClass('select_all'))) {
+		// 		var oCheckbox = $(this).closest('tr').find('.selection');
+		// 		var iLink = oCheckbox.attr('data-link-id');
+		// 		var iUniqueId = oCheckbox.attr('data-unique-id');
+		// 		var sAttCode = $(this).closest('.attribute-edit').attr('data-attcode');
+		// 		var value = $(this).val();
+		// 		return me.OnValueChange(iLink, iUniqueId, sAttCode, value);
+		// 	}
+		// 	return true;
+		// });
+
+		$('#'+this.iInputId).closest('form').submit(function() {
+			return me.OnFormSubmit();
+		});
+	};
+
+	this.StopPendingRequest = function()
+	{
+		if (me.ajax_request)
+		{
+			me.ajax_request.abort();
+			me.ajax_request = null;
+		}
+	};
+
+	this.ShowModalSearchForeignKeys = function()
+	{
+		// // Query the server to get the form to search for target objects
+		// if (me.bSelectMode)
+		// {
+		// 	$('#fstatus_'+me.id).html('<img src="../images/indicator.gif" />');
+		// }
+		// else
+		// {
+		// 	$('#label_'+me.id).addClass('dlg_loading');
+		// }
+		$('#label_'+me.id).addClass('dlg_loading');
+		var theMap = {
+			sAttCode: me.sAttCode,
+			iInputId: me.id,
+			sTitle: me.sTitle,
+			sAttCode: me.sAttCode,
+			sTargetClass: me.sTargetClass,
+			// bSearchMode: me.bSearchMode,
+			operation: 'ShowModalSearchForeignKeys'
+		};
+
+
+
+		// Make sure that we cancel any pending request before issuing another
+		// since responses may arrive in arbitrary order
+		me.StopPendingRequest();
+
+		// Run the query and get the result back directly in HTML
+		me.ajax_request = $.post( AddAppContext(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php'), theMap,
+			function(data)
+			{
+				// $('#dlg_'+me.id).html(data);
+				$('#dlg_'+me.id).empty().append($(data)); // $(data).filter(':not(script)'));
+				$('#dlg_'+me.id).dialog('open');
+				me.UpdateSizes();
+				me.UpdateButtons();
+				me.ajax_request = null;
+				FixSearchFormsDisposition();
+				me.ListResultsSearchForeignKeys();
+			},
+			'html'
+		);
+	};
+
+	this.UpdateSizes = function()
+	{
+		var dlg = $('#dlg_'+me.id);
+		// Adjust the dialog's size to fit into the screen
+		if (dlg.width() > ($(window).width()-40))
+		{
+			dlg.width($(window).width()-40);
+		}
+		if (dlg.height() > ($(window).height()-70))
+		{
+			dlg.height($(window).height()-70);
+		}
+		var searchForm = dlg.find('div.display_block:first'); // Top search form, enclosing display_block
+		var results = $('#dr_'+me.id);
+		var oPadding = {};
+		var aKeys = ['top', 'right', 'bottom', 'left'];
+		for(k in aKeys)
+		{
+			oPadding[aKeys[k]] = 0;
+			if (dlg.css('padding-'+aKeys[k]))
+			{
+				oPadding[aKeys[k]] = parseInt(dlg.css('padding-'+aKeys[k]).replace('px', ''));
+			}
+		}
+		width = dlg.innerWidth() - oPadding['right'] - oPadding['left'] - 22; // 5 (margin-left) + 5 (padding-left) + 5 (padding-right) + 5 (margin-right) + 2 for rounding !
+		height = dlg.innerHeight() - oPadding['top'] - oPadding['bottom'] -22;
+		form_height = searchForm.outerHeight();
+		results.height(height - form_height - 40); // Leave some space for the buttons
+	};
+
+	this.UpdateButtons = function()
+	{
+		var okBtn = $('#btn_ok_'+me.id);
+		if ($('#count_'+me.id).val() > 0)
+		{
+			okBtn.removeAttr('disabled');
+		}
+		else
+		{
+			okBtn.prop('disabled', 'disabled');
+		}
+	};
+
+	this.ListResultsSearchForeignKeys = function(id)
+	{
+		var theMap = {
+			sTargetClass: me.sTargetClass,
+			iInputId: me.id,
+			sFilter: me.sFilter
+			// bSearchMode: me.bSearchMode
+		};
+
+		// Gather the parameters from the search form
+		$('#fs_'+me.id+' :input').each( function() {
+			if (this.name != '')
+			{
+				var val = $(this).val(); // supports multiselect as well
+				if (val !== null)
+				{
+					theMap[this.name] = val;
+				}
+			}
+		});
+
+
+
+		theMap['sRemoteClass'] = theMap['class'];  // swap 'class' (defined in the form) and 'remoteClass'
+		theMap.operation = 'ListResultsSearchForeignKeys'; // Override what is defined in the form itself
+		theMap.sAttCode = me.sAttCode;
+		sSearchAreaId = '#dr_'+me.id;
+		//$(sSearchAreaId).html('<div style="text-align:center;width:100%;height:24px;vertical-align:middle;"><img src="../images/indicator.gif" /></div>');
+		$(sSearchAreaId).block();
+		me.UpdateButtons();
+
+		// Make sure that we cancel any pending request before issuing another
+		// since responses may arrive in arbitrary order
+		me.StopPendingRequest();
+
+		// Run the query and display the results
+		me.ajax_request = $.post( AddAppContext(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php'), theMap,
+			function(data)
+			{
+				$(sSearchAreaId).html(data);
+				$(sSearchAreaId+' .listResults').tableHover();
+				$('#fr_'+me.id+' input:radio').click(function() { me.UpdateButtons(); });
+				me.UpdateButtons();
+				me.ajax_request = null;
+				$('#count_'+me.id).change(function(){
+					me.UpdateButtons();
+				});
+				me.UpdateSizes();
+			},
+			'html'
+		);
+
+		return false; // Don't submit the form, stay in the current page !
+	};
+
+	this.DoOk = function()
+	{
+		var s = $('#'+me.id+'_results').find(':input[name^=storedSelection]');
+		var iObjectId = 0;
+		if (s.length > 0)
+		{
+			iObjectId = s.val();
+		}
+		else
+		{
+			iObjectId = $('#fr_'+me.id+' input[name=selectObject]:checked').val();
+		}
+		$('#dlg_'+this.id).dialog('close');
+		$('#label_'+this.id).addClass('dlg_loading');
+
+		// Query the server again to get the display name of the selected object
+		var theMap = { sTargetClass: me.sTargetClass,
+			iInputId: me.id,
+			iObjectId: iObjectId,
+			sAttCode: me.sAttCode,
+			// bSearchMode: me.bSearchMode,
+			operation: 'getObjectName'
+		};
+
+		// Make sure that we cancel any pending request before issuing another
+		// since responses may arrive in arbitrary order
+		me.StopPendingRequest();
+
+		// Run the query and get the result back directly in JSON
+		me.ajax_request = $.post( AddAppContext(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php'), theMap,
+			function(data)
+			{
+				var oTemp = $('<div>'+data.name+'</div>');
+				var txt = oTemp.text(); // this causes HTML entities to be interpreted
+				$('#label_'+me.id).val(txt);
+				$('#label_'+me.id).removeClass('dlg_loading');
+				var prevValue = $('#'+me.id).val();
+				$('#'+me.id).val(iObjectId);
+				if (prevValue != iObjectId)
+				{
+					$('#'+me.id).trigger('validate');
+					$('#'+me.id).trigger('extkeychange');
+					$('#'+me.id).trigger('change');
+				}
+				$('#label_'+me.id).focus();
+				me.ajax_request = null;
+			},
+			'json'
+		);
+
+		return false; // Do NOT submit the form in case we are called by OnSubmit...
+	};
+
+	// Workaround for a ui.jquery limitation: if the content of
+	// the dialog contains many INPUTs, closing and opening the
+	// dialog is very slow. So empty it each time.
+	this.OnClose = function()
+	{
+		me.StopPendingRequest();
+		// called by the dialog, so in the context 'this' points to the jQueryObject
+		if (me.emptyOnClose)
+		{
+			$('#dr_'+me.id).html(me.emptyHtml);
+		}
+		$('#label_'+me.id).removeClass('dlg_loading');
+		$('#label_'+me.id).focus();
+		me.ajax_request = null;
+	};
+
+
+
+	this.DoSelectObjectClass = function()
+	{
+		// Retrieving selected value
+		var oSelectedClass = $('#ac_create_'+me.id+' select');
+		if(oSelectedClass.length !== 1) return;
+
+		// Setting new target class
+		me.sTargetClass = oSelectedClass.val();
+
+		// Opening real creation form
+		$('#ac_create_'+me.id).dialog('close');
+		me.CreateObject();
+	};
+
+
+
+
+	this.Update = function()
+	{
+		if ($('#'+me.id).prop('disabled'))
+		{
+			$('#v_'+me.id).html('');
+			$('#label_'+me.id).prop('disabled', 'disabled');
+			$('#label_'+me.id).css({'background': 'transparent'});
+			$('#mini_add_'+me.id).hide();
+			$('#mini_tree_'+me.id).hide();
+			$('#mini_search_'+me.id).hide();
+		}
+		else
+		{
+			$('#label_'+me.id).removeAttr('disabled');
+			$('#label_'+me.id).css({'background': '#fff url(../images/ac-background.gif) no-repeat right'});
+			$('#mini_add_'+me.id).show();
+			$('#mini_tree_'+me.id).show();
+			$('#mini_search_'+me.id).show();
+		}
+	};
+
+
+
+	this.OnFormSubmit = function()
+	{
+		var oDiv = $('#linkedset_'+me.id);
+
+		var aToBeCreated = [];
+		me.aAdded.forEach(function(oAdded){
+			if (oAdded != null)
+			{
+				aToBeCreated.push(oAdded);
+			}
+		});
+		var sToBeCreated = JSON.stringify(aToBeCreated);
+		$('<input type="hidden" name="attr_'+me.sAttCode+'_tbc">').val(sToBeCreated).appendTo(oDiv);
+	};
+	// this.HKDisplay = function()
+	// {
+	// 	var theMap = { sTargetClass: me.sTargetClass,
+	// 		sInputId: me.id,
+	// 		sFilter: me.sFilter,
+	//// 		bSearchMode: me.bSearchMode,
+	// 		sAttCode: me.sAttCode,
+	// 		value: $('#'+me.id).val()
+	// 	};
+	//
+	//// 	if (me.bSelectMode)
+	////	{
+	//// 		$('#fstatus_'+me.id).html('<img src="../images/indicator.gif" />');
+	//// 	}
+	//// 	else
+	//// 	{
+	//// 		$('#label_'+me.id).addClass('dlg_loading');
+	//// 	}
+	//	$('#label_'+me.id).addClass('dlg_loading');
+	//
+	// 	theMap['sRemoteClass'] = me.sTargetClass;
+	// 	theMap.operation = 'displayHierarchy';
+	//
+	// 	// Make sure that we cancel any pending request before issuing another
+	// 	// since responses may arrive in arbitrary order
+	// 	me.StopPendingRequest();
+	//
+	// 	// Run the query and display the results
+	// 	me.ajax_request = $.post( AddAppContext(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php'), theMap,
+	// 		function(data)
+	// 		{
+	// 			$('#ac_tree_'+me.id).html(data);
+	// 			var maxHeight = $(window).height()-110;
+	// 			$('#tree_'+me.id).css({maxHeight: maxHeight});
+	// 		},
+	// 		'html'
+	// 	);
+	// };
+	//
+	// this.OnHKResize = function(event, ui)
+	// {
+	// 	var dh = ui.size.height - ui.originalSize.height;
+	// 	if (dh != 0)
+	// 	{
+	// 		var dlg_content = $('#dlg_tree_'+me.id+' .wizContainer');
+	// 		var h = dlg_content.height();
+	// 		dlg_content.height(h + dh);
+	// 		var tree = $('#tree_'+me.id);
+	// 		var h = tree.height();
+	// 		tree.height(h + dh - 1);
+	// 	}
+	// };
+	//
+	// this.OnHKClose = function()
+	// {
+	// 	if (me.bSelectMode)
+	// 	{
+	// 		$('#fstatus_'+me.id).html('');
+	// 	}
+	// 	else
+	// 	{
+	// 		$('#label_'+me.id).removeClass('dlg_loading');
+	// 	}
+	// 	$('#label_'+me.id).focus();
+	// 	$('#dlg_tree_'+me.id).dialog("destroy");
+	// 	$('#dlg_tree_'+me.id).remove();
+	// };
+	//
+	// this.DoHKOk = function()
+	// {
+	// 	iObjectId = $('#tree_'+me.id+' input[name=selectObject]:checked').val();
+	//
+	// 	$('#dlg_tree_'+me.id).dialog('close');
+	//
+	// 	// Query the server again to get the display name of the selected object
+	// 	var theMap = { sTargetClass: me.sTargetClass,
+	// 		iInputId: me.id,
+	// 		iObjectId: iObjectId,
+	// 		sAttCode: me.sAttCode,
+	//// 		bSearchMode: me.bSearchMode,
+	// 		operation: 'getObjectName'
+	// 	};
+	//
+	// 	// Make sure that we cancel any pending request before issuing another
+	// 	// since responses may arrive in arbitrary order
+	// 	me.StopPendingRequest();
+	//
+	// 	// Run the query and get the result back directly in JSON
+	// 	me.ajax_request = $.post( AddAppContext(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php'), theMap,
+	// 		function(data)
+	// 		{
+	// 			var oTemp = $('<div>'+data.name+'</div>');
+	// 			var txt = oTemp.text(); // this causes HTML entities to be interpreted
+	// 			$('#label_'+me.id).val(txt);
+	// 			$('#label_'+me.id).removeClass('dlg_loading');
+	// 			var prevValue = $('#'+me.id).val();
+	// 			$('#'+me.id).val(iObjectId);
+	// 			if (prevValue != iObjectId)
+	// 			{
+	// 				$('#'+me.id).trigger('validate');
+	// 				$('#'+me.id).trigger('extkeychange');
+	// 				$('#'+me.id).trigger('change');
+	// 			}
+	// 			if ( $('#'+me.id).hasClass('multiselect'))
+	// 			{
+	// 				$('#'+me.id+' option').each(function() { this.selected = ($(this).attr('value') == iObjectId); });
+	// 				$('#'+me.id).multiselect('refresh');
+	// 			}
+	// 			$('#label_'+me.id).focus();
+	// 			me.ajax_request = null;
+	// 		},
+	// 		'json'
+	// 	);
+	//
+	// 	return false; // Do NOT submit the form in case we are called by OnSubmit...
+	// };
+
+
+}
\ No newline at end of file
diff --git a/pages/ajax.render.php b/pages/ajax.render.php
index 1ecfbb4d3..b8828c562 100644
--- a/pages/ajax.render.php
+++ b/pages/ajax.render.php
@@ -31,6 +31,7 @@ require_once(APPROOT.'/application/ajaxwebpage.class.inc.php');
 require_once(APPROOT.'/application/pdfpage.class.inc.php');
 require_once(APPROOT.'/application/wizardhelper.class.inc.php');
 require_once(APPROOT.'/application/ui.linkswidget.class.inc.php');
+require_once(APPROOT.'/application/ui.searchformforeignkeys.class.inc.php');
 require_once(APPROOT.'/application/ui.extkeywidget.class.inc.php');
 require_once(APPROOT.'/application/datatable.class.inc.php');
 require_once(APPROOT.'/application/excelexporter.class.inc.php');
@@ -257,7 +258,8 @@ try
 			$iInputId = utils::ReadParam('iInputId', '');
 			$sSuffix = utils::ReadParam('sSuffix', '');
 			$sTitle = utils::ReadParam('sTitle', '', false, 'raw_data');
-			$oWidget = new UISearchFormForeignKeys($sClass, $iInputId, $sAttCode, $sSuffix);
+			$sTargetClass = utils::ReadParam('sTargetClass', '', false, 'class');
+			$oWidget = new UISearchFormForeignKeys($sTargetClass, $iInputId, $sAttCode, $sSuffix);
 			$oWidget->ShowModalSearchForeignKeys($oPage, $sTitle);
 			break;
 

From 4bc3d0ce2dc243602a974e82c4f4b60f5c74607e Mon Sep 17 00:00:00 2001
From: Bruno Da Silva <bruno.dasilva@combodo.com>
Date: Fri, 30 Mar 2018 14:24:54 +0000
Subject: [PATCH 191/202] add AGPL licence to the file

SVN:b1162[5591]
---
 js/linkswidget.js | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/js/linkswidget.js b/js/linkswidget.js
index d26d20a31..4510eaa2a 100644
--- a/js/linkswidget.js
+++ b/js/linkswidget.js
@@ -1,3 +1,20 @@
+// Copyright (C) 2010-2018 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
 // JavaScript Document
 function LinksWidget(id, sClass, sAttCode, iInputId, sSuffix, bDuplicates, oWizHelper, sExtKeyToRemote)
 {

From d4960080ea1b910f1ebc1dc252d17815f0d72b08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Fri, 30 Mar 2018 15:23:41 +0000
Subject: [PATCH 192/202] Advanced Search: Auto-complete search on foreign keys

SVN:b1162[5592]
---
 .../ui.searchformforeignkeys.class.inc.php    |  14 +-
 js/search/search_form_criteria_enum.js        |   8 +-
 js/searchformforeignkeys.js                   | 237 ++++--------------
 3 files changed, 58 insertions(+), 201 deletions(-)

diff --git a/application/ui.searchformforeignkeys.class.inc.php b/application/ui.searchformforeignkeys.class.inc.php
index 92d67d0d7..2ebc24f7b 100644
--- a/application/ui.searchformforeignkeys.class.inc.php
+++ b/application/ui.searchformforeignkeys.class.inc.php
@@ -54,7 +54,7 @@ class UISearchFormForeignKeys
 				'open' => $bOpen,
 				'menu' => false,
 				'table_id' => "SearchResultsToAdd_{$this->m_iInputId}",
-				'table_id2' => 'add_'.$this->m_sAttCode,
+				'table_id2' => "add_{$this->m_iInputId}",
 				'table_inner_id' => "ResultsToAdd_{$this->m_iInputId}",
 				'selection_mode' => true,
 				'cssCount' => '#count_'.$this->m_sAttCode.$this->m_sNameSuffix,
@@ -65,14 +65,14 @@ class UISearchFormForeignKeys
 		$sHtml .= "<div style=\"background: #fff; border:0; text-align:center; vertical-align:middle;\"><p>".Dict::S('UI:Message:EmptyList:UseSearchForm')."</p></div>\n";
 		$sHtml .= "</div>\n";
 		$sHtml .= "<input type=\"hidden\" id=\"count_{$this->m_iInputId}\" value=\"0\"/>";
-		$sHtml .= "<input type=\"button\" value=\"".Dict::S('UI:Button:Cancel')."\" onClick=\"$('#dlg_{$this->m_iInputId}').dialog('close');\">&nbsp;&nbsp;<input id=\"btn_ok_{$this->m_iInputId}\" disabled=\"disabled\" type=\"button\" onclick=\"return oWForeignKeysWidget{$this->m_iInputId}.DoAddObjects(this.id);\" value=\"".Dict::S('UI:Button:Add')."\">";
+		$sHtml .= "<input type=\"button\" value=\"".Dict::S('UI:Button:Cancel')."\" onClick=\"$('#dlg_{$this->m_iInputId}').dialog('close');\">&nbsp;&nbsp;<input id=\"btn_ok_{$this->m_iInputId}\" disabled=\"disabled\" type=\"button\" onclick=\"return oForeignKeysWidget{$this->m_iInputId}.DoAddObjects(this.id);\" value=\"".Dict::S('UI:Button:Add')."\">";
 		$sHtml .= "</div>\n";
 		$sHtml .= "</form>\n";
 		$oPage->add($sHtml);
-		$oPage->add_ready_script("$('#dlg_{$this->m_iInputId}').dialog({ width: $(window).width()*0.8, height: $(window).height()*0.8, autoOpen: false, modal: true, resizeStop: oWForeignKeysWidget{$this->m_iInputId}.UpdateSizes });");
+		$oPage->add_ready_script("$('#dlg_{$this->m_iInputId}').dialog({ width: $(window).width()*0.8, height: $(window).height()*0.8, autoOpen: false, modal: true, resizeStop: oForeignKeysWidget{$this->m_iInputId}.UpdateSizes });");
 		$oPage->add_ready_script("$('#dlg_{$this->m_iInputId}').dialog('option', {title:'$sTitle'});");
-		$oPage->add_ready_script("$('#SearchFormToAdd_{$this->m_iInputId} form').bind('submit.uilinksWizard', oWForeignKeysWidget{$this->m_iInputId}.SearchObjectsToAdd);");
-		$oPage->add_ready_script("$('#SearchFormToAdd_{$this->m_iInputId}').resize(oWForeignKeysWidget{$this->m_iInputId}.UpdateSizes);");
+		$oPage->add_ready_script("$('#SearchFormToAdd_{$this->m_iInputId} form').bind('submit.uilinksWizard', oForeignKeysWidget{$this->m_iInputId}.SearchObjectsToAdd);");
+		$oPage->add_ready_script("$('#SearchFormToAdd_{$this->m_iInputId}').resize(oForeignKeysWidget{$this->m_iInputId}.UpdateSizes);");
 	}
 
 	/**
@@ -97,8 +97,8 @@ class UISearchFormForeignKeys
 		}
 
 		$oBlock = new DisplayBlock($oFilter, 'list', false);
-		$oBlock->Display($oP, "ResultsToAdd_{$this->m_sAttCode}",
-			array('menu' => false, 'cssCount' => '#count_'.$this->m_sAttCode.$this->m_sNameSuffix, 'selection_mode' => true, 'table_id' => 'add_'.$this->m_sAttCode));
+		$oBlock->Display($oP, "ResultsToAdd_{$this->m_iInputId}",
+			array('menu' => false, 'cssCount' => "#count_{$this->m_iInputId}", 'selection_mode' => true, 'table_id' => "add_{$this->m_iInputId}"));
 	}
 
 }
\ No newline at end of file
diff --git a/js/search/search_form_criteria_enum.js b/js/search/search_form_criteria_enum.js
index f22464604..d00a0ae91 100644
--- a/js/search/search_form_criteria_enum.js
+++ b/js/search/search_form_criteria_enum.js
@@ -273,15 +273,15 @@ $(function()
 			// External classes
 			var oFilterIconElem = oFilterElem.find('.sff_search_dialog').uniqueId();
 			oFilterIconElem.attr('id', oFilterIconElem.attr('id').replace(/-/g, '_'));
-			var oWForeignKeysWidgetCurrent = new SearchFormForeignKeys(
+			var oForeignKeysWidgetCurrent = new SearchFormForeignKeys(
 				oFilterIconElem.attr('id'), 	// id
 				me.options.field.target_class, 	// sTargetClass
 				me.options.field.code,			// sAttCode
 				'',								// sFilter  //TODO
 				me.options.field.label			// sTitle
 			);
-			window['oWForeignKeysWidget' + oFilterIconElem.attr('id')] = oWForeignKeysWidgetCurrent;
-			oWForeignKeysWidgetCurrent.Init();
+			window['oForeignKeysWidget'+oFilterIconElem.attr('id')] = oForeignKeysWidgetCurrent;
+			oForeignKeysWidgetCurrent.Init();
 
 			// model of similar code found in UIExtKeyWidget (you can find another on in UILinksWidget for example)
 			// oACWidget_{$this->iId} = new ExtKeyWidget('{$this->iId}', '{$this->sTargetClass}', '$sFilter', '$sTitle', true, $sWizHelper, '{$this->sAttCode}', $sJSSearchMode);
@@ -342,7 +342,7 @@ $(function()
 			//
 			// // - Open search dialog
 			oFilterElem.find('.sff_search_dialog').on('click', function(){
-				oWForeignKeysWidgetCurrent.ShowModalSearchForeignKeys();
+				oForeignKeysWidgetCurrent.ShowModalSearchForeignKeys();
 			});
 
 
diff --git a/js/searchformforeignkeys.js b/js/searchformforeignkeys.js
index 74d3178f2..e693a2b1a 100644
--- a/js/searchformforeignkeys.js
+++ b/js/searchformforeignkeys.js
@@ -143,7 +143,7 @@ function SearchFormForeignKeys(id, sTargetClass, sAttCode, sFilter, sTitle)
 			dlg.height($(window).height()-70);
 		}
 		var searchForm = dlg.find('div.display_block:first'); // Top search form, enclosing display_block
-		var results = $('#dr_'+me.id);
+		var results = $('#SearchResultsToAdd_'+me.id);
 		var oPadding = {};
 		var aKeys = ['top', 'right', 'bottom', 'left'];
 		for(k in aKeys)
@@ -199,7 +199,7 @@ function SearchFormForeignKeys(id, sTargetClass, sAttCode, sFilter, sTitle)
 		theMap['sRemoteClass'] = theMap['class'];  // swap 'class' (defined in the form) and 'remoteClass'
 		theMap.operation = 'ListResultsSearchForeignKeys'; // Override what is defined in the form itself
 		theMap.sAttCode = me.sAttCode;
-		sSearchAreaId = '#dr_'+me.id;
+		sSearchAreaId = '#SearchResultsToAdd_'+me.id;
 		//$(sSearchAreaId).html('<div style="text-align:center;width:100%;height:24px;vertical-align:middle;"><img src="../images/indicator.gif" /></div>');
 		$(sSearchAreaId).block();
 		me.UpdateButtons();
@@ -228,59 +228,56 @@ function SearchFormForeignKeys(id, sTargetClass, sAttCode, sFilter, sTitle)
 		return false; // Don't submit the form, stay in the current page !
 	};
 
-	this.DoOk = function()
-	{
-		var s = $('#'+me.id+'_results').find(':input[name^=storedSelection]');
-		var iObjectId = 0;
-		if (s.length > 0)
-		{
-			iObjectId = s.val();
-		}
-		else
-		{
-			iObjectId = $('#fr_'+me.id+' input[name=selectObject]:checked').val();
-		}
-		$('#dlg_'+this.id).dialog('close');
-		$('#label_'+this.id).addClass('dlg_loading');
+	/**
+	 * @return {boolean}
+	 */
+	this.DoAddObjects = function () {
+		// Gather the parameters from the search form
+		var theMap = {};
+		var context = $('#SearchResultsToAdd_'+me.id);
+		var selectionMode = $(':input[name=selectionMode]', context);
+		if (selectionMode.length > 0) {
+			// Paginated table retrieve the mode and the exceptions
+			theMap['selectionMode'] = selectionMode.val();
+			$('#fs_SearchFormToAdd_'+me.id+' :input').each(function () {
+				theMap[this.name] = this.value;
+			});
 
-		// Query the server again to get the display name of the selected object
-		var theMap = { sTargetClass: me.sTargetClass,
-			iInputId: me.id,
-			iObjectId: iObjectId,
-			sAttCode: me.sAttCode,
-			// bSearchMode: me.bSearchMode,
-			operation: 'getObjectName'
-		};
-
-		// Make sure that we cancel any pending request before issuing another
-		// since responses may arrive in arbitrary order
-		me.StopPendingRequest();
-
-		// Run the query and get the result back directly in JSON
-		me.ajax_request = $.post( AddAppContext(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php'), theMap,
-			function(data)
-			{
-				var oTemp = $('<div>'+data.name+'</div>');
-				var txt = oTemp.text(); // this causes HTML entities to be interpreted
-				$('#label_'+me.id).val(txt);
-				$('#label_'+me.id).removeClass('dlg_loading');
-				var prevValue = $('#'+me.id).val();
-				$('#'+me.id).val(iObjectId);
-				if (prevValue != iObjectId)
-				{
-					$('#'+me.id).trigger('validate');
-					$('#'+me.id).trigger('extkeychange');
-					$('#'+me.id).trigger('change');
+			$(':input[name^=storedSelection]', context).each(function () {
+				if (typeof theMap[this.name] === "undefined") {
+					theMap[this.name] = [];
 				}
-				$('#label_'+me.id).focus();
-				me.ajax_request = null;
-			},
-			'json'
+				theMap[this.name].push(this.value);
+				$(this).remove(); // Remove the selection for the next time the dialog re-opens
+			});
+		}
+
+		// Normal table, retrieve all the checked check-boxes
+		$(':checked[name^=selectObject]', context).each(
+			function (i) {
+				if ((this.name != '') && ((this.type != 'checkbox') || (this.checked))) {
+					arrayExpr = /\[\]$/;
+					if (arrayExpr.test(this.name)) {
+						// Array
+						if (typeof theMap[this.name] === "undefined") {
+							theMap[this.name] = [];
+						}
+						theMap[this.name].push(this.value);
+					}
+					else {
+						theMap[this.name] = this.value;
+					}
+				}
+				$(this).parents('tr:first').remove(); // Remove the whole line, so that, next time the dialog gets displayed it's no longer there
+			}
 		);
 
-		return false; // Do NOT submit the form in case we are called by OnSubmit...
+		$('#dlg_'+me.id).dialog('close');
+
+		return false;
 	};
 
+
 	// Workaround for a ui.jquery limitation: if the content of
 	// the dialog contains many INPUTs, closing and opening the
 	// dialog is very slow. So empty it each time.
@@ -290,15 +287,13 @@ function SearchFormForeignKeys(id, sTargetClass, sAttCode, sFilter, sTitle)
 		// called by the dialog, so in the context 'this' points to the jQueryObject
 		if (me.emptyOnClose)
 		{
-			$('#dr_'+me.id).html(me.emptyHtml);
+			$('#SearchResultsToAdd_'+me.id).html(me.emptyHtml);
 		}
 		$('#label_'+me.id).removeClass('dlg_loading');
 		$('#label_'+me.id).focus();
 		me.ajax_request = null;
 	};
 
-
-
 	this.DoSelectObjectClass = function()
 	{
 		// Retrieving selected value
@@ -313,9 +308,6 @@ function SearchFormForeignKeys(id, sTargetClass, sAttCode, sFilter, sTitle)
 		me.CreateObject();
 	};
 
-
-
-
 	this.Update = function()
 	{
 		if ($('#'+me.id).prop('disabled'))
@@ -336,139 +328,4 @@ function SearchFormForeignKeys(id, sTargetClass, sAttCode, sFilter, sTitle)
 			$('#mini_search_'+me.id).show();
 		}
 	};
-
-
-
-	this.OnFormSubmit = function()
-	{
-		var oDiv = $('#linkedset_'+me.id);
-
-		var aToBeCreated = [];
-		me.aAdded.forEach(function(oAdded){
-			if (oAdded != null)
-			{
-				aToBeCreated.push(oAdded);
-			}
-		});
-		var sToBeCreated = JSON.stringify(aToBeCreated);
-		$('<input type="hidden" name="attr_'+me.sAttCode+'_tbc">').val(sToBeCreated).appendTo(oDiv);
-	};
-	// this.HKDisplay = function()
-	// {
-	// 	var theMap = { sTargetClass: me.sTargetClass,
-	// 		sInputId: me.id,
-	// 		sFilter: me.sFilter,
-	//// 		bSearchMode: me.bSearchMode,
-	// 		sAttCode: me.sAttCode,
-	// 		value: $('#'+me.id).val()
-	// 	};
-	//
-	//// 	if (me.bSelectMode)
-	////	{
-	//// 		$('#fstatus_'+me.id).html('<img src="../images/indicator.gif" />');
-	//// 	}
-	//// 	else
-	//// 	{
-	//// 		$('#label_'+me.id).addClass('dlg_loading');
-	//// 	}
-	//	$('#label_'+me.id).addClass('dlg_loading');
-	//
-	// 	theMap['sRemoteClass'] = me.sTargetClass;
-	// 	theMap.operation = 'displayHierarchy';
-	//
-	// 	// Make sure that we cancel any pending request before issuing another
-	// 	// since responses may arrive in arbitrary order
-	// 	me.StopPendingRequest();
-	//
-	// 	// Run the query and display the results
-	// 	me.ajax_request = $.post( AddAppContext(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php'), theMap,
-	// 		function(data)
-	// 		{
-	// 			$('#ac_tree_'+me.id).html(data);
-	// 			var maxHeight = $(window).height()-110;
-	// 			$('#tree_'+me.id).css({maxHeight: maxHeight});
-	// 		},
-	// 		'html'
-	// 	);
-	// };
-	//
-	// this.OnHKResize = function(event, ui)
-	// {
-	// 	var dh = ui.size.height - ui.originalSize.height;
-	// 	if (dh != 0)
-	// 	{
-	// 		var dlg_content = $('#dlg_tree_'+me.id+' .wizContainer');
-	// 		var h = dlg_content.height();
-	// 		dlg_content.height(h + dh);
-	// 		var tree = $('#tree_'+me.id);
-	// 		var h = tree.height();
-	// 		tree.height(h + dh - 1);
-	// 	}
-	// };
-	//
-	// this.OnHKClose = function()
-	// {
-	// 	if (me.bSelectMode)
-	// 	{
-	// 		$('#fstatus_'+me.id).html('');
-	// 	}
-	// 	else
-	// 	{
-	// 		$('#label_'+me.id).removeClass('dlg_loading');
-	// 	}
-	// 	$('#label_'+me.id).focus();
-	// 	$('#dlg_tree_'+me.id).dialog("destroy");
-	// 	$('#dlg_tree_'+me.id).remove();
-	// };
-	//
-	// this.DoHKOk = function()
-	// {
-	// 	iObjectId = $('#tree_'+me.id+' input[name=selectObject]:checked').val();
-	//
-	// 	$('#dlg_tree_'+me.id).dialog('close');
-	//
-	// 	// Query the server again to get the display name of the selected object
-	// 	var theMap = { sTargetClass: me.sTargetClass,
-	// 		iInputId: me.id,
-	// 		iObjectId: iObjectId,
-	// 		sAttCode: me.sAttCode,
-	//// 		bSearchMode: me.bSearchMode,
-	// 		operation: 'getObjectName'
-	// 	};
-	//
-	// 	// Make sure that we cancel any pending request before issuing another
-	// 	// since responses may arrive in arbitrary order
-	// 	me.StopPendingRequest();
-	//
-	// 	// Run the query and get the result back directly in JSON
-	// 	me.ajax_request = $.post( AddAppContext(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php'), theMap,
-	// 		function(data)
-	// 		{
-	// 			var oTemp = $('<div>'+data.name+'</div>');
-	// 			var txt = oTemp.text(); // this causes HTML entities to be interpreted
-	// 			$('#label_'+me.id).val(txt);
-	// 			$('#label_'+me.id).removeClass('dlg_loading');
-	// 			var prevValue = $('#'+me.id).val();
-	// 			$('#'+me.id).val(iObjectId);
-	// 			if (prevValue != iObjectId)
-	// 			{
-	// 				$('#'+me.id).trigger('validate');
-	// 				$('#'+me.id).trigger('extkeychange');
-	// 				$('#'+me.id).trigger('change');
-	// 			}
-	// 			if ( $('#'+me.id).hasClass('multiselect'))
-	// 			{
-	// 				$('#'+me.id+' option').each(function() { this.selected = ($(this).attr('value') == iObjectId); });
-	// 				$('#'+me.id).multiselect('refresh');
-	// 			}
-	// 			$('#label_'+me.id).focus();
-	// 			me.ajax_request = null;
-	// 		},
-	// 		'json'
-	// 	);
-	//
-	// 	return false; // Do NOT submit the form in case we are called by OnSubmit...
-	// };
-
-
 }
\ No newline at end of file

From d22d3945ee612f590f72712462aa99bee0178708 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Tue, 3 Apr 2018 07:37:04 +0000
Subject: [PATCH 193/202] Advanced Search: Auto-complete search on foreign keys
 + refactoring of table_id2

SVN:b1162[5593]
---
 .../ui.linksdirectwidget.class.inc.php        |  4 +-
 application/ui.linkswidget.class.inc.php      |  4 +-
 .../ui.searchformforeignkeys.class.inc.php    |  4 +-
 js/searchformforeignkeys.js                   |  4 +-
 .../search/searchform.class.inc.php           | 43 +++++++++++--------
 5 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/application/ui.linksdirectwidget.class.inc.php b/application/ui.linksdirectwidget.class.inc.php
index 00dfdfd49..9c0ddadfd 100644
--- a/application/ui.linksdirectwidget.class.inc.php
+++ b/application/ui.linksdirectwidget.class.inc.php
@@ -333,8 +333,8 @@ class UILinksWidgetDirect
 		$sHtml .= $oBlock->GetDisplay($oPage, "SearchFormToAdd_{$this->sInputid}",
 			array(
 			    'open' => $bOpen,
-				'table_id' => "SearchResultsToAdd_{$this->sInputid}",
-				'table_id2' => "add_{$this->sInputid}",
+				'result_list_outer_selector' => "SearchResultsToAdd_{$this->sInputid}",
+				'table_id' => "add_{$this->sInputid}",
 				'table_inner_id' => "ResultsToAdd_{$this->sInputid}",
 				'cssCount' => "#count_{$this->sInputid}",
 				'query_params' => $oFilter->GetInternalParams(),
diff --git a/application/ui.linkswidget.class.inc.php b/application/ui.linkswidget.class.inc.php
index cd9f96f63..deef928b2 100644
--- a/application/ui.linkswidget.class.inc.php
+++ b/application/ui.linkswidget.class.inc.php
@@ -420,8 +420,8 @@ EOF
 			array(
 				'open' => $bOpen,
 				'menu' => false,
-				'table_id' => "SearchResultsToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}",
-				'table_id2' => 'add_'.$this->m_sAttCode,
+				'result_list_outer_selector' => "SearchResultsToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}",
+				'table_id' => 'add_'.$this->m_sAttCode,
 				'table_inner_id' => "ResultsToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}",
 				'selection_mode' => true,
 				'json' => $sJson,
diff --git a/application/ui.searchformforeignkeys.class.inc.php b/application/ui.searchformforeignkeys.class.inc.php
index 2ebc24f7b..fad5d22db 100644
--- a/application/ui.searchformforeignkeys.class.inc.php
+++ b/application/ui.searchformforeignkeys.class.inc.php
@@ -53,8 +53,8 @@ class UISearchFormForeignKeys
 			array(
 				'open' => $bOpen,
 				'menu' => false,
-				'table_id' => "SearchResultsToAdd_{$this->m_iInputId}",
-				'table_id2' => "add_{$this->m_iInputId}",
+				'result_list_outer_selector' => "SearchResultsToAdd_{$this->m_iInputId}",
+				'table_id' => "add_{$this->m_iInputId}",
 				'table_inner_id' => "ResultsToAdd_{$this->m_iInputId}",
 				'selection_mode' => true,
 				'cssCount' => '#count_'.$this->m_sAttCode.$this->m_sNameSuffix,
diff --git a/js/searchformforeignkeys.js b/js/searchformforeignkeys.js
index e693a2b1a..b18919410 100644
--- a/js/searchformforeignkeys.js
+++ b/js/searchformforeignkeys.js
@@ -255,8 +255,8 @@ function SearchFormForeignKeys(id, sTargetClass, sAttCode, sFilter, sTitle)
 		// Normal table, retrieve all the checked check-boxes
 		$(':checked[name^=selectObject]', context).each(
 			function (i) {
-				if ((this.name != '') && ((this.type != 'checkbox') || (this.checked))) {
-					arrayExpr = /\[\]$/;
+				if ((this.name !== '') && ((this.type !== 'checkbox') || (this.checked))) {
+					var arrayExpr = /\[\]$/;
 					if (arrayExpr.test(this.name)) {
 						// Array
 						if (typeof theMap[this.name] === "undefined") {
diff --git a/sources/application/search/searchform.class.inc.php b/sources/application/search/searchform.class.inc.php
index e4ea15ed9..f3a67c541 100644
--- a/sources/application/search/searchform.class.inc.php
+++ b/sources/application/search/searchform.class.inc.php
@@ -91,6 +91,18 @@ class SearchForm
 			$aListParams['json'] = json_decode($sJson, true);
 		}
 
+		if (!isset($aExtraParams['result_list_outer_selector']))
+		{
+			if (isset($aExtraParams['table_id']))
+			{
+				$aExtraParams['result_list_outer_selector'] = $aExtraParams['table_id'];
+			}
+			else
+			{
+				$aExtraParams['result_list_outer_selector'] = "search_form_result_{$sSearchFormId}";
+			}
+		}
+
 
 		$aSubClasses = MetaModel::GetSubclasses($sRootClass);
 		if (count($aSubClasses) > 0)
@@ -104,7 +116,7 @@ class SearchForm
 			$aOptions[MetaModel::GetName($sClassName)] = "<option selected value=\"$sClassName\">".MetaModel::GetName($sClassName)."</options>\n";
 			ksort($aOptions);
 			$sContext = $oAppContext->GetForLink();
-			$sClassesCombo = "<select name=\"class\" onChange=\"ReloadSearchForm('$sSearchFormId', this.value, '$sRootClass', '$sContext', '{$aExtraParams['table_id']}')\">\n".implode('',
+			$sClassesCombo = "<select name=\"class\" onChange=\"ReloadSearchForm('$sSearchFormId', this.value, '$sRootClass', '$sContext', '{$aExtraParams['result_list_outer_selector']}')\">\n".implode('',
 					$aOptions)."</select>\n";
 		}
 		else
@@ -148,28 +160,19 @@ class SearchForm
 		$oBaseSearch->ResetCondition();
 		$sBaseOQL = str_replace(' WHERE 1', '', $oBaseSearch->ToOQL());
 
+
 		if (isset($aExtraParams['table_inner_id']))
 		{
 			$sDataConfigListSelector = $aExtraParams['table_inner_id'];
 		}
 		else
 		{
-			$sDataConfigListSelector = $aExtraParams['table_id'];
-		}
-
-		if (!isset($aExtraParams['table_id']))
-		{
-			$aExtraParams['table_id'] = "search_form_result_{$sSearchFormId}";
+			$sDataConfigListSelector = $aExtraParams['result_list_outer_selector'];
 		}
 		if (!isset($aExtraParams['table_inner_id']))
 		{
 			$aListParams['table_inner_id'] = "table_inner_id_{$sSearchFormId}";
 		}
-		// When table_id is different of result_list_outer_selector
-		if (isset($aExtraParams['table_id2']))
-		{
-			$aListParams['table_id'] = $aExtraParams['table_id2'];
-		}
 		$bOpen = false;
 		if (isset($aExtraParams['open']))
 		{
@@ -189,7 +192,7 @@ class SearchForm
 
 		$aSearchParams = array(
 			'criterion_outer_selector' => "#fs_{$sSearchFormId}_criterion_outer",
-            'result_list_outer_selector' => "#{$aExtraParams['table_id']}",
+			'result_list_outer_selector' => "#{$aExtraParams['result_list_outer_selector']}",
 			'data_config_list_selector' => "#{$sDataConfigListSelector}",
 			'endpoint' => utils::GetAbsoluteUrlAppRoot().'pages/ajax.searchform.php',
 			'init_opened' => $bOpen,
@@ -327,9 +330,10 @@ class SearchForm
 			}
 			$oSearch->SetModifierProperty('UserRightsGetSelectFilter', 'bSearchMode', true);
 			$oSet = new DBObjectSet($oSearch);
-			if ($oSet->Count() > MetaModel::GetConfig()->Get('max_combo_length'))
+			$iCount = $oSet->Count();
+			if ($iCount > MetaModel::GetConfig()->Get('max_combo_length'))
 			{
-				return array('autocomplete' => true);
+				return array('autocomplete' => true, 'count' => $iCount);
 			}
 		}
 		else
@@ -337,14 +341,17 @@ class SearchForm
 			if (method_exists($oAttrDef, 'GetAllowedValuesAsObjectSet'))
 			{
 				$oSet = $oAttrDef->GetAllowedValuesAsObjectSet();
-				if ($oSet->Count() > MetaModel::GetConfig()->Get('max_combo_length'))
+				$iCount = $oSet->Count();
+				if ($iCount > MetaModel::GetConfig()->Get('max_combo_length'))
 				{
-					return array('autocomplete' => true);
+					return array('autocomplete' => true, 'count' => $iCount);
 				}
 			}
 		}
 
-		return array('values' => $oAttrDef->GetAllowedValues());
+		$aAllowedValues = $oAttrDef->GetAllowedValues();
+
+		return array('values' => $aAllowedValues, 'count' => count($aAllowedValues));
 	}
 
 	/**

From 013dcdf93e94cac0a16ec61ddb9eb60622bf0785 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Tue, 3 Apr 2018 13:12:49 +0000
Subject: [PATCH 194/202] Advanced Search: Auto-complete search on foreign keys

SVN:b1162[5594]
---
 .../ui.searchformforeignkeys.class.inc.php    | 17 +++++-
 application/utils.inc.php                     | 45 +++++++++++++-
 js/search/search_form_criteria_enum.js        |  1 +
 js/searchformforeignkeys.js                   | 60 +++++++++++--------
 pages/ajax.render.php                         |  9 +++
 5 files changed, 106 insertions(+), 26 deletions(-)

diff --git a/application/ui.searchformforeignkeys.class.inc.php b/application/ui.searchformforeignkeys.class.inc.php
index fad5d22db..40fc04cac 100644
--- a/application/ui.searchformforeignkeys.class.inc.php
+++ b/application/ui.searchformforeignkeys.class.inc.php
@@ -26,7 +26,7 @@ require_once(APPROOT.'/application/displayblock.class.inc.php');
 
 class UISearchFormForeignKeys
 {
-	public function __construct($sTargetClass, $iInputId, $sAttCode, $sSuffix)
+	public function __construct($sTargetClass, $iInputId = null, $sAttCode = null, $sSuffix = null)
 	{
 		$this->m_sRemoteClass = $sTargetClass;
 		$this->m_iInputId = $iInputId;
@@ -75,6 +75,21 @@ class UISearchFormForeignKeys
 		$oPage->add_ready_script("$('#SearchFormToAdd_{$this->m_iInputId}').resize(oForeignKeysWidget{$this->m_iInputId}.UpdateSizes);");
 	}
 
+	public function GetFullListForeignKeysFromSelection($oPage, $oFullSetFilter)
+	{
+		try
+		{
+			$aLinkedObjects = utils::ReadMultipleSelectionWithFriendlyname($oFullSetFilter);
+			$oPage->add(json_encode($aLinkedObjects));
+		}
+		catch (CoreException $e)
+		{
+			http_response_code(500);
+			$oPage->add(json_encode(array('error' => $e->GetMessage())));
+			IssueLog::Error($e->getMessage()."\nDebug trace:\n".$e->getTraceAsString());
+		}
+	}
+
 	/**
 	 * Search for objects to be linked to the current object (i.e "remote" objects)
 	 *
diff --git a/application/utils.inc.php b/application/utils.inc.php
index 019e2f50f..7e44ac4f8 100644
--- a/application/utils.inc.php
+++ b/application/utils.inc.php
@@ -413,8 +413,10 @@ class utils
 	
 	/**
 	 * Interprets the results posted by a normal or paginated list (in multiple selection mode)
+	 *
 	 * @param $oFullSetFilter DBSearch The criteria defining the whole sets of objects being selected
-	 * @return Array An arry of object IDs corresponding to the objects selected in the set
+	 *
+	 * @return Array An array of object IDs corresponding to the objects selected in the set
 	 */	
 	public static function ReadMultipleSelection($oFullSetFilter)
 	{
@@ -448,6 +450,47 @@ class utils
 		return $aSelectedObj;
 	}
 
+	/**
+	 * Interprets the results posted by a normal or paginated list (in multiple selection mode)
+	 *
+	 * @param DBSearch $oFullSetFilter The criteria defining the whole sets of objects being selected
+	 *
+	 * @return Array An array of object IDs:friendlyname corresponding to the objects selected in the set
+	 * @throws \CoreException
+	 */
+	public static function ReadMultipleSelectionWithFriendlyname($oFullSetFilter)
+	{
+		$sSelectionMode = utils::ReadParam('selectionMode', '');
+
+		if ($sSelectionMode === '')
+		{
+			throw new CoreException('selectionMode is mandatory');
+		}
+
+		// Paginated selection
+		$aSelectedIds = utils::ReadParam('storedSelection', array());
+		if ($sSelectionMode == 'positive')
+		{
+			// Only the explicitly listed items are selected
+			$oFullSetFilter->AddCondition('id', $aSelectedIds, 'IN');
+		}
+		else
+		{
+			// All items of the set are selected, except the one explicitly listed
+			$oFullSetFilter->AddCondition('id', $aSelectedIds, 'NOTIN');
+		}
+		$aSelectedObj = array();
+		$oFullSet = new DBObjectSet($oFullSetFilter);
+		$sClassAlias = $oFullSetFilter->GetClassAlias();
+		$oFullSet->OptimizeColumnLoad(array($sClassAlias => array('friendlyname'))); // We really need only the IDs but it does not work since id is not a real field
+		while ($oObj = $oFullSet->Fetch())
+		{
+			$aSelectedObj[$oObj->GetKey()] = $oObj->Get('friendlyname');
+		}
+
+		return $aSelectedObj;
+	}
+	
 	public static function GetNewTransactionId()
 	{
 		return privUITransaction::GetNewTransactionId();
diff --git a/js/search/search_form_criteria_enum.js b/js/search/search_form_criteria_enum.js
index d00a0ae91..3a8749d0c 100644
--- a/js/search/search_form_criteria_enum.js
+++ b/js/search/search_form_criteria_enum.js
@@ -277,6 +277,7 @@ $(function()
 				oFilterIconElem.attr('id'), 	// id
 				me.options.field.target_class, 	// sTargetClass
 				me.options.field.code,			// sAttCode
+				me.element,						// oSearchWidgetElmt
 				'',								// sFilter  //TODO
 				me.options.field.label			// sTitle
 			);
diff --git a/js/searchformforeignkeys.js b/js/searchformforeignkeys.js
index b18919410..b2b4471cb 100644
--- a/js/searchformforeignkeys.js
+++ b/js/searchformforeignkeys.js
@@ -20,18 +20,20 @@
  * @param id String the dom identifier of the source input
  * @param sTargetClass
  * @param sAttCode
+ * @param oSearchWidgetElmt
  * @param sFilter
  * @param sTitle
  * @constructor
  */
-function SearchFormForeignKeys(id, sTargetClass, sAttCode, sFilter, sTitle)
+function SearchFormForeignKeys(id, sTargetClass, sAttCode, oSearchWidgetElmt, sFilter, sTitle)
 {
 	this.id = id;
-	this.sOriginalTargetClass = sTargetClass;
+	//this.sOriginalTargetClass = sTargetClass;
 	this.sTargetClass = sTargetClass;
 	this.sFilter = sFilter;
 	this.sTitle = sTitle;
 	this.sAttCode = sAttCode;
+	this.oSearchWidgetElmt = oSearchWidgetElmt;
 	this.emptyHtml = ''; // content to be displayed when the search results are empty (when opening the dialog)
 	this.emptyOnClose = true; // Workaround for the JQuery dialog being very slow when opening and closing if the content contains many INPUT tags
 	this.ajax_request = null;
@@ -46,7 +48,7 @@ function SearchFormForeignKeys(id, sTargetClass, sAttCode, sFilter, sTitle)
 		$('#'+this.id+'_btnRemove').prop('disabled', false);
 
 
-		var dialog = $('<div id="dlg_'+me.id+'"></div>').appendTo(document.body);
+		$('<div id="dlg_'+me.id+'"></div>').appendTo(document.body);
 
 		// me.trace(dialog);
 
@@ -59,18 +61,6 @@ function SearchFormForeignKeys(id, sTargetClass, sAttCode, sFilter, sTitle)
 			$('#dlg_'+me.id).remove();
 		});
 
-		// $('#linkedset_'+me.id+' :input').off('change').on('change', function() {
-		// 	if (!($(this).hasClass('selection')) && !($(this).hasClass('select_all'))) {
-		// 		var oCheckbox = $(this).closest('tr').find('.selection');
-		// 		var iLink = oCheckbox.attr('data-link-id');
-		// 		var iUniqueId = oCheckbox.attr('data-unique-id');
-		// 		var sAttCode = $(this).closest('.attribute-edit').attr('data-attcode');
-		// 		var value = $(this).val();
-		// 		return me.OnValueChange(iLink, iUniqueId, sAttCode, value);
-		// 	}
-		// 	return true;
-		// });
-
 		$('#'+this.iInputId).closest('form').submit(function() {
 			return me.OnFormSubmit();
 		});
@@ -101,7 +91,6 @@ function SearchFormForeignKeys(id, sTargetClass, sAttCode, sFilter, sTitle)
 			sAttCode: me.sAttCode,
 			iInputId: me.id,
 			sTitle: me.sTitle,
-			sAttCode: me.sAttCode,
 			sTargetClass: me.sTargetClass,
 			// bSearchMode: me.bSearchMode,
 			operation: 'ShowModalSearchForeignKeys'
@@ -154,9 +143,9 @@ function SearchFormForeignKeys(id, sTargetClass, sAttCode, sFilter, sTitle)
 				oPadding[aKeys[k]] = parseInt(dlg.css('padding-'+aKeys[k]).replace('px', ''));
 			}
 		}
-		width = dlg.innerWidth() - oPadding['right'] - oPadding['left'] - 22; // 5 (margin-left) + 5 (padding-left) + 5 (padding-right) + 5 (margin-right) + 2 for rounding !
-		height = dlg.innerHeight() - oPadding['top'] - oPadding['bottom'] -22;
-		form_height = searchForm.outerHeight();
+		//var width = dlg.innerWidth() - oPadding['right'] - oPadding['left'] - 22; // 5 (margin-left) + 5 (padding-left) + 5 (padding-right) + 5 (margin-right) + 2 for rounding !
+		var height = dlg.innerHeight()-oPadding['top']-oPadding['bottom']-22;
+		var form_height = searchForm.outerHeight();
 		results.height(height - form_height - 40); // Leave some space for the buttons
 	};
 
@@ -173,7 +162,10 @@ function SearchFormForeignKeys(id, sTargetClass, sAttCode, sFilter, sTitle)
 		}
 	};
 
-	this.ListResultsSearchForeignKeys = function(id)
+	/**
+	 * @return {boolean}
+	 */
+	this.ListResultsSearchForeignKeys = function ()
 	{
 		var theMap = {
 			sTargetClass: me.sTargetClass,
@@ -184,7 +176,7 @@ function SearchFormForeignKeys(id, sTargetClass, sAttCode, sFilter, sTitle)
 
 		// Gather the parameters from the search form
 		$('#fs_'+me.id+' :input').each( function() {
-			if (this.name != '')
+			if (this.name !== '')
 			{
 				var val = $(this).val(); // supports multiselect as well
 				if (val !== null)
@@ -199,7 +191,7 @@ function SearchFormForeignKeys(id, sTargetClass, sAttCode, sFilter, sTitle)
 		theMap['sRemoteClass'] = theMap['class'];  // swap 'class' (defined in the form) and 'remoteClass'
 		theMap.operation = 'ListResultsSearchForeignKeys'; // Override what is defined in the form itself
 		theMap.sAttCode = me.sAttCode;
-		sSearchAreaId = '#SearchResultsToAdd_'+me.id;
+		var sSearchAreaId = '#SearchResultsToAdd_'+me.id;
 		//$(sSearchAreaId).html('<div style="text-align:center;width:100%;height:24px;vertical-align:middle;"><img src="../images/indicator.gif" /></div>');
 		$(sSearchAreaId).block();
 		me.UpdateButtons();
@@ -209,7 +201,7 @@ function SearchFormForeignKeys(id, sTargetClass, sAttCode, sFilter, sTitle)
 		me.StopPendingRequest();
 
 		// Run the query and display the results
-		me.ajax_request = $.post( AddAppContext(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php'), theMap,
+		me.ajax_request = $.post(AddAppContext(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php'), theMap,
 			function(data)
 			{
 				$(sSearchAreaId).html(data);
@@ -254,7 +246,7 @@ function SearchFormForeignKeys(id, sTargetClass, sAttCode, sFilter, sTitle)
 
 		// Normal table, retrieve all the checked check-boxes
 		$(':checked[name^=selectObject]', context).each(
-			function (i) {
+			function () {
 				if ((this.name !== '') && ((this.type !== 'checkbox') || (this.checked))) {
 					var arrayExpr = /\[\]$/;
 					if (arrayExpr.test(this.name)) {
@@ -271,6 +263,26 @@ function SearchFormForeignKeys(id, sTargetClass, sAttCode, sFilter, sTitle)
 				$(this).parents('tr:first').remove(); // Remove the whole line, so that, next time the dialog gets displayed it's no longer there
 			}
 		);
+		theMap["class"] = me.sTargetClass;
+		theMap['operation'] = 'GetFullListForeignKeysFromSelection';
+		$('#busy_'+me.iInputId).html('&nbsp;<img src="../images/indicator.gif"/>');
+		// Run the query and display the results
+		$.ajax(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php', {
+				"data": theMap,
+				"method": "POST"
+			})
+			.done(function (data) {
+				if (Object.keys(data).length > 0) {
+					me.oSearchWidgetElmt.trigger("itop.search.criteria_enum.add_selected_values", data);
+				}
+			})
+			.fail(function (data) {
+				try {
+					console.error(data);
+				} catch (e) {
+				}
+			})
+		;
 
 		$('#dlg_'+me.id).dialog('close');
 
diff --git a/pages/ajax.render.php b/pages/ajax.render.php
index b8828c562..84d4c3d36 100644
--- a/pages/ajax.render.php
+++ b/pages/ajax.render.php
@@ -263,6 +263,14 @@ try
 			$oWidget->ShowModalSearchForeignKeys($oPage, $sTitle);
 			break;
 
+		// ui.searchformforeignkeys
+		case 'GetFullListForeignKeysFromSelection':
+			$oPage->SetContentType('application/json');
+			$oWidget = new UISearchFormForeignKeys($sClass);
+			$oFullSetFilter = new DBObjectSearch($sClass);
+			$oWidget->GetFullListForeignKeysFromSelection($oPage, $oFullSetFilter);
+			break;
+
 		// ui.searchformforeignkeys
 		case 'ListResultsSearchForeignKeys':
 			$oPage->SetContentType('text/html');
@@ -275,6 +283,7 @@ try
 			$oWidget->ListResultsSearchForeignKeys($oPage, $sRemoteClass);
 			break;
 
+
 		// ui.linkswidget
 		case 'addObjects':
 			$oPage->SetContentType('text/html');

From 612479b63283586e182f4dcb8e0247e54688ddf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Tue, 3 Apr 2018 13:16:04 +0000
Subject: [PATCH 195/202] Advanced Search: Support of regexp for strings

SVN:b1162[5595]
---
 js/search/search_form_criteria_string.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/js/search/search_form_criteria_string.js b/js/search/search_form_criteria_string.js
index b659c6cb1..d266465ac 100644
--- a/js/search/search_form_criteria_string.js
+++ b/js/search/search_form_criteria_string.js
@@ -28,6 +28,11 @@ $(function()
 					'code': 'ends_with',
 					'rank': 30,
 				},
+				'REGEXP': {
+					'label': 'regexp',
+					'code': 'REGEXP',
+					'rank': 40,
+				},
 				'=': null,	// Remove this one from string widget.
 			},
 		},

From b1c48929e46ea27a67f68a91802557434beab67d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Tue, 3 Apr 2018 13:29:10 +0000
Subject: [PATCH 196/202] Advanced Search: Auto-complete search on foreign keys

SVN:b1162[5596]
---
 application/ui.searchformforeignkeys.class.inc.php | 6 ++----
 pages/ajax.render.php                              | 8 ++------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/application/ui.searchformforeignkeys.class.inc.php b/application/ui.searchformforeignkeys.class.inc.php
index 40fc04cac..1b97ac808 100644
--- a/application/ui.searchformforeignkeys.class.inc.php
+++ b/application/ui.searchformforeignkeys.class.inc.php
@@ -26,12 +26,10 @@ require_once(APPROOT.'/application/displayblock.class.inc.php');
 
 class UISearchFormForeignKeys
 {
-	public function __construct($sTargetClass, $iInputId = null, $sAttCode = null, $sSuffix = null)
+	public function __construct($sTargetClass, $iInputId = null)
 	{
 		$this->m_sRemoteClass = $sTargetClass;
 		$this->m_iInputId = $iInputId;
-		$this->m_sAttCode = $sAttCode;
-		$this->m_sNameSuffix = $sSuffix;
 	}
 
 	/**
@@ -57,7 +55,7 @@ class UISearchFormForeignKeys
 				'table_id' => "add_{$this->m_iInputId}",
 				'table_inner_id' => "ResultsToAdd_{$this->m_iInputId}",
 				'selection_mode' => true,
-				'cssCount' => '#count_'.$this->m_sAttCode.$this->m_sNameSuffix,
+				'cssCount' => "#count_{$this->m_iInputId}",
 				'query_params' => $oFilter->GetInternalParams(),
 			));
 		$sHtml .= "<form id=\"ObjectsAddForm_{$this->m_iInputId}\">\n";
diff --git a/pages/ajax.render.php b/pages/ajax.render.php
index 84d4c3d36..8f8b3fdd6 100644
--- a/pages/ajax.render.php
+++ b/pages/ajax.render.php
@@ -254,12 +254,10 @@ try
 		// ui.searchformforeignkeys
 		case 'ShowModalSearchForeignKeys':
 			$oPage->SetContentType('text/html');
-			$sAttCode = utils::ReadParam('sAttCode', '');
 			$iInputId = utils::ReadParam('iInputId', '');
-			$sSuffix = utils::ReadParam('sSuffix', '');
 			$sTitle = utils::ReadParam('sTitle', '', false, 'raw_data');
 			$sTargetClass = utils::ReadParam('sTargetClass', '', false, 'class');
-			$oWidget = new UISearchFormForeignKeys($sTargetClass, $iInputId, $sAttCode, $sSuffix);
+			$oWidget = new UISearchFormForeignKeys($sTargetClass, $iInputId);
 			$oWidget->ShowModalSearchForeignKeys($oPage, $sTitle);
 			break;
 
@@ -276,10 +274,8 @@ try
 			$oPage->SetContentType('text/html');
 			$sTargetClass = utils::ReadParam('sTargetClass', '', false, 'class');
 			$iInputId = utils::ReadParam('iInputId', '');
-			$sSuffix = utils::ReadParam('sSuffix', '');
-			$sAttCode = utils::ReadParam('sAttCode', '');
 			$sRemoteClass = utils::ReadParam('sRemoteClass', '', false, 'class');
-			$oWidget = new UISearchFormForeignKeys($sTargetClass, $iInputId, $sAttCode, $sSuffix);
+			$oWidget = new UISearchFormForeignKeys($sTargetClass, $iInputId);
 			$oWidget->ListResultsSearchForeignKeys($oPage, $sRemoteClass);
 			break;
 

From 5f08d98f66202562de9784a670e351a21a692fed Mon Sep 17 00:00:00 2001
From: Bruno Da Silva <bruno.dasilva@combodo.com>
Date: Tue, 3 Apr 2018 16:27:28 +0000
Subject: [PATCH 197/202] search widget : widget numeric bugfix for between

when a date was empty the datetime plugin added the hours as a suffix

SVN:b1162[5599]
---
 js/search/search_form_criteria_date_abstract.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/search/search_form_criteria_date_abstract.js b/js/search/search_form_criteria_date_abstract.js
index 9d2e1757e..51b912e65 100644
--- a/js/search/search_form_criteria_date_abstract.js
+++ b/js/search/search_form_criteria_date_abstract.js
@@ -232,7 +232,7 @@ $(function()
 					{
 						sValue = oOpElem.find('input[name="'+oInputParam.getter_code+'"]').val();
 					}
-					else if (typeof oInputParam.getter_suffix != 'undefined')
+					else if (sLabel != "" && typeof oInputParam.getter_suffix != 'undefined')
 					{
 						sValue = sLabel + oInputParam.getter_suffix;
 					}

From 54c5edc5da39fe782e9424451c7dc6420af4e15a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Wed, 4 Apr 2018 07:02:02 +0000
Subject: [PATCH 198/202] Advanced Search: Auto-complete search on foreign keys

SVN:b1162[5600]
---
 js/searchformforeignkeys.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/js/searchformforeignkeys.js b/js/searchformforeignkeys.js
index b2b4471cb..5eb58c1cb 100644
--- a/js/searchformforeignkeys.js
+++ b/js/searchformforeignkeys.js
@@ -227,7 +227,7 @@ function SearchFormForeignKeys(id, sTargetClass, sAttCode, oSearchWidgetElmt, sF
 		// Gather the parameters from the search form
 		var theMap = {};
 		var context = $('#SearchResultsToAdd_'+me.id);
-		var selectionMode = $(':input[name=selectionMode]', context);
+		var selectionMode = $(':input[name="selectionMode"]', context);
 		if (selectionMode.length > 0) {
 			// Paginated table retrieve the mode and the exceptions
 			theMap['selectionMode'] = selectionMode.val();
@@ -235,7 +235,7 @@ function SearchFormForeignKeys(id, sTargetClass, sAttCode, oSearchWidgetElmt, sF
 				theMap[this.name] = this.value;
 			});
 
-			$(':input[name^=storedSelection]', context).each(function () {
+			$(':input[name="storedSelection[]"]', context).each(function () {
 				if (typeof theMap[this.name] === "undefined") {
 					theMap[this.name] = [];
 				}
@@ -245,7 +245,7 @@ function SearchFormForeignKeys(id, sTargetClass, sAttCode, oSearchWidgetElmt, sF
 		}
 
 		// Normal table, retrieve all the checked check-boxes
-		$(':checked[name^=selectObject]', context).each(
+		$(':checked[name="selectObject[]"]', context).each(
 			function () {
 				if ((this.name !== '') && ((this.type !== 'checkbox') || (this.checked))) {
 					var arrayExpr = /\[\]$/;

From 8b300358e91a5497b1f917ac7766400b1b95a27a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Wed, 4 Apr 2018 08:16:48 +0000
Subject: [PATCH 199/202] Advanced Search: Fix direct links search

SVN:b1162[5603]
---
 application/ui.linksdirectwidget.class.inc.php | 2 ++
 js/linksdirectwidget.js                        | 9 +++++++++
 test/application/search/SearchFormTest.php     | 2 +-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/application/ui.linksdirectwidget.class.inc.php b/application/ui.linksdirectwidget.class.inc.php
index 9c0ddadfd..b38db95c3 100644
--- a/application/ui.linksdirectwidget.class.inc.php
+++ b/application/ui.linksdirectwidget.class.inc.php
@@ -396,6 +396,8 @@ class UILinksWidgetDirect
 		}
 		if ($oCurrentObj != null)
 		{
+			$this->SetSearchDefaultFromContext($oCurrentObj, $oFilter);
+
 			$aArgs = array_merge($oCurrentObj->ToArgs('this'), $oFilter->GetInternalParams());
 			$oFilter->SetInternalParams($aArgs);
 		}
diff --git a/js/linksdirectwidget.js b/js/linksdirectwidget.js
index 7af1d3b69..b143a1938 100644
--- a/js/linksdirectwidget.js
+++ b/js/linksdirectwidget.js
@@ -184,6 +184,15 @@ $(function()
 			oParams.real_class = '';
 			oParams.att_code = this.options.att_code;
 			oParams.iInputId = this.id;
+
+			// Gather the already linked target objects
+			oParams.aAlreadyLinked = new Array();
+			$('#'+this.id+' .listResults td input:checkbox').each(function () {
+					iKey = parseInt(this.value, 10); // Numbers are in base 10
+					oParams.aAlreadyLinked.push(iKey);
+				}
+			);
+
 			if (this.options.oWizardHelper)
 			{
 				this.options.oWizardHelper.UpdateWizard();
diff --git a/test/application/search/SearchFormTest.php b/test/application/search/SearchFormTest.php
index abeb95d02..bbbd06659 100644
--- a/test/application/search/SearchFormTest.php
+++ b/test/application/search/SearchFormTest.php
@@ -58,7 +58,7 @@ class SearchFormTest extends ItopDataTestCase
 	{
 		return array(
 			array("SELECT Contact", 8, 'zlist'),
-			array("SELECT Contact AS C WHERE C.status = 'active'", 2, 'others'),
+			array("SELECT Contact AS C WHERE C.status = 'active'", 3, 'others'),
 			array("SELECT Person", 12, 'zlist'),
 			array(
 				"SELECT Person AS p JOIN UserRequest AS u ON u.agent_id = p.id WHERE u.status != 'closed'",

From aa22956f87264ab2ede29dc109add80b8148b134 Mon Sep 17 00:00:00 2001
From: Denis Flaven <denis.flaven@combodo.com>
Date: Wed, 4 Apr 2018 08:36:41 +0000
Subject: [PATCH 200/202] Added two new glyphs (binoculars and binoculars-alt)
 to the Combodo font.

SVN:b1162[5604]
---
 css/font-combodo/combodo-webfont.ttf    | Bin 5360 -> 5956 bytes
 css/font-combodo/combodo-webfont.woff   | Bin 5828 -> 7180 bytes
 css/font-combodo/combodo-webfont.woff2  | Bin 3200 -> 6088 bytes
 css/font-combodo/combodo.sfd            | 135 +++++++++++-
 css/font-combodo/font-combodo.css       |  12 +-
 css/font-combodo/glyphs/B.svg           |  35 +++
 css/font-combodo/glyphs/b-lowercase.svg | 280 ++++++++++++++++++++++++
 7 files changed, 456 insertions(+), 6 deletions(-)
 create mode 100755 css/font-combodo/glyphs/B.svg
 create mode 100755 css/font-combodo/glyphs/b-lowercase.svg

diff --git a/css/font-combodo/combodo-webfont.ttf b/css/font-combodo/combodo-webfont.ttf
index 5be2cbdd45b55db0d7c60d3b636f10baedb6585f..495c822c0dd93e30b63b386284d2fd7898204df8 100644
GIT binary patch
delta 1185
zcmZWpUuaup6hGgW+vN67nk>10YP<ZeNz<)Knwx)J)2tMGYr7?PZ6`sUGilN-4{4IJ
zFlryn9tsXb1us507%1~)7Qs?btb(Fr2);S#!w?*Ms^G)*VNXiyx!3sQ2ZwWh=ikTg
zeCJ**{2<Z+0sw<>3rtXw<;(e-JBNb+;uv~QFT5}>gALq>S;TH-H5y-h_vc9fQbSy-
zY?NE<??=A?P=w@_%FVVH{PZ?}=?XfS>*X7*lN0O=B0^xV*WbAI!&mQBF}?#}e^Og7
zcdGWIM|$uNlvE8pmRZv-HXB7eTH9!EjlFGp2l0=HGxcVr>|PoA8yl1m`!~v4EqIOW
zWBf(L-bQ(2eck)zEC7d>(3e`x8*O->m;r=uFg|CHCC`0$KmF%VuiLWEpx?ouAK>um
z*E$75t9FvM3>c|)wLn~iRqG_I9#HGhrEBw5_)d#yYbNPLf-A`E&Mhoc4@k5OP-HTY
zM7fAf=U@*c_!yQjOpRs$m-SKL;edfz)C0g`jL{OBtSxGawuZw3>^}D&vOTgrv^}tW
zYx_*^pvrW`$M*L14**#8KKO3`J2rKXex$x^;_Y;eY4>E!!{&#Us^wR<wZCop%hX|@
zh|{}IufkbKLJnk{U0iSxQA#HhDJd>WqM!@UnFIb{$m|ad5;T&D^F&IWCn<;D%yU9K
zl^FG#b)8Hw{~8Ih<%`lfjryV@35@fkBsP_7h2v%3S<Na<u|)Xs(TgJ6C=?n6@}{AV
zKXD6!TcB4XKC3KSeUb6psnESMF=cb{+-cXjrA;Mv=3eMjZv6PDkj@koy+|o!(r0<S
zZoh4L*4Ht^(#cz<FK7)s5JFBf@G4XcRu<7sJjB6w8KjbdbSjO4RB{A~7(5(tLBtH?
z8c0eh!SDtBPV`E8ISmLN66j7N;l$dYJ_93-lw4ujp;kMgls5CqCZ*o~1<DB#meLU2
zE*7_oayCLqBp1_D+^*orNN{f?L@CSpEf$V0^m}Pj$v5>NrQy$w5?b>J7kWk3a;)9W
z<d>&t580gwv?txG-0*SV^vd+~3MqTV$3s5f&|@+Bo15d@JUJNVR;^=JYdbKr%T6ul
zGk1x7gu5Vkx+TV@@Pw)jM{yaLUc@OB+(@(uu9C5xXj8Q7UB3zUW2b8~=-0Y-4|oaN
zwaqX{ruV;h*obWkCUEH|APzB@gpB&c>0+lQq=|TJGNWGNhE)&O@Y(TJg10#FJK#aU
bf5Y<-#Fra`Fz#d==G9NRIp*-`?GOF|Bk$!e

delta 573
zcmXw$%WD%+7{$+>nI<twlhP&=l_Z1`)PONBZBh`G+QwE|BevkHr5V#l(4>hZ#tK5k
zmC%KYyK3#CZbcMHS1yX8f=ls<e}YiZg}PBXo}|d|ap(7)x#xS#>q9>xOAr8DxC0gW
zY<6Po#`5L^!1Iw=|Ea;DEZhi^H^{-<cr1DG{*@3QisXEuY*f3x`)cIBj7x<^J%nE6
z9-v;JuFV^@s%g?0p2uX{eCgKQaKrM2`fV27D$W{9Gp^sq-&5RT^c9)0o=_jrEKCj;
z%k{<ZvO-O~B_~Ujf}yYV@Ul8d4wj9@DlUsA^<i>o!6?s8_pRzcHycz$wNk5N9ADW$
ziTbhjuwu{3%2@2_wEO5UIJ!0FfluGAU;BT`E|Io6cJ?CAh=8!ml8DHgO6Tsgb3-$D
zfjDw%%1mLBldbZakk3VIDuW|h2BS0_z%!)quw~d9z8(IyAuvH|t=ta{8J>37pzt}2
zEJl#yx<LPvJMZQP^Nsn+++>B*$~hNoyX+3Y$xnbz`BGVv?-ZY$QoT;irG4($u;eY<
z)<*NL`bTY!*nZkOTEF&*yy`jM^m?7boj?@*j3i4Wkd|>hU`s^%qse$8E!XwEvZ5~p
eTr?N#s0SW+p~HuL*pCB<;2@H6TOZK4t=@mH_j=?2

diff --git a/css/font-combodo/combodo-webfont.woff b/css/font-combodo/combodo-webfont.woff
index cf721201377bd9cbb91e3a0115d6887e73ae366f..f8588d08510ce20bbafce59484043cc3649e02c8 100644
GIT binary patch
literal 7180
zcmY*ebyO8!xE=1jlynM+lyrFs>Fy3`q~p>p-CY*}QA!#_X{3}+>F&Celz@bEzw7V4
zf8JSZ&zZf?{?2^o%*<J{=6I{i$pI(;vQT0J1pjKr-T&qP&i{XrlhalOfM>f%mGU2g
z96^-wGO}_=tp~~JkzfQ^09kddm)rn=a)smyNSGPegOx3v%v}Kh^a06BkZpshM-fJr
zUT<jt0QD<U<NOCmBm@d`wQ&LfumsZc4e7Vms(bmx#@quL`>X}&!T3Mm+c^5d000dF
z0K_!NHf^{HhpDZ#xfL=l1nJ@X2b`c@V_T$%)P5j26%zF565uvlr?)=Hz9o=c3yA=^
zLCB(`izU*BI*;TmNJxarM5Q{J`yj82@=v4r2NWr=q_eq`H2_c`$BIIM>;uJ2B9p+?
z#p5k92MMId4~copp*Nkb?$*dy$QhE?A-&4&^Nuv$))vT|DUmq?X#apKXxIv%AkR?9
zGrSABT}|;s&H?Iw%>XcERf?P^0GQoq`vK5B!oVBge-r}%{i^`LXVKEk%FGOQmD`Ko
zZP5uph7-xi$TdPm03`$%9clR2FEvUSfc4Lfj6y+z^q-8<{7?87Z(a(^>gX8k=;BTJ
zjSU7%i$}l$M$Cr$2Rb@>ItGVBNFYUx#ZXGKHH{b>z6Y0Ke6TiO847D(-IH>~&`<)v
z?h+dv*$=y=h6MoX)j&fd8|ms8NA1a$DDS;Xl*Ca;1Gx#rqlUBK-vSGx5-kKV386lG
z`2JjcP$)F~tlKup96jU*N*qy$4<o*Vq+K2*0G`3#{4Y1;&_c|}(d5wZ1wflzVb|=~
zY$0_N;h?0SXjX3A$K3tg>ChisKHOJ4^jz%LS7ZA59iQ`x^Q!Qxs^v6)KL%H0Qkr?9
zVXHCkk!ehGJwDz)-agtqRy~NHJkCFcKh8ZSK8#&e{R$nwe{;EtSPd56ToL{19|OQ0
z@n41jJXlF)l3E?`lIV{K+2KU85%Hg*(-K2NsfP(VrfK`3=_o*!IH%Nq^JuKutoB9{
zAAy4h4(*wz5nLp$%}DC?&qu}VnMts)5{}%$u;X`6j(0<$Mm|+Ii&f-#`9%t!&}g43
z1W1X|67o326z~cQ*LsX*@F))^mwNwp7}MIJPwGOTjqu&8Db&{jmqq*g3GljbbVEnj
z*`Vj`0~Xq+i4Vf|z?P^B3m&<uaHwJ3mxqbFCsDU|)ThE^b-Yt&(?XcPX(8L6+?2zQ
z$VZxn@NU9p)-9mWqV(boPVwT`58rur?1!rBlP6ljc?hltcqOzPoFJJG)3h_EZp6w-
zL&e|t($i}m=!rTb2j1#v)em1Sb{f~z?wW<Oj)bDmckB9MQ{mz<5>I}oA7sZNxUeYe
z!5~PXd?L8DJn&E?ajihu+oGr>{41&+tv7kDBactL_EF@Ms*}s}t}6q|PVaVdWudG7
zs6{dY3t<bE5KI{<Ii2e$im_I9w9VJIV-g=iwoVd*voY!p=Ve6F>OFC}bTRybmX`kx
z#Wm|Tj>b!QyOi30on#rgH5qN|1Lsg-bxT@yej2-dPzt>fVXx%1#f3=w@%ud%)bGWV
zwLBH8VVY|HX87Md6CGhA?1GX(%qG2+sDH<ILhHiAjKXK9p<lhwP|_swpb7#*ro`XF
zIU;`Cd;M&izm+=>vm03Q1Y0Hs*-|d((BGu~7451wO?rWch=A8HYB>+E?|;#J_7}^c
zN3#>H{9_n+J~9kTK&lhGtPu(}$y)<wv8kY}-iB)Ct-Pq~97qaZ$m+z0^JSj=FyTcd
zt9nJGp`FQ+&i;xAn(eS{#>k5W#pAUx>wG+5Nuw4HH{3v`4FVXD>n<B03|Il-Kr!$G
zxI!UAYGeR4zzT2!Vt_QD14IB-z{UT*-)7@s-QI9>6_5&BI*<P5Jodbnz}64SA74%!
zH;f~nfq)1byy^euBhtXvk#f#A_i}qN10m?`Wz%^1)A+seA*ap7+F$+m1uXC1Gn>3;
zmL+h~j4RL%wH7Ys7*L|@^TJV9T)$C(LzJBQ)TWALVW}$cUX08_W_)@(EaF#jG&p|r
zETp0uXH{qlML{m9uiq6j4<IgEj{=WIhFyYIFWZiiyR=gak|Ns`CWzHP8q4S~3X4eJ
zH*dKg;4umFq9wcA6~JPfx;=JxQl874HKb0&HKY#For||!ir)P+&FbI4BL1n#e|Y!w
zp6r3Z`ZY_bg3edQSIVubp6<jti)^*iV3iWf@B`8X=V&G=BFJ-1hE2+^0=vfF)&B?u
zmVT08;0IgCdEQE9p}5I;GD&=xsT4+cDo~$7*p|+?b7wwNmRhQ6A8`=k*C?Gmg$-p)
zEPvzs%Jla8s~LMuXM?%3(GIf`)WNK6T)jMwz2*{Ihq(ErOkqQ?j+S@Xxo(+I>0GAM
zw4**O{f>frloacD2|5hRpJk6qsGj*sQuB7+p0v?1nXj|Xpr5W*vx?-}wf{%5iVMd`
zyHLBvb5#bWu~opXE;H_|3Kis_?kHMYe?EK?IY&A>DL?7pu<-L>vCDzEX%?@W`C;#F
zQdcNLMMwVWwrQ(d5O)Se1?SxhGNR^RR(rF5e4*#J6YBl$_us23ILpg9%eUNp<GQ9#
zy&v8OQHo0rXlE?u3DrdluKu}_+*Jtq{$jDe#3zX@zq0VFGvUXJD=3M%k~7J%Dr-op
zX#u8T%k~qx&}wG8CL%OP3j6Mc_smwuu;d|YJ4?{!F{GwA$>~+GMumpdxgn-?BV^E8
zdhBs+_9EBlPUT`x_e58-nclVRFT={w&dY(aELX)_R>D=mhrin+c*Z$AnuejY&mDEm
z6wseVT9kl9#>CgHmB1z+Lv%c*)BM%zpB`(8RI|$DxN00Uof{18^$b`t4p{a&>cy7)
zcF|7qF#Vao;u*MJ`AZ8yBVw_*D`Ypr5h76TnQcB(FF^@*Q}JA)k%LzX<5eVv^`*X1
z)A0BWtR>Gr|F%WU8|~CM3q6LC+t)8&km>(?qbB1~$Q3qg2G9)aFd9avc2dy527wgJ
z5Rz+HC~fBPOImEO`?(=)+Sc%+G^c>D&AY6ox4Fbe;;zAGtfhhXjfsK#-b7FJJjNCX
z1c~D#H~X=?BUjtm@)9oFd0+dSY(|olFEFW9-Cre)i3Xf6-&fG=Y0(vzrW0KA8$JoL
z?YOJj4W91{2)h}7>|GjIYL7arBrFVM=mWu2AJAs~lc5>gYWJkPFK#OParrvYS@<DI
ze_&WM6lV{?!*MVlie&Xd&^tp(R8*4n?$7vRByBAo+vAEItf?l;aVC-p-Z}nzpT<DC
z3p?|rYq=TcSmVQo{5<0^<3tlDSTAue+u#0eL7y$L6c4&ji1r=@>mR`{%H;zu84*rB
zR3^gSZEC@w;Ltb}X*?~?nGyncjn@~YMXn{$9?xvMvTlM>TrR{r$!aX3gRqOkfTUAN
zVv!A$G>s-TDbJ^x1LXA=Fr3m{7D3fAo@VA$FB{mGh}Sl5sWI{0QUe(}2)bCf(wuRW
zmlpvP`%9Dn;Y{43^LYOr)sIv2HA~hsCeA<w4?>PFrNTc`wWdNEAb((miooT@bF<+;
zh1i-^lKL3>Pd|yWPM#ZDf<!1q#89ZH)o2PKRk7g2mnxxsM@58|i2*^L4{ayk-WCf9
zh~6!vNaqF@WvJjhoGah=eXuNk{M_!l&Jgc&IaqZqyr}P}t~(}sTl%qN;aXZAR{Amv
zBfG3_Y4yRS&umaW0zJ27wy||TGQkvwo><zcOZn<Wi!6?or+u7|LaU^wA!HAP_=B-Y
zLe}u+)H~a^j7LU-IxM|<ty2`lDL#4nz!)>KqQ-->QMc#Br&ytE66KHpgw;W1@Ez^5
zB{ZGSz0#$`>!ubfOSecsw^=J(78#_mph#Mu=O6cm*>@3!%2Stea!g-#M8fzTruv<M
zU{MU!W`j#Imu{@;0XE<a%gQAgWm3u`xO+W4FkjNp=lO!_DGD*g;HQr&sKNN%-(%gS
zY0pA@eXajy5eShz$;mZpTo$`o)4Y;K?;da!xK5h8m8(B%ESRNYwJ8cm|E%KswSq)k
zue4I6g_lYlPVML8d9eFre&juQ{yMteyLYb=-`{@@+WB>Md7M_#E}^ce?fT>o4^!;0
zoebZA)V*FmM7!pTW+Z1}&Pv1UE6(n<r!CEr@J~Gy7&D({pD`SO)qJBa8S$-M?qMVi
zh7uSmd9<+G<t?e4=Zzn^IYA5qYAcWw3(g^Mrq%Pr1$+*Lr3inT{D|e)OQB(UMooyL
z?+aP~vPIHHdL#T)jzX4AQPX)`fBrwJhlqS{77INZ&60)QTLF9qqvw@7#*@wHxOBP~
zoSd7uY;Qy70mgOWD9IWPa$kO&CVC}W!e9M7r=C5Lf}8@h#mA%-6goMnaJbcW4HyPF
zfrWBRq;K2lUZTJF<=9TwOTZ(vS@^<Sb_82)cg=M+y82}aBdX!+?v^~hOm5h{m?Er<
z*L0jgdW(D<;|UR#T>>w67;pC{p<iRq%ERW1On*N!x1&I(_rg!RsaKJZB=exN(5S>u
z6A08N^enP3UfZ`3Xkva9-U9oap4W9H<%_BO%^jNE{hK}7Hk~n^_m_<=8jGXY=q47S
zMY1}n?}v)3D_5~-+Zy-xKLhf{#%{qV?JT$RuFdplkmM5vFxf;u+2E-?w<DRNrc~Hq
zbijjq==vsp$}{MiuR$tH@%C#T?35gMY}os*w>;}a;;b?SV2Wr>ns=IV1+_-_ujpzt
z6BO+^#q&>UGL;gd1EOeeWO9zM$U3z{_<!GmESA@*#kgs{l@r2uJKKokBDttHARNf=
zc397N&3({*L@5ruk2q!9({TC>-WhRY`JNN(NB1j{rF?SiD!JmcJ2R;-ESE#Z?JW!K
zwG0J{h+#vb8fF{K-)Dvn^dTpC?Ze!INn!Wtv34pEu#atS#tOX#`Tb}z8QVCD+yb$&
zKk0SxPzgu_&{X5M?4t_LF}9CwyYPvUX{D1!R9G`%uIw?O^=c4JkBU%vW}u?@*gyb1
z-B7QF8is<9Xdx{-YZS{(?@b|dd0$lYjqPfF-SEIKf*`+GE#j0@$-2+@o|~he>f%j5
zn-r{k7Q)8tc(oKr@O~UR@FM4Miy(zwih8rDRihOmm7}k=ls#qTy-Xi^L*Re84a+%r
z_fn7Y52Dp4eGvK?!R9ui=Pr(aAmldFm=&bAw1oMZcAnXr)j!SuwUMW~^t{PjbN1A}
zRl7)_5_4l!$X*<pV*e?J4SIo(KAq+rxasumP^?2XR-%aFO`7LUILA)ig_nhE(c-*_
z|GS=Z&%p1#b#+n=TJumv>}o}P1=^Pfl4lndAPDH?M!r-6wgq8QjC%O<9&nARl#<Px
z9MUl26X#+71zyavYK4S|a|;*jZApE^Dz=%TdorI<72LxhM(ud#_kfbT068tan#>K=
zCLcuTDPjGl(YTrWM5fqRrq2N#xm7K5eVIYQhC16}e`|WM(WJOAc_taMf7Xzb3=52K
zFdN0m{W0TUI=?O&P>Cgwf<dvsU<0m~%5~{eg24d8Q(ty$JHzE8JX&47+W_Xz%zyH)
zTbPjxY;VEIgu6h_i4NYCfioX<>bs!;3B}`pSq#I%FjB``fB|Nuh{Z{)&2XC}Mh*F*
zUXCFLW&3+V{Gx|wD<Ds3_GxDP%^g{-Qp9?aNTg-Whhvm6efz`F+=<nW)h|?^E49Wn
zsx)%tk2FL{5!Hz3yf#OC`|K$8HKK^ur$yhfTXCeityAMraK;F&Nj~Vs)Fgg>o!2rc
z&+H)^>A0_$Si^h%Tw|54p(-9RT5Hv~Gcd=txu3GRulo0#^xBW$YxC`_^mh!G$D|^1
zfAa8BFiU<h0))2cKKD(>o5WpY!F^}b*~a;!k&83t>!wB%lp0LFPo-}_C!nGTb%RmV
znfvN#Pcb9f$=a`V!dC~c8aJczSRd&1Td{NX#H<Ytv6B3PXWiR@GX4V7+wZHleDaY>
z1s;V5B4tfu4&t|l<Bt`&ex>|Fqf9!N92Yk5)8f6LxO;LhF&(+)u~nbb3hp}r9?i|s
z3aLdp(q1)jg{-`aK-r2>>Xl;=3oY*gjxR-x!ik|%0s7w5?YMtXM_T_vre*RSG@fUS
zg`RZ{(IEV?tz^_qQBJ;<nOziZn=FNPzNre|j@@q+D!~<oJxjT-HCY;?zQ~67s#zJX
ziJDLu4*MOh+x1r}Z}&4F=oGKvHgf;{%d)hTW{$HVq+1n~M9!_YbE(BrE4R#*hSNpi
zIqRVr{-T5(QJ!p9q&$h)29@u-9p1G<bCdqeMs9W87e3%)9VMS~pUw$C{qdofSrqaH
zc#ZR}H|n5|vfG{g$%H;{fqAAgow=QvnImQXA~7t&wJD?Tt><S7*#-iB_z!wi&?Iv-
z#9B!6jZw>wtCV2L_@`;9_9rY`M|ZX%J45jUuBOv{GzT{K7I(7mhC+UQm-7i)11LtX
zBi@qZM2E}L$AN}q19+L9067u7s_`|}so7;VHAK7P)y!y?_vSbW!&L#%Mihh?EUvfm
z_Y^}pG282t@vkTXJqWIoyk8icnoXB^E(?nn?HsG;vj&9u#og$YPMrl{dkbU92!Lir
zga~j$s#PO2@u`@kD5dUxxk;V%dAgP-;v=-6M>XCUXIw9-$D*6mOgzVc3<vwUlJl%}
zNDPy<cZ5Lrif7JQ*1BKbzR_jYIxEY3IAU}L!{Cn9r{b3P>))b9t3079lt}Q+puZZ?
zY|imuE&(Etcz4HWZn-aqrX2Oc1S}+1X&*83;dc60$51vK^o(Gn^=3Edxv9(4C5HW@
zZq&+)T`}=sMfLZ~k(hHz{gykB#l+i)Y>B((g9!7?CV92$v8EVI9JyaVFAWv?t-iDy
zb`R~9MEIKhE{|E6BJ5R<J3C-D&88Z5PcG`P=qJ_2jW?oaC>`j8LwRH72OLuT%=4wH
zvhoE5-ym#bl=afk##b4mQwG*G@<U*D8Fr4t^p=q*;)&l_ZIyn@8|6iD1#XC$*yk4F
z@fJy((*)9_WJ#6M)jkBpYWfOV<=L`x_kZ993G;q~Wo)erG>Lp+i4E1|i`#x_EL+$e
z+v7UP4W}tdyZ;cl1G*2)tX3>~%c}ITgs)zrLhC5Mp#(2)NSkSE3+?S(#y-i&sNm9!
zPfSdzo{;dH1~!Syf~{<pL!8NJ2mGA0fpScYtr!f={CyEKPv%79_FvzI@D83BzBBb?
zSVN}{wQV$eo6Ru9A^oF5e>7~5D&$9_MPnbl(*GjMTCh)>A20kmZmLdk2LfMpX?**2
z-y}@-PND|4JC5EZsm?fb3cIVOrj4zPHYEnj@C$FNLNDH~DR~_e?Df7(_MFhqg;xb)
z#YfIrLV?BdqllC@J1+^7XN8ZNkAte-iD1mlpQ6Lw<<fvzMn1ml<W&p)^l?Vt`PcMq
zjN!P^HV8UT1=-jhGBdL^C6M0!&2z-mJ=FAU0nJ+5BTYA7*3ZVx2_c-zT@Q~ME;b$`
z3HN%g#31%%L8F#<zcFuuEvPu@;4`_#J@Ni+Q*#z>W=~Bf)&#6S%oS6aI2;zk-Y0o2
zGaH$O0l&&p4Zhh4u5JxF+ih~=VLds?&K7tn>k`D0T<fp^dEW6EW=V#=Ya*UpvCtUN
z(At{M{Onm>f6Q6$#mufMcdSZVY%0H*>-ALi9_rc7(tb(85;Y?Bi90sQMh*T_W1#E>
zTbyYSQLVxpLHtl_n^c>Ni?d7BoW1_)S4rNL`G=pY^4`w9RuDzEyY123%I-mvcPHde
zrut5ver0_nH=^-r+JLyAW!cjOUK|zTiH@-VbDJ}$7h;NikWm+x->enQ$U^@!a%OcT
z!^h~ATx;ycderp0+MAS|amSKowgTa1I<L1_OTP!*#MZTTSx)id7d>}W7k#s^bfCyo
zfk1WHRH+IsuK7NmqRZa*<*?pA+v}&OyqXvr{+jC$rbDG6K&9U#{e5}Cjb<br=U#Or
zJ0s)*eppU)c&MgMWpdgO)H+pO;TIsng*B`7OQNBcNz(pOO>pV!Q~cHq(i)wrnkxPf
zZWDr|Yz~I}sE@6z4F-jN{tgY*)caRAtsA*@Fx*+@e2r|^3b|3x3bg(DwAMxy7w5Y-
zJq&fPF^iLSIDz^dQ=Ypdis%scF0&&%v0ffOi1`B)E+c`%q7;)Vm?@VY#hpw-HZQ^z
zZjQ#g`)khhjd5$vh-0OgKo_KK==$4-cW0OuZ4|Mavb6Ta3<o=HLp45|oiiiDf5b2N
zhLWobB0lC*7JcS5Ah*=a`$pNLQEU-+C%!qJy|Y`j5x){F-Cr_ow?}z?ztT9JgHUFY
z#~>=E$<|g>5w`UvEZP>dZWc6~N{!4qHJKh{M%vNV{>ajzz)PLQZEx6Q=$b8c_L^)Y
zv~&=)R<+tqhqrlu#%ymY)m4u-|KQj@M_|0SC7Q{8pVp6)sPAQ&g{|vpL%Q-~RuJk<
z%_UfNL}eseznx9FD5%eXcwDL7#C9k}&9*SVU49_YEzAi|%X)#%)Q~24vLYBs^;fNe
z;`U{OL9`@uf|OMm8{eUmlVrN?aUA0(m2N@i_wKD0JCzf(@Tmt>$A}>@c>K2>n%?(H
z<83W1e~*v1>qkZ$9^r1DHE_*FW7*#_w4`k8=2;P}f&^?92Rt<*E^Da46s9HyZ6a%`
z6Esu-cC44Xw(i|A#a+>;Q+=xsV{a^n94@QWRm#;Pg3OAiw(;mPRAkgC<hajzIf{DW
z-Rs)Z^GRs*zbBTb(*i2$w>)wLTMi#l@V}Q^`Yd`Tb=r4H5X&CfPJ6vTc=L=WkP<Nx
z&@X;YQuThlT!zV&M^64rYPV)}>gDggGa|o~7H30BpHnpx=ap7S2Y#-G?br(o^GKA}
z>$um(KjN7JF#XAxF)okuaw2cD+FzHn_=}BXR@v*G`4Jr^;dL3)U*TT}Jdz$tmI<$m
zMeU&~>u0$}N{3SVYmbweM|1f@!jqhd+$)4FhJ>xn?bP-3HgA;@y)2(+xbjUX`!6rn
z1zqd0osw|-8Kt{Ri<j5jxzFPhmMRI&AvBX;t)L)Ykv_I88AJ#Ms2Dg6raL$qFwAac
zyaN?JZTD4}SkAq{CSM(GC@$;H2+kiZXslhKs8&e<?+<5Vy|K6KqT!WWH980P{8q;P
z_n*~ixEVK00|1X-#1&l85xlkPlHYJ`#pv3ldF<NQ?z{GYd}vxI63l)Q?y|_weWyH`
z2IZwR569qYn5X?og-+?#MUIQ-N9iGzt2IjII*OWR<Tf%MEc(pBiKQ&DlKL-Q_VA|8
zc1;q$!Qkp@;P_0qF9Idbl%50m;}*G@^Y{qh{oh{D8j1xMnjjh@a?=DxGt%DyA~pwE
g$YG!XPbvYI|J=yKG<|v#vikq~ODKk|xB>w1KgAR*)Bpeg

literal 5828
zcmZ9QWmFVgw1$Te5JtK|I))acO9Z5)yK_Jq>H0umq(c}5WC#gq7(lwaL7Jhvq=uHf
z<6ZaH-D^E-pZ8sR?Q_olxqUSh6f|^oH2?te9snKy6|@ZiG=S~D)Bg`S1qB8G01XEK
zAmIZ5DAW(%?4~Fv=)MO4NJUY#wEysqZOc%Uf2V-*bWxfT1s#9@K&PR@CxG&tQCbm&
zrBR}_jE#$xJIeco(x#}s#=vbtTL(KU)ZJu+DDM>tVf@=Sj}9mk<;kEl9SRm~8H^$a
z7cW1QXNl6B|6p!LA9AtsL-iwzLusu41*i#dwQ{jTc~De;DgXc-%|iG)xx1UE7wW%o
zR1FCVhNlR?Yd@H`p}!%iL0u(zNh2uths$Q{PyPvRFl}Ga>zF|nuxXzqxKAq&^t~Yr
zgi|dP$TxGh-`bSn>O(|I^eei7Atp^!T|idQ-$+fcEo~wwrS~}%2_DBraAC(_;7Ovv
zrN`~uZdPDj;BjO97yd6_;?&rfW2*(~ZC!?~ZSyFpYHTe9UcY)Le7aYJrq|PvKfrFy
z)MUe?mzTa5Ce)68L)9Z+8~Z%`*>%t%>CcZ#q@StYKt6;x;HHS$Z9IswX=}er`!Mo)
zq^1Tel@V&IrSGGq9<Y$mQmo;Y$?tttW*_p}^8jP`={me~mys<&>lFzl>+4MaF#lwK
zT(VJXYnJjUyG6Sv%HDVPi~^s6#Ki5EVvsH#HSE$7zo?q9^}U9hnj!Vg%uVe0EI?X%
zl_XyRkD*UwU5j#Dxz@vD%SS}gqSu>Z={d6EKxQna<8pmhT{lDxNw$>9G|dc+H%Ah1
z@DbV+?@g0YS9k2ZjQFx#%$9k;YbN3)m)c%aQFFZas2_Ai|89Q&MAoOiLUmbrIur3y
z^oO?-iF$=9GLK1V!bO)v3zD_v^<hkg;6fMn;gD&L9B!H=M(~kw?rZ<<my8T36%Xr?
zJG#1VZT;GmIfQUQ)mXq-pro$*&uPHmRU9z+OI0f-zjNh~10%WwTpod8FK8xa+lfwo
z*`P_EW1hg>(B~tRRlJ9GHWe`-1g~H!_+r}JC+z;>TQHn}8up@POI~G6e3Y7@%PCA}
zP^5v{-65L_!h-07#(2ZAW*ugC^OFqoPJc1rCJsa>LRRs@WdnNFDA$v<4Vie!e@1gy
zm!yHzNm8R!Bji1rl1gMxxYV(tUila`5q7Q|{%L;x#A1D`&e~7qRZ^_8EzaCuoR#8<
zwL%}_>j)iN+unQ=ztL*mesFBoxH^1ZQu=YFdw-*FCI0Lji&t8oIjyH3i+jWBhh&9W
zkrZ2z>-}~ggr>{3_fMDq53T32BQqz@K7zYHk<C<w-f$7>S+fw|93fUM%vG=MZ~wSn
z!Q0}U!U@~nVk5lRc9~jKk9mYZWcHBs4L%5RBX(n$a=_2yrzi<Vppu`_48GgVV(`}3
z(6U91!B}=Xy2yZLAO80AMAt>MQkD#HV8APlB5mBse2)#h4FRNw#}YiIzt_-;s>I>R
zsJDN2JOneF#ADgiZYW^Zc5*SEE_u3HGFpiGQaB|e9|nH!x+X<8xtK9MOf9wM*{p0p
z@yF-RnU1+JZF+GyKvKGSQNBsruzv8T2(_}dwj1#u{spm=XyATZuWejofMS$*>w3o!
zr<y_-G!BQ59zxNSYOdaA8#FUo=b?C^EfAIl9O;!vi#2qLTqCj#Ym;M>_r*~pY+EJr
zIGGpN{?p}kC2wL9I5qKYYQ`SECsE6Oo=8DE3M{P4uXA=?(#+JZNzlMLqm-=OEZF`)
z)jTzAf-C$-7`^Rr?m%SD<%7CZGIIUw#OEFd^AEH8h=wFPv;gc=<67!UL&$FgV^$+4
zMt+q}fy{JCBDFlsB}XhILUyckXGB^C9*snQwovzanwK$^k%Xt}NG0moc8GU!Zot*E
zVmJJl^@(QFQaAOohx{vbZM4b!Z*JzBt+$BQ3z&P?-MY=zhurn&Dah#vJl7kt;I9}>
zgXR51VI;iIvvJy&SC)9WT?}+tuU2(p<f%eKMRd0bZsa~4EbQFkU!y5@B&dm+Os60=
z$}e;SOQPy$O*UWrEs^AvAdHm6#2%)p#TJZTa6AoNJocHz<TP1&t5Hx-Uee)mZfMqX
zIAw77NgE`PY7&+EvuM@%HNsiO`6K>xr+|fd5rZL44-;S2wo}c_!DN?pra~bH$E2fI
z5EU<-=n-#Z3c+!CWhpDqsE|+vXEO%u=JUl@NUeB#f=Hv%0c%Q%keKjHVK|nT{+RAh
zkyIHXsKgMATBDASz`3VbVyw}7amL>f10FLr_25HyPibA#_<mW}*g*5^%Yp0dhVu!N
zcs;iTGvi-_hVmC;JEjBJ<z^?poAI1J5**=vg$(&)RBb(;>FMusASv$V=(s)hJ21&J
z5XL$DU_>0I%`aJUyv8e_TXA7a7hxAPB1j#(YSGEjC^1^(Htq=V6--Z<*wSURURhCA
z?po%AFLsC@iIKAJ6VQQ=pMim{pFQZr(hIKrVOkINyegeF>!E(uOLnkxi2GjiL})?i
z3O%*YENJi2=k(KfXEP1g-|htC+&$CZiBuP%6eZkuf@EwWyAwBpZM15z;cf3{l3#-$
z!_mVZJm+BzvIZn~{x+ed7}lvGmY(zdcfcRjLtO`wA!tw{PiR3J*H%nCwNB%^NYxKm
zuc1g-zbs5Ybrb^mPj0@*YkDSAlnnoN@rD{3al*aYzd+mgk|qc&(WZ%R9Ny_%yN<EX
zifBBr9?O}@;FkZhgh)at4Ph+S!O2T|KUa=_Hp`e+L@e{J?4KEO#Vg`|SGoR*PMEEg
zcKYeb4VJpx7!sUXyu$fzA42jzr2L%Z-JaK*zN1q)8n17Hwpg*5VoBJLS?kiQv~#`%
z<L@gk>|1K%?Ri=Xx`=6uM>$OZey0m&K0&mGGqrFF8iC~QVKZ{_4mTW!Qk6{Dvg6L#
znd<Nv?#FYlcWkZi2*g3iZxJd=cFMKnzKXxs2;e?}P9}Ppsg)%aFNAar0;LSyFYOo~
zR;pXKh1LLrm>wHr$a#Jw-t9wzqX8gF6<@(g%%F$tpcY&+mPG>E@P!D3|24D%XCUfK
zEb7W{gse3^9V;RzhtLD+N+i?9?VDp?zB4=*r)m4PaW>KgEbVoyGnQoZ9Ux-z**&cj
z)123?_HB3-bG>uOha?V9se#96kY7-IG!cBpY%;YW*c8v3XR<3ZsPmu?pD!;GFND4>
zBr_axVY7}2%e~#$Yz|V$@-(6)kHjDPRI^_mpqj4bCTQXw%p(KrXuOne9jAngakrFr
zlCubBPs9&$SAZ&p90jmD-ddmF{((fEyRwH+u<t>*`H?3JClQyyG3?lr!%$6^ik=iX
zq?*y`HvW?Q*WHZL9O@;A-()v3CZJ9KNuAgko$GrIv5oO87=&5#GBI7eVSYT@>!#|<
z-}Sg#X9b<9^dSwC`yT$Kw^7!1G^PkRJ>&7~K<}I%*wl;;?qApc8=rB~T8o!T3KFOB
z=`OisJs`fU@aovDRd9HgxcujAn)ddPr);d1CLxrwJQXq;_!{qG;XYG{Bj;ev(Whc`
zA*CI|(0xXzS1#|b<={%$>GzVCIlbg|zihvPSvv#P;5C#%ALdf6m1#s`^Bz08_*TXY
z5HbsNb})YIzYTUV^UjLKE({&v2QshmS}SLZY0sz)Zl)XADyRA*b1<kaQkPVPcPMP?
zX5Ge>KhqBQhmegKNIqXv^0ne~R+9kakA~#3N((E)bsQg&qINs0#Xm>7NeFayzR=%8
z({I|s1X4(1K{b-D+_{TyG{NYtD|5do2@gG>e>2;l0*#POt>n?Xk!gAZEd`Ed#dP^I
zMwS0UhjdT+*Y+CdhDOvvK2MrtKUEQtjSpLc&VNJ_(c;E~XsP`)l=pp4V7a<+bh6sx
zngJ)bgMKoSHc<jZB+MKy<M31+IC6W7(vY7yTKUu!e_c4K>~~`p?5jykN@S1bUfc_M
zY4VyV>{~GD>jbRF4)06U7gA@*{+MN%ZVo`pO$0LsxVGEw7KbpEr+-G{OPJI)W($lK
z=tKW?H}&gJgg|x8GAQIkOTO@c=mmuE<rIe9&}7!z60iSM(pP;S!v*r*WXh%^xa!t!
zDzx^x$khN-9@G=t3Z!u{X5n7P!<4)1cx^c&ss{!jsVn*Lt=22wZqmHM3;+8mC{v@w
zsgubprxI)N<sZHxUYR2z13br(Ao`jrPWp-aL_(el*>a+qI;P;BS-B5S=3?TPN-qlx
z)GK<3+|V6kI%U$*F(+8)nF{D8NHTu!#1{%AJx=+hOjho&G2Q=spvkv5e#A`mm{5e`
znqWYqr9)mmSUvF;V2tVnc+)WT`^m3zE9frA%;uS-BqjX4m$Xy3eDhhK<;Miycul02
zWk;XgM%8d*%O`3KyFOu?N9^u2&cA9j1y9s>*^>ukEzCUIni2Guu3e@;sd(*cK3)ag
zYubwGlwwd5UOWC{03()TrsBT6$hURq-4m|rMFyUO(1wk?NP&2?xY~Y5a5z^dFepk-
z__iLJe)XWUx7oAW5`OW<wW5FMamsc`Qp$(cj#$|8<*RBAZBVrz$J4dDm0e;p(K1!X
zK=$A*t<amux9`ms)b?u^QXI~^o4F@DtDT`k>CsAOcaQxI)!|$<pw{Ml^nz5+#JshI
z3Fv=WiP0xCcb~Qnv&f^tGt%xCkH^oW`lMv{3y^7&2r{p~lXKKVBSx<BiT|C)K$nzS
zb+t>Y@|i}{qq^dw;zHQl@Yoa0yw<AQn+O|u8g@yeN$5!j<UTvX#CVzr_epIv#qHSb
z*lI7<u5T(?Twzsc6r90ILu%vx#orGmoE%r;_wLw<-cjVHzbk#ggOG)a?f?ca$VG>d
z_Fq5#tgfs61&8b2mX?*5mzBlS`)RE~RShc5sS~k3Q*q048}-}{bE$AuM<*faOj11@
zH7EzR>sMNW{AV&$HzRW+TU5Nf&xB34b8Y4MPng65OiLp8rt*zpH^Q>a$E^|;Wa|~C
z(a#>1>y_nCc>$8O2glsOo|oIhZn<qUZoGOf;ZSaGajhP_4eTy5)?MNAmf_xWut;GS
zJ;99x*HJ99TZBZ{%gDs~;JGUW7+l_PGGOO7MWlLdYjb()ndh?ys}7$^!}Rd>t&PsL
z$>vMHQ!BpDT}F@gyA|&r&r8LTsg`gmcuB9ty=u_=d0V#s8c*#V$Q1NKB!lKL*A8M9
znYfl6dn3y;b~-r?XR1%hm%_q#B?}K--9OQYe_YgWh&FHIcTxmPI!hUv+sR4keH}Yk
z_!udig;CM9?%A;XNrlvBvE^H9fCXAnCk|U_G}rIljY^`tpw{4V|CaS%zAX=Qgq1CG
zK>;tg`)$%{4u;8D3t9jURzI93$Qlwvm?dk%>Up1z>Plx;oL32U*BXR?X1`5eL_S~f
zmefzYng&~axjFNw=1*GJ-eh8r)c|GCocWxL4fnUVj*h-~F^a^!EqBSRUa|pVNo867
z-s3U&O7mhHS!Eptmq`*qL`0fIC|gheaC$EbJykKShbu)XVtr)CP4TJ4(Sf|fP4J3+
zKGYe}8FBagBc##avcOOOx&5w1d+^;=+~0F6p4j)@uIOR(!uN#Wa=q{V%$4WKKOY$6
z@sNJeyV>NMy?dbE3A+tekF2x$q%={C-4Nj?63g=lWfh{{E!-8R9B2zi#tc;)ES;H&
zVt+#twkmUVh{kUW)jg79WE6K~P=#~4ji>S3JldCS?B!D!R}7H!4h~@;WCcSh6F)j=
zM}0f_VEtfDaIz7-Q4Z#JEhnBe*Xa3BUm1dB&-JO5XA49|ks_s@*nPyZaSvMi)x;#1
z#XI$j#7Fk0#JI)Q%<U)ku6t1ZGfy`}rOWFGMqp&?d$e44*6|x-1TOab7fsYHKIqp^
zoB(OUB4jew(_3GzBtvI<MxMk#alKfH5d5p5N}VcxIHNOgf^ln5C-V83k{iL-qg)Y=
zbDKR!+W4r>N1+j0>wrp0nS7C`{KPMQbD#ZjDaNShdzJ#tIiv|Ty!f#+k~LWiI6QY$
zKvWZlCmbmP_V@)fxA0#5>#K+7i5+6|zeAEG8Cp-Qec#TdX%&x7cE}#WLpq{IdJ*;W
z*^SQ{&I4VNMTNuAJ|qartm0WY{ih^wZg-FZ{W}8-8hjfUI2+~8mn+=@8%ZKn&sf$-
zx0jof$$gtYo`2kN#S^cZe32|D9mWz^&r+Mp8h8S!Sf2nPXp$5{lCeGqAp2O9t`y>d
zfZK=u>3!(fQO3yQ$k96M1RY02Be4#bUCwo-w!-OM8=_vJx<~LTo|(Akm+;k9%oK!j
zg#Aag|K5~FZ809w=fWl1Yed^PjNLpNxO`hz9|@e|+)@%I)dt`yBOAp0iH$(P!7`dX
z36dic>ic@iV|;P>YGu$>{z=D&-+|vIPvmx4a=)}$7rl8Uu<ukYU$IUlh-JS?nkjEy
zmc-V^(z%a}sqx#)N&a3bE2VPo?%%kj{h+-64H7n4<i)1^Auv?)P3HT8yD?a5KJzO*
z2{jAabxBRdf-sryA_6b^eedIbV(@SN<+M{Ax`sE}-qashF?WmI(R&gnE3fCQW4GKD
zi{~~>Z&IsAZCwlP^MY9U#q+IL2Oqyc<OX-vUkGhbjY;3RO|u6w^sfmhePno#;6Do%
z4Pg2HWsfM6hF_}8Y5twORJRU!*8up&LO&$g5uG(Ux57UE>a%zJX(Uf<&D~pEv=e#l
z2{Rf*iI4wbj$79nxS;8H<@{toFVF7Jq#*x<5P#lyyen=)SY}&mq|?}GR$AI=nw)Fu
zI9VBD&Rr6GNXn+g_%Lj$WoT$(5Ub(oV)dg5?(Tb^_JrkOOecX_o1wOZs2GvT9sif7
zY)gv&<(YjCCO?>srEMrc8jGJ{5WPoDW(21bfMEgP{pVY)Tf;g!hB`U~Q}%%v7;<kS
zz(J#yBLmM#?JVuUp=b(NEQCor-@DvHJ3~9O5jXApazIT4cLX(q1{w|(8b25}4Dhdy
zr6oAjk_t-!ix3CxjIuL`91D+Ow6~+P12cjR=nBjNK0ZBR^a3eijE7GYPxOx=r%!Z6
z<{(R38yPYN^j8A>HSk>Aswz+SutRJ#SK@dY)aLNs5Z~l~-;U}Ig^4Y9RlLqx-QmIz
z!Nb5Y4K|v`DV%vM<bPw0<sn9yCPNC)jl-M$zk2XZb{}E4bteFGB$1MmN)wG8pwf?y
zL~R^VGr<G^Vo*e*V8eI>u%WUyrYJxNg&OKC3#bCT2EhJJPZIzD0#N_+PO5V4k|C7e
z?U0$wx%i;2f<aU_#><d2nVjJT%Efl3QeBhlBUR!!m-?F=q$bVidG(WVBfmA+JkeJH
z>s1d0>B4ywg%t!%dmaC;Tth5-5MCf92<Q4VCkt{1Yu74n36y@HQAx`c(2D0f5V+1u
z9E2MPd&0TSnaOmgm%EIiBv&-m{2`O@($OIf-kT;B_ExF>Ibt7w{#4y4>IkV#_P1g-
z@5oS*4W{npOhA*-lsade&i7?va|G&iYn8se`|v$UQ*RP+852{6#NVr^y4hVGV`4k!
zx3A@}H?<iSuhPrf2fYeFrbd!N9+&I~5J%2jP5Popz6S2^63erpcHe0Y?PiMM1;T7V
iS(}Sdz4p#A)qhLffAa<d!k^-SeLzD10K|n>5BMKiP6-46

diff --git a/css/font-combodo/combodo-webfont.woff2 b/css/font-combodo/combodo-webfont.woff2
index 81215716176ac46cd18c85d6464d3d02b3f34153..0bddf7d18c11ae23b65c495467f808dbb2f263c7 100644
GIT binary patch
literal 6088
zcmV;(7dPm4Pew8T0RR9102jyr5dZ)H04C@F02gHd0U4P900000000000000000000
z0000#Mn+Uk92zDDU;u+k2rdbPWf2Gpwp6ez0X7081AGfW00bZfgaHSESPX(oKX+wf
zW(FHlA_d$S>S5ymV0o?;+5e{lPGktxP<Fingar=@BTTE!fZ;R&t@gB39Q$=HS1RT<
zw(Gg83VNc<<^CAMGrmRZ-TmjW^<X{i6a-dh;%fH&hVOKWI-%Zmt`DUgqB*^LP5l4k
zMg$W6g9MF02oeav$I>EIOGT8{q2g3#usNM6>r9oy{yrxkUNMWwrgdJ)1(3J)sYWj6
z>eQWrCte|3DIW57@BEuU7BsRdL=&1~vK}N|YpN0q=2E5LMQYg)!ovbxQy?%5kYCou
z(pR>VT*?<fERkXG8o&3(_-}xKvbQ=nQhX!`J9l$xB}D=d{y+WE@^>*y5Rt!TLDY+;
zxaYp06+=@{l*}Yo0Mc!4eTr0T)X7dZ1$Sbw|Nl)b>HlNt-QQBt`H*j~q&0vJz%XXb
z)*0FFd9=>U$yep8vbT-4N}JkHset7jAbCL^rP@xjH>EdR01N?vK{%8hq_g!3`=@D{
zK17_y+Vrqjg^d*)vFO+Kwg3PS0PyOhV`BgSc%}R56#xLd{_4Sd3(X<`l#CFJldgeW
z06Z-?(Xnb38~`_5c+hbj0ND4}!w<ON13<V7*u28jSv>_@0NyYe<tFBX8w-FT0~oW&
z)xtFoUPSi=J<em`aX>?p9_9!D;AA#FUJn3#VNwOf6{*naAo$;Mv%u^$`^}ThH(RU|
z{{a91ugR4IqWgkR1O5N`<8$}g{8Y#P$Nz`_@B5JX;O!5-|KOnyTHk*k%dOp%Va@-a
z1ONbN0sxqKbNYEKUXwij><WTbB$fb>-aBRUe?~JpLrkXURceZz;1D<qen2(*@v514
zuqwnju?}{b@Qo;fm=Y?j)Kt92CXlNW$um>0w2e2m*~U8rV`e2<#1uXv(M*dRs-#-y
zNn1n%ry58^%B<94YPLl#)y^QK*r1>Ct2S@aR{!PS*<1>8&(xH^#?H;l8OrQdVa<&e
zdDO8Cwr^q`_cb?jf<9)v@64oandv?i9feD0TjW=`c?5BVbcN)cTqKcPQ;G>HwdpY(
z7%X4Hg|N9vS=D^BLI7D1$s@&J$ASuPi82%770f2@%w~;PAoDv0QDb*!d)`EbP3qXE
z(O`l3t4o7MjwNN!iZWeCHlC?aW>3Ot?uJhiUwJQ42#)uR3Y-@6MMzMG%N2FzBb3B@
zBO4{^k{T|E+1dz`QY4K;Q)FaE?FpBkDi%ea17u_r_dK|(XprVKBiEhUrQr6_7=@<f
zUX>Y(yQT3GD)kC}p|EYNIsut%S9Uf#dNvXUj=ZK<r@>IIWhWBIY;FT{wB97MS|105
z?#e#SkilBQE=uZ2nZ}P(RNza3!)nVH1OedxcT=VacU*f5kp4HBvQ<w50Dbnvn*fm!
z`{^Kc>!v*wIT84H|1!WPo0gUxI2T%6yll~e{JfF;{3XRJvjSOHNBD<<z|y531TxYx
z0|8-47S2-U+HNeP;=rOnVF0HuOw)1+`ibbi@6$|mx8Ki_;pm4%HSf&0<{PSho)l@W
z;WD3i^bwcoT9O7IQwLaF_vnkN4~eFn1BU;FkD2QNMb#WcA2TophKVtQkW1ST5(^<n
z;*<k`D0rOIZJ|02P&uNSqI*9xH|+X%X~L`pl4e93)%aF*U!v_cWnJyuUR%=i+zv}n
zw6twpR2BX>S>JQAZPh(~du`+L<T2NLXI-~%xR~j(s>y<xJVYOX#KssBK?r~)CIALP
z2oA#*gfB}ct99J5b#Dh|V*sdFhh&1IEAj534%9Ya^cnHiHPUEjP}H@U;{0qhu@=%y
z{fvNi=Z`}uUkKTl9XFdqJ<p1c=UR{y^=!4fiuXmDfFa=6R%xRoSv67(B=u^CMb#7w
zJE%G~DsW&#TJjQGM?#ow9zsfT1Lc^p{MvGk=#d+KDZA=n7N$UU?XE_l5mBjsqnyaQ
zkVha{)f~K5ZVFlwEl&#O<~p%kz`@0^?cgXCT8c~K5GMSs4VBd$NQerYqrq*B0-{?i
zDJ(Q;m0Ppd5N&y<c)P+5-3?9tvc$TfYB8t0x4dyO+lXuy#dD%r4l<LSXG0=UOB!w-
zP;DJitHgx~%(lv6-S#n&y2`d~xhF3HN$&ZmBqxdzi56LAe@L_oJVb?Ze8ZMu#KXyO
zV^|ofVoA*cC3jB9mK2rt3}Z|IMozUDU#o-<^yIbQV4FKYH19{mVnwPC4hOlQ{gH%>
z_3ITCdXZP?NngXlT{OuT#*VJq*iJC(6Gau5bb5?5iDE}y;)=@~1}eblRDkpbj<-75
zO)d~>FL*%wJR+y?bX%g$uH6DdLo3m$R9`Ce#?ZIg1F~#cIMX;6l8%7ra4@KJ!{Y>A
z@LOUnHwX0Oa1*e&t9J4cofq8PdoP~@!;Le{?iTevJRYRsC@|V87{9@m?I37zu4vyh
zK~D-<T8Xt_hUb8QY1uR+4-c~YB^0WvS{r%WkNQ0of4wb5fv9|%*rOL9fzKxHHi{b#
z^&osqC#Lk1I-+-Sm72$8yT%oNrX@DvU*+-;X8UdMb|{Xc%<QMfFMB-i0HO|<iaT6i
z4&jd#UsWeC?z{M^_TE(Uq+`Ob<WZ}g9CZ+KuJZo0)mj2gshYVo<1<yq5NVHM7`qia
zL8&-m%Tb6PH7fcrt89Q!v2yTAJ#0ykeWN7UkLZTvqpGe!L=bpN1<Yn9hPw7-1hk<=
z`D3OS3w)s98dU{7?ms0%^&D^%iM}dHvut@FmVmZ&{tgW{=5w(+rzvilg2K7vX`W90
zA}y@RXr$*2li9?g`4F>nUlF)Kl_<EMs|W%3I7ku+U6UrHU(u1?vsK55hr%?Jt(w)M
z_(OgL&N%Dh8&43`0ZX)9_i4bf(TB5mlP;od8@i8sJBB)h8e!YT2X56l!E2&T@DiHp
z_Oh*4sjJ^vu1~w3w?lW#P-RMFG6_?a;h5XSjT2y84OPcVcl7t~C}jvtG*Eqb#vV_l
zMiZkmzp{06CPQ+qV{!YLrK!~4rGHm`y7%i6x^%J$&6ZS?J>HaR@nPL=v){A*F2P&p
zPxjs1I{jeBuAxPidCQ|2rR${AB&BE1CU<&L5{53h>}et{dsoOvQp8U9FQla{j`Z}~
z4rDX+zD~!i{hiZdjgROZ5o!{vX<L2+m-_Vnv)eX4a&F;@Eq(e)(~FxJ+cs7$T_#Zs
zQ_|r$$+CUo#6AN}Z*#OxyLEpyQ|s-p&pOaKrPrN0a}AYwzGa;SEuW5^*|y=~vkSAE
z`;Cp(ZP?g{eOD{PT6T5&k9)6%gPw_RS*2UWd=P_+m!uQlJ-cpU-*Bo*6H}jF`!9y8
z>-_cme(>%)+14TV41d49dGCFf^XQ*<Ck{GVWS_L;D(f#Fn7eM}%cBDa^BYpKAE2d8
zI<YU~PPX%9jkZ4&m^Jwvj1QF0^jp5Oh+*{{3vsyAKNIE-#NoO5tU%Me1x;mriBNsK
z!QEe5mQ0p66(^JPl8y6@VX``GY}+1hHO}|4s<^1=EdN|ks7FBMktSqk4}VN$3S9qj
z6N4)#+hZl*$po8W-MqCW3X<$^slDV@I%jxeGLvptralt2$G#c7CMRIN=;$UpE?v~|
z(a(Xs<EU&*!Gp-c*D2#>2cLfUuP6HXRQq%Zf}bCM<kh;L>M8T|F75M$6v@8MpqlW8
z4>^E!7wSaKW+>0K=99BE+|`nbs_z|`07hRLmTI02=h*0b$E&tz5sfF&AR_O31tSsS
zFw6^c^SzG}(GNa-lmUO!s!a<LxuwmP8RK*9{SwXh`5q~@Fjn%g?5T6F=KblW`Ty}&
zo>SgE_@2PY4s$-Sya0ZiQ!*yT^Mh$I48w(Q9wnjmlSO@9<$eo+SdPL1_+qI{V3>a2
zrpt4OM;^Q~|CNQf^6hg2*R~v%V!YRmA&}#<yrDw!=euo%#qSM033vbPtx-$XoPR4_
z-2HBZ^)Ha~KvW}*#Y5A-h}ysUF`lpU{dKQSu<^aI)+|xv&U|X=sdb4hYfml3JJg^)
z8LIOQ2&}nv%ig)=UFoV#Zi&O1syjp*qgr=qe!1;%DYeZMHHu5_yl4x5q7-+xu8E7J
zbB2e1`ut0FzD&{(5M$dz3R-r{QxqnimB--JD|0l7^?kaylgew3&zBO6vC0ZDXee*Y
z;cViKKJjRP6y7?2yWWsg$z<Ni@gj}F71bOqdFc`RDHlVWKLwr^l=UL~p)k??hlPsQ
zqb`!n)z$2odh9+D`y_lQxX^QDna;c)CoHURAjUZI;h%31WKL-$jG)freJZ~BmLIkB
zvpTMn4W|%Dg}QR&gu3YEi<(XhPsIt50!0Sq(Da}ZMW^K97%y6zv&3RuIRIg>tkx&c
zusd6SYqullkL5mpm8Ow>TF-5_KP(Ot<=rk|X{B+T*Y?#XhG0$23?mstKfUmI4J08W
z6Y$3h>L2<1jp{2C;}k~4Sb;pf@8sCjZkLus;66WXv3`G-hkH*U3MQ#eXi!C90_kbv
z#|UvnSKmf{Nk`<cPZS7OBV?c=VlnQf2=xbhlX9Ws+f6)bvhpOMR>)0)A0Kk{b_@TY
z=?@L79a~wNVpWFjxb8!=;>LL~I`76e)IX&)g@OcFw<Kn{mcJVCy}NDro-ZPI%4N=P
z*uf!v7lriWy}ixNji$!tv~1n3?BLUL$Fk1swYg6ZWp`cOCK;c_1&!m91L98VY*FDT
zb*CkdHAIZ31-ZO&>T)l9B<bd$6hzEvI-L%p1FivQFrDu0U2YxB?%I_dn=6t%J@;Bv
z2WO9`n`<{tCnpwN+NE6e@accsn<{_5v1SWspPI_&F7Z89+BmMLi}*}WX?U8J)Ajc}
z)e>)le|Ne*Qi3PP<rgAZU-?{L6R02Ox9DSr3-bjV?pOY=_+I(F!flff77LCdj2VFz
zq?TXILIjb>FoXt}s0y1<*HVZaBBrZ1$E}ELaq2y?dcTpGI>TNCtb6+ROeK__Oqkb@
zY+8`=PD;0ztTaFV>pqshjl@r^_(1tKd1KX&<WFgjInNs}I1^`2LaFu@SghD<(9M(~
zWV%c>XO3(!61U!Lx{B~Z^HNR8c@3_<LDX|#)5$Cb2>e$~V&J<42>jivMv<tJK=T;B
z$s_^)Ei<&6*ap(r^6=D?%*7F0csChf5izjgpgn%U*U?a2tzm#8mMD+H0T|AsC<Txx
zVzik-lM7l?t+LSQj7CQe<_Afa4Hw3_<um)M!ZgJdd8bPmLgknec}y<OagTKo+Gu=!
zh`N|CY3sG7!1d$@p@;$n^||?Elusa0_+%DC;FW+IwAv!60;FKPY$KKFz`BuuGD=4n
z6^c<Hi7&Wb!X?f{%KqX_Bm`u7t?<)u3pxdnc?;GL&x~(C$0612I`L<A&_2I_2T$3>
zqmaRfndMz(3TH$<8hprNF%)A(sFruCsp5g@HcCR0(V(Ib9h(^mLUPi=L$JPFFe+-L
zqPPL*K}}j+kZ_BzpV{WWQY){Il%3-e;)zXe@`~jKZF4J4t!#5&lyjo1nGoRaRh9b*
z#bjYvopVbmKF459R?Y!xD(0voRwZj<t>MAC<$-7A*dQCOmTfpN=$J<aDHtHJLHTTp
z$kSO`tB7?ZArRq6`R37yNJI%=O%V#$tprj`QY29erRma!+hDni4w?K^!A8}}(>B@8
zRJB(fEkj5FMy`;8wDjC!D1sC1=G!2rpb)C12VdReA9N5I<<f=RbA?5PqH9@HMzfXF
zdd3LH?Zf7dHj45+D~o80Ts!JDOio8am2^<_nVkr=7-PBaWJ!>4dXQ)Rfty)RM=+F2
z%gw)f<BmERmI!hj$o$I6i)n3=Wpj!X<NS--K-wXw<lId?cPt`{xY(uJ6%727qF--%
zWjeWTjOF^gX=J9XOHXOO`Co2XS=zg9RMy|-hv|BXZiqC~-JMoBb$2Nad-3ITF50nq
zBr933a(n7bMw>Q|=xI+|v@Q+vVNO~%{lnm%o?H3Q(J!l>W}>KZ=8H%siN<lx?1UEJ
zSg6sB?meF8>ZM4guqD}&c)E3?dvh?rmV*XO-f|6Bw4Cz1ZkgSb3Z9WCo6%W>TRiVL
zu*2*KyTC5e0a%TT@0`>OGyvFck*8(;%)&{;Nq~b?iX<#C$&RI_qF8NNu}4*OR6~dG
zu3Ju%t_|x(rctaBuQmR#*%s&x_m-6sD5%bn2IA2EV?1oHV;PXX(y4W$m!VgM+TY*q
zeT)FbxJ7i;$d)CeJC^?STPFPbKMP4Xvhia2Ul=8qj2^vA2-&M(d`FXYt2V6^)(-4V
z(WMETYhOmyys3izMg{JbwCKE(4o2FLyfoRRp{g|u%T}AYX*A1M#Zat_DyX)FJp-Ih
zUJ4SMKCx-(3Qg;1R%T1`CkM)_RzFkRqH_fZ)<kH)b~?Z)>%)AutVd5sy}oD}<9RJB
zHgs|4zc1X+?<%q@z>XOaghEiKq8;+>kxPKdtfSSU%xYK>MJ?-Iq3)ShP>M}+gB|1|
zEJQ_66JsLgMPs+ye$NNF3`?X4wVGzB&`Q&kAXY9&y+TRr^lbRJC%YWhmRBqhlbPn?
z=!(6*H1%`P<mGnRmsqGt9Q-8AKrY_gXgY&=o%AA<qTMjqq~&+@um%EWUPGZSV<n^z
z`yV2yURa<;-c`$zC+YIDs-cKNYGP@XcY6ET1+`MxOKNt%inxSmU&CZV6^&;@2mxJ;
z;ewD764Sva=ski*^O%rOd-q3?8rt5<hh{R$d~<VGZl=F>BX-)ZNLAj-Rwi1yx-<H!
zMdzd`GtBd#jHgbU9wg#Gr(;4<SZ(jdL?dq9TtzTHa0zwz^c#Ds34Dc3n-k}5g*~rU
z$?0zb#r`iX)5~&626dk%Elq98Sp^v<n$vG9R+cSBlLw<oBFIXy?kuv}Wh}OOS<niP
zzw4h|C+Gt`=a>I=%*xL!D)~EYO9gC{@b+yQ8!JxrNvyw>gtO6+XGI`V=zwFLY}Bl+
z3}mdDl})U8RI4B#N`;?(2(v#IAt5PgC}*u=8KEH}CAm<{rNa)IaOoT}GJPKEQCaq+
z>M;!%7X_6N)<k=xA(fZ-^mc~D3WcyxfqSm8Tr5XwYl?F=z~ogIhYjhP#14Al)|$0Q
zzq~Mqv|`W-2je;XA-}i6fVh((L4cyyqjss7N|O#tF2SRYZsh7bIkXx1?z*&$yib(#
z`EnN)S1v;UB9RR3XsoI{(#u3V)g?@j;A{hA&5o}fKINgraTjsUzWz7a^Fsh&KREr|
zT57Vi>^Gk2Ki-Xhn?^GJ-qeqsP~`nHI1K^nPzB9dOzs_he;kgPVkyYzha0B>26pao
z$FQ^f?|{gH=omm0z|MvQ5W`XA@c6;HSpP3^nsS(b7ywvrVh;`$J%ks#aPmVNA^4L{
zu)T_RI>;W_9FaJR_mEC;ya)2?M#SE<2PIwiG2UPT_TVDJBZ#6Ws|QXj`2av+2Tt}d
z;SQ-qhdsQ<Dc>(##Qw0y4fBELL+gqbwucN1Nw`sfP&pRxCjQcnqVM0zxA*(eFj9O9
z#5xNdt3@xl$!3#9<}(yrQ^jOB+*yO=2LzW^oj|7*={`Dqm|%5z!ro6HTzc7odvaYu
zMM-=tP8jON4i4|(#f4g(4#ROka6plJ9{v-8Y2&eQAuEeSKa;<{&iLODY%t$ug9!kT
zBkBu8K@2$sB^3uJmmF?Btm?oZ4hcv?9^^v-6haXcLkW~Zip<WN8K789SxB(<B-r^j
zYjbwcF0c#jBD;8MC@a#>#=9(t-wP+U5ZnVLH!syW3gKRRH2x=6AECPHN91WUT;F9F
zA^u=)0Z@v$dIa@WjiBc0+mUL-n_!sTgZKbuLt+3|AUQx#$QvNV$RFT|P%yyfqp)AV
zI|N5U6QhJgy}>9NU+SXxYKbQ)r4`#&A~hs+BRxb}kQt&)C>vtbC?Aqhs2GxqP&ugJ
Or*w_Ty#VeHNQwapF{0i8

literal 3200
zcmV-`41e=?Pew8T0RR9101SWt4FCWD02Iss01PPr0RR9100000000000000000000
z0000#Mn+Uk92zDDU;u(z5eN#MRG0z_9smJ00we=61Rw>30S7)C@DQV-c9B+evcE{M
zsi@5k{wB1`b`g%*NEFLhT+>=0f1s%UU_4V_al&UCqHQ&^MaV8o3g%)4U?o-{R%2vc
zWODVDUUtayJ~#eu+X+09fCC9M^Z@vSe0!6*Qt6c$=}SlGrEt5s0)cFoasFj_`jfu2
zId6a$LI8%+AEAna&FMV_h^u?rq(R_;1y}(7{nR0U!dj`UV|B<1S;=863gKS6U(+>z
zSmP(`p~h6m8i_=uVGf5Js;)*L1xh1bjYc@fVIJ;+Vyv8|=5v%D000$mP9_!H>d%&L
z?v8`=kDIKx$V0M}1tesNB0(5ngL3#Vwp=(14j^A21HerCYWSln4gd&zfYKhiRr^Mk
zf?dEv@~FmC^0Mq(BJrrmgaRlP%|Hi0ng~T5##iQIL)3@VqQpwh7yvwI{4<Q5&AFV(
z@pk**0V36~Pe3RgLtUba6D;8Vt+W88ykC|CJun${DaDx)k1G7GCoUrP%ncHDGY*A{
zP+VmMUrfeftBlVGDIR$vWhOMEnFB{mFIy;Jx3US$h|OY)X%S^3-prL5;UuOfQJ$iG
zUFtA@@D>Tn3^NrKuN{YiNaC`5BVG*|k1|>2x=ad{l}dyM@S5>oI*vA~KztmQkVveO
zKS&Wq8M64b#LII5aj4h~RT%&P1c}eg;?pq9e=bAAfkFdu0m(cXX4$ue`Q-b2p!<*>
zvIArn`<~|bgbB~0SZ{jB5fL>#U}z|s9<@9U5C5no{7!<1aDDl1de@$p<sz5Acx_n@
z#K{*#81WKPATycc#j!*M(x55_gA`2S@xcV21^{adzE#XYcsjgh7$%E*!9{LW;Fy}(
zNbJ3vs0Gr1wN-;WKIF!nbL==wTHe29&N0Q1BFd114|E7p_c>N2201hj1Nq8|$9vIs
zX*}%e#bn6%p8GFvZtkmffh4#Qz*aEk=2=c3lJYDKE#>CF^}<nNfUNb0)BBH9u)g;Y
zKFzn_4O$>a+A{|E++|cX&>CrzQ(&O|NQZPjlC^s&T}3Um=uLjuLzr^xa1SQE{|KJN
z0Cdj%oNjvXSQBi(d%j1~h77H)GoFs8X`lBYbBKCQw5k!CeCK_K(X+a-+NlzzoMXLd
zN<VypyHH^8vBSu2t{GfOo6AJ?sfwc8FSEC2fZAI%Iw9ER;Ba6_Si|#&=`~wlxnVz$
zx6n<8R?@+ly)&JYAIh!B<7{kYE$;URICt)_mN8^wMvyuj1QUNd3`{xpc$a2p<MG16
zWyDHQHLrES2yVnLUa>tPYxYqZ9s@G#k+<v99mDCq0@-^&ra<mo7+=vfwly2*<`IFk
zvpgi_aN;3FaFJ^dc@-QwMD72&nWtMIk>`;!8!v7hFhJ%_jdx=_r*J$_@=+kS%`)f}
z<S}m#oFT^ISqlsjy?T&z3m*Q>^z5VRG~~|HS?!I^GObppb2bC}7ROJomp>K0%YLJO
z<p6{^__rgwx}W^5bD1IcA7)~{9w!d+#)s(*%+XK<Otc0PC4&N~=WG3BS4lA_vP=-~
zlcc(w4i`@ml1-j!V!cI*A*lo;l9Utp_8psxjW<;R*>R$rgH^5e$)g!+p};Nk@Kc@<
zAwj$VLFl`mNi>iuT<{>i(q3DfI1*vlzz~6|{Qx#JD~@ZP*X0~<RuRCkvEXB2n}zWQ
zhSY!u7$^}mdi&rB0%{Is_vyJUON=Sh-5XIs5PYrkJQIdR&hsrh)(ow_uC8XMn${9w
z3@a|gWm*2KyRxHt$pK}g)jpZg+$YST0ss&Mj#6TXO(|mBo6LmDYKc|3QoT(L>UTz%
zFVgOdvKRvvQRWeg0w$M~Ob%db!5Dz5WlVm4=n1X%4{Mv>Wo8q#Y9$#7jzjF__f=6g
zabD*HVj6pp6G(qa_(J-N&S{e~Vsd6cANP9<@M#K|x};fA-x;1SwO@XDEBEr~a{W(f
z6?4yZBoiB1H8ny?OH8qufS=44kXfuLgq9M*54aJy^UF0!yUlFF=mMoYy)&n#;@3HC
z`SC7Uw$-zLFX$StH!G;{O%_^D+_vW4w$&4dcdxlPS7M;~1_{+c@jF&v>y-;ZFl4oj
zD=B!Z)x^=2_eNJu9NM*d-@%ESLzRKelg1`Fe2BP+5f)E+C5FTo=C;|Tnxx&POf;RZ
zl&5!O)t3J<yDdM~In$<k4p7pX<>{GXCqt9I{`&LinCC|an)C*3gj^$A+5e3Rjf``T
zpZT(eOm&sUZ=6#%(0%6jS#wYR`bnEN*EUt;@L|l8Q;1|@%A8nl{L8bE0D~<o<pm)s
z4;{Lt!X)eBcqt4NyIOg&YUHZT{=pG1Y%wkjKW*U4kA^x}3;sJ2G2R4`JH;gMSpVOF
zG(yaWO2DN2w}%k!IJ8g*z6gv*8okUApv}_}qSf>7(D`2W-&JGPF0}Pte{jIq+I*nC
z-(SLFm88aQaFp6rI%`ChrUsF0LAZ_P>Ef+o0($Zm_S)e5=FHn~*fSbY(WrzCk){i@
z#W-7zVAtoo5)PeFK_U3s#@*-QUT4ruMYhQa@4Q2t@1|*NJ8|yf>s%z<pmHI_UhtX5
zf0V>M)jAS}!lp|LS<vckvpze>T|pr9M&JWZC5X7@75|THtTX(!V^hP~CR}=D&8)5C
z7f=}c{O<^4pm>Ql>&^K>Z{O=n4#4r>%cEsf-`dMM-`s0qO7})F8wj|3O_X27!*H9&
zue>}>T|WP3${l`a5z9~#*Q$f<D+Xf5_pfNjGi4IjfD}dLkvf|aO8&yriH|jD{C9~C
zt~uxS$q}3*%@d79BIm*=AGyRnT)xo%^lqCK_CjLq-{5+5U@^j3Lh`n4Fp`7_>8y(o
zK=e!hjJlv~UBrkJX=|m8n<uacH*pN`46>ddKu@#`w;=uhT5lbCS4!rl^+oacwFblM
zw|BxlMO1<ZiA~~31fri0(imCoCdBEpwepxjy=jyk?UoYNz$b(j5mpd`=0QmgDr<6>
zP5#bh8U3P~1mFWsn>tLH**Kw48qE?}{C3OfdmzDb2nY*BP`jmiV-EB4D+Dr2r6PkC
zf!w>}vTVg-LgsU3J%(jrxHgL5Nl;{#hrnn}Erp_`Za5Z@p>0)Ib<cuO9T@AvmAkjy
zNPow%K+vKv^OvSCELkj9)9C4Ci~eU}5a!@(Q_WPWoQ71!MB^8$g)^L1T#VdQ`yd)2
zp!(C_?DWTX&DGI-2dJvi@7gp0?)`=&c^IJhfcN*UUi|H(x-Q|V6X`5yZX5<<kfL;s
zh9HBp^}`(h%&_?`Jde;wgyj(&rm&bs6SA8#62(Tg&qmmEp>#PRlZY+3uP&R)CMh^`
zrzkjB>}Yp@R%vXW8)bS6P0p*=2;A~6%3kZ_-rN|_84*)$-x+|Cn3q^LbNOgluDuBh
zfipRRFSA^(yIcbmjo3~svIEM+OGvJ(_2?{Y7OK|iiZ8&tXKBUOwy9IwmK-vkXPJ}|
zvnnOUd(GCmLrY{ji#wXqzxdF<53{jE%S2tuRha0I#KoLJ8K19aKm_xZI>Blm@89Xa
z6zixX7L^u9sCA0J-1FrCKm7m9KLS2(=-<7{^+Wg7HkZ8tNk=4cVHIz$MW@Y(@8`w1
zyM+1UiATii!rENAuS&bAl;WY;F+IhF%~fV9bB)<m`a}9d@`5dF0l)|v<Kh&@nj#bm
z97Ti-0u@Ls#}_CI0l)?T;n_L6`?{&%lp`BK0Kjwczcq3!<OjZI9|rCTn%Sj%?u-rq
zHU$8b00f*tdFu<1k_DtFMh$=pRl$c~I7R0s3wHCv2G~{#y$~k&^TYj4Wor3Ws)iWZ
zq!@r~GL+Is`K6T}Q@*|dVkza2@?HbV+A#x$RltCw%LxfyIv${?dO5_~g$xiSjYG<7
z4X7yN5JTm!3^=CPg!sY=02&P%b!k?mLZwy=2PGUalstIy=7PzSsiQZsRNn{wmvgkl
z@z-ksd&)X}LumuZ=ixo3Q>H?jTE&`y&mS(qsB5WSs|`r1P}VNGiCG!`;9@r`d2;2)
zwTILPcncNiTbnD&7^RyB<KGvXt0+BP{ahbp+h)JGjPYhIs`?=@JZhBOc;X%gct(VI
mczC*b8pmX+i6N9u$Dk6VKF{QBB4QF!#_ZU0;K+p%0002c?*#S$

diff --git a/css/font-combodo/combodo.sfd b/css/font-combodo/combodo.sfd
index 102234437..ee4bb1e16 100644
--- a/css/font-combodo/combodo.sfd
+++ b/css/font-combodo/combodo.sfd
@@ -21,7 +21,7 @@ OS2Version: 0
 OS2_WeightWidthSlopeOnly: 0
 OS2_UseTypoMetrics: 1
 CreationTime: 1463745065
-ModificationTime: 1506001058
+ModificationTime: 1522325525
 OS2TypoAscent: 0
 OS2TypoAOffset: 1
 OS2TypoDescent: 0
@@ -35,6 +35,7 @@ HheadAscent: 0
 HheadAOffset: 1
 HheadDescent: 0
 HheadDOffset: 1
+OS2Vendor: 'PfEd'
 MarkAttachClasses: 1
 DEI: 91125
 Encoding: ISO8859-1
@@ -46,7 +47,7 @@ FitToEm: 0
 WinInfo: 0 31 10
 BeginPrivate: 0
 EndPrivate
-BeginChars: 256 11
+BeginChars: 256 13
 
 StartChar: zero
 Encoding: 48 48 0
@@ -940,7 +941,135 @@ SplineSet
  815.574 32.7998 814.774 33.5996 813.175 33.5996 c 2
  810.774 33.5996 l 1
 EndSplineSet
-Validated: 524321
+Validated: 33
+EndChar
+
+StartChar: B
+Encoding: 66 66 11
+Width: 1024
+VWidth: 0
+HStem: 0 59<210.859 353.111 670.997 813.141> 103 28<483.475 540.525> 326 280<245 398 626 779>
+VStem: 87 62<121.402 265.716> 415 60<134.336 199.804> 549 60<134.336 199.804> 875 62<121.402 265.716>
+LayerCount: 3
+Fore
+SplineSet
+376 606 m 0
+ 420 606 456 571 456 527 c 0
+ 456 514 l 1
+ 458 444 l 1
+ 566 444 l 1
+ 568 514 l 1
+ 568 514 568 524 568 527 c 0
+ 568 571 604 606 648 606 c 0
+ 677 606 704 590 718 564 c 1
+ 719 564 l 1
+ 754 502 l 1
+ 781 491 803 472 817 446 c 1
+ 818 446 l 1
+ 914 283 l 1
+ 929 255 937 224 937 192 c 0
+ 937 87 852 0 747 0 c 0
+ 666 0 594 54 568 131 c 1
+ 555 114 534 103 512 103 c 0
+ 490 103 469 114 456 132 c 1
+ 431 55 358 0 277 0 c 0
+ 172 0 87 87 87 192 c 0
+ 87 224 95 255 110 283 c 1
+ 206 446 l 1
+ 207 446 l 1
+ 221 472 243 491 270 502 c 1
+ 306 564 l 1
+ 320 590 347 606 376 606 c 0
+282 326 m 0
+ 208 326 149 266 149 193 c 0
+ 149 119 208 59 282 59 c 0
+ 355 59 415 119 415 193 c 0
+ 415 266 355 326 282 326 c 0
+742 326 m 0
+ 669 326 609 266 609 193 c 0
+ 609 119 669 59 742 59 c 0
+ 816 59 875 119 875 193 c 0
+ 875 266 816 326 742 326 c 0
+512 204 m 0
+ 492 204 475 188 475 168 c 0
+ 475 148 492 131 512 131 c 0
+ 532 131 549 148 549 168 c 0
+ 549 188 532 204 512 204 c 0
+EndSplineSet
+EndChar
+
+StartChar: b
+Encoding: 98 98 12
+Width: 1024
+VWidth: 0
+Flags: H
+HStem: -1 35<183.649 347.721 676.937 838.822> 198 25<478.803 548.794> 294 234<470.756 555.897>
+VStem: 75 44<83.375 145> 414 42<83.6665 369.146> 432 24<255 473> 569 42<83.6665 369.146> 569 24<255 473> 906 43<84.3258 145>
+LayerCount: 3
+Fore
+SplineSet
+352 616 m 0xf080
+ 390 616 423 593 420 563 c 1
+ 422 488 l 1
+ 452 468 454 441 454 441 c 1
+ 455 305 456 159 456 12 c 1
+ 453 -62 369 -121 266 -121 c 0
+ 161 -121 74 -59 74 17 c 0
+ 74 20 76 22 76 25 c 1
+ 74 25 l 1
+ 106 196 l 1
+ 106 196 l 1
+ 113 235 143 270 188 292 c 1
+ 186 292 l 1
+ 206 408 l 1
+ 206 408 228 457 274 487 c 1
+ 282 570 l 1
+ 284 570 l 1
+ 287 596 316 616 352 616 c 0xf080
+266 114 m 0
+ 185 114 118 69 118 14 c 0
+ 118 -41 185 -86 266 -86 c 0
+ 347 -86 414 -41 414 14 c 0
+ 414 69 347 114 266 114 c 0
+514 408 m 0
+ 554 408 589 384 592 353 c 1
+ 592 353 l 1
+ 592 135 l 1
+ 592 135 l 1
+ 590 103 555 78 514 78 c 0
+ 473 78 436 103 434 135 c 1
+ 432 135 l 1
+ 432 353 l 1
+ 434 353 l 1
+ 437 384 474 408 514 408 c 0
+466 138 m 0
+ 466 118 489 103 514 103 c 2
+ 539 103 560 118 560 138 c 0
+ 560 158 539 174 514 174 c 0
+ 489 174 466 158 466 138 c 0
+672 616 m 0
+ 708 616 737 596 740 570 c 1
+ 742 570 l 1
+ 750 487 l 1
+ 796 457 818 408 818 408 c 1
+ 838 292 l 1
+ 836 292 l 1
+ 881 270 911 235 918 196 c 1
+ 950 25 l 1
+ 948 25 l 1
+ 948 22 948 20 948 17 c 0
+ 948 -59 863 -121 758 -121 c 0
+ 655 -121 571 -62 568 12 c 1
+ 568 159 569 305 570 441 c 1
+ 570 441 572 468 602 488 c 1
+ 604 563 l 1
+ 601 593 634 616 672 616 c 0
+758 114 m 0
+ 677 114 610 69 610 14 c 0
+ 610 -41 677 -86 758 -86 c 0
+ 839 -86 906 -41 906 14 c 0
+ 906 69 839 114 758 114 c 0
+EndSplineSet
 EndChar
 EndChars
 EndSplineFont
diff --git a/css/font-combodo/font-combodo.css b/css/font-combodo/font-combodo.css
index 07a583cda..bf60a2766 100644
--- a/css/font-combodo/font-combodo.css
+++ b/css/font-combodo/font-combodo.css
@@ -1,8 +1,8 @@
 @font-face {
     font-family: 'CombodoRegular';
-    src: url('combodo-webfont.woff2?v=2.0') format('woff2'),
-         url('combodo-webfont.woff?v=2.0') format('woff'),
-         url('combodo-webfont.ttf?v=2.0') format('truetype');
+    src: url('combodo-webfont.woff2?v=2.1') format('woff2'),
+         url('combodo-webfont.woff?v=2.1') format('woff'),
+         url('combodo-webfont.ttf?v=2.1') format('truetype');
     font-weight: normal;
     font-style: normal;
 
@@ -187,6 +187,12 @@
 .fc-closed-request:before {
   content: "3";
 }
+.fc-binoculars:before {
+  content: "B";
+}
+.fc-binoculars-alt:before {
+  content: "b";
+}
 .fc-combodo-icon-o:before {
   content: "C";
 }
diff --git a/css/font-combodo/glyphs/B.svg b/css/font-combodo/glyphs/B.svg
new file mode 100755
index 000000000..d1a20a22c
--- /dev/null
+++ b/css/font-combodo/glyphs/B.svg
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg8"
+   version="1.1"
+   viewBox="0 0 264.58333 264.58333"
+   height="1000"
+   width="1000">
+  <defs
+     id="defs2" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer2">
+    <path
+       id="path4516"
+       transform="scale(0.26458333)"
+       d="m 363.57227,214.44727 c -28.72645,0.0164 -55.09978,15.88172 -68.57422,41.25195 l -0.53907,-0.18164 -34.7832,60.49414 c -26.17161,10.74972 -47.91781,30.06712 -61.67773,54.78906 l -0.51367,-0.125 -93.94336,159.60352 0.33984,0.0918 c -14.914544,27.26255 -22.732489,57.83851 -22.734376,88.91407 -3.76e-4,102.32848 82.952766,185.2825 185.281246,185.2832 79.57685,-0.18509 150.14836,-51.16271 175.33008,-126.65039 12.75761,17.44216 33.06009,27.76494 54.66992,27.79687 21.38684,-0.0322 41.50695,-10.14508 54.29297,-27.28906 25.33697,75.22798 95.78021,125.95807 175.16016,126.14258 102.32848,-7e-4 185.28163,-82.95472 185.28125,-185.2832 -0.002,-31.07556 -7.81983,-61.65152 -22.73438,-88.91407 l 0.33985,-0.0918 -93.94336,-159.60352 -0.51367,0.125 c -13.75992,-24.72194 -35.50612,-44.03935 -61.67774,-54.78906 l -34.7832,-60.49414 -0.53906,0.18164 c -13.47444,-25.37023 -39.84777,-41.23555 -68.57422,-41.25195 -42.90975,4.5e-4 -77.69486,34.78556 -77.69531,77.69531 -0.7247,3.23852 -0.16993,12.87304 -0.16993,12.87304 l -2.25,67.8418 H 443.6875 l -2.25,-67.8418 c 0,0 -0.20029,-9.98923 -0.16992,-12.87304 -4.5e-4,-42.90975 -34.78556,-77.69486 -77.69531,-77.69531 z m -92.14454,274.125 c 71.79702,0 130,58.20298 130,130 0,71.79702 -58.20298,130 -130,130 -71.79702,0 -130,-58.20298 -130,-130 0,-71.79702 58.20298,-130 130,-130 z m 449.45313,0 c 71.79702,0 130,58.20298 130,130 0,71.79702 -58.20298,130 -130,130 -71.79702,0 -130,-58.20298 -130,-130 0,-71.79702 58.20298,-130 130,-130 z M 496.1543,607.14258 c 19.72489,-3.1e-4 35.71515,15.98995 35.71484,35.71484 3.1e-4,19.72489 -15.98995,35.71516 -35.71484,35.71485 -19.7249,3.1e-4 -35.71516,-15.98995 -35.71485,-35.71485 -3.1e-4,-19.72489 15.98996,-35.71515 35.71485,-35.71484 z"
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:3.77952766;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+  </g>
+</svg>
diff --git a/css/font-combodo/glyphs/b-lowercase.svg b/css/font-combodo/glyphs/b-lowercase.svg
new file mode 100755
index 000000000..08dac675b
--- /dev/null
+++ b/css/font-combodo/glyphs/b-lowercase.svg
@@ -0,0 +1,280 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   id="svg8"
+   version="1.1"
+   viewBox="0 0 264.58333 264.58334"
+   height="1000"
+   width="1000">
+  <defs
+     id="defs2" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     style="display:none"
+     transform="translate(0,-32.41665)"
+     id="layer1">
+    <image
+       width="262.41626"
+       height="211.46167"
+       preserveAspectRatio="none"
+       style="image-rendering:optimizeQuality"
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAM4AAACmCAIAAAAd2iekAAAACXBIWXMAAAsTAAALEwEAmpwYAAAA
+B3RJTUUH4gMdCzQSNk2I5QAAIABJREFUeNrtfedzY1eW38sBORIgwZw656BuqZVG0monWJ71zrp2
+vVV2+T+Zv8Df/Mku22Xv2ju7W5ODZqSeVufMJruZMwkip4eX8/OHR6JBACQB8IFBwlWXSkKTB+fe
++7vnnnPuCaBhGEB7tEfrB9RegvZoQ6092lBrj/ZofCCH+N3VaiIIgm1Sx4jU8YCaruvlMwdBsOkJ
+t0kdCqljADVja+z/bLVJHQqp4wE1o2yUptrc2WqTOhRSxwNqhmHoul4x4ebEeJvUoZA6HlAzDEPT
+tAoZDkEQBEFNrF2b1MGTOh7ODnPCFWdrP2vXJnXApPY/wAN4mNJ1Xdd182yVpDcMwzAMNzrhNqlD
+IXU8LlBztqUJ7+dgtUkdCqnjATVd11VV1TRt250NQQiCQBDUJnX0SR0PqJUmXG74wDC8n7VrkzpI
+UscDauUCvKQrmBNuSICbhnrZ2hmmkV6TlKppHMfn8gWaYSVJ0jQdhmGCwF0ORzDgI0kCAIA6SVnI
+VfXK8LyQzeWLDCuKkqZpEASiKEoSuM/rtpGkqUsdMFc7EbTwtm0J1Mw5lwtwENzXXaCqKgAYO5Ey
+DIPj+Ew2n87mkunMRiyRKxR4XlAVDUZgp8Pu93p6uyPhcDDg87jdLgSBwdZzVT1UVU1nc6l0NpFM
+rUfj2VyB5TlVVWEYJgnc63F3hTtCHYGA3x8KBjwe98FwtdMOHgOpZhrYFQIcgiAMw/a/dgAAQhBc
+ImUYhqppDMPNL67cffB4bOJNPJmuuUwIDPf3dd+8dumD926Egn4MQ0EQKidlIVc110SWlVQm++e7
+Dx88fr64sqaqaukvAQAwoQ+BYDjUcfHC2Y/fvzk6POhyOuq3FpvgapcdNIe1Pl6LnR0lR47pyzE/
+bFrnkGVZ07TytUMQBEXREilFVReXV3/1u6+evRxnGFZWlApduHygCGwjiUhn+D/+h78eHRp0u13l
+pCzkqnqwHD+3sPjf/tf/i8YSHC9omrq1Nm9xtqm8wzCKoi6n88bVi1/84LPhwX4EQVrE1e44K8kI
+q7AB//SnP7X23jS5tARnul65dgiCwDBs/r8gig+fvPjFr//w6vVUvkApirLzsTEAADB0XVYUhuM2
+YomOYDAYDJAEYTlXtXDGjb+e+t//9PPF5TWOF0qxFRU4MzbXEFBVTRDFTC6fSKZQFA2HO3ZHW3Nc
+7b6DrXi5QizEWfkwWTQVhaZ12+q1K0FW0/SnL8a/unN/bGKS44XdSZZ21DAMUZRm5pfuPnzqcjkv
+XTgL1cdbnVzV/MX5heXbdx9Nzcxvl7g1cFb6QNf1XL4wNjEJgCAEQbduXqv5FU1ztcuN1AqDoFVQ
+M0+DYRjWadwgBMHld4GqatFY/PY3D1+9nqofZ6Ud1TT9xavXvd1dgwO9XrfbKq5qjiLNjL+ZeT42
+UT/Oyq/dVxNTCIz09kS6I51IlYhqmquaEzRHSZJZ/hhvzU1c8cq2n3tzT93WAABBEP54++7M/ALL
+co3izPyAKtILSytLS6ut1rgXl1YWlpapIt0ozszBsOzM3MKf/nxXEITW2QElnJV5DEDA6lA2yBJ5
+VkkUgmAYbk4/q1g7BEEq1k5V1VyhcO/h02wu3xzOzLEWjU3NLljF1U5jam5hbSPWHM7Mkcnl7z54
+ms9TZUbrfrna3eVruUFgpVQrZ7Hpt+GddNuKOVNUcWxikirSqqo1jTMAAHIFKpZI7m6A18/VTocw
+Fk/m8lTTODOPVqFIj72eKonGfXJVjbNyd4EJsla8k1oDtfJA9UYZNbVRRVG2H6wd145m2Zm5RVlR
+9oMzAAAEQaSKNMvxNdHWKFc1KXC8QBVpQRCbxpk5ZFmemVukGXb/XO38tPBWWLQoZBKyVqQ1F4NQ
+rdvCMIyiaE3pyPPiWjS+s/+s3h3VdV2SZJ4X9FpQa5SrGhQMg+d5SZZ1Xd8PzgAA0DRtbX2D4/j9
+c1Vrgtu2r3WhH4hVIGvOZmlCtxUEIZlMaZq+H5yVLW4Nji3RuLf0anCfODNN5kQqxQuChXZACWel
+vTM17NaFGFkGtSZYbMLHraqaIIgUzZSbS01rQjAMEQRewbmFnncCxyAI3CfOTJaoIkPTjCzLJsH9
+cLV9ggeEM2su0P3grFHdlhf4Ik1bgjMAACAIJnDcQjugQhmCwE2xth+cbTGmUTTN8fz+7YCqCR5Q
+aO4hBDDtR7flOH67j2o/OIMQ5G10jbUat6ZpqqqCIABDm06f/eDM/G2aZrb81c1ztX2CYNMeg0O7
+QPdvB9Tp42Y5gSoyFWsIAgAEQQSBEziOoihi/oNs7rGm6aqmSZIkipIgiqIobc4chjEULS2xtZ73
+kiaEoQgMw9qmGAYJAicJgiBwHMcQGIFhaOvnNVVVFVVTFEWSJF4Qq59KizTD84IVXL2dYHOi8XhA
+bZ8aN8dzhWKxJPYRBEZgGEVggiAiXaGOYMDrcbtcLpfD4bDbMBwzDEAUJZ7nM5lcIpWOJVPxREpR
+VFmRURTFMMxCO6AmKQzDMAwFIQjDMAxFO8Mdkc5QONTREfDZbDaSJEAQkCSZZXmG41iGo2g6nc5G
+YwleEBRVVVVV2wrdpmmaFwRLA58ONAQcOWCc7VPj5li+SG1eoJFwcLC/d3Cgb6CvpzsSJkmSwAkc
+w2AYBiEQAkFg62Y0DEPXdE3XJUnKF6jZ+cWnLydiiSSGodbaAdWkMAwNBQORSOc7Vy6dGh32et04
+jsMQBMHQWx3XMHTDMHTz37qqabwgrq1vLCwtLyytLq+ubcQShmFQNCNKcnM4s2qCxwNqlmjcsqI6
+7PbPPr51YmSwKxzyelx2m81ut5EkgWP4nmEzhsPudjn9Pu+pEyP5AkUQhLWe92pSn338wYe3bvp9
+Xp/X63I6UHTvOBfDMBwOO46hnaHA5QtnChQdT6Rm5hZ0w9A13cJwrANONTiIPNCSY7r6zc6ccP06
+6fLq+tr6ht1GdkfCDrttC1gggiCCKDEMy/G8KMmyLEub5xhEEJjACZfT7nG73S4njm9empIkq6qK
+IPD+udplgqqqISiCY2+/tEgzVLFIM5woiaqqAYABwzCOYRiGEThmt9ucDgdJ4CVSqqZxrBBPpThO
+6O3uGujvPfhlPzZQM82xao27ibtA0zRFVTVVBQBD0zSOFxiG5XhRkuVMNp/J5gpUkRMEQRAFQVRM
+xRxD7TZbwOcNBQOhjmAw4PP7vF6vG0NRC7nahZRhGJIk5wtULl/IZPOpdCaVyWbzBY7nZVkBAABF
+EJIkSJKwk6TH7Qr4vV6P22En7Xaby+l02O2mWtmoU8nCZT8eF6j1Grciq6omyXKRZlZW12fml5bX
+NpZX11mW3fUBHgAAwGYje3siN69eun71YmdHEMVQBIastQMqSKmqxgt8dCP+5Pmrxy9erUdj/F4B
+dggMOx32/t7uwYHe0ydGhocGgwEfBMMoghzKsh8PqVaasGHoVmncLMctr64/fvbyzfR8JpuXZVlV
+NVXTavl1a3ibERjGMMzvdb9348rH79/s6+221g6oILW8uv6nP9+7++BpvkDJsqxuf9veyUFo+u4R
+BMYwvCMYuHj+9AfvvTM80Oew24+RHXBwUCsFDpTem5uOeTfXLpfPT88uvHo9tbC0ks0XijSrKEpT
+7Bsogvh93lOjQ7duXrt66bzD4WiaK12v7fIVJenJi1d37z+ZmpnP5PLlD9u746zcEQ2CIIZibrcr
+GPCdGBm6dun82VOjXq+nOa4aneDxuEC314ww9uPj1nWd4/jpufnXkzPTswsra9Fcgdqn511V1VQ6
+IwgCy/OSrNy4djkY8Ddh6OwU1J8vUM9ejn999+HM3CJNM3VyVf3gYRiAJMvpTDadyabSmVg8sbyy
+dvHC2ZMjg6b21hBXTdhzxy7lGARBoDkftywr2VxuZnbh/uNnE5PT+UJxK+aneZyVfrPIsONvZnhB
+8ng8NpJ0OOwNCeydnhZYlpuanf/l7/40v7isKGrTOKv4oWyukMtTyyvrG/Ekw7wzOjLk87jLk6ks
+fPBoxV1nZXJeictaKcfNKKSyoiRT6YdPnv+fn/18em6B44X9vyRW7KiuG5lsDkVRv9/bEQiUxU00
+pnHD8OYENU2fmVv4+s79x8/G6lEfG33A5QVhZS06PTvvdrn8Xi9BEuaq7s5VoztYnpF0RKFWXjvu
+rSberMa9vLr2mz98/dsvb+cLBU3TLcdZ6YNEMk2SRF9vt3MvwbaTxl3a0VQm+8fb976680DZLU64
+SZyVFpkXxPnFFVmWwx1Bj9u1J1dN48xCqEHW4qwcZJtYbip1SpaVuYWln//6ywePnxeoYktxZoqK
+2fnF15PT+/e8T0xOz8wv8oLQIpyVfGb5AnXn/uN/+dXvl5ZXBUGwKvCpInXKwgFZiLOKlOOmy+kI
+gri6Hv3dl18/fzmezmR1vbU4M790fSM+NTMvSXLTqQamq3ZqZj66Ea9D19l/aK6WTGWePBv7zZdf
+r2/EJEneP85Ks2uFrmY91EoXfClwoCGoqaqaSKXu3n985/7jTC5fllzaKpyZgyoWV6Mb8UTtUPJ6
+gvo1TY8nkmvrGwWq2GqcldY8ncl+/c39h09eZHN5M2G46VSDas3nW55yXKTp15Mzv/zdH1mWOzCc
+mfZBLlcYe/2mWseq0/MuK8qL8clcvrCXSLAGZ+Zv64bOMNwvf/en6blFXpDaKccNeERfTUzd/uYh
+y3L6AeLMHAzLzS0sK9t9rfUn96qqOrewyLDsgeHM/E1d1xmGvXPv8ez8UjvluF6cxROpqdn5xeXV
+g8cZAACiKCYSqfK0v4YicDRNSyTTwlaU78HgbPOrdX1ucXl6diGTzTeBs+9iyvHU7Pz84jLLcQeP
+M9PszVNF8x5pItVA1/UCRZvBGgeJM2NLJM8uLE3NzDVkbH4XU47NmPqpmbnoRvxQcGaKJUEQNU2v
+Gem1u8ZtGIam6YIo7pAL3VqcmR+srkUnJmckWa7Hfjz4lGPIKpA1dxpKE9Z1LZ3NRTfihc2EqIPG
+mfnzmq6bkqzRCBzdMBRF2cEjdRA4AwAgV6BW1qKZbH5Px1jpeFfcmy1NnYIOV56VNG5VVReXVhiO
+OyyclaSTKV8bLvJTVgfvUHBmDpphZ+eXlF2jSKoNnYNJOUYswVlz/pFyjVtVtaWVKMsJh4kzADAA
+wCyoC8OQKEmZTG51fSOZzpmFZCRZBgCAwDGnw+73eTvDocH+3nBHkCBwwwBM3+ch4gwAAJbl5peW
+b1y7BOB1LXvJM3UAqaCH03q2OtZF0/SNRHKraM/h4GzTU6Vp+QIVjcWXVtY2YslUOlso0gzLCYKo
+qGZ8NkqShMvp8Hk94VBHX09kZGigr6frcOWZOXhBWI/GNU2tb9m/eynHAABqupHO5MS3ryuHgzNV
+VVfXN6hicfzN9PTcYr5AVZNSFJUXhFy+sLIWBQDA7/OePX3iyoWzPq+nLOL8EHAGAIAoSal0RlHU
+6lCzdsrx5qqpmkZRxfqiIVooOURR+vWXX61H41Td1kkuX7j74MnE5Ex/Xw+/71Jq+5ygLCsFiuIF
+0avr5TG3RyHlGDpgnNX0vGu6nspktIYDCqzfUVVVZ+eWaIZtlBRNM1PTc6WpHQrOzKGqWjKVEcs8
+yRZWMz0eUNvF8y7LSiKZ3qFk2sHhzFRo5E2fRcPWtKIoZrbOIeLM1HqTyXQJakcn5fggLtA9Y95F
+SUqk0pquHS7Ovh2kdF1LpFKCJFqeanAMoLZnzLsgSolU/VKtjbM9pFoilREE0cJUg+NxgdYTgSOK
+YjKV0euSam2c7QU1XUumMoIgHrWU4wPrcrxb7qsoSvXpam2c1SXV4skUzTDVdsDhphxDB4Cz3SMj
+ZFlmWJZhuL1e7to4q4+KrjMMw7BcWb39Q9PPDgJq9accc7xQoOi9kr/bOKufkKGoKlUs8puFc/eV
+cnzUL9CGUo5phs3lCuWfmDXeUQSFERiGIBiGYRhCYEiUZEEQpM2AsO8iznAMs9lIAsdVbXOomqap
+mqIqZsh9iVQ+TzEs5/W4j07K8eF3OaYZJlsoQBCEmhVsYRhFEYLAXU6nnSQJEicJgiQIG4mvrseW
+VtbS2dx3Vp55Pa6R4YH+vh6eFwRe5AWB5wWW52mGEQTJDH/SVFVR1XyhyLD8kepyjLQCZxUBxLun
+tDAMR9NMwOc9fWp0dHigrzsSDnX4fB4IBE2naCkQ7pe//dNGIvldvjdxHD8xNPiTv/pReR6kruuq
+pqVS6UQyvR6LLy2vzs4vMRwriuI+U46PrlRrLuW4rzfy7/7N9yEIdLmcTodZaxRHUESRZV3HTGqa
+piVSmeXVaC5HfZf1s0wuv7iyli9Qkc5Q6YnTfA/AkM6A3zs82Hf98nmaZiEE7u2ONJdy3Iq+s4CF
+Ra9KJ6y8p3apy/EurMuyrOl6qbe1SURWFI7leIHnBYFhuWyu8Hpq7umL8Uw21zjD3x47AATBUDDw
+7jtXL5473RH0O512kiAwDEVguGyBQQRBFFVDywqj1n8jlX+XtXlTlkHNRFg5zswYlTp51Q2D5wWa
+YYpFhmYYlmUZlmMYlmbZfIGKJ9PziyuyrHyXcVZCAIZhp0aHIl1hn9fjdNgdNtJutxE4breTLqfT
+7Xa5Xa4mUo4ruhybYdUWijdroFZKOS5d89DW2PMkyYoiSbIgiKvRjenZ+emZ+eXV9UKBUlXVaPs1
+6iAFAQCCIF6vp7+3+9TJkXOnTvb39ZAkgeNYeQ+QenAGbE8TsdYPZwHUjKpRf6A6w3ATU9OPnr2Y
+mp4vULQkS6qiamZmYhtndZMCzVcnBEERBMcxr8d95vToe+9cPX/mlNPh2BNnqqqWp1eWUqeOnK5W
+Ic/qSWlRNY2m6RevXo+NTy6trqezOZpmzAm3/bT7JAWCAIIgLpezI+Af6u+9fPHs1UvnXS4XUqs6
+aSnluFw5s/zqtBJq5W9Ke+Isnc3NLSxNvJmenV9aWYsyDKuX+R7bOLOKFASCTqdjoK/n5OjQhXOn
+T44MlRdhNUXD1gv1W3lmVsA4ohZoCWp7poJqmhZPpl6OT95/9Gxs/E1Zues2OFpFyixqfuXiufff
+vX7l4tnO8KaXZPOxQVXLW8+2NEXPsgsU2LVMkmEYiqrm8oVf/PaP9x4+3Ygl2uA4YFI9kc4P33vn
+xz/63Of1wjBUSm03dTJo8wGwhalT1kAN2CsbVBDE5bW1//EP/zq/uEzTTJn/pg2OAyIFw7Db5Twx
+Mvif/u4nka4QhqJml2Pzumyi6OKh+dV2GRzPv56c/edf/HZ2Ycnsdd8Gx6GQgmHIbrOdHBn84gef
+nT45YreRpbypJoqUNTpaHvAtiuLEm+kvv747MTlt5ie2wXFYpDRNZ1h2YnKaJAld1y+cO00SxLck
+5dgwjMXltW/uP3n8fGx7Nag2OA6HlGEAsqw8fzmBY5jb7Tp76sS3IeXYLKD89Tf3n41NbK+Q0AbH
+IZMSRHFsYtLhcJwYGcIaeSfdz2ghnEVJun33wfibmXyBaoPjqJHKU8XXU7N/vvdElKTjDTVVVbO5
+wld3HsSTqbYdcARJ6bqRSKa+/uZ+Lkft2dzySEONKtIvx98sr66XXZ1tcBwtUrwgLq+ujY2/2SpQ
+cgyhZhhGKpO9+/AJLwjt94AjS8owDJ4XvnnwJJ3JHIDPqyVQkxUlmc5MvJne6hvXBscRJaUo6vjk
+dDKdkRuuAXU0oJZKZ1dWo1tetPaOHl1ShmEoirK8Gk1lsscUapmV1fWyDNA2OI4uKcMwVtajqfTx
+hFouX4gnkm2cHRdS8Xgqly/UROGRhpqu6xRFV7QFae/oUSaVzeWLRVovA1Yr8vOsh5okyRRNF5nq
+huVtcBxRUlSRpoq0LMvlOKvOszxaUDPdHBRVrOKyvaNHl5RhGFSRyWTyQCtTjq3vcpzOZKpcgu0d
+PeqkqCKdzmaPWZfjVCZH0XQbZ8eLVLFIp9LZlnY5RiyHWiabK9LMtwBnMAyRBOHxuB02G07gKAJD
+EAQCgKZpiqKKksTxAlWkBVFssGD0UYQsVSymM5nylGPLk6asgVp5ynEZ1I4rzkAQxDHM43b19XRd
+unB2oL83FPS7HA4MRwEAEEW5SNOpdG49Gnv1enItGqeKdJ396o6saCzSTDqTK1XraEWXY8QSeVb6
+D0VR8oUix/LHWp457Lab1658+vGtUyeGUQTRdR0ADAgCARAEAMBhh11OR19Pz5VL53/4l5/MzC1+
+def+42dj7GYvtmN5BbMsm8sXFEXBMKwVqe2AtaGRuq6nMlmO57Um9crD3wYIAp0Oxxc/+Oy9d672
+9UTsdpssy7oObKuxiqJmMD4AAHYbee7MSafTEe4I/voPXzEsq+vGcVT1NF3neD6VyUY6OxGkJXmg
+1kBtszSVrscT6aPQkqxpUhiKXb9y8d13ro4MDyAwbBbH273ov9NhPzE8AABGMp2+/+j5zpGGRxdn
+5hBEMZ5Md4XDx6DLsa7rsURKEKRjijMAADAMvXHtUqQzhMBw/V2OMQzr7uq8cfUShqHHFGcAAAiC
+FE+kWlRczTKpZjKn60YsFhcE4fiaYxAEuZzOapztWfQfRRCXy7nD3x4DnJlSLZZIaa1xqgHWdjnW
+dT0aT/KNXaBHaxtkWXkx/jqVyTba/CtPUS9evd6eFXZsXHFbUk2MxZI79Go+GlAzr3bDMGRZTqUz
+jaRFHLltkGTp7oMn9x4+iW7EdtHPKsZadOPugyd3Hz6VZOmY4gwAQFGUEqm0rCgtisi1zAJVFIUq
+0hwv1H0sdls7GILMSogYhqIoiqIIiiKGDqiapphDVXlBEEVJUazsi6hpWjKVvv/4GcOw58+cGhzo
+7QgGdsKZpmnZXH5xee3V66mxiTfJVMZycKAIQhA4SeAIgmAoUtIUVU1TVE1RFFlWJElit9UMaAZn
+AAComsbxPFUselyunZXOIwA1UZJT6exenS52nDAMw06n02EjbTab3Uba7Ta/12O3kQRB4Dhm/jF0
+QFYUSZJkSRZlmWZYiioWaUYQBEEQWY7jBXErcHlfx31peS2Xo1ajsYvnzwwN9HvcLhtBYBhaquEj
+y4ogikWGWV2Pjo1Pzi+uFKiiJThDUdRuI83y0zYbabfbnA67027DcQzDMBzHMBSDYVhVNUmRRUmW
+RJHnhWy+wPE8z4s8z7M8zzDsDg8Ye3Clqmo6nQ13dBxxqEnJdKa+s/V2wjAEISiK45jT6Tw1OjzY
+39vX293b3dUV7kD3Kq6p6zrNMMl0ZmMjEYvHF1fW1qKxbI6SFUWWFWNXB9ee21AoFl+8ej02Mel0
+Onq7Il2dHT6fmyQJU6fJ54vxRHo9HmOYmo60hnEGQRCGoRiKBvz+gf6eE8MDvZFId6TT43aiKFKu
+NcJwpXViGIYsK/FkKhqLr65vLK+uT88ushwnS7KiKmWY25srXdeT6cwJSQKcjqMLNUmUUumGW5IF
+A/6zp09evXz+3JlTLqcDRVEEhs0mLHviTJZlBIG7QsFQwHfh3ClV1Yo0s7oeffnqzcvxyQJVVOoV
+sTtug64bDMPOLi4uLK+UCtxt9prRNU3TLMEZgiBej+vKxXPXLp0fGR70+7wogkAQuL1tErBTSzIQ
+BDEM7enu6gqHrlw8ryhKschMTs++ePV6cmY+kUrXz5Wm6clUVhBbkoRspVRLpbJ7tY/dnDCB4+Fw
+6N3rl0+fHOnqDPu8XrfLiSBw/Q48s3MvCABmdRMMABEE8Xo8HcHAyNDgp9/7YOLNzIuxicXl1Tpy
+gXbbBl03dF1VAHU/kN3ZY4wOD/ZfvXzhwtmTAb/P53U77HYURc0Jbj9ru1knZr0+BIZxAAAA0mG3
+ORy2E6NDiWR6Zm7x/uNniWRK2jLXduFK0/VUKitJRxxqopTMZPTdpJoBAACOYd1d4ZOjw6dOjJw7
+c7Ir3EEQRP0+wz079xIE7vN6Bvp6QsFAb3fX5PTs1OzCylp0ZyXycIxEBEEG+nrOnBw5e/rEydHh
+3u4uE0Nm84B9tiZGEMTv8/q8nq5wqDMUDAZ9M3MLs/OLsXhy9w5duqYlM2nxKEs1wzAEUUxncjs7
+AA0IBEmCGBnqv3b5wtVLF4YG+5poS1Nn514Igvp7uyOdoVOjwz3Px+4/fra8us6wXJUZXwkOFEGG
+BgcURWEYluG4eh7ZSJJw2G0Oux1F4ZXVTUzvgjMQBJ0O+2B/7/vvXr9x9VJXZwhF0UYnWOdawTDU
+Ge4IhwLDg71d4Y7nY68Xl9d4QdzJnaHpejqTFUSxFW8G1kBN0zSeFwoUvYNZYEAQZCOI4cH+v/nx
+D8+cHnXY7ZbgbHcnPoqifb2Rzs6OkaGBn/38N6+nZjiO13ct8Gaz2//z3/8Nw7JzC8vzi8sb8aSq
+aYau67qhG/rbEuZmrUUIQmAo0hUeHugbGuhz2G3/5b/+d5pmdsEZBII2u+3sqRN/+9dfnD1zAkPR
+/UywzrUCQXCwr7crFBrs7/+XX/1+YXGZF8SaO6XreoGieV7QNA1BkKMINZbl8hS1E84AAPC4nJcv
+nP2bH/8wHO6w22zNrZ0sy3s2TK7pmjp75oTDYfvtH29/fecBzbC7XHYwBHWGOi6eO/3ejWuiKFJF
+OpXOUDRNMyxDswzLAwDgdNicLofL6fC4XMFAwGYjMBQBQTCTycEQtPu96XDYPvnw1o/+8tOB/h50
++142PcE618put1+9dD4SCf/fn/3y+dhEvtI7U462IstyHo/7KEKNZrl8ntoJZ36v58qlc3/1o8+7
+usI2kmyidlzJDmhCfQFBEEPR3p7I5598iCLoL377paIohrFj0X8YhnEcRxDYYbe53a5wR1BWFFVV
+FVU1K/YgCIwiiBlHBG9V+FdVDXrbGKD2vYmiyPc/+973Pni3rydSLc+anmBDa9XT1fm3P/kCgqBn
+L8dzhdq94XKFAsMdVagxLJuvwbcBAABJEGdPnfjo1s3B/r4m1m5PO6BOOgSOD/b3SZKcSCafvhyX
+JXlP5d3EaAXRliWkAAARCklEQVQmKrgqXXYguAXVHeQZhqHvXr/y/s3rQwN9BIFbPsF6SJn9qYYH
++z/9+JYoSU+evxLEGspoPl80Zb+1GptFUGPYXKFQjTMAAIb6e29cv3zuzEkzAqdFdkA9A0ORvp7I
+5598kEimo7G4JMlN25u1lSoY3okUjuN9PV0//PyTocFtOLPcDqiHFAiCF8+foYpMNld4Mz1bW6ox
+3BFNOaZZLpcvVlt2KIJ89P7NyxfOkgRxAHbAnqQIHDt9cuTWzWt+nxewFGcwDGMouhOtoN/30fs3
+z5056XTYD8AO2JMUjmHXLp3/9KNbKIJUi618nqJp+oimHLMsm6eoau/OyFD/YH+v3+dt2g5oNJhn
+T1I4hr1/81ow4N/lsmuCKxTFwM1LtMZFHOoIfHzrXQLHDmCCdZLyeFxDg30jwwMIXHmz5QsFhuUA
+q4cFUNM0jWG4YlXlQQzHbl6/0tkZanrtWqEmQxAUDPhPjg6HO4LN4WwHrnYEbqgjcGJ0MNQRKOf8
+wOyAHTcegkIdgVs3ruN4ZdllimZohrU8cM0CqNEMW6SZsqjAzR11OhyXL5zze70NqZamu9wM6t+W
+PNKUmlxNCgQhm812+uRod6TLUq52nGN3V+ep0REMQ0tPqC2dYP2kPG73pQtnHA57xU/KskKzrOWC
+zQKo5QsUw7IV9zqOYR0Bf093l81GNtput/6g/qZJDQ/0NyTV9sNVuCM42Nd7wBOshxRJ4JHOUDDg
+r+i7bRgGy3KFYtHaBwMLoMYwbPUDDkmSPZGuRj3OB6YmB4M+t9t5MFy53a6OoP9w7YAdHRAI0h3p
+IkkCAIytPwAAADwvMgx35FKORVneHj0BAgCAoojD5YCgxs5oS93l5aQIHMcxzMyHaClXEASZcZ0H
+PMF6JQ0IOh226pgaVVVr5UkcugVayyQGARAGoUbX7sDU5D1bl1rFVemLDt0OqE3KMGqaM0YLKsRY
+INVQZDMSeptZquuiJNXD7UG6y8tPrapptUQaCMMQCDbMFQgCEFxj10wikiybdWUObIL1kDIMQ1UV
+URTLogw3+UdgGEWP3nM7SRJ4VZ8iSZZzuUI98d8H7y4HAIBhOZ4XKg6umWJotsVslCsQgkqPP8b2
+Sp8sx1FU0emwH+QE6yGlaZosy7l8ofquxHHMRpJH7gJ1Ou1m0H35EARxI54QJWl3OXxYanIylalK
+PAEgCMQxzDzNjXIFmQ+mGFatnuZyhVg8eUTsgG2yVpIEQYwlUtUvoSRBOB2OIwe1oN/vcbsq9B5V
+VfMFamlpdZf6PIfoLp9bXNqIJyp9zijq87oBAGiOKwiCfF43Wvk8b8STyYXllYN/D9iTFM8Ly2vR
+AlXcClEGS8fG43YFAr4jBzUMw3xeT9mr4ubFIYrSvcfPM9nCUbADyhljWG5yZn57/3gAAACbzdbX
+E9F1vTmuYBju6+2222zb1WsgnkjNzi2aMcCHbweUkcrl80+evtxSqd9KCr/P6/O6cavz8yyAGgSB
+4Y5gf2+k4nNZUcYm3kRj8Qr5fLjucllR3kzNra3HWI6v+CuH3TY02AeBQHNcoShycmTI+TatbXMD
+eV6IxhIzcwuGAR7we8AupARR3Ignx9/MKIpaYc309XaHOoKWB3xb89we6QqPDg9WMKdpWjyRGn89
+FY3Gyu2DQ3SXK4qazuTu3H+USmcrlEgYhn1e9+jQQMnt3ChXKIKcPjHi93pgGC6P8jUraT54/KJA
+Fc0KoAf2HrATKV3XN2LJ11Oziap8ShAER4cHI12dgNXDGqh1hjpGh4dsZI03qDv3Hj1+PkZvtTE4
+RHe5YRh5ino+9vrhk+f5yug6wGG3RbrCA/09W/7MZjzvw4N9PZFOh8MGVPV5ffRs7MX463yNMvuH
+YDPRDPfs5cS9h08r5BkIgnYbOTo82BkKHlGoEQTe0915/erF6u7Meap47+Gzr/583/QJHWLYDMcL
+b6bm/vGff8HxfDUOB/t7Lp47DW0elSa5AgDgwtlTg3091dHkPC/8w89+8Xpqhq3x7QdqM+mGcef+
+o0fPXlI0W+njwLB3rl7q7e6qiN+0ZMA//elP908FBEEUQWw2YmJyRhSlCscSLwg0w+m6Hgz4YQiq
+1m2rPcBNq8k7kaKKzP3Hz3//x9ura9GqFHzD7XS8+86V925cs5HEPrmykUS+UFiPxiR5W5SvYRii
+JFMUjSJoR9C/+142McF6SJkNQP9879Gd+0/Xo3FlezI2DMM+r+fvfvJvq0OFjxDUTE3FYbczHJfJ
+5CrEhqqqLMfn8nlZkZ0Oh40kzaib8ph3q9zl1aQ0TU+lM3cfPLlz79HM/GK1uxKB4XeuXrp14+pA
+Xw8IQvvkiiAwU4JGYwl9u2VnGEaxyBRpRtU0n9djI4maBnKjE6xzrVRVTaQy9x8/u3Pvyer6RnUZ
+vI6A/8P3b3z8/rvuHWsSHg2oQRCEY1jA74un0rl8odSwaEsfl3P5QjyRQhCEwDGCwEmSxDDMKjug
+Jild1zmeX4/GHj55+Yev7swtLFXhzEARZGig94d/8b3TJ0cJHN+JVP1cgSDocDhwAk+m0sUiU/Fe
+oqpqOptLZbIwDBEEQeA4gmz7roYmWD9XDMutR+NPX7z68uu7q+sxafvuAADgdDounDv1ky9+0Bnu
+sDwD1GKomWjz+7yGbuTyhVSm3MQzzFPGMOzy6jrNsC6X0+/3IWbTibqXb8eg/lrqi6woNMPOLy7/
+9svbv/r9nzLZXNUrmQHDkN/n+duffHHh7CmX07kTqUa5wjDM63H7/b7puYUKdcIUNgWqODUzz/Oi
+y2m32UgYgc1rsaEJ1sOVoiiqqnI8PzO3+OXtu7fvPszkCtV2CQzDZ0+d+Px7H1y9fKEV8sx6qG1Z
+o0FRkqIbiZrJvbKixJPpqdmF1fVYwOd1OBw1s9920jmqr5Wa26Dr+sTkzM9//eW//Or3NffbJNIZ
+Cn728fsf3rrhcjrRzWcla4J5HHZ70O/XNC2ZztQMZ9U0LRqLv5qYSqWzdpIMdQTMV4o6J1gnV7wg
+LK6s/tO//uYPt+/OLa6IglTT+o10hj//9MNPPnwPRVGgZcN6qCEI4nY77XZbMpVmuc0cL3Brew0A
+UDWdF8RMNj87v7S0vJovFEAIcjmdEATtJODqVJN5QViPxR8/ffmbL2/fufd4anY+mysoSu36tL2R
+rls3r332vfd9Xg+O49ZaJwiCYCga7giqqmLqZ9W/rqoaL4iZXH5pZXVmbilXyIMAUHqEbdoOMIta
+LC6vPn3+6utvHty+92h+caVA0YqiGrVeOHoinT/+0efvvnPF5/W0qLb35tK0ovCpqmmJZOrB4xd3
+7j1cXd/gBQHcIbnX63F3hUM93V29ka5IJOz3eX0ej8fjcjrs5cXMqq8VcxsMwxBEqUDRxSKVzuZj
+iWQ0Fo9uJDZiCZbl1B0SMSAIPDE8+M7Vi9cuXxge7N+Pxl2Tq3JS84vLj5+NPXr6cmZ+cac4FxiG
+HXZbpCsU6Qx1d4Y7w6FgwOf1egN+n8Nuq0dz0nWdZTmqSOcKVDqTjW7ENmKJWDyZTGcKm+lFNaZm
+t5EDfT3f++jWu9evdIaC1Zi2NuW4JVAzDENVVZph/nzv0f1HzxaXV7cu09p8QyBIEMRgf29XZ7gz
+FAx1BAJ+n81GoptvL4Zh6DAMb7YQ1HTNMCAIUlWN54U8RaVS2VQmE92Ib8STVf0hK50yBI729/V8
+8uF7Vy+d6wqHmvOImnWpqoN5apKKJ1JPX7z68va95dW1Wlf5Nh3D7XJ2hkM9ka7OcCgUCvq8bofN
+hmKoWeAQhk3tFtA0XdU0TdM0VVMUheWFXD6fTmfjqfRGLL66tiFJUllTzxrL7nI5TwwPfHjrxqcf
+vW+vyv8oy/o5wlAz39q0rcDDB4+ffXXn/sTkrChJdXaYg0AQx7HOcMjpcJAkThIYTuA2ktR1Q5Yk
+UZRFWRYEIU/RuXyBrTuxB4Yhu43s7gr//b//q5OjQw67vWmN21S361feGZabnl34n//4s/WNBM/x
+28XtblXZHA673+f1edwkSZIkaSMJgsBAEBREkedEXhB5gaeLTCKVkmTFMHSgjgJvMAwROHHpwpnv
+f/rRh7du1NxBc1jbacpiqJk4M9uXmpQlWd6IJZ6+GP/D13cz2WydaANBMxoWhEAQBLfq1QOAYQCG
+YQBGqUpo/RnYRm93183rlz/54L1QKIBjZjmOAwrqNwxDkuREKvXl7bsPHj9fW4/Vg7PNdYAg80Yu
+i1EHN3teb7W+1nS9fpwFA4Hvf/bRrRtX+3t7qpNAy7scH12olXrklnf+NstRF6jiyvrGs5evnr4Y
+T6Yy9aWzWlPPEYaggN97/cqFC+dOD/b3dAQCJjL2YwdUB1nsScpUKpLp7NLy6tjEm4fPxrLZnKZp
+B1awEobhzlDw+tWL169cGujt9vu81U8CpY0rNWm0EGrWt54tyV7T02buK0mSwYA/4Pf0RLqmZxcW
+l1fjyZQs79KNwQKc2UgyGPD193afOjF05uRopCtkt9kOK6gfBEEURXsinV63qyPoD3UEp2bn19Y2
+srk8Lwitw5lZlLkrHBoe7D99cuTcmRODfX0oilbrYOaN1AqDwGKpViHMTF6rt0EQxKWVtfHJmfmF
+pWQ6m8sXijRdVXy1eZyZO+r1uH1ed2eoY6Cv5/SJ4dGRAdN7t4vybqEdUA8pXhDmFpZmZheWV9cT
+qUyhSBeooqKojW/HjmtFEoTb5fT5vOGOwOjI0MWzp4YG+qpD80vbZ47SJV26tY8W1Mq7HJsEoa2x
+k5AQRWlyduH5y1evp2Zj8aSZwqSqmqapRplToM6i/zAMIwiMwDCOYz6v98rFc9cun+/riTjsNks8
+743aAfWTohl2dW1j7PXUy/HJfKEgSfLWOmh1JAFtw5m5DjCCIDCMIEh3V+e5M6euXblw9uQIQeC7
+gKaEM6Asm9Dy7rMWQM2oGuacdz8QhmEoiiorMk2ziVRmZW19dX1jdS26EUsUikVd04C6i/47nfbe
+nu7+nu7+3shAX3dvd4TAcRAETHuifuXdQjugflIQBIMQqCiqIAjrG7GVtY3V9dhqdGM9usEw3K7d
+bbbjDIZ9Xk9PpLOvt7uvp3ugr7czFHS5nBiKoiiyO85UVS3ZASWQWf5CZTHUSrpk/YJX0zRRkhmW
+LRZpluM4jqNpNlegBEGUFVVWZFGURFESJAkCQQzDCBwnSILEMQInHA671+PyeT02G2m32Ww20k6S
+BIEritKc8m6hHdAoKTPaiuMFnhc4nud5IV+gChTNspwoiYIki4IoSpIsy7quYyiK4xiBYziOkwRu
+I8mOjqDP63HY7TYbabeRdpsNx7E9mTRxVi7PoDKD9yhCrVzUN4Szas+7YRiSLLMcr6m6phvmm7Es
+K5KiQCBgvgmaPXJQFCUJwm632bb0j/qd+Ba+B7SOFC+IHMcLoqgoitnNSJJlWZZVRUEQ2OzyZmYE
+2m02r8dNEET9omgr5dg0dN7Ksy0vsfUvVFZCrc7qBDUPlqIoW9uwebb2E87QJlUnKVVVy/0a9Wg+
+h+zsKLHbHM7K8xBNu7W5tLM2qUZJVbjQWoczy6Qa0NRjWZmnapunsem1a5NqjpR5b5oVJICWDcQq
+kdYczsqVPHPCpq7QJnXwpFqKMytfCxqdcMnZu08B3iZ1KKSOB9RKT6X7n3Cb1KGQOszXgoYmXO0H
+b3rt2qQOntTxkGrlbpGSotCoy7dN6hBJHQ+oVbwolPt7m1i7NqmDJ3U8LtDyCVc8t+1n7dqkDozU
+MZNq5dLbPFttUseI1DGAWrWPt+lT1SZ1KKSOpQXaHt/ZAbWXoD3aUGuPb9X4//0/Sa3hNTUCAAAA
+AElFTkSuQmCC
+"
+       id="image823"
+       x="2.9734159"
+       y="52.273003" />
+  </g>
+  <g
+     id="layer2">
+    <path
+       id="path827-9"
+       d="m 97.624888,39.796021 c -8.178314,0.006 -14.961537,4.568212 -15.54272,10.453627 l -0.226343,-0.0021 -1.86862,19.061368 c -10.48507,6.763065 -15.77113,18.088851 -15.77113,18.088851 l -4.276224,26.459893 0.258381,0.0661 C 50.006857,118.97418 43.274297,126.9138 41.68205,135.75964 l -0.183967,0.014 -7.216098,39.0214 0.316778,0.0109 c -0.07327,0.65029 -0.11842,1.30208 -0.135393,1.9544 -5e-6,17.33952 19.483317,31.39599 43.51724,31.39602 23.49434,-0.0182 42.72694,-13.48746 43.45006,-30.42967 0.0382,-33.56054 -0.12647,-67.01884 -0.28628,-98.079355 0,0 -0.58301,-6.16341 -7.34633,-10.666015 l -0.6258,-17.202566 c 0.0278,-0.242592 0.0447,-0.485771 0.0506,-0.729154 1.9e-4,-6.215145 -6.98334,-11.253585 -15.598012,-11.253579 z M 78.113934,154.49394 c 18.592694,-9e-5 33.665126,10.22596 33.665136,22.84046 0,12.61451 -15.072436,22.84056 -33.665136,22.84047 -18.592498,-1e-4 -33.664614,-10.2261 -33.664612,-22.84047 6e-6,-12.61437 15.07212,-22.84036 33.664612,-22.84046 z"
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.36251795;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       id="path898"
+       d="m 134.63546,87.230775 a 17.907058,13.764381 0 0 0 -17.83715,12.695354 h -0.87127 v 49.712211 h 0.83251 a 17.907058,13.76438 0 0 0 17.87591,13.09635 17.907058,13.76438 0 0 0 17.86403,-13.09635 h 0.31057 V 99.926129 h -0.32711 A 17.907058,13.764381 0 0 0 134.63546,87.230775 Z m 0,53.624635 a 10.557147,8.1148223 0 0 1 10.55749,8.11475 10.557147,8.1148223 0 0 1 -10.55749,8.11475 10.557147,8.1148223 0 0 1 -10.55698,-8.11475 10.557147,8.1148223 0 0 1 10.55698,-8.11475 z"
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.00007248;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       id="path827-9-6"
+       d="m 171.1122,39.796021 c 8.17832,0.006 14.96154,4.568212 15.54273,10.453627 l 0.22634,-0.0021 1.86862,19.061369 c 10.48507,6.763074 15.77113,18.08886 15.77113,18.08886 l 4.27623,26.459883 -0.25839,0.0661 c 10.19138,5.05042 16.92394,12.99004 18.51619,21.83588 l 0.18396,0.014 7.2161,39.0214 -0.31678,0.0109 c 0.0733,0.65029 0.11842,1.30208 0.1354,1.9544 0,17.33952 -19.48332,31.39599 -43.51725,31.39602 -23.49434,-0.0182 -42.72693,-13.48746 -43.45005,-30.42967 -0.0382,-33.56054 0.12647,-67.01884 0.28628,-98.079352 0,0 0.58301,-6.163411 7.34633,-10.666016 l 0.6258,-17.202565 c -0.0278,-0.242592 -0.0447,-0.485771 -0.0506,-0.729154 -1.9e-4,-6.215148 6.98334,-11.253588 15.598,-11.253582 z m 19.51096,114.697919 c -18.59269,-9e-5 -33.66512,10.22596 -33.66513,22.84046 0,12.61451 15.07243,22.84056 33.66513,22.84047 18.5925,-1e-4 33.66462,-10.2261 33.66461,-22.84047 0,-12.61437 -15.07212,-22.84036 -33.66461,-22.84046 z"
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.36251807;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+  </g>
+</svg>

From da5a8b0fd12b728cef0f9374567753a05e810ed4 Mon Sep 17 00:00:00 2001
From: Guillaume Lajarige <guillaume.lajarige@combodo.com>
Date: Wed, 4 Apr 2018 12:54:18 +0000
Subject: [PATCH 201/202] Advanced search: UI/UX, WIP.

SVN:b1162[5605]
---
 css/light-grey.css                       |  45 ++--
 css/light-grey.scss                      |  76 ++----
 dictionaries/en.dictionary.itop.ui.php   |  19 +-
 dictionaries/fr.dictionary.itop.ui.php   |  89 +++++--
 js/search/search_form_criteria.js        |  15 +-
 js/search/search_form_criteria_enum.js   | 297 ++++++++++++++++++-----
 js/search/search_form_criteria_string.js |   4 +-
 js/search/search_form_handler.js         |  25 +-
 8 files changed, 388 insertions(+), 182 deletions(-)

diff --git a/css/light-grey.css b/css/light-grey.css
index d03dcf729..3a5194490 100644
--- a/css/light-grey.css
+++ b/css/light-grey.css
@@ -802,8 +802,7 @@ input.dp-applied {
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group, .search_form_handler .sf_criterion_area .sf_more_criterion .sfc_form_group, .search_form_handler .sf_criterion_area .search_form_criteria .sfm_content, .search_form_handler .sf_criterion_area .sf_more_criterion .sfm_content {
   position: absolute;
   z-index: -1;
-  min-width: 170px;
-  /* 100%; */
+  min-width: 100%;
   left: 0px;
   margin-top: -1px;
 }
@@ -818,6 +817,10 @@ input.dp-applied {
 .search_form_handler .sf_criterion_area .search_form_criteria.locked {
   background-color: #f1f1f1;
 }
+.search_form_handler .sf_criterion_area .search_form_criteria.locked .sfc_title {
+  user-select: none;
+  cursor: initial;
+}
 .search_form_handler .sf_criterion_area .search_form_criteria.draft .sfc_header, .search_form_handler .sf_criterion_area .search_form_criteria.draft .sfc_form_group {
   border-style: dashed;
 }
@@ -890,9 +893,6 @@ input.dp-applied {
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators {
   font-size: 12px;
 }
-.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator {
-  /* Common operators for most criteria types processing*/
-}
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator.force_hide {
   display: none !important;
 }
@@ -912,6 +912,9 @@ input.dp-applied {
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_op_name {
   width: 90px;
 }
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_op_content input[type="text"] {
+  width: 160px;
+}
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_opc_multichoices {
   padding: 4px 8px;
 }
@@ -928,6 +931,20 @@ input.dp-applied {
   margin: 0px -8px;
   /* Compensate .sfc_opc_multichoices side padding so the hover style can take the full with */
 }
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_opc_multichoices .sfc_opc_mc_items .sfc_opc_mc_items_list.sfc_opc_mc_items_selected {
+  position: relative;
+  padding-top: 5px;
+  margin-top: 5px;
+}
+.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_opc_multichoices .sfc_opc_mc_items .sfc_opc_mc_items_list.sfc_opc_mc_items_selected::before {
+  content: "";
+  position: absolute;
+  border-top: 1px solid #ddd;
+  width: calc(100% - 12px);
+  /* minus margin-left x2 */
+  margin-left: 6px;
+  top: 0px;
+}
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_opc_multichoices .sfc_opc_mc_items .sfc_opc_mc_items_list .sfc_opc_mc_placeholder {
   padding: 15px 8px;
   font-style: italic;
@@ -944,12 +961,6 @@ input.dp-applied {
   display: inline-block;
   width: 100%;
 }
-.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator.sfc_fg_operator_equals .sfc_op_name, .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator.sfc_fg_operator_contains .sfc_op_name, .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator.sfc_fg_operator_starts_with .sfc_op_name, .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator.sfc_fg_operator_ends_with .sfc_op_name {
-  width: 90px;
-}
-.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator.sfc_fg_operator_equals .sfc_op_content input, .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator.sfc_fg_operator_contains .sfc_op_content input, .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator.sfc_fg_operator_starts_with .sfc_op_content input, .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator.sfc_fg_operator_ends_with .sfc_op_content input {
-  width: 160px;
-}
 .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_apply, .search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_cancel {
   margin-top: 8px;
   padding: 3px 6px;
@@ -1027,9 +1038,6 @@ input.dp-applied {
 .search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_enum .sfc_form_group .sfc_fg_operator_in > label .sfc_op_content {
   width: 100%;
 }
-.search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_numeric .sfc_fg_operator_dropdown_group select {
-  width: 88px;
-}
 .search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_numeric .sfc_form_group.advanced .sfc_fg_operator_between {
   margin-top: 5px;
   margin-bottom: 5px;
@@ -1038,15 +1046,6 @@ input.dp-applied {
   width: 90px;
   display: inline-block;
 }
-.search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_numeric .sfc_fg_operator_between input {
-  width: 130px;
-}
-.search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_numeric .sfc_fg_operator_equals .sfc_op_name, .search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_numeric .sfc_fg_operator_greater_than .sfc_op_name, .search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_numeric .sfc_fg_operator_greater_than_or_equals .sfc_op_name, .search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_numeric .sfc_fg_operator_less_than .sfc_op_name, .search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_numeric .sfc_fg_operator_less_than_or_equals .sfc_op_name, .search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_numeric .sfc_fg_operator_different .sfc_op_name {
-  width: 90px;
-}
-.search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_numeric .sfc_fg_operator_equals .sfc_op_content input, .search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_numeric .sfc_fg_operator_greater_than .sfc_op_content input, .search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_numeric .sfc_fg_operator_greater_than_or_equals .sfc_op_content input, .search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_numeric .sfc_fg_operator_less_than .sfc_op_content input, .search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_numeric .sfc_fg_operator_less_than_or_equals .sfc_op_content input, .search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_numeric .sfc_fg_operator_different .sfc_op_content input {
-  width: 130px;
-}
 .search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_date_time .sfc_form_group.advanced .sfc_fg_operator_between, .search_form_handler .sf_criterion_area .search_form_criteria.search_form_criteria_date .sfc_form_group.advanced .sfc_fg_operator_between {
   margin-bottom: 5px;
 }
diff --git a/css/light-grey.scss b/css/light-grey.scss
index 10dbd5c15..7c559f935 100644
--- a/css/light-grey.scss
+++ b/css/light-grey.scss
@@ -892,7 +892,7 @@ input.dp-applied {
 			.sfm_content{
 				position: absolute;
 				z-index: -1;
-				min-width: 170px; /* 100%; */
+				min-width: 100%;
 				left: 0px;
 				margin-top: -1px;
 			}
@@ -905,6 +905,11 @@ input.dp-applied {
 			/* Non editable criteria */
 			&.locked{
 				background-color: $gray-extra-light;
+
+				.sfc_title{
+					user-select: none;
+					cursor: initial;
+				}
 			}
             /* Draft criteria (modifications not applied) */
             &.draft{
@@ -1015,6 +1020,11 @@ input.dp-applied {
 						.sfc_op_name{
 							width: 90px;
 						}
+						.sfc_op_content{
+							input[type="text"]{
+								width: 160px;
+							}
+						}
 
 						.sfc_opc_multichoices{
 							padding: 4px 8px;
@@ -1034,6 +1044,21 @@ input.dp-applied {
 								margin: 0px -8px; /* Compensate .sfc_opc_multichoices side padding so the hover style can take the full with */
 
 								.sfc_opc_mc_items_list{
+									&.sfc_opc_mc_items_selected{
+										position: relative;
+										padding-top: 5px;
+										margin-top: 5px;
+
+										&::before{
+											content: "";
+											position: absolute;
+											border-top: 1px solid $gray-lighter;
+											width: calc(100% - 12px); /* minus margin-left x2 */
+											margin-left: 6px;
+											top: 0px;
+										}
+									}
+
 									.sfc_opc_mc_placeholder{
 										padding: 15px 8px;
 										font-style: italic;
@@ -1054,21 +1079,6 @@ input.dp-applied {
 								}
 							}
 						}
-
-						/* Common operators for most criteria types processing*/
-						&.sfc_fg_operator_equals,
-						&.sfc_fg_operator_contains,
-						&.sfc_fg_operator_starts_with,
-						&.sfc_fg_operator_ends_with {
-							.sfc_op_name{
-								width: 90px;
-							}
-							.sfc_op_content{
-								input{
-									width: 160px;
-								}
-							}
-						}
 					}
 				}
 
@@ -1139,8 +1149,6 @@ input.dp-applied {
 
 				}
 
-
-
 				&:not(.advanced) {
 					.hide_on_less {
 						display: none;
@@ -1180,11 +1188,6 @@ input.dp-applied {
 				}
 			}
 			&.search_form_criteria_numeric {
-				.sfc_fg_operator_dropdown_group {
-					select {
-						width: 88px;
-					}
-				}
 				.sfc_form_group.advanced {
 					.sfc_fg_operator_between {
 						margin-top: 5px;
@@ -1198,24 +1201,6 @@ input.dp-applied {
 							display: inline-block;
 						}
 					}
-					input {
-						width: 130px;
-					}
-				}
-				.sfc_fg_operator_equals,
-				.sfc_fg_operator_greater_than,
-				.sfc_fg_operator_greater_than_or_equals,
-				.sfc_fg_operator_less_than,
-				.sfc_fg_operator_less_than_or_equals,
-				.sfc_fg_operator_different {
-					.sfc_op_name{
-						width: 90px;
-					}
-					.sfc_op_content{
-						input{
-							width: 130px;
-						}
-					}
 				}
 			}
 
@@ -1227,15 +1212,6 @@ input.dp-applied {
 					}
 				}
 				.sfc_fg_operator_between_days {
-					//label {
-					//	&.sfc_op_content_from_time_label,
-					//	&.sfc_op_content_until_time_label,
-					//	&.sfc_op_content_from_label,
-                     //   &.sfc_op_content_until_label {
-					//		width: 90px;
-					//		display: inline-block;
-					//	}
-					//}
 					input {
 						width: 135px;
 					}
diff --git a/dictionaries/en.dictionary.itop.ui.php b/dictionaries/en.dictionary.itop.ui.php
index 8eed44e62..496491554 100644
--- a/dictionaries/en.dictionary.itop.ui.php
+++ b/dictionaries/en.dictionary.itop.ui.php
@@ -1397,25 +1397,25 @@ When associated with a trigger, each action is given an "order" number, specifyi
 	'UI:Search:Criteria:Title:Default:Empty' => '%1$s is empty',
 	'UI:Search:Criteria:Title:Default:NotEmpty' => '%1$s is not empty',
 	'UI:Search:Criteria:Title:Default:Equals' => '%1$s equals %2$s',
-
+	'UI:Search:Criteria:Title:Default:Contains' => '%1$s contains %2$s',
+	'UI:Search:Criteria:Title:Default:StartsWith' => '%1$s starts with %2$s',
+	'UI:Search:Criteria:Title:Default:EndsWith' => '%1$s ends with %2$s',
+	'UI:Search:Criteria:Title:Default:RegExp' => '%1$s matches %2$s',
 	'UI:Search:Criteria:Title:Default:GreaterThan' => '%1$s > %2$s',
 	'UI:Search:Criteria:Title:Default:GreaterThanOrEquals' => '%1$s >= %2$s',
 	'UI:Search:Criteria:Title:Default:LessThan' => '%1$s < %2$s',
 	'UI:Search:Criteria:Title:Default:LessThanOrEquals' => '%1$s <= %2$s',
 	'UI:Search:Criteria:Title:Default:Different' => '%1$s ≠ %2$s',
 	'UI:Search:Criteria:Title:Default:Between' => '%1$s between [%2$s]',
-	'UI:Search:Criteria:Title:Default:BetweenDates:All' => '%1$s All',
+	'UI:Search:Criteria:Title:Default:BetweenDates:All' => '%1$s: Any',
 	'UI:Search:Criteria:Title:Default:BetweenDates:From' => '%1$s from %2$s',
 	'UI:Search:Criteria:Title:Default:BetweenDates:Until' => '%1$s until %2$s',
-	'UI:Search:Criteria:Title:Default:Between:All' => '%1$s: All',
+	'UI:Search:Criteria:Title:Default:Between:All' => '%1$s: Any',
 	'UI:Search:Criteria:Title:Default:Between:From' => '%1$s from %2$s',
 	'UI:Search:Criteria:Title:Default:Between:Until' => '%1$s until %2$s',
 	'UI:Search:Criteria:Title:Default:BetweenDays' => '%1$s [%2$s]',
-	'UI:Search:Criteria:Title:Default:Contains' => '%1$s contains %2$s',
-	'UI:Search:Criteria:Title:Default:StartsWith' => '%1$s starts with %2$s',
-	'UI:Search:Criteria:Title:Default:EndsWith' => '%1$s ends with %2$s',
 	//   - Numeric widget
-//	'UI:Search:Criteria:Title:Numeric:Equals' => '%1$s equals %2$s',
+	//   None yet
 	//   - DateTime widget
 	'UI:Search:Criteria:Title:DateTime:Between' => '%2$s <= 1$s <= %3$s',
 	//   - Enum widget
@@ -1440,6 +1440,7 @@ When associated with a trigger, each action is given an "order" number, specifyi
 	'UI:Search:Criteria:Operator:String:Contains' => 'Contains',
 	'UI:Search:Criteria:Operator:String:StartsWith' => 'Starts with',
 	'UI:Search:Criteria:Operator:String:EndsWith' => 'Ends with',
+	'UI:Search:Criteria:Operator:String:RegExp' => 'Regular exp.',
 	//   - Numeric widget
 	'UI:Search:Criteria:Operator:Numeric:Equals' => 'Equals',  // => '=',
 	'UI:Search:Criteria:Operator:Numeric:GreaterThan' => 'Greater',  // => '>',
@@ -1464,8 +1465,8 @@ When associated with a trigger, each action is given an "order" number, specifyi
 	'UI:Search:Criteria:Numeric:PlaceholderUntil' => 'Any',
 	'UI:Search:Criteria:DateTime:From' => 'From',
 	'UI:Search:Criteria:DateTime:FromTime' => 'From',
-	'UI:Search:Criteria:DateTime:Until' => 'Until',
-	'UI:Search:Criteria:DateTime:UntilTime' => 'Until',
+	'UI:Search:Criteria:DateTime:Until' => 'until',
+	'UI:Search:Criteria:DateTime:UntilTime' => 'until',
 	'UI:Search:Criteria:DateTime:PlaceholderFrom' => 'Any date',
 	'UI:Search:Criteria:DateTime:PlaceholderFromTime' => 'Any date',
 	'UI:Search:Criteria:DateTime:PlaceholderUntil' => 'Any date',
diff --git a/dictionaries/fr.dictionary.itop.ui.php b/dictionaries/fr.dictionary.itop.ui.php
index 9e63d6c0d..e8caf4480 100644
--- a/dictionaries/fr.dictionary.itop.ui.php
+++ b/dictionaries/fr.dictionary.itop.ui.php
@@ -1204,13 +1204,12 @@ Lors de l\'association à un déclencheur, on attribue à chaque action un numé
 	// Search form
 	'UI:Search:Toggle' => 'Réduire / Ouvrir',
 	'UI:Search:Criterion:MoreMenu:AddCriteria' => 'Ajouter un critère',
-	// - Operators
-	'UI:Search:Criteria:Operator:Default:Empty' => 'Vide',
-	'UI:Search:Criteria:Operator:Default:NotEmpty' => 'Non vide',
-	'UI:Search:Criteria:Operator:Default:Equals' => 'Egal',
-	'UI:Search:Criteria:Operator:String:Contains' => 'Contient',
-	'UI:Search:Criteria:Operator:String:StartsWith' => 'Commence par',
-	'UI:Search:Criteria:Operator:String:EndsWith' => 'Fini par',
+	// - Add new criteria button
+	'UI:Search:AddCriteria:List:RecentlyUsed:Title' => 'Récents',
+	'UI:Search:AddCriteria:List:MostPopular:Title' => 'Populaires',
+	'UI:Search:AddCriteria:List:Others:Title' => 'Autres',
+	'UI:Search:AddCriteria:List:RecentlyUsed:Placeholder' => 'Aucun.',
+
 	// - Criteria titles
 	//   - Default widget
 	'UI:Search:Criteria:Title:Default:Empty' => '%1$s vide',
@@ -1219,20 +1218,76 @@ Lors de l\'association à un déclencheur, on attribue à chaque action un numé
 	'UI:Search:Criteria:Title:Default:Contains' => '%1$s contient %2$s',
 	'UI:Search:Criteria:Title:Default:StartsWith' => '%1$s commence par %2$s',
 	'UI:Search:Criteria:Title:Default:EndsWith' => '%1$s fini par %2$s',
+	'UI:Search:Criteria:Title:Default:RegExp' => '%1$s correspond à %2$s',
+	'UI:Search:Criteria:Title:Default:GreaterThan' => '%1$s > %2$s',
+	'UI:Search:Criteria:Title:Default:GreaterThanOrEquals' => '%1$s >= %2$s',
+	'UI:Search:Criteria:Title:Default:LessThan' => '%1$s < %2$s',
+	'UI:Search:Criteria:Title:Default:LessThanOrEquals' => '%1$s <= %2$s',
+	'UI:Search:Criteria:Title:Default:Different' => '%1$s ≠ %2$s',
+	'UI:Search:Criteria:Title:Default:Between' => '%1$s entre [%2$s]',
+	'UI:Search:Criteria:Title:Default:BetweenDates:All' => '%1$s : Indifférent',
+	'UI:Search:Criteria:Title:Default:BetweenDates:From' => '%1$s depuis %2$s',
+	'UI:Search:Criteria:Title:Default:BetweenDates:Until' => '%1$s jusqu\'à %2$s',
+	'UI:Search:Criteria:Title:Default:Between:All' => '%1$s : Indifférent',
+	'UI:Search:Criteria:Title:Default:Between:From' => '%1$s à partir de %2$s',
+	'UI:Search:Criteria:Title:Default:Between:Until' => '%1$s jusqu\'à %2$s',
+	'UI:Search:Criteria:Title:Default:BetweenDays' => '%1$s [%2$s]',
+	//   - Numeric widget
+	//   None yet
+	//   - DateTime widget
+	'UI:Search:Criteria:Title:DateTime:Between' => '%2$s <= 1$s <= %3$s',
+	//   - Enum widget
+	'UI:Search:Criteria:Title:Enum:In' => '%1$s : %2$s',
+	'UI:Search:Criteria:Title:Enum:In:Many' => '%1$s : %2$s et %3$s autres',
+	'UI:Search:Criteria:Title:Enum:In:All' => '%1$s : Indifférent',
 	//   - External key widget
 	'UI:Search:Criteria:Title:ExternalKey:Empty' => '%1$s est renseigné',
 	'UI:Search:Criteria:Title:ExternalKey:NotEmpty' => '%1$s n\'est pas renseigné',
 	'UI:Search:Criteria:Title:ExternalKey:Equals' => '%1$s %2$s',
-	'UI:Search:Criteria:Title:ExternalKey:In' => '%1$s: %2$s',
-	'UI:Search:Criteria:Title:ExternalKey:In:Many' => '%1$s: %2$s et %3$s autres',
-	'UI:Search:Criteria:Title:ExternalKey:In:All' => '%1$s: Indifférent',
-	//   - Enum widget
-	'UI:Search:Criteria:Title:Enum:In' => '%1$s : %2$s',
-	'UI:Search:Criteria:Title:Enum:In:Many' => '%1$s : %2$s et %3$s autres',
-	'UI:Search:Criteria:Title:Enum:In:All' => '%1$s: Indifférent',
-	// -
-	'UI:Search:Value:Filter:Placeholder' => 'Filter...',
-	'UI:Search:Value:Toggler:CheckAllNone' => 'Check all / none',
+	'UI:Search:Criteria:Title:ExternalKey:In' => '%1$s : %2$s',
+	'UI:Search:Criteria:Title:ExternalKey:In:Many' => '%1$s : %2$s et %3$s autres',
+	'UI:Search:Criteria:Title:ExternalKey:In:All' => '%1$s : Indifférent',
+
+	/// - Criteria operators
+	//   - Default widget
+	'UI:Search:Criteria:Operator:Default:Empty' => 'Vide',
+	'UI:Search:Criteria:Operator:Default:NotEmpty' => 'Non vide',
+	'UI:Search:Criteria:Operator:Default:Equals' => 'Egal',
+	//   - String widget
+	'UI:Search:Criteria:Operator:String:Contains' => 'Contient',
+	'UI:Search:Criteria:Operator:String:StartsWith' => 'Commence par',
+	'UI:Search:Criteria:Operator:String:EndsWith' => 'Fini par',
+	'UI:Search:Criteria:Operator:String:RegExp' => 'Exp. rég.',
+	//   - Numeric widget
+	'UI:Search:Criteria:Operator:Numeric:Equals' => 'Egal',  // => '=',
+	'UI:Search:Criteria:Operator:Numeric:GreaterThan' => 'Supérieur',  // => '>',
+	'UI:Search:Criteria:Operator:Numeric:GreaterThanOrEquals' => 'Sup. / égal',  // > '>=',
+	'UI:Search:Criteria:Operator:Numeric:LessThan' => 'Inférieur',  // => '<',
+	'UI:Search:Criteria:Operator:Numeric:LessThanOrEquals' => 'Inf. / égal',  // > '<=',
+	'UI:Search:Criteria:Operator:Numeric:Different' => 'Différent',  // => '≠',
+
+	// - Other translations
+	'UI:Search:Value:Filter:Placeholder' => 'Filtrez...',
+	'UI:Search:Value:Search:Placeholder' => 'Recherchez...',
+	'UI:Search:Value:Autocomplete:StartTyping' => 'Commencez à taper pour voir les valeurs possibles.',
+	'UI:Search:Value:Autocomplete:Wait' => 'Patientez ...',
+	'UI:Search:Value:Autocomplete:NoResult' => 'Aucun résultat.',
+	'UI:Search:Value:Toggler:CheckAllNone' => 'Cocher tout / aucun',
+	'UI:Search:Value:Toggler:CheckAllNoneFiltered' => 'Cocher tout / aucun filtrés',
+
+	// - Widget other translations
+	'UI:Search:Criteria:Numeric:From' => 'Depuis',
+	'UI:Search:Criteria:Numeric:Until' => 'Jusqu\'à',
+	'UI:Search:Criteria:Numeric:PlaceholderFrom' => 'Indifférent',
+	'UI:Search:Criteria:Numeric:PlaceholderUntil' => 'Indifférent',
+	'UI:Search:Criteria:DateTime:From' => 'Depuis',
+	'UI:Search:Criteria:DateTime:FromTime' => 'Depuis',
+	'UI:Search:Criteria:DateTime:Until' => 'jusqu\'à',
+	'UI:Search:Criteria:DateTime:UntilTime' => 'jusqu\'à',
+	'UI:Search:Criteria:DateTime:PlaceholderFrom' => 'Indifférent',
+	'UI:Search:Criteria:DateTime:PlaceholderFromTime' => 'Indifférent',
+	'UI:Search:Criteria:DateTime:PlaceholderUntil' => 'Indifférent',
+	'UI:Search:Criteria:DateTime:PlaceholderUntilTime' => 'Indifférent',
 
 	'UI:Search:Criteria:Raw:Filtered' => 'Filtré',
 	'UI:Search:Criteria:Raw:FilteredOn' => 'Filtré sur %1$s',
diff --git a/js/search/search_form_criteria.js b/js/search/search_form_criteria.js
index 6803cdd10..76e1f89b7 100644
--- a/js/search/search_form_criteria.js
+++ b/js/search/search_form_criteria.js
@@ -45,7 +45,7 @@ $(function()
 		},
 
 		// Operators
-		operators: {},
+		operators: null,
 		// Form handler
 		handler: null,
 		// Keys that should not trigger an event in filter/autocomplete inputs
@@ -58,6 +58,9 @@ $(function()
 			
 			this.element.addClass('search_form_criteria');
 
+			// Init properties (complexe type properties would be static if not initialized with a simple type variable...)
+			this.operators = {};
+
 			// Init operators
 			this._initOperators();
 
@@ -371,6 +374,7 @@ $(function()
 			}
 			else
 			{
+				this.element.addClass('locked');
 				this.element.find('.sfc_header').append('<span class="sfc_locked"><span class="fa fa-lock"></span></span>');
 			}
 
@@ -399,7 +403,9 @@ $(function()
 				var sMethod = '_prepare' + this._toCamelCase(oOp.code) + 'Operator';
 
 				// Create DOM element from template
-				var oOpElem = $(this._getOperatorTemplate()).uniqueId();
+				var oOpElem = $(this._getOperatorTemplate())
+					.uniqueId()
+					.appendTo(this.element.find('.sfc_fg_operators'));
 
 				// Prepare operator's base elements
 				this._prepareOperator(oOpElem, sOpIdx, oOp);
@@ -413,12 +419,7 @@ $(function()
 				{
 					this._prepareDefaultOperator(oOpElem, sOpIdx, oOp);
 				}
-
-				// Append to form group
-				oOpElem.appendTo(this.element.find('.sfc_fg_operators'));
 			}
-
-			// TODO: We could hide the radio button if there is only one operator
 		},
 		// - Prepare the buttons (DOM and events) for a criteria
 		_prepareButtons: function()
diff --git a/js/search/search_form_criteria_enum.js b/js/search/search_form_criteria_enum.js
index 3a8749d0c..2310a2547 100644
--- a/js/search/search_form_criteria_enum.js
+++ b/js/search/search_form_criteria_enum.js
@@ -72,6 +72,25 @@ $(function()
 		//------------------
 		// Inherited methods
 		//------------------
+		// - Bind external events
+		_bindEvents: function()
+		{
+			var me = this;
+
+			this._super();
+
+			// Add selected data
+			this.element.on('itop.search.criteria_enum.add_selected_values', function(oEvent, oData){
+				return me._onAddSelectedValues(oData);
+			});
+		},
+
+		// Events callbacks
+		_onAddSelectedValues: function(oData)
+		{
+			this._addSelectedValues(oData);
+			this._apply();
+		},
 
 		// DOM element helpers
 		// - Prepare element DOM structure
@@ -92,11 +111,12 @@ $(function()
 			// DOM elements
 			var sOpId = oOpElem.attr('id');
 			var oOpContentElem = $('<div></div>')
-				.addClass('sfc_opc_multichoices');
+				.addClass('sfc_opc_multichoices')
+				.appendTo(oOpElem.find('.sfc_op_content'));
 
 			// - Check / Uncheck all togglers
 			var sTogglerId = 'toggle_' + sOpId;
-			var oTogglersElem = $('<div></div>')
+			var oTogglerElem = $('<div></div>')
 				.addClass('sfc_opc_mc_toggler')
 				.append('<label for="' + sTogglerId + '"><input type="checkbox" id="' + sTogglerId + '" />' + Dict.S('UI:Search:Value:Toggler:CheckAllNone') + '</label>')
 				.appendTo(oOpContentElem);
@@ -141,11 +161,14 @@ $(function()
 			oFilterElem.find('.sff_reset').on('click', function(){
 				oFilterElem.find('input')
 					.val('')
-					.trigger('focus');
+					// Focus the input for improved UX
+					.trigger('focus')
+					// Submit autocomplete with new value
+					.trigger('itop.search.criteria_enum.autocomplete.submit');
 			});
 
 			// - Check / Uncheck all toggler
-			oTogglersElem.on('click', function(oEvent){
+			oTogglerElem.on('click', function(oEvent){
 				// Check / uncheck all allowed values
 				var bChecked = $(this).closest('.sfc_opc_mc_toggler').find('input:checkbox').prop('checked');
 				oOpContentElem.find('.sfc_opc_mc_item input:checkbox').prop('checked', bChecked);
@@ -154,20 +177,6 @@ $(function()
 				me._apply();
 			});
 
-			// - Apply on check
-			oAllowedValuesElem.on('click', '.sfc_opc_mc_item input', function(oEvent){
-				// Prevent propagation, otherwise there will be multiple "_apply()"
-				oEvent.stopPropagation();
-
-				// Uncheck toggler
-				oTogglersElem.find('input:checkbox').prop('checked', false);
-
-				// Apply criteria
-				me._apply();
-			});
-
-			oOpElem.find('.sfc_op_content').append(oOpContentElem);
-
 			if(this._hasAutocompleteAllowedValues())
 			{
 				this._prepareInOperatorWithAutocomplete(oOpElem, sOpIdx, oOp);
@@ -183,12 +192,12 @@ $(function()
 			var me = this;
 
 			var oOpContentElem = oOpElem.find('.sfc_opc_multichoices');
-			var oDynamicListElem = oOpElem.find('.sfc_opc_mc_items_dynamic');
-			var oFilterElem = oOpElem.find('.sf_filter');
+			var oTogglerElem = oOpContentElem.find('.sfc_opc_mc_toggler');
+			var oFilterElem = oOpContentElem.find('.sf_filter');
+			var oAllowedValuesElem = oOpContentElem.find('.sfc_opc_mc_items');
+			var oDynamicListElem = oOpContentElem.find('.sfc_opc_mc_items_dynamic');
 
 			// DOM elements
-			// - Check all / none toggler
-			oOpContentElem.find('.sfc_opc_mc_toggler').remove();
 			// - Filter
 			oFilterElem.find('.sff_input_wrapper')
 				.append('<span class="sff_picto sff_filter fa fa-filter"></span>');
@@ -208,8 +217,6 @@ $(function()
 				}
 			}
 
-
-
 			// Events
 			// - Filter
 			// Note: "keyup" event is use instead of "keydown", otherwise, the input value would not be set yet.
@@ -247,30 +254,47 @@ $(function()
 				oFilterElem.find('input').trigger('focus');
 			});
 
+			// - Apply on check
+			oAllowedValuesElem.on('click', '.sfc_opc_mc_item input', function(oEvent){
+				// Prevent propagation, otherwise there will be multiple "_apply()"
+				oEvent.stopPropagation();
 
+				// Uncheck toggler
+				oTogglerElem.find('input:checkbox').prop('checked', false);
+
+				// Apply criteria
+				me._apply();
+			});
 		},
 		_prepareInOperatorWithAutocomplete: function(oOpElem, sOpIdx, oOp)
 		{
 			var me = this;
 
 			var oOpContentElem = oOpElem.find('.sfc_opc_multichoices');
-			var oDynamicListElem = oOpElem.find('.sfc_opc_mc_items_dynamic');
-			var oFilterElem = oOpElem.find('.sf_filter');
+			var oTogglerElem = oOpContentElem.find('.sfc_opc_mc_toggler');
+			var oFilterElem = oOpContentElem.find('.sf_filter');
+			var oAllowedValuesElem = oOpContentElem.find('.sfc_opc_mc_items');
 
 			// DOM
+			// - Hide toggler for now
+			oTogglerElem.hide();
+
+			// - Set typing hint
+			this._setACTypingHint();
+
 			// - Add search dialog button
 			oFilterElem
 				.append('<button type="button" class="sff_search_dialog"><span class=" fa fa-search"></span></button>')
 				.addClass('sf_with_buttons');
 
 			// - Prepare "selected" values area
-			var oSelectedElem = $('<div></div>')
+			var oSelectedValuesElem = $('<div></div>')
 				.addClass('sfc_opc_mc_items')
-				.addClass('sfc_opc_mc_items_selected')
+				.append('<div class="sfc_opc_mc_items_list sfc_opc_mc_items_selected"></div>')
 				.appendTo(oOpContentElem);
+			this._refreshSelectedValues();
 
-
-			// External classes
+			// - External classes
 			var oFilterIconElem = oFilterElem.find('.sff_search_dialog').uniqueId();
 			oFilterIconElem.attr('id', oFilterIconElem.attr('id').replace(/-/g, '_'));
 			var oForeignKeysWidgetCurrent = new SearchFormForeignKeys(
@@ -284,18 +308,11 @@ $(function()
 			window['oForeignKeysWidget'+oFilterIconElem.attr('id')] = oForeignKeysWidgetCurrent;
 			oForeignKeysWidgetCurrent.Init();
 
-			// model of similar code found in UIExtKeyWidget (you can find another on in UILinksWidget for example)
-			// oACWidget_{$this->iId} = new ExtKeyWidget('{$this->iId}', '{$this->sTargetClass}', '$sFilter', '$sTitle', true, $sWizHelper, '{$this->sAttCode}', $sJSSearchMode);
-			// $sMessage = Dict::S('UI:Message:EmptyList:UseSearchForm');
-			// oACWidget_{$this->iId}.emptyHtml = "<div style=\"background: #fff; border:0; text-align:center; vertical-align:middle;\"><p>$sMessage</p></div>";
-			// $('#$this->iId').bind('update', function() { oACWidget_{$this->iId}.Update(); } );
-			// $('#$this->iId').bind('change', function() { $(this).trigger('extkeychange') } );
-
 			// Events
 			// - Autocomplete
 			var oACXHR = null;
 			var oACTimeout = null;
-			oFilterElem.find('input').on('keyup', function(oEvent){
+			oFilterElem.find('input').on('keyup itop.search.criteria_enum.autocomplete.submit', function(oEvent){
 				// TODO: Move on values with up and down arrow keys; select with space or enter.
 				if(me._isFilteredKey(oEvent.keyCode))
 				{
@@ -303,19 +320,18 @@ $(function()
 				}
 
 				var sQuery = $(this).val();
-				if( (sQuery === '') || (sQuery.length <= me.options.autocomplete.min_autocomplete_chars) )
+				if( (sQuery === '') ) // TODO: Put this back after tests || (sQuery.length < me.options.autocomplete.min_autocomplete_chars) )
 				{
-					// TODO: Remove items and show placeholder
-					oDynamicListElem.html('<div class="sfc_opc_mc_placeholder">' + Dict.S('UI:Search:Value:Autocomplete:StartTyping') + '</div>');
-
+					me._setACTypingHint();
 					oFilterElem.find('.sff_reset').hide();
 				}
 				else
 				{
+					// Show loader
+					me._setACWaitHint();
+
 					clearTimeout(oACTimeout);
 					oACTimeout = setTimeout(function(){
-						// Show loader
-						oDynamicListElem.html('<div class="sfc_opc_mc_placeholder">' + Dict.S('UI:Search:Value:Autocomplete:Wait') + '</div>');
 
 						if(oACXHR !== null)
 						{
@@ -332,7 +348,7 @@ $(function()
 								operation: 'ac_extkey',
 							}
 							)
-							.done(function(oResponse, sStatus, oXHR){ me._onACSearchSuccess(oResponse, oDynamicListElem); })
+							.done(function(oResponse, sStatus, oXHR){ me._onACSearchSuccess(oResponse); })
 							.fail(function(oResponse, sStatus, oXHR){  me._onACSearchFail(oResponse, sStatus); })
 							.always(function(oResponse, sStatus, oXHR){ me._onACSearchAlways(); });
 
@@ -340,14 +356,53 @@ $(function()
 					}, me.options.autocomplete.xhr_throttle);
 				}
 			});
-			//
-			// // - Open search dialog
+
+			// - Apply on check
+			oAllowedValuesElem.on('click', '.sfc_opc_mc_item input', function(oEvent){
+				// Prevent propagation, otherwise there will be multiple "_apply()"
+				oEvent.stopPropagation();
+
+				var oItemElem = $(this).closest('.sfc_opc_mc_item');
+
+				// Hide item
+				oItemElem.hide();
+
+				// Copy item to selected items list
+				var oValues = {};
+				oValues[oItemElem.find('input:checkbox').val()] = oItemElem.text();
+				me._addSelectedValues(oValues);
+
+				// Apply criteria
+				me._apply();
+			});
+
+			// - Apply on uncheck
+			oSelectedValuesElem.on('click', '.sfc_opc_mc_item', function(oEvent){
+				// Prevent propagation, otherwise there will be multiple "_apply()"
+				oEvent.stopPropagation();
+
+				// Show item among allowed values (if still there, could have been removed bu another search needle)
+				var oAllowedValueElem = oAllowedValuesElem.find('.sfc_opc_mc_item[data-value-code="' + $(this).attr('data-value-code') + '"]');
+				if(oAllowedValueElem.length > 0)
+				{
+					oAllowedValuesElem.find('.sfc_opc_mc_item[data-value-code="' + $(this).attr('data-value-code') + '"]')
+						.show()
+						.find('input:checkbox')
+						.prop('checked', false);
+				}
+
+				// Remove item from selected values
+				$(this).remove();
+				me._refreshSelectedValues();
+
+				// Apply criteria
+				me._apply();
+			});
+
+			// - Open search dialog
 			oFilterElem.find('.sff_search_dialog').on('click', function(){
 				oForeignKeysWidgetCurrent.ShowModalSearchForeignKeys();
 			});
-
-
-
 		},
 		_setTitle: function(sTitle)
 		{
@@ -356,7 +411,7 @@ $(function()
 			var iAllowedValuesCount = Object.keys(this._getPreloadedAllowedValues()).length;
 
 			// Manually increase allowed values count if null is allowed
-			if(this.options.field.is_null_allowed === true)
+			if( (this.options.field.is_null_allowed === true) && (this._hasAutocompleteAllowedValues() === false) )
 			{
 				iAllowedValuesCount++;
 			}
@@ -395,7 +450,8 @@ $(function()
 		{
 			var aValues = [];
 
-			oOpElem.find('.sfc_opc_mc_item input:checked').each(function(iIdx, oElem){
+			var sValuesSelector = this._getSelectedValuesWrapperSelector();
+			oOpElem.find(sValuesSelector).find('.sfc_opc_mc_item input:checked').each(function(iIdx, oElem){
 				var sValue = $(oElem).val();
 				var sLabel = $(oElem).parent().text();
 				aValues.push({value: sValue, label: sLabel});
@@ -417,17 +473,43 @@ $(function()
 			// Re-check allowed values from param
 			for(var iIdx in aValues)
 			{
-				oOpElem.find('.sfc_opc_mc_item[data-value-code="' + aValues[iIdx].value + '"] input').prop('checked', true);
+				if(oOpElem.find('.sfc_opc_mc_item[data-value-code="' + aValues[iIdx].value + '"]').length > 0)
+				{
+					oOpElem.find('.sfc_opc_mc_item[data-value-code="' + aValues[iIdx].value + '"] input')
+						.prop('checked', true);
+				}
+				else
+				{
+					var oItemElem = this._makeListItemElement(aValues[iIdx].label, aValues[iIdx].value, true);
+					oItemElem.appendTo(this._getSelectedValuesWrapperSelector());
+				}
 			}
 
+			this._refreshSelectedValues();
+
 			return true;
 		},
 
 
 		// Autocomplete helpers
-
+		_setACHint: function(sHint)
+		{;
+			this.element.find('.sfc_opc_mc_items_dynamic').html('<div class="sfc_opc_mc_placeholder">' + sHint + '</div>');
+		},
+		_setACTypingHint: function()
+		{
+			this._setACHint(Dict.S('UI:Search:Value:Autocomplete:StartTyping'));
+		},
+		_setACWaitHint: function()
+		{
+			this._setACHint(Dict.S('UI:Search:Value:Autocomplete:Wait'));
+		},
+		_setACNoResultHint: function()
+		{
+			this._setACHint(Dict.S('UI:Search:Value:Autocomplete:NoResult'));
+		},
 		// Autocomplete callbacks
-		_onACSearchSuccess: function(oResponse, oListElem)
+		_onACSearchSuccess: function(oResponse)
 		{
 			if(typeof oResponse !== 'object')
 			{
@@ -435,18 +517,23 @@ $(function()
 				return false;
 			}
 
-			oListElem.html('');
+			var oDynamicListElem = this.element.find('.sfc_opc_mc_items_dynamic')
+				.html('');
 			if(Object.keys(oResponse).length > 0)
 			{
-				for(var iKey in oResponse)
+				// Note: Response is indexed by labels from server so the JSON is always ordered on decoding.
+				for(var sLabel in oResponse)
 				{
-					var oValueElem = this._makeListItemElement(iKey, oResponse[iKey]);
-					oValueElem.appendTo(oListElem);
+					var sValue = oResponse[sLabel];
+					var bInitChecked = this._isSelectedValues(sValue);
+					var bInitHidden = this._isSelectedValues(sValue);
+					var oValueElem = this._makeListItemElement(sLabel, sValue, bInitChecked, bInitHidden);
+					oValueElem.appendTo(oDynamicListElem);
 				}
 			}
 			else
 			{
-				oListElem.append('<div class="sfc_opc_mc_placeholder">' + Dict.S('UI:Search:Value:Autocomplete:NoResult') + '</div>')
+				this._setACNoResultHint();
 			}
 		},
 		_onACSearchFail: function(oResponse, sStatus)
@@ -455,7 +542,7 @@ $(function()
 			{
 				var sErrorMessage = Dict.Format('Error:XHR:Fail', '');
 
-				this.element.find('.sfc_opc_mc_items_dynamic').html('<div class="sfc_opc_mc_placeholder">=/</div>');
+				this._setACHint('=/');
 				this.handler.triggerHandler('itop.search.criteria.error_occured', sErrorMessage);
 			}
 		},
@@ -465,6 +552,11 @@ $(function()
 
 
 		// Value helpers
+		// - Return the selector fo the element containing the selected values
+		_getSelectedValuesWrapperSelector: function()
+		{
+			return (this._hasAutocompleteAllowedValues()) ? '.sfc_opc_mc_items_selected' : '.sfc_opc_mc_items_static, .sfc_opc_mc_items_dynamic';
+		},
 		// - Return true if sValue is among the selected values "codes"
 		_isSelectedValues: function(sValue)
 		{
@@ -497,12 +589,82 @@ $(function()
 
 			return bFound;
 		},
+		// - Add oValues to the list of selected values
+		_addSelectedValues: function(oValues)
+		{
+			var oSelectedValuesElem = this.element.find(this._getSelectedValuesWrapperSelector());
+			for(var sValue in oValues)
+			{
+				// Add only if not already selected
+				if(this._isSelectedValues(sValue))
+				{
+					continue;
+				}
+
+				if(oSelectedValuesElem.find('.sfc_opc_mc_item[data-value-code="' + sValue + '"]').length > 0)
+				{
+					oSelectedValuesElem.find('.sfc_opc_mc_item[data-value-code="' + sValue + '"] input')
+						.prop('checked', true);
+				}
+				else
+				{
+					var oItemElem = this._makeListItemElement(oValues[sValue], sValue, true);
+					oItemElem
+						.appendTo(oSelectedValuesElem)
+						.effect('highlight', {}, 500);
+				}
+
+				this.options.values.push({
+					value: sValue,
+					label: oValues[sValue]
+				});
+			}
+			this._refreshSelectedValues();
+		},
+		_refreshSelectedValues: function()
+		{
+			// No sense to make this in preloaded mode
+			if(this._hasAutocompleteAllowedValues() === false)
+			{
+				return false;
+			}
+
+			// Show / hide
+			var oSelectedValuesElem = this.element.find(this._getSelectedValuesWrapperSelector());
+			if(oSelectedValuesElem.find('.sfc_opc_mc_item').length > 0)
+			{
+				oSelectedValuesElem.show();
+			}
+			else
+			{
+				oSelectedValuesElem.hide();
+			}
+
+			// Reorder
+			oSelectedValuesElem.html('');
+			var aSortedValues = this._sortValuesByLabel(this.options.values);
+			for(var iIdx in aSortedValues)
+			{
+				var oItemElem = this._makeListItemElement(aSortedValues[iIdx][1], aSortedValues[iIdx][0], true);
+				oItemElem.appendTo(oSelectedValuesElem);
+			}
+		},
 		// - Return an array of allowed values sorted by labels
 		_sortValuesByLabel: function(oSource)
 		{
 			var aSortable = [];
+			var bSourceAsObject = $.isPlainObject(oSource);
 			for (var sKey in oSource) {
-				aSortable.push([sKey, oSource[sKey]]);
+				// eg. [{value: "3", label: "Demo"}, {value: "2", label: "IT Department"}] in autocomplete mode
+				if(bSourceAsObject === false)
+				{
+					aSortable.push([oSource[sKey].value, oSource[sKey].label]);
+				}
+				// eg. {2: "IT Department", 3: "Demo"} in regular mode
+				else
+				{
+					aSortable.push([sKey, oSource[sKey]]);
+				}
 			}
 
 			aSortable.sort(function(a, b) {
@@ -521,13 +683,22 @@ $(function()
 			return aSortable;
 		},
 		// - Make a jQuery element for a list item
-		_makeListItemElement: function(sLabel, sValue)
+		_makeListItemElement: function(sLabel, sValue, bInitChecked, bInitHidden)
 		{
 			var oItemElem = $('<div></div>')
 				.addClass('sfc_opc_mc_item')
 				.attr('data-value-code', sValue)
 				.append('<label><input type="checkbox" value="'+sValue+'"/>'+sLabel+'</label>');
 
+			if(bInitChecked === true)
+			{
+				oItemElem.find('input:checkbox').prop('checked', true);
+			}
+			if(bInitHidden === true)
+			{
+				oItemElem.hide();
+			}
+
 			return oItemElem;
 		},
 	});
diff --git a/js/search/search_form_criteria_string.js b/js/search/search_form_criteria_string.js
index d266465ac..b90b387ed 100644
--- a/js/search/search_form_criteria_string.js
+++ b/js/search/search_form_criteria_string.js
@@ -29,8 +29,8 @@ $(function()
 					'rank': 30,
 				},
 				'REGEXP': {
-					'label': 'regexp',
-					'code': 'REGEXP',
+					'label': Dict.S('UI:Search:Criteria:Operator:String:RegExp'),
+					'code': 'reg_exp',
 					'rank': 40,
 				},
 				'=': null,	// Remove this one from string widget.
diff --git a/js/search/search_form_handler.js b/js/search/search_form_handler.js
index 03c42f869..de5aa8c44 100644
--- a/js/search/search_form_handler.js
+++ b/js/search/search_form_handler.js
@@ -76,18 +76,10 @@ $(function()
 		},
 
 		// jQuery elements
-		elements:
-		{
-			message_area: null,
-			criterion_area: null,
-			more_criterion: null,
-			results_area: null,
-		},
+		elements: null,
 
-		submit: {
-			xhr: null,
-			//timeout: null,
-		},
+		// Submit properties (XHR, throttle, ...)
+		submit: null,
 
 		// the constructor
 		_create: function()
@@ -96,6 +88,17 @@ $(function()
 			
 			this.element.addClass('search_form_handler');
 
+			// Init properties (complexe type properties would be static if not initialized with a simple type variable...)
+			this.elements = {
+				message_area: null,
+				criterion_area: null,
+				more_criterion: null,
+				results_area: null,
+			};
+			this.submit = {
+				xhr: null,
+			};
+
 			//init others widgets :
 			this.element.search_form_handler_history({"itop_root_class":me.options.search.class_name});
 

From 2bb6acfa2256faf1639974c9f61f8a09c975c325 Mon Sep 17 00:00:00 2001
From: Guillaume Lajarige <guillaume.lajarige@combodo.com>
Date: Wed, 4 Apr 2018 13:32:20 +0000
Subject: [PATCH 202/202] Advanced search: UI/UX, WIP.

SVN:b1162[5606]
---
 js/search/search_form_criteria_enum.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/js/search/search_form_criteria_enum.js b/js/search/search_form_criteria_enum.js
index 2310a2547..00eb15134 100644
--- a/js/search/search_form_criteria_enum.js
+++ b/js/search/search_form_criteria_enum.js
@@ -640,14 +640,14 @@ $(function()
 				oSelectedValuesElem.hide();
 			}
 
-			// Reorder
-			oSelectedValuesElem.html('');
-			var aSortedValues = this._sortValuesByLabel(this.options.values);
-			for(var iIdx in aSortedValues)
-			{
-				var oItemElem = this._makeListItemElement(aSortedValues[iIdx][1], aSortedValues[iIdx][0], true);
-				oItemElem.appendTo(oSelectedValuesElem);
-			}
+			// TODO: Reorder
+			// oSelectedValuesElem.html('');
+			// var aSortedValues = this._sortValuesByLabel(this.options.values);
+			// for(var iIdx in aSortedValues)
+			// {
+			// 	var oItemElem = this._makeListItemElement(aSortedValues[iIdx][1], aSortedValues[iIdx][0], true);
+			// 	oItemElem.appendTo(oSelectedValuesElem);
+			// }
 		},
 		// - Return an array of allowed values sorted by labels
 		_sortValuesByLabel: function(oSource)