Reload entities whenever dialog is opened (#534)

volkszaehler · Dec 18, 2016 · beddf11 · beddf11
1 parent c02dd8b
commit beddf11
Showing 1 changed file with 22 additions and 23 deletions.
diff --git a/htdocs/frontend/javascripts/wui.js b/htdocs/frontend/javascripts/wui.js
@@ -160,34 +160,33 @@ vz.wui.dialogs.init = function() {
 	$('#entity-add.dialog').dialog({
 		title: unescape('Kanal hinzuf%FCgen'),
 		width: 650,
-		resizable: false
-	});
-	$('#entity-add.dialog > div').tabs({
-		activate: function(event, ui) { // lazy loading public entities
-			if (ui.newTab.attr('aria-controls') == 'entity-public') {
-				// populate MW entities (vz.middleware[0] is the default local)
-				vz.middleware.forEach(function(middleware, idx) {
-					vz.load({
-						controller: 'entity',
-						url: middleware.url
-					}).done(function(json) {
-						var public = [];
-						json.entities.forEach(function(json) {
-							var entity = new Entity(json, middleware.url);
-							public.push(entity);
-						});
+		resizable: false,
+		open: function() {
+			// lazy load public entities
+			var title = $('#entity-public-middleware option:selected').text();
+
+			vz.middleware.forEach(function(middleware, idx) {
+				vz.load({
+					controller: 'entity',
+					url: middleware.url
+				}).done(function(json) {
+					var public = [];
+					json.entities.forEach(function(json) {
+						var entity = new Entity(json, middleware.url);
+						public.push(entity);
+					});
 
-						public.sort(Entity.compare);
-						vz.middleware[idx].public = public;
+					public.sort(Entity.compare);
+					vz.middleware[idx].public = public;
 
-						if (idx === 0) {
-							populateEntities(vz.middleware[idx]);
-						}
-					});
+					if (middleware.title == title) {
+						populateEntities(vz.middleware[idx]);
+					}
 				});
-			}
+			});
 		}
 	});
+	$('#entity-add.dialog > div').tabs();
 
 	// show available entity types
 	vz.capabilities.definitions.entities.forEach(function(def) {