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

#129 Result list to show an hyperlink with the object name (replacing the "zoom" icon)

Browse Source 
SVN:trunk[455]
This commit is contained in:
Romain Quetiez
2010-06-10 09:02:14 +00:00
parent a4e8c8d07d
commit c8ea97beae
13 changed files with 59 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
addons/userrights/userrightsprofile.class.inc.php
View File

@@ -207,7 +207,7 @@ class URP_Profiles extends UserRightsBaseClass
// Display lists // Display lists
MetaModel::Init_SetZListItems('details', array('name', 'description')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('details', array('name', 'description')); // Attributes to be displayed for the complete details
MetaModel::Init_SetZListItems('list', array('name', 'description')); // Attributes to be displayed for a list MetaModel::Init_SetZListItems('list', array('description')); // Attributes to be displayed for a list
// Search criteria // Search criteria
MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
@@ -313,7 +313,7 @@ class URP_Dimensions extends UserRightsBaseClass
// Display lists // Display lists
MetaModel::Init_SetZListItems('details', array('name', 'description', 'type')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('details', array('name', 'description', 'type')); // Attributes to be displayed for the complete details
MetaModel::Init_SetZListItems('list', array('name', 'description')); // Attributes to be displayed for a list MetaModel::Init_SetZListItems('list', array('description')); // Attributes to be displayed for a list
// Search criteria // Search criteria
MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
@@ -431,7 +431,7 @@ class URP_UserProfile extends UserRightsBaseClass
// Display lists // Display lists
MetaModel::Init_SetZListItems('details', array('userid', 'profileid', 'reason')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('details', array('userid', 'profileid', 'reason')); // Attributes to be displayed for the complete details
MetaModel::Init_SetZListItems('list', array('userid', 'profileid', 'reason')); // Attributes to be displayed for a list MetaModel::Init_SetZListItems('list', array('profileid', 'reason')); // Attributes to be displayed for a list
// Search criteria // Search criteria
MetaModel::Init_SetZListItems('standard_search', array('userid', 'profileid')); // Criteria of the std search form MetaModel::Init_SetZListItems('standard_search', array('userid', 'profileid')); // Criteria of the std search form
MetaModel::Init_SetZListItems('advanced_search', array('userid', 'profileid')); // Criteria of the advanced search form MetaModel::Init_SetZListItems('advanced_search', array('userid', 'profileid')); // Criteria of the advanced search form
@@ -474,7 +474,7 @@ class URP_ProfileProjection extends UserRightsBaseClass
// Display lists // Display lists
MetaModel::Init_SetZListItems('details', array('dimensionid', 'profileid', 'value', 'attribute')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('details', array('dimensionid', 'profileid', 'value', 'attribute')); // Attributes to be displayed for the complete details
MetaModel::Init_SetZListItems('list', array('dimensionid', 'profileid', 'value', 'attribute')); // Attributes to be displayed for a list MetaModel::Init_SetZListItems('list', array('profileid', 'value', 'attribute')); // Attributes to be displayed for a list
// Search criteria // Search criteria
MetaModel::Init_SetZListItems('standard_search', array('dimensionid', 'profileid')); // Criteria of the std search form MetaModel::Init_SetZListItems('standard_search', array('dimensionid', 'profileid')); // Criteria of the std search form
MetaModel::Init_SetZListItems('advanced_search', array('dimensionid', 'profileid')); // Criteria of the advanced search form MetaModel::Init_SetZListItems('advanced_search', array('dimensionid', 'profileid')); // Criteria of the advanced search form
@@ -547,7 +547,7 @@ class URP_ClassProjection extends UserRightsBaseClass
// Display lists // Display lists
MetaModel::Init_SetZListItems('details', array('dimensionid', 'class', 'value', 'attribute')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('details', array('dimensionid', 'class', 'value', 'attribute')); // Attributes to be displayed for the complete details
MetaModel::Init_SetZListItems('list', array('dimensionid', 'class', 'value', 'attribute')); // Attributes to be displayed for a list MetaModel::Init_SetZListItems('list', array('class', 'value', 'attribute')); // Attributes to be displayed for a list
// Search criteria // Search criteria
MetaModel::Init_SetZListItems('standard_search', array('dimensionid', 'class')); // Criteria of the std search form MetaModel::Init_SetZListItems('standard_search', array('dimensionid', 'class')); // Criteria of the std search form
MetaModel::Init_SetZListItems('advanced_search', array('dimensionid', 'class')); // Criteria of the advanced search form MetaModel::Init_SetZListItems('advanced_search', array('dimensionid', 'class')); // Criteria of the advanced search form
@@ -625,7 +625,7 @@ class URP_ActionGrant extends UserRightsBaseClass
// Display lists // Display lists
MetaModel::Init_SetZListItems('details', array('profileid', 'class', 'permission', 'action')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('details', array('profileid', 'class', 'permission', 'action')); // Attributes to be displayed for the complete details
MetaModel::Init_SetZListItems('list', array('profileid', 'class', 'permission', 'action')); // Attributes to be displayed for a list MetaModel::Init_SetZListItems('list', array('class', 'permission', 'action')); // Attributes to be displayed for a list
// Search criteria // Search criteria
MetaModel::Init_SetZListItems('standard_search', array('profileid', 'class', 'permission', 'action')); // Criteria of the std search form MetaModel::Init_SetZListItems('standard_search', array('profileid', 'class', 'permission', 'action')); // Criteria of the std search form
MetaModel::Init_SetZListItems('advanced_search', array('profileid', 'class', 'permission', 'action')); // Criteria of the advanced search form MetaModel::Init_SetZListItems('advanced_search', array('profileid', 'class', 'permission', 'action')); // Criteria of the advanced search form
@@ -663,7 +663,7 @@ class URP_StimulusGrant extends UserRightsBaseClass
// Display lists // Display lists
MetaModel::Init_SetZListItems('details', array('profileid', 'class', 'permission', 'stimulus')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('details', array('profileid', 'class', 'permission', 'stimulus')); // Attributes to be displayed for the complete details
MetaModel::Init_SetZListItems('list', array('profileid', 'class', 'permission', 'stimulus')); // Attributes to be displayed for a list MetaModel::Init_SetZListItems('list', array('class', 'permission', 'stimulus')); // Attributes to be displayed for a list
// Search criteria // Search criteria
MetaModel::Init_SetZListItems('standard_search', array('profileid', 'class', 'permission', 'stimulus')); // Criteria of the std search form MetaModel::Init_SetZListItems('standard_search', array('profileid', 'class', 'permission', 'stimulus')); // Criteria of the std search form
MetaModel::Init_SetZListItems('advanced_search', array('profileid', 'class', 'permission', 'stimulus')); // Criteria of the advanced search form MetaModel::Init_SetZListItems('advanced_search', array('profileid', 'class', 'permission', 'stimulus')); // Criteria of the advanced search form
@@ -696,7 +696,7 @@ class URP_AttributeGrant extends UserRightsBaseClass
// Display lists // Display lists
MetaModel::Init_SetZListItems('details', array('actiongrantid', 'attcode')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('details', array('actiongrantid', 'attcode')); // Attributes to be displayed for the complete details
MetaModel::Init_SetZListItems('list', array('actiongrantid', 'attcode')); // Attributes to be displayed for a list MetaModel::Init_SetZListItems('list', array('attcode')); // Attributes to be displayed for a list
// Search criteria // Search criteria
MetaModel::Init_SetZListItems('standard_search', array('actiongrantid', 'attcode')); // Criteria of the std search form MetaModel::Init_SetZListItems('standard_search', array('actiongrantid', 'attcode')); // Criteria of the std search form
MetaModel::Init_SetZListItems('advanced_search', array('actiongrantid', 'attcode')); // Criteria of the advanced search form MetaModel::Init_SetZListItems('advanced_search', array('actiongrantid', 'attcode')); // Criteria of the advanced search form

63
application/ajaxwebpage.class.inc.php
View File

@@ -80,69 +80,6 @@ class ajax_page extends WebPage
{ {
} }
/**
* Adds a tabular content to the web page
* @param Hash $aConfig Configuration of the table: hash array of 'column_id' => 'Column Label'
* @param Hash $aData Hash array. Data to display in the table: each row is made of 'column_id' => Data. A column 'pkey' is expected for each row
* @param Hash $aParams Hash array. Extra parameters for the table. Entry 'class' holds the class of the objects listed in the table
* @return void
*/
public function table($aConfig, $aData, $aParams = array())
{
// WARNING WARNING WARNING
// This whole function is actually a copy paste from iTopWebPage::table
$oAppContext = new ApplicationContext();
static $iNbTables = 0;
$iNbTables++;
$sHtml = "";
$sHtml .= "<table class=\"listResults\">\n";
$sHtml .= "<thead>\n";
$sHtml .= "<tr>\n";
foreach($aConfig as $sName=>$aDef)
{
$sHtml .= "<th title=\"".$aDef['description']."\">".$aDef['label']."</th>\n";
}
$sHtml .= "</tr>\n";
$sHtml .= "</thead>\n";
$sHtml .= "<tbody>\n";
foreach($aData as $aRow)
{
if (false) //(isset($aParams['preview']) && $aParams['preview'])
{
$sHtml .= "<tr id=\"Row_".$iNbTables."_".$aRow['key']."\" onClick=\"DisplayPreview(".$iNbTables.",".$aRow['key'].",'".$aParams['class']."')\">\n";
}
else if (isset($aRow['key']))
{
$sHtml .= "<tr onDblClick=\"DisplayDetails(".$aRow['key'].",'".$aParams['class']."')\">\n";
}
else
{
$sHtml .= "<tr>\n";
}
foreach($aConfig as $sName=>$aVoid)
{
if ($sName != 'key')
{
$sValue = empty($aRow[$sName]) ? '&nbsp;' : $aRow[$sName];
$sHtml .= "<td>$sValue</td>\n";
}
else
{
$sUIPage = cmdbAbstractObject::ComputeUIPage($aParams['class']);
$sHtml .= "<td><a class=\"no-arrow\" href=\"$sUIPage?operation=details&id=".$aRow['key']."&class=".$aParams['class']."&".$oAppContext->GetForLink()."\"><img src=\"../images/zoom.gif\" title=\"".Dict::S('UI:Details+')."\" border=\"0\"></a></td>\n";
}
}
$sHtml .= "</tr>\n";
}
$sHtml .= "</tbody>\n";
$sHtml .= "</table>\n";
if (isset($aParams['preview']) && $aParams['preview'])
{
$sHtml .= "<div class=\"PreviewPane\" id=\"PreviewPane_".$iNbTables."\" style=\"height:100px;border:1px solid black;margin-top:2px;padding:3px;text-align:left;display:none;\">Preview Pane</div>";
}
$this->add($sHtml);
}
/** /**
* Adds a script to be executed when the DOM is ready (typical JQuery use) * Adds a script to be executed when the DOM is ready (typical JQuery use)
* NOT implemented in this version of the class. * NOT implemented in this version of the class.

2
application/audit.category.class.inc.php
View File

@@ -51,7 +51,7 @@ class AuditCategory extends cmdbAbstractObject
// Display lists // Display lists
MetaModel::Init_SetZListItems('details', array('name', 'description', 'definition_set')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('details', array('name', 'description', 'definition_set')); // Attributes to be displayed for the complete details
MetaModel::Init_SetZListItems('list', array('name', 'description', )); // Attributes to be displayed for a list MetaModel::Init_SetZListItems('list', array('description', )); // Attributes to be displayed for a list
// Search criteria // Search criteria
MetaModel::Init_SetZListItems('standard_search', array('name', 'description')); // Criteria of the std search form MetaModel::Init_SetZListItems('standard_search', array('name', 'description')); // Criteria of the std search form
MetaModel::Init_SetZListItems('advanced_search', array('name', 'description', 'definition_set')); // Criteria of the advanced search form MetaModel::Init_SetZListItems('advanced_search', array('name', 'description', 'definition_set')); // Criteria of the advanced search form

2
application/audit.rule.class.inc.php
View File

@@ -55,7 +55,7 @@ class AuditRule extends cmdbAbstractObject
// Display lists // Display lists
MetaModel::Init_SetZListItems('details', array('category_id', 'name', 'description', 'query', 'valid_flag')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('details', array('category_id', 'name', 'description', 'query', 'valid_flag')); // Attributes to be displayed for the complete details
MetaModel::Init_SetZListItems('list', array('category_id', 'name', 'description', 'valid_flag')); // Attributes to be displayed for a list MetaModel::Init_SetZListItems('list', array('category_id', 'description', 'valid_flag')); // Attributes to be displayed for a list
// Search criteria // Search criteria
MetaModel::Init_SetZListItems('standard_search', array('category_id', 'name', 'description', 'valid_flag')); // Criteria of the std search form MetaModel::Init_SetZListItems('standard_search', array('category_id', 'name', 'description', 'valid_flag')); // Criteria of the std search form
MetaModel::Init_SetZListItems('advanced_search', array('category_id', 'name', 'description', 'valid_flag', 'query')); // Criteria of the advanced search form MetaModel::Init_SetZListItems('advanced_search', array('category_id', 'name', 'description', 'valid_flag', 'query')); // Criteria of the advanced search form

29
application/cmdbabstract.class.inc.php
View File

@@ -271,6 +271,7 @@ abstract class cmdbAbstractObject extends CMDBObject
$iListId++; $iListId++;
// Initialize and check the parameters // Initialize and check the parameters
$bViewLink = isset($aExtraParams['view_link']) ? $aExtraParams['view_link'] : true;
$sLinkageAttribute = isset($aExtraParams['link_attr']) ? $aExtraParams['link_attr'] : ''; $sLinkageAttribute = isset($aExtraParams['link_attr']) ? $aExtraParams['link_attr'] : '';
$iLinkedObjectId = isset($aExtraParams['object_id']) ? $aExtraParams['object_id'] : 0; $iLinkedObjectId = isset($aExtraParams['object_id']) ? $aExtraParams['object_id'] : 0;
$sTargetAttr = isset($aExtraParams['target_attr']) ? $aExtraParams['target_attr'] : ''; $sTargetAttr = isset($aExtraParams['target_attr']) ? $aExtraParams['target_attr'] : '';
@@ -340,7 +341,10 @@ abstract class cmdbAbstractObject extends CMDBObject
$aAttribs['form::select'] = array('label' => "", 'description' => ''); $aAttribs['form::select'] = array('label' => "", 'description' => '');
} }
} }
$aAttribs['key'] = array('label' => '', 'description' => Dict::S('UI:ClickToDisplay+')); if ($bViewLink)
{
$aAttribs['key'] = array('label' => MetaModel::GetName($sClassName), 'description' => '');
}
foreach($aList as $sAttCode) foreach($aList as $sAttCode)
{ {
$aAttribs[$sAttCode] = array('label' => MetaModel::GetLabel($sClassName, $sAttCode), 'description' => MetaModel::GetDescription($sClassName, $sAttCode)); $aAttribs[$sAttCode] = array('label' => MetaModel::GetLabel($sClassName, $sAttCode), 'description' => MetaModel::GetDescription($sClassName, $sAttCode));
@@ -359,7 +363,10 @@ abstract class cmdbAbstractObject extends CMDBObject
while (($oObj = $oSet->Fetch()) && ($iMaxObjects != 0)) while (($oObj = $oSet->Fetch()) && ($iMaxObjects != 0))
{ {
$aRow = array(); $aRow = array();
$aRow['key'] = $oObj->GetKey(); if ($bViewLink)
{
$aRow['key'] = $oObj->GetHyperLink();
}
if ($bSelectMode) if ($bSelectMode)
{ {
if ($bSingleSelectMode) if ($bSingleSelectMode)
@@ -369,9 +376,8 @@ abstract class cmdbAbstractObject extends CMDBObject
else else
{ {
$aRow['form::select'] = "<input type=\"checkBox\" class=\"selectList{$iListId}\" name=\"selectObject[]\" value=\"".$oObj->GetKey()."\"></input>"; $aRow['form::select'] = "<input type=\"checkBox\" class=\"selectList{$iListId}\" name=\"selectObject[]\" value=\"".$oObj->GetKey()."\"></input>";
}
} }
}
$aRow['key'] = $oObj->GetKey();
foreach($aList as $sAttCode) foreach($aList as $sAttCode)
{ {
$aRow[$sAttCode] = $oObj->GetAsHTML($sAttCode); $aRow[$sAttCode] = $oObj->GetAsHTML($sAttCode);
@@ -411,7 +417,7 @@ abstract class cmdbAbstractObject extends CMDBObject
$sHtml .= '</td></tr>'; $sHtml .= '</td></tr>';
} }
$sHtml .= "<tr><td $sColspan>"; $sHtml .= "<tr><td $sColspan>";
$sHtml .= $oPage->GetTable($aAttribs, $aValues, array('class'=>$sClassName, 'filter'=>$oSet->GetFilter()->serialize(), 'preview' => true)); $sHtml .= $oPage->GetTable($aAttribs, $aValues);
$sHtml .= '</td></tr>'; $sHtml .= '</td></tr>';
$sHtml .= '</table>'; $sHtml .= '</table>';
return $sHtml; return $sHtml;
@@ -424,6 +430,7 @@ abstract class cmdbAbstractObject extends CMDBObject
$aList = array(); $aList = array();
// Initialize and check the parameters // Initialize and check the parameters
$bViewLink = isset($aExtraParams['view_link']) ? $aExtraParams['view_link'] : true;
$bDisplayMenu = isset($aExtraParams['menu']) ? $aExtraParams['menu'] == true : true; $bDisplayMenu = isset($aExtraParams['menu']) ? $aExtraParams['menu'] == true : true;
// Check if there is a list of aliases to limit the display to... // Check if there is a list of aliases to limit the display to...
$aDisplayAliases = isset($aExtraParams['display_aliases']) ? explode(',', $aExtraParams['display_aliases']) : array(); $aDisplayAliases = isset($aExtraParams['display_aliases']) ? explode(',', $aExtraParams['display_aliases']) : array();
@@ -444,7 +451,10 @@ abstract class cmdbAbstractObject extends CMDBObject
foreach($aAuthorizedClasses as $sAlias => $sClassName) // TO DO: check if the user has enough rights to view the classes of the list... foreach($aAuthorizedClasses as $sAlias => $sClassName) // TO DO: check if the user has enough rights to view the classes of the list...
{ {
$aList[$sClassName] = MetaModel::GetZListItems($sClassName, 'list'); $aList[$sClassName] = MetaModel::GetZListItems($sClassName, 'list');
$aAttribs['key_'.$sAlias] = array('label' => '', 'description' => Dict::S('UI:ClickToDisplay+')); if ($bViewLink)
{
$aAttribs['key_'.$sAlias] = array('label' => MetaModel::GetName($sClassName), 'description' => '');
}
foreach($aList[$sClassName] as $sAttCode) foreach($aList[$sClassName] as $sAttCode)
{ {
$aAttribs[$sAttCode.'_'.$sAlias] = array('label' => MetaModel::GetLabel($sClassName, $sAttCode), 'description' => MetaModel::GetDescription($sClassName, $sAttCode)); $aAttribs[$sAttCode.'_'.$sAlias] = array('label' => MetaModel::GetLabel($sClassName, $sAttCode), 'description' => MetaModel::GetDescription($sClassName, $sAttCode));
@@ -466,7 +476,10 @@ abstract class cmdbAbstractObject extends CMDBObject
$aRow = array(); $aRow = array();
foreach($aAuthorizedClasses as $sAlias => $sClassName) // TO DO: check if the user has enough rights to view the classes of the list... foreach($aAuthorizedClasses as $sAlias => $sClassName) // TO DO: check if the user has enough rights to view the classes of the list...
{ {
$aRow['key_'.$sAlias] = $aObjects[$sAlias]->GetKey(); if ($bViewLink)
{
$aRow['key_'.$sAlias] = $aObjects[$sAlias]->GetHyperLink();
}
foreach($aList[$sClassName] as $sAttCode) foreach($aList[$sClassName] as $sAttCode)
{ {
$aRow[$sAttCode.'_'.$sAlias] = $aObjects[$sAlias]->GetAsHTML($sAttCode); $aRow[$sAttCode.'_'.$sAlias] = $aObjects[$sAlias]->GetAsHTML($sAttCode);
@@ -506,7 +519,7 @@ abstract class cmdbAbstractObject extends CMDBObject
$sHtml .= '</td></tr>'; $sHtml .= '</td></tr>';
} }
$sHtml .= "<tr><td $sColspan>"; $sHtml .= "<tr><td $sColspan>";
$sHtml .= $oPage->GetTable($aAttribs, $aValues, array('class'=>$aAuthorizedClasses, 'filter'=>$oSet->GetFilter()->serialize(), 'preview' => true)); $sHtml .= $oPage->GetTable($aAttribs, $aValues);
$sHtml .= '</td></tr>'; $sHtml .= '</td></tr>';
$sHtml .= '</table>'; $sHtml .= '</table>';
return $sHtml; return $sHtml;

6
application/displayblock.class.inc.php
View File

@@ -332,7 +332,11 @@ class DisplayBlock
$aData[] = array ( 'group' => $sLabels[$sValue], $aData[] = array ( 'group' => $sLabels[$sValue],
'value' => "<a href=\"./UI.php?operation=search&dosearch=1&$sParams&filter=$sFilter&$sGroupByField=".urlencode($sValue)."\">$iCount</a>"); // TO DO: add the context information 'value' => "<a href=\"./UI.php?operation=search&dosearch=1&$sParams&filter=$sFilter&$sGroupByField=".urlencode($sValue)."\">$iCount</a>"); // TO DO: add the context information
} }
$sHtml .= $oPage->GetTable(array('group' => array('label' => MetaModel::GetLabel($this->m_oFilter->GetClass(), $sGroupByField), 'description' => ''), 'value' => array('label'=> Dict::S('UI:GroupBy:Count'), 'description' => Dict::S('UI:GroupBy:Count+'))), $aData); $aAttribs =array(
'group' => array('label' => MetaModel::GetLabel($this->m_oFilter->GetClass(), $sGroupByField), 'description' => ''),
'value' => array('label'=> Dict::S('UI:GroupBy:Count'), 'description' => Dict::S('UI:GroupBy:Count+'))
);
$sHtml .= $oPage->GetTable($aAttribs, $aData);
} }
else else
{ {

2
application/iotask.class.inc.php
View File

@@ -60,7 +60,7 @@ class InputOutputTask extends cmdbAbstractObject
// Display lists // Display lists
MetaModel::Init_SetZListItems('details', array('name', 'description', 'category', 'objects_class', 'source_type', 'source_subtype', 'source_path' , 'options', 'test_mode', 'verbose_mode')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('details', array('name', 'description', 'category', 'objects_class', 'source_type', 'source_subtype', 'source_path' , 'options', 'test_mode', 'verbose_mode')); // Attributes to be displayed for the complete details
MetaModel::Init_SetZListItems('list', array('name', 'description', 'category', 'objects_class', 'source_type', 'source_subtype', 'options')); // Attributes to be displayed for a list MetaModel::Init_SetZListItems('list', array('description', 'category', 'objects_class', 'source_type', 'source_subtype', 'options')); // Attributes to be displayed for a list
// Search criteria // Search criteria
MetaModel::Init_SetZListItems('standard_search', array('name', 'category', 'objects_class', 'source_type', 'source_subtype')); // Criteria of the std search form MetaModel::Init_SetZListItems('standard_search', array('name', 'category', 'objects_class', 'source_type', 'source_subtype')); // Criteria of the std search form
MetaModel::Init_SetZListItems('advanced_search', array('name', 'description', 'category', 'objects_class', 'source_type', 'source_subtype')); // Criteria of the advanced search form MetaModel::Init_SetZListItems('advanced_search', array('name', 'description', 'category', 'objects_class', 'source_type', 'source_subtype')); // Criteria of the advanced search form

2
application/menunode.class.inc.php
View File

@@ -71,7 +71,7 @@ class menuNode extends DBObject
MetaModel::Init_AddAttribute(new AttributeInteger("user_id", array("allowed_values"=>null, "sql"=>"user_id", "default_value" => 0, "is_null_allowed"=>false, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeInteger("user_id", array("allowed_values"=>null, "sql"=>"user_id", "default_value" => 0, "is_null_allowed"=>false, "depends_on"=>array())));
MetaModel::Init_SetZListItems('details', array('parent_id', 'name', 'label', 'hyperlink', 'template', 'rank', 'type')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('details', array('parent_id', 'name', 'label', 'hyperlink', 'template', 'rank', 'type')); // Attributes to be displayed for the complete details
MetaModel::Init_SetZListItems('list', array('parent_id', 'name', 'label', 'rank', 'type')); // Attributes to be displayed for a list MetaModel::Init_SetZListItems('list', array('parent_id', 'label', 'rank', 'type')); // Attributes to be displayed for a list
} }
public function IsVisible() public function IsVisible()

1
application/ui.linkswidget.class.inc.php
View File

@@ -227,6 +227,7 @@ class UILinksWidget
$aExtraParams['target_attr'] = $sExtKeyToRemote; $aExtraParams['target_attr'] = $sExtKeyToRemote;
$aExtraParams['menu'] = false; $aExtraParams['menu'] = false;
$aExtraParams['select'] = false; $aExtraParams['select'] = false;
$aExtraParams['view_link'] = false;
cmdbAbstractObject::DisplaySet($oPage, $oSet, $aExtraParams); cmdbAbstractObject::DisplaySet($oPage, $oSet, $aExtraParams);
} }

39
application/webpage.class.inc.php
View File

@@ -111,6 +111,13 @@ class WebPage
return "<p>$s_html</p>\n"; return "<p>$s_html</p>\n";
} }
/**
* Adds a tabular content to the web page
* @param Hash $aConfig Configuration of the table: hash array of 'column_id' => 'Column Label'
* @param Hash $aData Hash array. Data to display in the table: each row is made of 'column_id' => Data. A column 'pkey' is expected for each row
* @param Hash $aParams Hash array. Extra parameters for the table.
* @return void
*/
public function table($aConfig, $aData, $aParams = array()) public function table($aConfig, $aData, $aParams = array())
{ {
$this->add($this->GetTable($aConfig, $aData, $aParams)); $this->add($this->GetTable($aConfig, $aData, $aParams));
@@ -135,39 +142,13 @@ class WebPage
$sHtml .= "<tbody>\n"; $sHtml .= "<tbody>\n";
foreach($aData as $aRow) foreach($aData as $aRow)
{ {
if (false) //(isset($aParams['preview']) && $aParams['preview']) $sHtml .= "<tr>\n";
{
$sHtml .= "<tr id=\"Row_".$iNbTables."_".$aRow['key']."\" onClick=\"DisplayPreview(".$iNbTables.",".$aRow['key'].",'".$aParams['class']."')\">\n";
}
else if (isset($aRow['key']))
{
$sHtml .= "<tr onDblClick=\"DisplayDetails(".$aRow['key'].",'".$aParams['class']."')\">\n";
}
else
{
$sHtml .= "<tr>\n";
}
foreach($aConfig as $sName=>$aAttribs) foreach($aConfig as $sName=>$aAttribs)
{ {
$aMatches = array(); $aMatches = array();
$sClass = isset($aAttribs['class']) ? 'class="'.$aAttribs['class'].'"' : ''; $sClass = isset($aAttribs['class']) ? 'class="'.$aAttribs['class'].'"' : '';
if (preg_match('/^key_(.+)$/', $sName, $aMatches) > 0) $sValue = ($aRow[$sName] === '') ? '&nbsp;' : $aRow[$sName];
{ $sHtml .= "<td $sClass>$sValue</td>\n";
$sAlias = $aMatches[1];
$sClass = $aParams['class'][$sAlias];
$sUIPage = cmdbAbstractObject::ComputeUIPage($sClass);
$sHtml .= "<td><a class=\"no-arrow\" href=\"$sUIPage?operation=details&id=".$aRow[$sName]."&class=".$sClass."&".$oAppContext->GetForLink()."\"><img src=\"../images/zoom.gif\" title=\"".Dict::S('UI:Details+')."\" border=\"0\"></a></td>\n";
}
else if ($sName == 'key')
{
$sUIPage = cmdbAbstractObject::ComputeUIPage($aParams['class']);
$sHtml .= "<td><a class=\"no-arrow\" href=\"$sUIPage?operation=details&id=".$aRow['key']."&class=".$aParams['class']."&".$oAppContext->GetForLink()."\"><img src=\"../images/zoom.gif\" title=\"".Dict::S('UI:Details+')."\" border=\"0\"></a></td>\n";
}
else
{
$sValue = ($aRow[$sName] === '') ? '&nbsp;' : $aRow[$sName];
$sHtml .= "<td $sClass>$sValue</td>\n";
}
} }
$sHtml .= "</tr>\n"; $sHtml .= "</tr>\n";
} }

20
core/trigger.class.inc.php
View File

@@ -56,7 +56,7 @@ class Trigger extends cmdbAbstractObject
// Display lists // Display lists
MetaModel::Init_SetZListItems('details', array('finalclass', 'description')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('details', array('finalclass', 'description')); // Attributes to be displayed for the complete details
MetaModel::Init_SetZListItems('list', array('finalclass', 'description')); // Attributes to be displayed for a list MetaModel::Init_SetZListItems('list', array('finalclass')); // Attributes to be displayed for a list
// Search criteria // Search criteria
// MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form // MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
// MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form // MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
@@ -87,7 +87,7 @@ class TriggerOnObject extends Trigger
"category" => "core/cmdb", "category" => "core/cmdb",
"key_type" => "autoincrement", "key_type" => "autoincrement",
"key_label" => "", "key_label" => "",
"name_attcode" => "", "name_attcode" => "description",
"state_attcode" => "", "state_attcode" => "",
"reconc_keys" => array(), "reconc_keys" => array(),
"db_table" => "priv_trigger_onobject", "db_table" => "priv_trigger_onobject",
@@ -117,7 +117,7 @@ class TriggerOnStateChange extends TriggerOnObject
"category" => "core/cmdb", "category" => "core/cmdb",
"key_type" => "autoincrement", "key_type" => "autoincrement",
"key_label" => "", "key_label" => "",
"name_attcode" => "", "name_attcode" => "description",
"state_attcode" => "", "state_attcode" => "",
"reconc_keys" => array(), "reconc_keys" => array(),
"db_table" => "priv_trigger_onstatechange", "db_table" => "priv_trigger_onstatechange",
@@ -131,7 +131,7 @@ class TriggerOnStateChange extends TriggerOnObject
// Display lists // Display lists
MetaModel::Init_SetZListItems('details', array('description', 'target_class', 'state')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('details', array('description', 'target_class', 'state')); // Attributes to be displayed for the complete details
MetaModel::Init_SetZListItems('list', array('finalclass', 'target_class', 'state', 'description')); // Attributes to be displayed for a list MetaModel::Init_SetZListItems('list', array('finalclass', 'target_class', 'state')); // Attributes to be displayed for a list
// Search criteria // Search criteria
// MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form // MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
// MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form // MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
@@ -147,7 +147,7 @@ class TriggerOnStateEnter extends TriggerOnStateChange
"category" => "core/cmdb", "category" => "core/cmdb",
"key_type" => "autoincrement", "key_type" => "autoincrement",
"key_label" => "", "key_label" => "",
"name_attcode" => "", "name_attcode" => "description",
"state_attcode" => "", "state_attcode" => "",
"reconc_keys" => array(), "reconc_keys" => array(),
"db_table" => "priv_trigger_onstateenter", "db_table" => "priv_trigger_onstateenter",
@@ -160,7 +160,7 @@ class TriggerOnStateEnter extends TriggerOnStateChange
// Display lists // Display lists
MetaModel::Init_SetZListItems('details', array('description', 'target_class', 'state')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('details', array('description', 'target_class', 'state')); // Attributes to be displayed for the complete details
MetaModel::Init_SetZListItems('list', array('target_class', 'state', 'description')); // Attributes to be displayed for a list MetaModel::Init_SetZListItems('list', array('target_class', 'state')); // Attributes to be displayed for a list
// Search criteria // Search criteria
// MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form // MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
// MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form // MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
@@ -176,7 +176,7 @@ class TriggerOnStateLeave extends TriggerOnStateChange
"category" => "core/cmdb", "category" => "core/cmdb",
"key_type" => "autoincrement", "key_type" => "autoincrement",
"key_label" => "", "key_label" => "",
"name_attcode" => "", "name_attcode" => "description",
"state_attcode" => "", "state_attcode" => "",
"reconc_keys" => array(), "reconc_keys" => array(),
"db_table" => "priv_trigger_onstateleave", "db_table" => "priv_trigger_onstateleave",
@@ -189,7 +189,7 @@ class TriggerOnStateLeave extends TriggerOnStateChange
// Display lists // Display lists
MetaModel::Init_SetZListItems('details', array('description', 'target_class', 'state')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('details', array('description', 'target_class', 'state')); // Attributes to be displayed for the complete details
MetaModel::Init_SetZListItems('list', array('target_class', 'state', 'description')); // Attributes to be displayed for a list MetaModel::Init_SetZListItems('list', array('target_class', 'state')); // Attributes to be displayed for a list
// Search criteria // Search criteria
// MetaModel::Init_SetZListItems('standard_search', array('')); // Criteria of the std search form // MetaModel::Init_SetZListItems('standard_search', array('')); // Criteria of the std search form
// MetaModel::Init_SetZListItems('advanced_search', array('')); // Criteria of the advanced search form // MetaModel::Init_SetZListItems('advanced_search', array('')); // Criteria of the advanced search form
@@ -205,7 +205,7 @@ class TriggerOnObjectCreate extends TriggerOnObject
"category" => "core/cmdb", "category" => "core/cmdb",
"key_type" => "autoincrement", "key_type" => "autoincrement",
"key_label" => "", "key_label" => "",
"name_attcode" => "", "name_attcode" => "description",
"state_attcode" => "", "state_attcode" => "",
"reconc_keys" => array(), "reconc_keys" => array(),
"db_table" => "priv_trigger_onobjcreate", "db_table" => "priv_trigger_onobjcreate",
@@ -218,7 +218,7 @@ class TriggerOnObjectCreate extends TriggerOnObject
// Display lists // Display lists
MetaModel::Init_SetZListItems('details', array('description', 'target_class')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('details', array('description', 'target_class')); // Attributes to be displayed for the complete details
MetaModel::Init_SetZListItems('list', array('finalclass', 'target_class', 'description')); // Attributes to be displayed for a list MetaModel::Init_SetZListItems('list', array('finalclass', 'target_class')); // Attributes to be displayed for a list
// Search criteria // Search criteria
// MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form // MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
// MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form // MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form

1
dictionaries/dictionary.itop.ui.php
View File

@@ -415,7 +415,6 @@ Dict::Add('EN US', 'English', 'English', array(
'UI:UndefinedObject' => 'undefined', 'UI:UndefinedObject' => 'undefined',
'UI:Document:OpenInNewWindow:Download' => 'Open in new window: %1$s, Download: %2$s', 'UI:Document:OpenInNewWindow:Download' => 'Open in new window: %1$s, Download: %2$s',
'UI:SelectAllToggle+' => 'Select / Deselect All', 'UI:SelectAllToggle+' => 'Select / Deselect All',
'UI:ClickToDisplay+' => 'Click to display',
'UI:TruncatedResults' => '%1$d objects displayed out of %2$d', 'UI:TruncatedResults' => '%1$d objects displayed out of %2$d',
'UI:DisplayAll' => 'Display All', 'UI:DisplayAll' => 'Display All',
'UI:CountOfResults' => '%1$d object(s)', 'UI:CountOfResults' => '%1$d object(s)',

1
dictionaries/fr.dictionary.itop.ui.php
View File

@@ -410,7 +410,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
'UI:UndefinedObject' => 'non défini', 'UI:UndefinedObject' => 'non défini',
'UI:Document:OpenInNewWindow:Download' => 'Ouvrir dans un nouvelle fenêtre: %1$s, Télécharger: %2$s', 'UI:Document:OpenInNewWindow:Download' => 'Ouvrir dans un nouvelle fenêtre: %1$s, Télécharger: %2$s',
'UI:SelectAllToggle+' => 'Tout Sélectionner / Tout Désélectionner', 'UI:SelectAllToggle+' => 'Tout Sélectionner / Tout Désélectionner',
'UI:ClickToDisplay+' => 'Cliquer pour afficher',
'UI:TruncatedResults' => '%1$d objets affichés sur %2$d', 'UI:TruncatedResults' => '%1$d objets affichés sur %2$d',
'UI:DisplayAll' => 'Tout afficher', 'UI:DisplayAll' => 'Tout afficher',
'UI:CountOfResults' => '%1$d objet(s)', 'UI:CountOfResults' => '%1$d objet(s)',