Fixed: Blockly, possible saving of 'ghost' events

Author: gizmocuz

History.txt

@@ -80,6 +80,7 @@ Version 2.0.xxxx (xxxx 2015)
 - Implemented: Counters in P1 Electra/Gas month reports per day
 - Implemented: MySensors, V_RAIN
 - Implemented: MySensors, V_WIND/V_GUST/V_DIRECTION
+- Fixed: Blockly, possible saving of 'ghost' events
 
 Version 2.0.2284 (February 22th 2015)
 - Fixed: Firefox, RGBW/Setpoint popup

main/WebServer.cpp

@@ -12953,7 +12953,16 @@ namespace http {
 						_tSortedEventsInt eitem;
 						eitem.ID = ID;
 						eitem.eventstatus = eventStatus;
+						if (_levents.find(Name) != _levents.end())
+						{
+							//Duplicate event name, add the ID
+							szQuery.clear();
+							szQuery.str("");
+							szQuery << Name << " (" << ID << ")";
+							Name = szQuery.str();
+						}
 						_levents[Name] = eitem;
+
 					}
 					//return a sorted event list
 					std::map<std::string, _tSortedEventsInt>::const_iterator itt2;
@@ -13038,7 +13047,7 @@ namespace http {
 				if (!parsingSuccessful)
 				{
 
-					_log.Log(LOG_ERROR, "Webserver eventparser: Invalid data received!");
+					_log.Log(LOG_ERROR, "Webserver event parser: Invalid data received!");
 
 				}
 				else {

www/eventsframe.html

@@ -592,16 +592,16 @@
       	if (blockName) { 
       		var exists = false; 
       		var doSave = false;
-      		$('#savedEvents  option').each(function(){
+      		$('#savedEvents option').each(function(){
 	      		if (this.text == blockName) {
 		      		exists = true;
+					id=this.value;
 		      	}
 		     });
 		     if (exists) {
 			 	var answer = confirm("Overwrite "+blockName+"?")
 			    if (answer){
 					doSave = true;
-					id = $("#blockId").html();
 				}
 				else{
 					doSave = false;

www/html5.appcache

@@ -1,5 +1,5 @@
 CACHE MANIFEST
-# ref 870
+# ref 872
 
 CACHE:
 # CSS