Explorar o código

- Fixed bug #31: HTML display in the "export" page uses the appropriate stylesheet.

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@85 a333f486-631f-4898-b8df-5754b55c2be0
dflaven %!s(int64=16) %!d(string=hai) anos
pai
achega
570be41e13
Modificáronse 2 ficheiros con 5 adicións e 5 borrados
  1. 2 2
      application/cmdbabstract.class.inc.php
  2. 3 3
      webservices/export.php

+ 2 - 2
application/cmdbabstract.class.inc.php

@@ -213,9 +213,9 @@ abstract class cmdbAbstractObject extends CMDBObject
 	
 	// Comment by Rom: this helper may be used to display objects of class DBObject
 	//                 -> I am using this to display the changes history 
-	public static function DisplaySet(web_page $oPage, CMDBObjectSet $oSet, $sLinkageAttribute = '')
+	public static function DisplaySet(web_page $oPage, CMDBObjectSet $oSet, $sLinkageAttribute = '', $bDisplayMenu = true)
 	{
-		$oPage->add(self::GetDisplaySet($oPage, $oSet, $sLinkageAttribute));
+		$oPage->add(self::GetDisplaySet($oPage, $oSet, $sLinkageAttribute, $bDisplayMenu));
 	}
 	
 	public static function GetDisplaySet(web_page $oPage, CMDBObjectSet $oSet, $sLinkageAttribute = '', $bDisplayMenu = true)

+ 3 - 3
webservices/export.php

@@ -1,6 +1,6 @@
 <?php
 require_once('../application/application.inc.php');
-require_once('../application/webpage.class.inc.php');
+require_once('../application/nicewebpage.class.inc.php');
 require_once('../application/csvpage.class.inc.php');
 require_once('../application/xmlpage.class.inc.php');
 
@@ -31,8 +31,8 @@ if (!empty($sExpression))
 			switch($sFormat)
 			{
 				case 'html':
-				$oP = new web_page("iTop - Export");
-				cmdbAbstractObject::DisplaySet($oP, $oSet);
+				$oP = new nice_web_page("iTop - Export");
+				cmdbAbstractObject::DisplaySet($oP, $oSet, '' /* linkage */, false /* don't display the menu */);
 				break;
 				
 				case 'csv':