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

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@804 a333f486-631f-4898-b8df-5754b55c2be0

application/cmdbabstract.class.inc.php

@@ -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())
 	{
 

modules/itop-config-mgmt-1.0.0/model.itop-config-mgmt.php

@@ -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)

modules/itop-service-mgmt-1.0.0/model.itop-service-mgmt.php

@@ -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

webservices/export.php

@@ -70,7 +70,7 @@ if (!empty($sExpression))
 				}
 				$sUrl = "$sProtocol://{$sServerName}{$sPort}/pages/";
 				$oP->set_base($sUrl);
-				cmdbAbstractObject::DisplaySet($oP, $oSet, array('menu' => false, 'display_limit' => false, 'zlist' => 'details')); // no menu, no truncated list, "details" zlist
+				cmdbAbstractObject::DisplaySet($oP, $oSet, array('block_id' => 'expresult', 'menu' => false, 'display_limit' => false, 'zlist' => 'details')); // no menu, no truncated list, "details" zlist
 				break;
 				
 				case 'csv':