composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-23 02:28:44 +02: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

8
modules/itop-config-mgmt-1.0.0/model.itop-config-mgmt.php
View File

@@ -472,7 +472,7 @@ class Subnet extends cmdbAbstractObject
$oPage->p(Dict::Format('Class:Subnet/Tab:IPUsage-explain', $sIPMin, $sIPMax));
$oIfSet = new CMDBObjectSet(DBObjectSearch::FromOQL("SELECT NetworkInterface AS if WHERE INET_ATON(if.ip_address) >= INET_ATON('$sIPMin') AND INET_ATON(if.ip_address) <= INET_ATON('$sIPMax')"));
self::DisplaySet($oPage, $oIfSet);
self::DisplaySet($oPage, $oIfSet, array('block_id' => 'nwif'));
$iCountUsed = $oIfSet->Count();
$iCountRange = $iIPMax - $iIPMin;
@@ -1050,9 +1050,9 @@ class NetworkInterface extends ConnectableCI
{
return $this->Get('device_name').' - '.$this->Get('name');
}
public static function GetRelationQueries($sRelCode)
{
switch ($sRelCode)

30
modules/itop-service-mgmt-1.0.0/model.itop-service-mgmt.php
View File

@@ -327,22 +327,20 @@ class Service extends cmdbAbstractObject
MetaModel::Init_SetZListItems('advanced_search', array('name', 'description', 'org_id', 'type', 'status'));
MetaModel::Init_SetZListItems('standard_search', array('name', 'description', 'org_id', 'type', 'status'));
MetaModel::Init_SetZListItems('list', array('name', 'description', 'org_id', 'type', 'status'));
}
function DisplayBareRelations(WebPage $oPage, $bEditMode = false)
{
parent::DisplayBareRelations($oPage, $bEditMode);
$aExtraParam = array ('menu' => false);
$ServiceID=$this->GetKey();
if (!$bEditMode)
{
$oPage->SetCurrentTab(Dict::S('Class:Service/Tab:Related_Contracts'));
$oCustomerContracts=new CMDBObjectSet(DBObjectSearch::FromOQL("SELECT CustomerContract AS cc JOIN lnkContractToSLA AS ln ON ln.contract_id=cc.id JOIN SLA AS sla ON ln.sla_id=sla.id WHERE sla.service_id=$ServiceID"));
self::DisplaySet($oPage,$oCustomerContracts,$aExtraParam);
}
}
function DisplayBareRelations(WebPage $oPage, $bEditMode = false)
{
parent::DisplayBareRelations($oPage, $bEditMode);
$aExtraParam = array ('menu' => false, 'block_id' => 'service');
$ServiceID=$this->GetKey();
if (!$bEditMode)
{
$oPage->SetCurrentTab(Dict::S('Class:Service/Tab:Related_Contracts'));
$oCustomerContracts=new CMDBObjectSet(DBObjectSearch::FromOQL("SELECT CustomerContract AS cc JOIN lnkContractToSLA AS ln ON ln.contract_id=cc.id JOIN SLA AS sla ON ln.sla_id=sla.id WHERE sla.service_id=$ServiceID"));
self::DisplaySet($oPage,$oCustomerContracts,$aExtraParam);
}
}
}
class ServiceSubcategory extends cmdbAbstractObject