Skip to content
This repository has been archived by the owner on Jan 15, 2019. It is now read-only.

Commit

Permalink
Add backward compatibility for renamed function customColumnPerfdataS…
Browse files Browse the repository at this point in the history 
…anatized

Signed-off-by: Eric Lippmann <eric.lippmann@netways.de>

fixes #5065

Conflicts:
	app/modules/Cronks/config/javascript.xml
  • Loading branch information
@lazyfrosch
lazyfrosch committed Dec 9, 2013
1 parent 9f30a09 commit 380ca61
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 11 deletions.
26 changes: 15 additions & 11 deletions app/modules/Cronks/config/javascript.xml
View file
Expand Up @@ -12,18 +12,18 @@
<ae:parameter>%core.root_dir%/lib/ext3/examples/ux/RowExpander.js</ae:parameter>
<ae:parameter>%core.root_dir%/lib/ext3/examples/ux/ColumnNodeUI.js</ae:parameter>
<ae:parameter>%core.module_dir%/Cronks/lib/js/Ext/ux/SlidingTabs.js</ae:parameter>

<!-- Own Ext extensions -->
<ae:parameter>%core.module_dir%/Cronks/lib/js//Ext/ux/form/MultiSelect.Override.js</ae:parameter>
<ae:parameter>%core.module_dir%/Cronks/lib/js/Ext/ux/Portlet.js</ae:parameter>
<ae:parameter>%core.module_dir%/Cronks/lib/js/Ext/ux/LazyStore.js</ae:parameter>
<ae:parameter>%core.module_dir%/Cronks/lib/js/Ext/ux/FlashComponent.js</ae:parameter>

<!-- Misc libs -->
<ae:parameter>%core.module_dir%/Cronks/lib/js/rmd160.js</ae:parameter>
<ae:parameter>%core.root_dir%/lib/jit/Extras/excanvas.js</ae:parameter>
<ae:parameter>%core.root_dir%/lib/jit/jit-yc.js</ae:parameter>

<!-- Cronk util -->
<ae:parameter>%core.module_dir%/Cronks/lib/js/Cronk.js</ae:parameter>
<ae:parameter>%core.module_dir%/Cronks/lib/js/Cronk/form/action/CronkBuilderCustom.js</ae:parameter>
Expand All @@ -33,8 +33,8 @@
<ae:parameter>%core.module_dir%/Cronks/lib/js/Cronk/util/CronkTabpanel.js</ae:parameter>
<ae:parameter>%core.module_dir%/Cronks/lib/js/Cronk/util/CronkTabhelper.js</ae:parameter>
<ae:parameter>%core.module_dir%/Cronks/lib/js/Cronk/util/StaticContentUtil.js</ae:parameter>


<!-- Icinga/Cronk Helpers -->
<ae:parameter>%core.module_dir%/Cronks/lib/js/Icinga/Cronks/util/CronkUrlWindow.js</ae:parameter>
<ae:parameter>%core.module_dir%/Cronks/lib/js/Icinga/Cronks/util/CronkPermissionWindow.js</ae:parameter>
Expand All @@ -45,7 +45,7 @@
<ae:parameter>%core.module_dir%/Cronks/lib/js/Icinga/Cronks/util/FilterState.js</ae:parameter>
<ae:parameter>%core.module_dir%/Cronks/lib/js/Icinga/Cronks/util/FilterEditor.js</ae:parameter>
<ae:parameter>%core.module_dir%/Cronks/lib/js/Icinga/Cronks/util/FilterEditorWindow.js</ae:parameter>

<!-- Icinga/Cronks -->
<ae:parameter>%core.module_dir%/Cronks/lib/js/Icinga/Cronks/System/CronkListingPanel.js</ae:parameter>
<ae:parameter>%core.module_dir%/Cronks/lib/js/Icinga/Cronks/System/StatusOverall.js</ae:parameter>
Expand All @@ -55,11 +55,11 @@
<ae:parameter>%core.module_dir%/Cronks/lib/js/Icinga/Cronks/StatusMap/StatusMapDetailPanel.js</ae:parameter>
<ae:parameter>%core.module_dir%/Cronks/lib/js/Icinga/Cronks/StatusMap/StatusMapPanel.js</ae:parameter>
<ae:parameter>%core.module_dir%/Cronks/lib/js/Icinga/Cronks/StatusMap/StatusMapServiceGrid.js</ae:parameter>


