\n\n";
diff --git a/application/menunode.class.inc.php b/application/menunode.class.inc.php
index 4ad4413ee..4897817be 100644
--- a/application/menunode.class.inc.php
+++ b/application/menunode.class.inc.php
@@ -423,7 +423,7 @@ class OQLMenuNode extends MenuNode
// The standard template used for all such pages: a (closed) search form at the top and a list of results at the bottom
$sTemplate = <<$this->sOQL
-
$this->sPageTitle
+
$sIcon$this->sPageTitle
$this->sOQL
EOF;
$oTemplate = new DisplayTemplate($sTemplate);
diff --git a/application/nicewebpage.class.inc.php b/application/nicewebpage.class.inc.php
index 8b59d7167..6343279db 100644
--- a/application/nicewebpage.class.inc.php
+++ b/application/nicewebpage.class.inc.php
@@ -36,7 +36,7 @@ class NiceWebPage extends WebPage
parent::__construct($s_title);
$this->m_aReadyScripts = array();
$this->add_linked_script("../js/jquery-1.4.2.min.js");
- $this->add_linked_script("../js/jquery.history_remote.pack.js");
+ //$this->add_linked_script("../js/jquery.history_remote.pack.js");
$this->add_linked_stylesheet('../css/ui-lightness/jquery-ui-1.8.2.custom.css');
$this->add_linked_script('../js/jquery-ui-1.8.2.custom.min.js');
//$this->add_linked_script("../js/ui.resizable.js");
diff --git a/application/ui.linkswidget.class.inc.php b/application/ui.linkswidget.class.inc.php
index 931a5e3c4..6ee62d8e2 100644
--- a/application/ui.linkswidget.class.inc.php
+++ b/application/ui.linkswidget.class.inc.php
@@ -32,6 +32,11 @@ class UILinksWidget
protected $m_sAttCode;
protected $m_sNameSuffix;
protected $m_iInputId;
+ protected $m_aAttributes;
+ protected $m_sExtKeyToRemote;
+ protected $m_sLinkedClass;
+ protected $m_sRemoteClass;
+ protected static $iWidgetIndex = 0;
public function __construct($sClass, $sAttCode, $iInputId, $sNameSuffix = '')
{
@@ -39,120 +44,197 @@ class UILinksWidget
$this->m_sAttCode = $sAttCode;
$this->m_sNameSuffix = $sNameSuffix;
$this->m_iInputId = $iInputId;
- }
-
- public function Display(WebPage $oPage, $oCurrentValuesSet = null)
- {
- $sHTMLValue = '';
- $sTargetClass = self::GetTargetClass($this->m_sClass, $this->m_sAttCode);
- // #@# todo - add context information, otherwise any value will be authorized for external keys
- $aAllowedValues = MetaModel::GetAllowedValues_att($this->m_sClass, $this->m_sAttCode, array(), '');
+ $this->m_aEditableFields = array();
+ self::$iWidgetIndex++;
+
$oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $this->m_sAttCode);
- $sExtKeyToRemote = $oAttDef->GetExtKeyToRemote();
+ $this->m_sLinkedClass = $oAttDef->GetLinkedClass();
+ $this->m_sExtKeyToRemote = $oAttDef->GetExtKeyToRemote();
+ $oLinkingAttDef = MetaModel::GetAttributeDef($this->m_sLinkedClass, $this->m_sExtKeyToRemote);
+ $this->m_sRemoteClass = $oLinkingAttDef->GetTargetClass();
$sExtKeyToMe = $oAttDef->GetExtKeyToMe();
$sStateAttCode = MetaModel::GetStateAttributeCode($this->m_sClass);
- $sDefaultState = MetaModel::GetDefaultState($this->m_sClass);
+ $sDefaultState = MetaModel::GetDefaultState($this->m_sClass);
- $aAttributes = array();
- $sLinkedClass = $oAttDef->GetLinkedClass();
- foreach(MetaModel::ListAttributeDefs($sLinkedClass) as $sAttCode=>$oAttDef)
+ $this->m_aEditableFields = array();
+ $this->m_aTableConfig = array();
+ $this->m_aTableConfig['form::checkbox'] = array( 'label' => "m_sAttCode}{$this->m_sNameSuffix} .selection').each( function() { this.checked = value; } ); oWidget".self::$iWidgetIndex.".OnSelectChange();\">", 'description' => Dict::S('UI:SelectAllToggle+'));
+
+ foreach(MetaModel::ListAttributeDefs($this->m_sLinkedClass) as $sAttCode=>$oAttDef)
{
if ($sStateAttCode == $sAttCode)
{
// State attribute is always hidden from the UI
}
- else if (!$oAttDef->IsExternalField() && ($sAttCode != $sExtKeyToMe) && ($sAttCode != $sExtKeyToRemote))
+ else if (!$oAttDef->IsExternalField() && ($sAttCode != $sExtKeyToMe) && ($sAttCode != $this->m_sExtKeyToRemote) && ($sAttCode != 'finalclass'))
{
- $iFlags = MetaModel::GetAttributeFlags($this->m_sClass, $sDefaultState, $sAttCode);
+ $iFlags = MetaModel::GetAttributeFlags($this->m_sLinkedClass, $sDefaultState, $sAttCode);
if ( !($iFlags & OPT_ATT_HIDDEN) && !($iFlags & OPT_ATT_READONLY) )
{
- $aAttributes[] = $sAttCode;
+ $this->m_aEditableFields[] = $sAttCode;
+ $this->m_aTableConfig[$sAttCode] = array( 'label' => $oAttDef->GetLabel(), 'description' => $oAttDef->GetDescription());
}
}
}
- $sAttributes = '[]';
- if (count($aAttributes) > 0)
+ foreach(MetaModel::GetZListItems($this->m_sRemoteClass, 'list') as $sFieldCode)
{
- $sAttributes = "['".implode("','", $aAttributes)."']";
- }
- if ($oCurrentValuesSet != null)
- {
- // Serialize the link set into a JSon object
- $aCurrentValues = array();
- $oCurrentValuesSet->Rewind(); // Make sure we can iterate through this set...
- while($oLinkObj = $oCurrentValuesSet->Fetch())
+ // TO DO: check the state of the attribute: hidden or visible ?
+ if ($sFieldCode != 'finalclass')
{
- $sRow = '{';
- foreach($aAttributes as $sLinkAttCode)
- {
- $sRow.= "\"$sLinkAttCode\": \"".addslashes($oLinkObj->Get($sLinkAttCode))."\", ";
- }
- $sRow .= "\"$sExtKeyToRemote\": ".$oLinkObj->Get($sExtKeyToRemote).'}';
- $aCurrentValues[] = $sRow;
+ $oAttDef = MetaModel::GetAttributeDef($this->m_sRemoteClass, $sFieldCode);
+ $this->m_aTableConfig['static::'.$sFieldCode] = array( 'label' => $oAttDef->GetLabel(), 'description' => $oAttDef->GetDescription());
}
- $sJSON = '['.implode(',', $aCurrentValues).']';
}
- else
- {
- $sJSON = '[]'; // Empty array;
-//echo "JSON VA IECH \n";
- }
-//echo "JASON: $sJSON \n";;
-
- // Many values (or even a unknown list) display an autocomplete
- if ( (count($aAllowedValues) == 0) || (count($aAllowedValues) > 50) )
- {
- // too many choices, use an autocomplete
- // The input for the auto complete
- $sTitle = $oAttDef->GetDescription();
- $sHTMLValue .= "\n";
- $oPage->add_at_the_end($this->GetObjectPickerDialog($oPage, $sTargetClass, 'oLinkWidget'.$this->m_iInputId.'.OnOk')); // Forms should not be inside forms
- $oPage->add_at_the_end($this->GetLinkObjectDialog($oPage, $this->m_iInputId)); // Forms should not be inside forms
- $sHTMLValue .= "m_iInputId}\" size=\"35\" value=\"\" title=\"".Dict::S('UI:LinksWidget:Autocomplete+')."\"/>";
- $sHTMLValue .= "m_iInputId}\" value=\"".Dict::S('UI:Button:AddObject')."\" class=\"action\" onClick=\"oLinkWidget{$this->m_iInputId}.AddObject();\"/>";
- $sHTMLValue .= " m_iInputId', '$sExtKeyToRemote');\"/> m_iInputId}\">\n";
- // another hidden input to store & pass the object's Id
- $sHTMLValue .= "m_iInputId}\" onChange=\"EnableAddButton('{$this->m_iInputId}');\"/>\n";
- $sHTMLValue .= "m_iInputId}\" name=\"attr_{$this->m_sAttCode}{$this->m_sNameSuffix}\" value=\"\"/>\n";
- $oPage->add_ready_script("\$('#{$this->m_iInputId}').val('$sJSON');\noLinkWidget{$this->m_iInputId}.Init();\n\$('#ac_{$this->m_iInputId}').autocomplete('./ajax.render.php', { scroll:true, minChars:3, onItemSelect:selectItem, onFindValue:findValue, formatItem:formatItem, autoFill:true, keyHolder:'#id_ac_{$this->m_iInputId}', extraParams:{operation:'ui.linkswidget', sclass:'{$this->m_sClass}', attCode:'{$this->m_sAttCode}', max:30}});");
- $oPage->add_ready_script("\$('#ac_add_{$this->m_iInputId}').attr('disabled', 'disabled');");
- $oPage->add_ready_script("\$('#ac_{$this->m_iInputId}').result( function(event, data, formatted) { if (data) { $('#id_ac_{$this->m_iInputId}').val(data[1]); $('#ac_add_{$this->m_iInputId}').attr('disabled', ''); } else { $('#ac_add_{$this->m_iInputId}').attr('disabled', 'disabled'); } } );");
- }
- else
- {
- // Few choices, use a normal 'select'
- $sHTMLValue = "\n";
- }
- $sHTMLValue .= "
m_iInputId}_values\">\n";
- if ($oCurrentValuesSet != null)
- {
- // transform the DBObjectSet into a CMDBObjectSet !!!
- $aLinkedObjects = $oCurrentValuesSet->ToArray(false);
- // Actual values will be displayed asynchronously, no need to display them here
- //if (count($aLinkedObjects) > 0)
- //{
- // $oSet = CMDBObjectSet::FromArray($sLinkedClass, $aLinkedObjects);
- // $oDisplayBlock = DisplayBlock::FromObjectSet($oSet, 'list');
- // $sHTMLValue .= $oDisplayBlock->GetDisplay($oPage, $this->m_iInputId.'_current', array('linkage' => $sExtKeyToMe, 'menu' => false));
- //}
- }
- $sHTMLValue .= "
\n";
- return $sHTMLValue;
}
+
+ /**
+ * A one-row form for editing a link record
+ * @param WebPage $oP Web page used for the ouput
+ * @param DBObject $oLinkedObj The object to which all the elements of the linked set refer to
+ * @param mixed $linkObjOrId Either the object linked or a unique number for new link records to add
+ * @param Hash $aArgs Extra context arguments
+ * @return string The HTML fragment of the one-row form
+ */
+ protected function GetFormRow(WebPage $oP, DBObject $oLinkedObj, $linkObjOrId = null, $aArgs = array() )
+ {
+ $sPrefix = "$this->m_sAttCode{$this->m_sNameSuffix}";
+ $aRow = array();
+ if(is_object($linkObjOrId))
+ {
+ $key = $linkObjOrId->GetKey();
+ $sPrefix .= "[$key][";
+ $sNameSuffix = "]"; // To make a tabular form
+ $aArgs['prefix'] = $sPrefix;
+ $aRow['form::checkbox'] = "";
+ foreach($this->m_aEditableFields as $sFieldCode)
+ {
+ $oAttDef = MetaModel::GetAttributeDef($this->m_sLinkedClass, $sFieldCode);
+ $aRow[$sFieldCode] = cmdbAbstractObject::GetFormElementForField($oP, $this->m_sLinkedClass, $sFieldCode, $oAttDef, $linkObjOrId->Get($sFieldCode), '' /* DisplayValue */, $key, $sNameSuffix, 0, $aArgs);
+ }
+ }
+ else
+ {
+ // form for creating a new record
+ $sPrefix .= "[$linkObjOrId][";
+ $sNameSuffix = "]"; // To make a tabular form
+ $aArgs['prefix'] = $sPrefix;
+ $aRow['form::checkbox'] = "";
+ $aRow['form::checkbox'] .= "";
+ foreach($this->m_aEditableFields as $sFieldCode)
+ {
+ $oAttDef = MetaModel::GetAttributeDef($this->m_sLinkedClass, $sFieldCode);
+ $aRow[$sFieldCode] = cmdbAbstractObject::GetFormElementForField($oP, $this->m_sLinkedClass, $sFieldCode, $oAttDef, '' /* TO DO/ call GetDefaultValue($oObject->ToArgs()) */, '' /* DisplayValue */, '' /* id */, $sNameSuffix, 0, $aArgs);
+ }
+ }
+
+ foreach(MetaModel::GetZListItems($this->m_sRemoteClass, 'list') as $sFieldCode)
+ {
+ $aRow['static::'.$sFieldCode] = $oLinkedObj->GetAsHTML($sFieldCode);
+ }
+ return $aRow;
+ }
+
+ /**
+ * Display one row of the whole form
+ * @return none
+ */
+ protected function DisplayFormRow(WebPage $oP, $aConfig, $aRow, $iRowId)
+ {
+ $sHtml = '';
+ $sHtml .= "
\n";
+
+ return $sHtml;
+ }
+
+ /**
+ * Display the table with the form for editing all the links at once
+ * @param WebPage $oP The web page used for the output
+ * @param Hash $aConfig The table's header configuration
+ * @param Hash $aData The tabular data to be displayed
+ * @return string Html fragment representing the form table
+ */
+ protected function DisplayFormTable(WebPage $oP, $aConfig, $aData)
+ {
+ $sHtml = '';
+ $sHtml .= "
\n";
+
+ return $sHtml;
+ }
+
+
+ /**
+ * Get the HTML fragment corresponding to the linkset editing widget
+ * @param WebPage $oP The web page used for all the output
+ * @param DBObjectSet The initial value of the linked set
+ * @param Hash $aArgs Extra context arguments
+ * @return string The HTML fragment to be inserted into the page
+ */
+ public function Display(WebPage $oPage, DBObjectSet $oValue, $aArgs = array())
+ {
+ $iWidgetIndex = self::$iWidgetIndex;
+ $sHtmlValue = '';
+ $sTargetClass = self::GetTargetClass($this->m_sClass, $this->m_sAttCode);
+ $sHtmlValue .= "
\n";
+ $oPage->add_at_the_end($this->GetObjectPickerDialog($oPage)); // To prevent adding forms inside the main form
+ return $sHtmlValue;
+ }
+
/**
* This static function is called by the Ajax Page when there is a need to fill an autocomplete combo
- * @param $oPage WebPage The ajax page used for the put^put (sent back to the browser
+ * @param $oPage WebPage The ajax page used for the output (sent back to the browser)
* @param $oContext UserContext The context of the user (for limiting the search)
* @param $sClass string The name of the class of the current object being edited
* @param $sAttCode string The name of the attribute being edited
@@ -257,111 +339,106 @@ class UILinksWidget
return $sTargetClass;
}
- protected function GetObjectPickerDialog($oPage, $sTargetClass, $sOkFunction)
+ protected function GetObjectPickerDialog($oPage)
{
- $sDialogTitle = Dict::S('UI:ManageObjectsDlg');
- $sOkBtnLabel = Dict::S('UI:Button:Ok');
- $sCancelBtnLabel = Dict::S('UI:Button:Cancel');
- $sAddBtnLabel = Dict::S('UI:Button:AddToList');
- $sRemoveBtnLabel = Dict::S('UI:Button:RemoveFromList');
- $sFilterBtnLabel = Dict::S('UI:Button:FilterList');
- $sLabelSelectedObjects = Dict::S('UI:Label:SelectedObjects');
- $sLabelAvailableObjects = Dict::S('UI:Label:AvailableObjects');
- $sHTML = <<< EOF
-
\n";
+ $oPage->add_ready_script("$('#dlg_{$this->m_sAttCode}{$this->m_sNameSuffix}').dialog({ autoOpen: false, modal: true });");
+ $oPage->add_ready_script("$('#dlg_{$this->m_sAttCode}{$this->m_sNameSuffix}').dialog('option', {title:'".Dict::Format('UI:AddObjectsOf_Class_LinkedWith_Class_Instance', MetaModel::GetName($this->m_sLinkedClass), MetaModel::GetName($this->m_sClass), " ZZZZ ")."'});");
+ $oPage->add_ready_script("$('#SearchFormToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix} form').bind('submit.uilinksWizard', oWidget$iWidgetIndex.SearchObjectsToAdd);");
+ return $sHtml;
}
-
- protected function GetLinkObjectDialog($oPage, $sId)
+
+ /**
+ * 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 UserContext $oContext User context to limit the search...
+ * @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, UserContext $oContext, $sRemoteClass = '', $aAlreadyLinkedIds = array())
{
- $oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $this->m_sAttCode);
- $sLinkedClass = $oAttDef->GetLinkedClass();
- $sStateAttCode = MetaModel::GetStateAttributeCode($sLinkedClass);
- $sDefaultState = MetaModel::GetDefaultState($sLinkedClass);
- $oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $this->m_sAttCode);
- $sExtKeyToMe = $oAttDef->GetExtKeyToMe();
- $sExtKeyToRemote = $oAttDef->GetExtKeyToRemote();
-
- $sHTML = "
![](\"../images/tv-item-last.gif\")
m_sAttCode}{$this->m_sNameSuffix}_btnRemove\" type=\"button\" value=\"".Dict::S('UI:RemoveLinkedObjectsOf_Class')."\" onClick=\"oWidget$iWidgetIndex.RemoveSelected();\" >";
+ $sHtmlValue .= " m_sAttCode}{$this->m_sNameSuffix}_btnAdd\" type=\"button\" value=\"".Dict::Format('UI:AddLinkedObjectsOf_Class', MetaModel::GetName($this->m_sRemoteClass))."\" onClick=\"oWidget$iWidgetIndex.AddObjects();\">\n";
+ $sHtmlValue .= "