From 4b5d98d76b65e2a5ab83e87e6762c37bade10469 Mon Sep 17 00:00:00 2001
From: Robert Anderson <randerson@lbsd.net>
Date: Wed, 22 Jul 2009 13:27:41 +0000
Subject: [PATCH] Use formPanelID and gridPanelID

---
 webgui/js/app/windows/AdminGroupAttributes.js |  6 +++---
 webgui/js/app/windows/AdminGroupMembers.js    |  2 +-
 webgui/js/app/windows/AdminGroups.js          | 10 +++++-----
 webgui/js/app/windows/AdminRealmAttributes.js |  6 +++---
 webgui/js/app/windows/AdminRealms.js          |  8 ++++----
 webgui/js/app/windows/AdminUserAttributes.js  |  6 +++---
 webgui/js/app/windows/AdminUserGroups.js      |  4 ++--
 webgui/js/app/windows/AdminUserLogs.js        |  4 ++--
 webgui/js/app/windows/AdminUserTopups.js      |  6 +++---
 webgui/js/app/windows/AdminUsers.js           | 14 +++++++-------
 webgui/js/app/windows/WiSPLocationMembers.js  |  2 +-
 webgui/js/app/windows/WiSPLocations.js        |  8 ++++----
 webgui/js/app/windows/WiSPResellers.js        |  6 +++---
 webgui/js/app/windows/WiSPUserLogs.js         |  4 ++--
 webgui/js/app/windows/WiSPUserTopups.js       |  6 +++---
 webgui/js/app/windows/WiSPUsers.js            | 10 +++++-----
 16 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/webgui/js/app/windows/AdminGroupAttributes.js b/webgui/js/app/windows/AdminGroupAttributes.js