<!-- Search -->
<ae:parameter>%core.module_dir%/Cronks/lib/js/search/SearchHandler.js</ae:parameter>

<!-- Tackle view components -->
<ae:parameter>%core.module_dir%/Cronks/lib/js/Icinga/Cronks/Tackle/Translation.js</ae:parameter>
<ae:parameter>%core.module_dir%/Cronks/lib/js/Icinga/Cronks/Tackle/Renderer/ServiceHealthRenderer.js</ae:parameter>
Expand Down Expand Up @@ -90,15 +90,15 @@
<ae:parameter>%core.module_dir%/Cronks/lib/js/Icinga/Cronks/Tackle/ObjectGrid.js</ae:parameter>
<ae:parameter>%core.module_dir%/Cronks/lib/js/Icinga/Cronks/Tackle/InfoTabPanel.js</ae:parameter>
<ae:parameter>%core.module_dir%/Cronks/lib/js/Icinga/Cronks/Tackle/SLAChartPanel.js</ae:parameter>

<!-- Grid event handler -->
<ae:parameter>%core.module_dir%/Cronks/lib/js/Cronk/grid/handler/Grid.js</ae:parameter>
<ae:parameter>%core.module_dir%/Cronks/lib/js/Cronk/grid/components/ObjectInfo.js</ae:parameter>
<ae:parameter>%core.module_dir%/Cronks/lib/js/Cronk/grid/handler/Info.js</ae:parameter>
<ae:parameter>%core.module_dir%/Cronks/lib/js/Cronk/grid/handler/Statusmap.js</ae:parameter>
<ae:parameter>%core.module_dir%/Cronks/lib/js/Cronk/grid/handler/URL.js</ae:parameter>
<ae:parameter>%core.module_dir%/Cronks/lib/js/Cronk/grid/handler/Cronk.js</ae:parameter>

<!-- Grid events -->
<ae:parameter>%core.module_dir%/Cronks/lib/js/Cronk/grid/columns/ComponentFrame.js</ae:parameter>
<ae:parameter>%core.module_dir%/Cronks/lib/js/Cronk/grid/events/EventMixin.js</ae:parameter>
Expand All @@ -107,7 +107,7 @@
<ae:parameter>%core.module_dir%/Cronks/lib/js/Cronk/grid/events/MenuItem.js</ae:parameter>
<ae:parameter>%core.module_dir%/Cronks/lib/js/Cronk/grid/components/JsonActionPanel.js</ae:parameter>
<ae:parameter>%core.module_dir%/Cronks/lib/js/Cronk/grid/plugins/RowActionPanel.js</ae:parameter>

<!-- Grid toolset -->
<ae:parameter>%core.module_dir%/Cronks/lib/js/Cronk/grid/GridView.js</ae:parameter>
<ae:parameter>%core.module_dir%/Cronks/lib/js/Cronk/grid/ColumnModel.js</ae:parameter>
Expand All @@ -125,6 +125,10 @@
<ae:parameter>%core.module_dir%/Cronks/lib/js/Icinga/Cronks/System/TemplateGrid.js</ae:parameter>
<ae:parameter>%core.module_dir%/Cronks/lib/js/Cronk/grid/MetaGridPanel.js</ae:parameter>
<ae:parameter>%core.module_dir%/Cronks/lib/js/Cronk/grid/ObjectSelectionModel.js</ae:parameter>
<ae:parameter>%core.module_dir%/Cronks/lib/js/Cronk/grid/renderer/bc_customColumnPerfdataSanatized.js</ae:parameter>

<!-- Misc components -->
<ae:parameter>%core.module_dir%/Cronks/lib/js/Cronk/menu/ReloadStatus.js</ae:parameter>
</javascript>
</ae:configuration>
</ae:configurations>
11 changes: 11 additions & 0 deletions app/modules/Cronks/lib/js/Cronk/grid/renderer/bc_customColumnPerfdataSanatized.js
View file
@@ -0,0 +1,11 @@
/*
* Add backward compatibility for renamed function customColumnPerfdataSanatized
* @author Markus Frosch <markus.frosch@netways.de>
*/
(function () {
if (typeof Cronk.grid.ColumnRenderer.customColumnPerfdataSanatized !== 'function') {
Cronk.grid.ColumnRenderer.customColumnPerfdataSanatized = function (cfg) {
return Cronk.grid.ColumnRenderer.customColumnPerfdataSanitized(cfg);
};
}
})();

0 comments on commit 380ca61

Please sign in to comment.