[icinga-checkins] icinga.org: icinga-web/master: * Portal column fixes for new cronk struct ( fixes #1070)

git at icinga.org git at icinga.org
Thu Jan 20 14:43:11 CET 2011


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

Author: Marius Hein <marius.hein at netways.de>
Date:   Thu Jan 20 14:25:46 2011 +0100

* Portal column fixes for new cronk struct (fixes #1070)

---

 .../Cronks/templates/System/PortalViewSuccess.php  |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/modules/Cronks/templates/System/PortalViewSuccess.php b/app/modules/Cronks/templates/System/PortalViewSuccess.php
index 336d828..658e0fa 100755
--- a/app/modules/Cronks/templates/System/PortalViewSuccess.php
+++ b/app/modules/Cronks/templates/System/PortalViewSuccess.php
@@ -69,9 +69,8 @@ Cronk.util.initEnvironment("<?php echo $parentid = $rd->getParameter('parentid')
 						    },
 
 							notifyOver: function(dd, e, data) {
-
-								if (data.dragData.id.indexOf('portalView') == 0) {
-//									return false;
+								
+								if (data.dragData.cronkid.indexOf('portalView') == 0) {
 									return this.dropNotAllowed;
 								}
 
@@ -85,7 +84,6 @@ Cronk.util.initEnvironment("<?php echo $parentid = $rd->getParameter('parentid')
 
 									if (xy[0] >= item.x && xy[0] < item.x+item.w ) {
 										this.ac = index;
-//										return false;
 										return this.dropNotAllowed;
 									}
 
@@ -112,7 +110,7 @@ Cronk.util.initEnvironment("<?php echo $parentid = $rd->getParameter('parentid')
 									id: Ext.id(),
 
 									params: params,
-									crname: data.dragData.id,
+									crname: data.dragData.cronkid,
 									stateuid: Ext.id('cronk-sid'),
 									title: data.dragData.name,
 									closable: true,
@@ -121,6 +119,7 @@ Cronk.util.initEnvironment("<?php echo $parentid = $rd->getParameter('parentid')
 									tools: tools,
 									height: 200,
 									border: true
+									
 								});
 								
 								PortalHandler.initPortlet(portlet);





More information about the icinga-checkins mailing list