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

N°2772 - Fix errors during upgrade. Prevent JS Dict load for setup pages.

Browse Source
This commit is contained in:
Eric
2020-02-20 14:45:39 +01:00
parent e21e7c9cf0
commit d668d65c70
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
application/webpage.class.inc.php
View File

@@ -120,6 +120,7 @@ class WebPage implements Page
protected $a_OutputOptions;
protected $bPrintable;
protected $bHasCollapsibleSection;
protected $bAddJSDict;
/**
* WebPage constructor.
@@ -150,6 +151,7 @@ class WebPage implements Page
$this->a_OutputOptions = array();
$this->bHasCollapsibleSection = false;
$this->bPrintable = $bPrintable;
$this->bAddJSDict = true;
ob_start(); // Start capturing the output
}
@@ -757,7 +759,10 @@ class WebPage implements Page
}
// Dict entries for JS
$this->output_dict_entries();
if ($this->bAddJSDict)
{
$this->output_dict_entries();
}
// JS files
foreach ($this->a_linked_scripts as $s_script)

1
setup/setuppage.class.inc.php
View File

@@ -33,6 +33,7 @@ class SetupPage extends NiceWebPage
public function __construct($sTitle)
{
parent::__construct($sTitle);
$this->bAddJSDict = false;
$this->add_linked_script("../js/jquery.blockUI.js");
$this->add_linked_script("../setup/setup.js");
$this->add_saas("css/setup.scss");