[icinga-checkins] icinga.org: icinga-web/master: * Fixed some bugs

git at icinga.org git at icinga.org
Tue Nov 29 12:41:21 CET 2011


Module: icinga-web
Branch: master
Commit: f40bc5d14aaeffe460fdf7a903fc52c63dcd3329
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=f40bc5d14aaeffe460fdf7a903fc52c63dcd3329

Author: Marius Hein <marius.hein at netways.de>
Date:   Tue Nov 29 12:40:53 2011 +0100

* Fixed some bugs

---

 .../Cronks/lib/js/Cronks/Tackle/Command/Form.js    |    4 ++++
 app/modules/Cronks/lib/js/Cronks/Tackle/Cronk.js   |    2 +-
 .../Tackle/Renderer/FlagIconColumnRenderer.js      |    4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/modules/Cronks/lib/js/Cronks/Tackle/Command/Form.js b/app/modules/Cronks/lib/js/Cronks/Tackle/Command/Form.js
index db8f626..f24d413 100644
--- a/app/modules/Cronks/lib/js/Cronks/Tackle/Command/Form.js
+++ b/app/modules/Cronks/lib/js/Cronks/Tackle/Command/Form.js
@@ -28,6 +28,10 @@ Icinga.Cronks.Tackle.Command.Form = Ext.extend(Ext.Panel, {
 		
 		this.removeAll();
 		
+		if (this.record) {
+			this.target = this.record;
+		}
+		
 		this.form = this.formBuilder.build(commandName, {
             renderSubmit: this.standalone,
             targets: Ext.isArray(this.target) ? this.target : [this.target]
diff --git a/app/modules/Cronks/lib/js/Cronks/Tackle/Cronk.js b/app/modules/Cronks/lib/js/Cronks/Tackle/Cronk.js
index b8bfd7f..e3abc3e 100644
--- a/app/modules/Cronks/lib/js/Cronks/Tackle/Cronk.js
+++ b/app/modules/Cronks/lib/js/Cronks/Tackle/Cronk.js
@@ -81,7 +81,7 @@ Ext.ns('Icinga.Cronks.Tackle');
 
         toggleTabView: function(type) {
             var show = type;
-            var hide = type === "host" ? "service" : "hos;t"
+            var hide = (type === "host") ? "service" : "host"
 
             for(var i in this.tabItems[show]) {
                 this.infoTabs.unhideTabStripItem(this.tabItems[show][i]);
diff --git a/app/modules/Cronks/lib/js/Cronks/Tackle/Renderer/FlagIconColumnRenderer.js b/app/modules/Cronks/lib/js/Cronks/Tackle/Renderer/FlagIconColumnRenderer.js
index d7df13b..3c6a1ec 100644
--- a/app/modules/Cronks/lib/js/Cronks/Tackle/Renderer/FlagIconColumnRenderer.js
+++ b/app/modules/Cronks/lib/js/Cronks/Tackle/Renderer/FlagIconColumnRenderer.js
@@ -63,7 +63,7 @@ Icinga.Cronks.Tackle.Renderer.FlagIconColumnRenderer = function(type) {
 Icinga.Cronks.Tackle.Renderer.FlagIconColumnClickHandler =  function(col,grid,rowIdx,e) {
     var row = this.getView().getRow(rowIdx);
     var record = this.getStore().getAt(rowIdx);
-    var type = record.get('SERVICE_ID') ? 'service' : 'hos;t'
+    var type = record.get('SERVICE_ID') ? 'service' : 'host'
 
     var allowPassive = parseInt(record.get(type.toUpperCase()+'_PASSIVE_CHECKS_ENABLED'),10);
     var isFlapping = parseInt(record.get(type.toUpperCase()+'_IS_FLAPPING'),10);
@@ -174,4 +174,4 @@ Icinga.Cronks.Tackle.Renderer.FlagIconColumnClickHandler =  function(col,grid,ro
         items: mItems
     }).showAt(e.getXY());
 
-};
\ No newline at end of file
+};





More information about the icinga-checkins mailing list