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

Fixed regression in the setup (due to a recent change in NiceWebPage)

Browse Source 
SVN:trunk[1950]
This commit is contained in:
Romain Quetiez
2012-04-06 15:32:29 +00:00
parent a7b7264903
commit d0025358da
2 changed files with 46 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
application/nicewebpage.class.inc.php
View File

@@ -91,12 +91,12 @@ EOF
);
$this->add_linked_stylesheet("../css/light-grey.css");
$this->m_sRootUrl = utils::GetAbsoluteUrlAppRoot();
$this->m_sRootUrl = $this->GetAbsoluteUrlAppRoot();
$sAbsURLAppRoot = addslashes($this->m_sRootUrl);
$sAbsURLModulesRoot = addslashes(utils::GetAbsoluteUrlModulesRoot());
$oAppContext = new ApplicationContext();
$sExtraParams = $oAppContext->GetForLink();
$sAppContext = addslashes($sExtraParams);
$sAbsURLModulesRoot = addslashes($this->GetAbsoluteUrlModulesRoot());
$sAppContext = addslashes($this->GetApplicationContext());
$this->add_script(
<<<EOF
function GetAbsoluteUrlAppRoot()
@@ -135,6 +135,22 @@ EOF
$this->add("<p style=\"font-size:smaller\">$sText</p>\n");
}
public function GetAbsoluteUrlAppRoot()
{
return utils::GetAbsoluteUrlAppRoot();
}
public function GetAbsoluteUrlModulesRoot()
{
return utils::GetAbsoluteUrlModulesRoot();
}
function GetApplicationContext()
{
$oAppContext = new ApplicationContext();
return $oAppContext->GetForLink();
}
// By Rom, used by CSVImport and Advanced search
public function MakeClassesSelect($sName, $sDefaultValue, $iWidthPx, $iActionCode = null)
{