composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-12 23:14:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/support/2.7' into support/3.0

Browse Source 
# Conflicts:
#	core/cmdbsource.class.inc.php
#	core/config.class.inc.php
#	core/displayablegraph.class.inc.php
#	core/log.class.inc.php
#	datamodels/2.x/itop-config-mgmt/dictionaries/tr.dict.itop-config-mgmt.php
#	datamodels/2.x/itop-knownerror-mgmt/dictionaries/tr.dict.itop-knownerror-mgmt.php
#	datamodels/2.x/itop-service-mgmt/dictionaries/tr.dict.itop-service-mgmt.php
#	datamodels/2.x/itop-tickets/tr.dict.itop-tickets.php
#	datamodels/2.x/itop-welcome-itil/tr.dict.itop-welcome-itil.php
#	dictionaries/tr.dictionary.itop.core.php
#	dictionaries/tr.dictionary.itop.ui.php
#	pages/UI.php
#	setup/itopdesignformat.class.inc.php
#	test/core/LogAPITest.php
#	test/integration/iTopModulesPhpVersionChecklistTest.php
#	test/postbuild_integration/SetupCssIntegrityChecklistTest.php
#	test/postbuild_integration/iTopModuleXmlInstallationChecklistTest.php
#	test/status/StatusTest.php
This commit is contained in:
Pierre Goiffon
2022-01-10 16:15:00 +01:00
parent 9b0e55210d e530cbb4f2
commit 8578d18e7f
43 changed files with 1944 additions and 1840 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
js/simple_graph.js
View File

@@ -727,18 +727,25 @@ $(function()
}
if (oData.lists)
{
this.refresh_lists(oData.lists);
if (this.options.excluded_classes.length > 0) {
var newList = {};
$.each(oData.lists, function (index, listId) {
if (me.options.excluded_classes.indexOf(index) < 0) {
newList[index] = listId;
}
});
me.refresh_lists(newList);
} else {
me.refresh_lists(oData.lists);
}
}
if (this.element.is(':visible'))
{
this._updateBBox();
this.auto_scale();
this._reset_pan_and_zoom();
this.draw();
}
else
{
this.bRedrawNeeded = true;
if (me.element.is(':visible')) {
me._updateBBox();
me.auto_scale();
me._reset_pan_and_zoom();
me.draw();
} else {
me.bRedrawNeeded = true;
}
},
refresh_groups: function(aGroups)