[icinga-checkins] icinga.org: icinga-web/jmosshammer/default: * Fixed starttime format in commands and interface freezing when trying to send an invalid form

git at icinga.org git at icinga.org
Tue Nov 9 11:32:27 CET 2010


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

Author: jmosshammer <jannis.mosshammer at netways.com>
Date:   Thu Oct 21 16:44:20 2010 +0200

* Fixed starttime format in commands and interface freezing when trying to send an invalid form

---

 .../models/System/CommandSenderModel.class.php     |    2 +-
 .../System/ViewProc/js/IcingaCommandHandler.js     |    5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/modules/Cronks/models/System/CommandSenderModel.class.php b/app/modules/Cronks/models/System/CommandSenderModel.class.php
index f7c1f48..f8e0ed2 100755
--- a/app/modules/Cronks/models/System/CommandSenderModel.class.php
+++ b/app/modules/Cronks/models/System/CommandSenderModel.class.php
@@ -10,7 +10,7 @@ class Cronks_System_CommandSenderModel extends CronksBaseModel {
 	private $data				= array ();
 	private $command			= null;
 
-	private $timeFields			= array("checktime","endtime","checktime");
+	private $timeFields			= array("checktime","endtime","starttime");
 
 	public function  initialize(AgaviContext $context, array $parameters = array()) {
 		parent::initialize($context, $parameters);
diff --git a/app/modules/Cronks/templates/System/ViewProc/js/IcingaCommandHandler.js b/app/modules/Cronks/templates/System/ViewProc/js/IcingaCommandHandler.js
index 6449435..cdc3684 100755
--- a/app/modules/Cronks/templates/System/ViewProc/js/IcingaCommandHandler.js
+++ b/app/modules/Cronks/templates/System/ViewProc/js/IcingaCommandHandler.js
@@ -273,7 +273,8 @@ IcingaCommandHandler.prototype = {
 				});
 				
 				oForm.getForm().on('beforeaction', function(f, a) {
-					
+					if(!f.isValid())
+						return false;
 					var selection = Ext.util.JSON.encode( this.getSelection() );
 					
 					// Auth for the command, key is the timekey given
@@ -289,7 +290,7 @@ IcingaCommandHandler.prototype = {
 					a.options.params['selection'] = selection;
 					
 					oWin.disable();
-					
+
 					return true;
 					
 				}, this);





More information about the icinga-checkins mailing list