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

Fixed cosmetic issues (block_id) and made sure the warning would never appear again

Browse Source 
SVN:trunk[804]
This commit is contained in:
Romain Quetiez
2010-09-09 15:14:05 +00:00
parent ad6669135c
commit e9a84e1e84
4 changed files with 28 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -69,8 +69,7 @@ abstract class cmdbAbstractObject extends CMDBObject
$oAppContext = new ApplicationContext();
$sExtClassNameAtt = MetaModel::GetNameAttributeCode($sObjClass);
$sPage = self::ComputeUIPage($sObjClass);
$sAbsoluteUrl = utils::GetAbsoluteUrl(false); // False => Don't get the query string
$sAbsoluteUrl = substr($sAbsoluteUrl, 0, 1+strrpos($sAbsoluteUrl, '/')); // remove the current page, keep just the path, up to the last /
$sAbsoluteUrl = utils::GetAbsoluteUrlPath();
// Use the "name" of the target class as the label of the hyperlink
// unless it's not available in the external attributes...
@@ -509,7 +508,14 @@ abstract class cmdbAbstractObject extends CMDBObject
}
$sHtml .= '<table class="listContainer">';
$sColspan = '';
$divId = $aExtraParams['block_id'];
if (isset($aExtraParams['block_id']))
{
$divId = $aExtraParams['block_id'];
}
else
{
$divId = 'missingblockid';
}
$sFilter = $oSet->GetFilter()->serialize();
$iMinDisplayLimit = utils::GetConfig()->GetMinDisplayLimit();
$sCollapsedLabel = Dict::Format('UI:TruncatedResults', $iMinDisplayLimit, $oSet->Count());
@@ -812,25 +818,6 @@ EOF
$oPage->add("</Set>\n");
}
// By rom
function DisplayChangesLog(WebPage $oPage)
{
$oFltChangeOps = new CMDBSearchFilter('CMDBChangeOpSetAttribute');
$oFltChangeOps->AddCondition('objkey', $this->GetKey(), '=');
$oFltChangeOps->AddCondition('objclass', get_class($this), '=');
$oSet = new CMDBObjectSet($oFltChangeOps, array('date' => false)); // order by date descending (i.e. false)
$count = $oSet->Count();
if ($count > 0)
{
$oPage->p(Dict::Format('UI:ChangesLogTitle', $count));
self::DisplaySet($oPage, $oSet);
}
else
{
$oPage->p(Dict::S('UI:EmptyChangesLogTitle'));
}
}
public static function DisplaySearchForm(WebPage $oPage, CMDBObjectSet $oSet, $aExtraParams = array())
{