index 8b059b24..a13abae3 100644
--- a/webgui/js/app/windows/AdminGroupAttributes.js
+++ b/webgui/js/app/windows/AdminGroupAttributes.js
@@ -49,7 +49,7 @@ function showAdminGroupAttributesWindow(groupID) {
 					tooltip:'Edit attribute',
 					iconCls:'edit',
 					handler: function() {
-						var selectedItem = AdminGroupAttributesWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(AdminGroupAttributesWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -77,7 +77,7 @@ function showAdminGroupAttributesWindow(groupID) {
 					tooltip:'Remove attribute',
 					iconCls:'remove',
 					handler: function() {
-						var selectedItem = AdminGroupAttributesWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(AdminGroupAttributesWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -267,7 +267,7 @@ function showAdminGroupAttributeAddEditWindow(groupID,attrID) {
 	adminGroupAttributesFormWindow.show();
 
 	if (attrID) {
-		adminGroupAttributesFormWindow.getComponent('formpanel').load({
+		Ext.getCmp(adminGroupAttributesFormWindow.formPanelID).load({
 			params: {
 				ID: attrID,
 				SOAPUsername: globalConfig.soap.username,
diff --git a/webgui/js/app/windows/AdminGroupMembers.js b/webgui/js/app/windows/AdminGroupMembers.js
index f0b800c2..8b788591 100644
--- a/webgui/js/app/windows/AdminGroupMembers.js
+++ b/webgui/js/app/windows/AdminGroupMembers.js
@@ -40,7 +40,7 @@ function showAdminGroupMembersWindow(groupID) {
 					tooltip:'Remove member',
 					iconCls:'remove',
 					handler: function() {
-						var selectedItem = AdminGroupMembersWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(AdminGroupMembersWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
diff --git a/webgui/js/app/windows/AdminGroups.js b/webgui/js/app/windows/AdminGroups.js
index 4124f82c..bdfaa4f8 100644
--- a/webgui/js/app/windows/AdminGroups.js
+++ b/webgui/js/app/windows/AdminGroups.js
@@ -49,7 +49,7 @@ function showAdminGroupWindow() {
 					tooltip:'Edit group',
 					iconCls:'edit',
 					handler: function() {
-						var selectedItem = AdminGroupWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(AdminGroupWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -77,7 +77,7 @@ function showAdminGroupWindow() {
 					tooltip:'Remove group',
 					iconCls:'remove',
 					handler: function() {
-						var selectedItem = AdminGroupWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(AdminGroupWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -105,7 +105,7 @@ function showAdminGroupWindow() {
 					tooltip:'Group attributes',
 					iconCls:'attributes',
 					handler: function() {
-						var selectedItem = AdminGroupWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(AdminGroupWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -133,7 +133,7 @@ function showAdminGroupWindow() {
 					tooltip:'Group members',
 					iconCls:'groups',
 					handler: function() {
-						var selectedItem = AdminGroupWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(AdminGroupWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -277,7 +277,7 @@ function showAdminGroupAddEditWindow(id) {
 	adminGroupFormWindow.show();
 
 	if (id) {
-		adminGroupFormWindow.getComponent('formpanel').load({
+		Ext.getCmp(adminGroupFormWindow.formPanelID).load({
 			params: {
 				ID: id,
 				SOAPUsername: globalConfig.soap.username,
diff --git a/webgui/js/app/windows/AdminRealmAttributes.js b/webgui/js/app/windows/AdminRealmAttributes.js
index c0caf881..53bea2d7 100644
--- a/webgui/js/app/windows/AdminRealmAttributes.js
+++ b/webgui/js/app/windows/AdminRealmAttributes.js
@@ -49,7 +49,7 @@ function showAdminRealmAttributesWindow(realmID) {
 					tooltip:'Edit attribute',
 					iconCls:'edit',
 					handler: function() {
-						var selectedItem = AdminRealmAttributesWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(AdminRealmAttributesWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -77,7 +77,7 @@ function showAdminRealmAttributesWindow(realmID) {
 					tooltip:'Remove attribute',
 					iconCls:'remove',
 					handler: function() {
-						var selectedItem = AdminRealmAttributesWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(AdminRealmAttributesWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -267,7 +267,7 @@ function showAdminRealmAttributeAddEditWindow(realmID,attrID) {
 	adminRealmAttributesFormWindow.show();
 
 	if (attrID) {
-		adminRealmAttributesFormWindow.getComponent('formpanel').load({
+		Ext.getCmp(adminRealmAttributesFormWindow.formPanelID).load({
 			params: {
 				ID: attrID,
 				SOAPUsername: globalConfig.soap.username,
diff --git a/webgui/js/app/windows/AdminRealms.js b/webgui/js/app/windows/AdminRealms.js
index b829cd42..80cfc6e6 100644
--- a/webgui/js/app/windows/AdminRealms.js
+++ b/webgui/js/app/windows/AdminRealms.js
@@ -49,7 +49,7 @@ function showAdminRealmWindow() {
 					tooltip:'Edit realm',
 					iconCls:'edit',
 					handler: function() {
-						var selectedItem = AdminRealmWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(AdminRealmWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -76,7 +76,7 @@ function showAdminRealmWindow() {
 					tooltip:'Remove realm',
 					iconCls:'remove',
 					handler: function() {
-						var selectedItem = AdminRealmWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(AdminRealmWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -104,7 +104,7 @@ function showAdminRealmWindow() {
 					tooltip:'Realm attributes',
 					iconCls:'attributes',
 					handler: function() {
-						var selectedItem = AdminRealmWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(AdminRealmWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -236,7 +236,7 @@ function showAdminRealmAddEditWindow(id) {
 	adminRealmFormWindow.show();
 
 	if (id) {
-		adminRealmFormWindow.getComponent('formpanel').load({
+		Ext.getCmp(adminRealmFormWindow.formPanelID).load({
 			params: {
 				ID: id,
 				SOAPUsername: globalConfig.soap.username,
diff --git a/webgui/js/app/windows/AdminUserAttributes.js b/webgui/js/app/windows/AdminUserAttributes.js
index 7574c073..b700aa2d 100644
--- a/webgui/js/app/windows/AdminUserAttributes.js
+++ b/webgui/js/app/windows/AdminUserAttributes.js
@@ -49,7 +49,7 @@ function showAdminUserAttributesWindow(userID) {
 					tooltip:'Edit attribute',
 					iconCls:'edit',
 					handler: function() {
-						var selectedItem = AdminUserAttributesWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(AdminUserAttributesWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -77,7 +77,7 @@ function showAdminUserAttributesWindow(userID) {
 					tooltip:'Remove attribute',
 					iconCls:'remove',
 					handler: function() {
-						var selectedItem = AdminUserAttributesWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(AdminUserAttributesWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -269,7 +269,7 @@ function showAdminUserAttributeAddEditWindow(userID,attrID) {
 	adminGroupFormWindow.show();
 
 	if (attrID) {
-		adminGroupFormWindow.getComponent('formpanel').load({
+		Ext.getCmp(adminGroupFormWindow.formPanelID).load({
 			params: {
 				ID: attrID,
 				SOAPUsername: globalConfig.soap.username,
diff --git a/webgui/js/app/windows/AdminUserGroups.js b/webgui/js/app/windows/AdminUserGroups.js
index db22ff77..38849d30 100644
--- a/webgui/js/app/windows/AdminUserGroups.js
+++ b/webgui/js/app/windows/AdminUserGroups.js
@@ -49,7 +49,7 @@ function showAdminUserGroupsWindow(userID) {
 					tooltip:'Remove group',
 					iconCls:'remove',
 					handler: function() {
-						var selectedItem = AdminUserGroupsWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(AdminUserGroupsWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -197,7 +197,7 @@ function showAdminUserGroupAddWindow(userID,id) {
 	adminGroupFormWindow.show();
 
 	if (id) {
-		adminGroupFormWindow.getComponent('formpanel').load({
+		Ext.getCmp(adminGroupFormWindow.formPanelID).load({
 			params: {
 				ID: id,
 				SOAPUsername: globalConfig.soap.username,
diff --git a/webgui/js/app/windows/AdminUserLogs.js b/webgui/js/app/windows/AdminUserLogs.js
index 37eda599..86e7982f 100644
--- a/webgui/js/app/windows/AdminUserLogs.js
+++ b/webgui/js/app/windows/AdminUserLogs.js
@@ -76,7 +76,7 @@ function showAdminUserLogsWindow(id) {
 							handler: function() {
 								// Pull in window, grid & form	
 								var mainWindow = this.ownerCt.ownerCt;
-								var grid = mainWindow.getComponent('gridpanel');
+								var grid = Ext.getCmp(mainWindow.gridPanelID);
 								var form = mainWindow.getComponent('search-form');
 
 								// Grab store
@@ -247,7 +247,7 @@ function showAdminUserLogsWindow(id) {
 		}
 	);
 	// Grab store
-	var store = adminUserLogsWindow.getComponent('gridpanel').getStore();
+	var store = Ext.getCmp(adminUserLogsWindow.gridPanelID).getStore();
 
 	store.on('load',function() {
 		var inputTotal = store.sum('AcctInputMbyte');
diff --git a/webgui/js/app/windows/AdminUserTopups.js b/webgui/js/app/windows/AdminUserTopups.js
index b9f14f97..ecee786e 100644
--- a/webgui/js/app/windows/AdminUserTopups.js
+++ b/webgui/js/app/windows/AdminUserTopups.js
@@ -48,7 +48,7 @@ function showAdminUserTopupsWindow(userID) {
 					tooltip:'Edit topup',
 					iconCls:'option',
 					handler: function() {
-						var selectedItem = adminUserTopupsWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(adminUserTopupsWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -76,7 +76,7 @@ function showAdminUserTopupsWindow(userID) {
 					tooltip:'Remove topup',
 					iconCls:'remove',
 					handler: function() {
-						var selectedItem = adminUserTopupsWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(adminUserTopupsWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -266,7 +266,7 @@ function showAdminUserTopupAddEditWindow(userID,topupID) {
 	adminUserTopupFormWindow.show();
 
 	if (topupID) {
-		adminUserTopupFormWindow.getComponent('formpanel').load({
+		Ext.getCmp(adminUserTopupFormWindow.formPanelID).load({
 			params: {
 				id: topupID,
 				SOAPUsername: globalConfig.soap.username,
diff --git a/webgui/js/app/windows/AdminUsers.js b/webgui/js/app/windows/AdminUsers.js
index 19519250..8924a995 100644
--- a/webgui/js/app/windows/AdminUsers.js
+++ b/webgui/js/app/windows/AdminUsers.js
@@ -49,7 +49,7 @@ function showAdminUserWindow() {
 					tooltip:'Edit user',
 					iconCls:'option',
 					handler: function() {
-						var selectedItem = AdminUserWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(AdminUserWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -77,7 +77,7 @@ function showAdminUserWindow() {
 					tooltip:'Remove user',
 					iconCls:'remove',
 					handler: function() {
-						var selectedItem = AdminUserWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(AdminUserWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -105,7 +105,7 @@ function showAdminUserWindow() {
 					tooltip:'User attributes',
 					iconCls:'attributes',
 					handler: function() {
-						var selectedItem = AdminUserWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(AdminUserWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -133,7 +133,7 @@ function showAdminUserWindow() {
 					tooltip:'User logs',
 					iconCls:'logs',
 					handler: function() {
-						var selectedItem = AdminUserWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(AdminUserWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -161,7 +161,7 @@ function showAdminUserWindow() {
 					tooltip:'User groups',
 					iconCls:'groups',
 					handler: function() {
-						var selectedItem = AdminUserWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(AdminUserWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -189,7 +189,7 @@ function showAdminUserWindow() {
 					tooltip:'User topups',
 					iconCls:'logs',
 					handler: function() {
-						var selectedItem = AdminUserWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(AdminUserWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -320,7 +320,7 @@ function showAdminUserAddEditWindow(id) {
 	adminUserFormWindow.show();
 
 	if (id) {
-		adminUserFormWindow.getComponent('formpanel').load({
+		Ext.getCmp(adminUserFormWindow.formPanelID).load({
 			params: {
 				ID: id,
 				SOAPUsername: globalConfig.soap.username,
diff --git a/webgui/js/app/windows/WiSPLocationMembers.js b/webgui/js/app/windows/WiSPLocationMembers.js
index 80643130..805fe2ef 100644
--- a/webgui/js/app/windows/WiSPLocationMembers.js
+++ b/webgui/js/app/windows/WiSPLocationMembers.js
@@ -40,7 +40,7 @@ function showWiSPLocationMembersWindow(locationID) {
 					tooltip:'Remove member',
 					iconCls:'remove',
 					handler: function() {
-						var selectedItem = WiSPLocationMembersWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(WiSPLocationMembersWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
diff --git a/webgui/js/app/windows/WiSPLocations.js b/webgui/js/app/windows/WiSPLocations.js
index 110bbb21..ad42c7fb 100644
--- a/webgui/js/app/windows/WiSPLocations.js
+++ b/webgui/js/app/windows/WiSPLocations.js
@@ -49,7 +49,7 @@ function showWiSPLocationWindow() {
 					tooltip:'Edit location',
 					iconCls:'edit',
 					handler: function() {
-						var selectedItem = WiSPLocationWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(WiSPLocationWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -77,7 +77,7 @@ function showWiSPLocationWindow() {
 					tooltip:'Remove location',
 					iconCls:'remove',
 					handler: function() {
-						var selectedItem = WiSPLocationWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(WiSPLocationWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -105,7 +105,7 @@ function showWiSPLocationWindow() {
 					tooltip:'List members',
 					iconCls:'groups',
 					handler: function() {
-						var selectedItem = WiSPLocationWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(WiSPLocationWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -228,7 +228,7 @@ function showWiSPLocationAddEditWindow(id) {
 	wispLocationFormWindow.show();
 
 	if (id) {
-		wispLocationFormWindow.getComponent('formpanel').load({
+		Ext.getCmp(wispLocationFormWindow.formPanelID).load({
 			params: {
 				ID: id,
 				SOAPUsername: globalConfig.soap.username,
diff --git a/webgui/js/app/windows/WiSPResellers.js b/webgui/js/app/windows/WiSPResellers.js
index bda675c1..d48e6395 100644
--- a/webgui/js/app/windows/WiSPResellers.js
+++ b/webgui/js/app/windows/WiSPResellers.js
@@ -49,7 +49,7 @@ function showWiSPResellersWindow() {
 					tooltip:'Edit Reseller',
 					iconCls:'option',
 					handler: function() {
-						var selectedItem = WiSPResellerWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(WiSPResellerWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -77,7 +77,7 @@ function showWiSPResellersWindow() {
 					tooltip:'Remove Reseller',
 					iconCls:'remove',
 					handler: function() {
-						var selectedItem = WiSPResellerWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(WiSPResellerWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -281,7 +281,7 @@ function showWiSPResellerEditWindow(id) {
 	WiSPResellerFormWindow.show();
 
 	if (id) {
-		WiSPResellerFormWindow.getComponent('formpanel').load({
+		Ext.getCmp(WiSPResellerFormWindow.formPanelID).load({
 			params: {
 				id: id,
 				SOAPUsername: globalConfig.soap.username,
diff --git a/webgui/js/app/windows/WiSPUserLogs.js b/webgui/js/app/windows/WiSPUserLogs.js
index de032d27..0f1ebc8f 100644
--- a/webgui/js/app/windows/WiSPUserLogs.js
+++ b/webgui/js/app/windows/WiSPUserLogs.js
@@ -76,7 +76,7 @@ function showWiSPUserLogsWindow(id) {
 							handler: function() {
 								// Pull in window, grid & form	
 								var mainWindow = this.ownerCt.ownerCt;
-								var grid = mainWindow.getComponent('gridpanel');
+								var grid = Ext.getCmp(mainWindow.gridPanelID);
 								var form = mainWindow.getComponent('search-form');
 
 								// Grab store
@@ -247,7 +247,7 @@ function showWiSPUserLogsWindow(id) {
 		}
 	);
 	// Grab store
-	var store = wispUserLogsWindow.getComponent('gridpanel').getStore();
+	var store = Ext.getCmp(wispUserLogsWindow.gridPanelID).getStore();
 
 	store.on('load',function() {
 		var inputTotal = store.sum('AcctInputMbyte');
diff --git a/webgui/js/app/windows/WiSPUserTopups.js b/webgui/js/app/windows/WiSPUserTopups.js
index 5a880a1c..df1e7075 100644
--- a/webgui/js/app/windows/WiSPUserTopups.js
+++ b/webgui/js/app/windows/WiSPUserTopups.js
@@ -48,7 +48,7 @@ function showWiSPUserTopupsWindow(userID) {
 					tooltip:'Edit topup',
 					iconCls:'option',
 					handler: function() {
-						var selectedItem = wispUserTopupsWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(wispUserTopupsWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -76,7 +76,7 @@ function showWiSPUserTopupsWindow(userID) {
 					tooltip:'Remove topup',
 					iconCls:'remove',
 					handler: function() {
-						var selectedItem = wispUserTopupsWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(wispUserTopupsWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -266,7 +266,7 @@ function showWiSPUserTopupAddEditWindow(userID,topupID) {
 	wispUserTopupFormWindow.show();
 
 	if (topupID) {
-		wispUserTopupFormWindow.getComponent('formpanel').load({
+		Ext.getCmp(wispUserTopupFormWindow.formPanelID).load({
 			params: {
 				id: topupID,
 				SOAPUsername: globalConfig.soap.username,
diff --git a/webgui/js/app/windows/WiSPUsers.js b/webgui/js/app/windows/WiSPUsers.js
index df31e161..1c5cd47b 100644
--- a/webgui/js/app/windows/WiSPUsers.js
+++ b/webgui/js/app/windows/WiSPUsers.js
@@ -49,7 +49,7 @@ function showWiSPUserWindow() {
 					tooltip:'Edit user',
 					iconCls:'option',
 					handler: function() {
-						var selectedItem = WiSPUserWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(WiSPUserWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -77,7 +77,7 @@ function showWiSPUserWindow() {
 					tooltip:'Remove user',
 					iconCls:'remove',
 					handler: function() {
-						var selectedItem = WiSPUserWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(WiSPUserWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -105,7 +105,7 @@ function showWiSPUserWindow() {
 					tooltip:'User logs',
 					iconCls:'logs',
 					handler: function() {
-						var selectedItem = WiSPUserWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(WiSPUserWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -133,7 +133,7 @@ function showWiSPUserWindow() {
 					tooltip:'User topups',
 					iconCls:'logs',
 					handler: function() {
-						var selectedItem = WiSPUserWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(WiSPUserWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -697,7 +697,7 @@ function showWiSPUserAddEditWindow(id) {
 	wispUserFormWindow.show();
 
 	if (id) {
-		wispUserFormWindow.getComponent('formpanel').load({
+		Ext.getCmp(wispUserFormWindow.formPanelID).load({
 			params: {
 				ID: id,
 				SOAPUsername: globalConfig.soap.username,
-- 
GitLab