[icinga-checkins] icinga.org: icinga-web/feature/macro-expander-1882: Add backward compatibility for renamed function customColumnPerfdataSanatized

git at icinga.org git at icinga.org
Wed Nov 20 16:35:12 CET 2013


Module: icinga-web
Branch: feature/macro-expander-1882
Commit: d2b44fe3ca2b37667653a34d574109f7113cf78b
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=d2b44fe3ca2b37667653a34d574109f7113cf78b

Author: Markus Frosch <markus.frosch at netways.de>
Date:   Wed Nov 20 15:53:42 2013 +0100

Add backward compatibility for renamed function customColumnPerfdataSanatized

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

fixes #5065

---

 app/modules/Cronks/config/javascript.xml           |   23 ++++++++++----------
 .../renderer/bc_customColumnPerfdataSanatized.js   |   11 ++++++++++
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/app/modules/Cronks/config/javascript.xml b/app/modules/Cronks/config/javascript.xml
index 29330a8..2e8bf30 100644
--- a/app/modules/Cronks/config/javascript.xml
+++ b/app/modules/Cronks/config/javascript.xml
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -90,7 +90,7 @@
             <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>
@@ -98,7 +98,7 @@
             <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>
@@ -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>
@@ -125,6 +125,7 @@
             <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>
diff --git a/app/modules/Cronks/lib/js/Cronk/grid/renderer/bc_customColumnPerfdataSanatized.js b/app/modules/Cronks/lib/js/Cronk/grid/renderer/bc_customColumnPerfdataSanatized.js
new file mode 100644
index 0000000..d59ad0d
--- /dev/null
+++ b/app/modules/Cronks/lib/js/Cronk/grid/renderer/bc_customColumnPerfdataSanatized.js
@@ -0,0 +1,11 @@
+/*
+ * Add backward compatibility for renamed function customColumnPerfdataSanatized
+ * @author Markus Frosch <markus.frosch at netways.de>
+ */
+(function () {
+    if (typeof Cronk.grid.ColumnRenderer.customColumnPerfdataSanatized !== 'function') {
+        Cronk.grid.ColumnRenderer.customColumnPerfdataSanatized = function (cfg) {
+            return Cronk.grid.ColumnRenderer.customColumnPerfdataSanitized(cfg);
+        };
+    }
+})();





More information about the icinga-checkins mailing list