fixed serialization issue on SendEmail

mycontroller-org · Mar 21, 2017 · 0b1837a · 0b1837a
1 parent ec49a11
commit 0b1837a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/dist/src/main/package/www/languages/mc_locale_gui-nl_nl.json b/dist/src/main/package/www/languages/mc_locale_gui-nl_nl.json
@@ -38,7 +38,7 @@
     "ALIAS": "Alias",
     "ALIVE_TEST_FREQUENCY": "Bereikbaarheid verificatie frequentie (seconden)",
     "ALLOW_ANONYMOUS": "Anonymous toelaten",
-    "ALPHABETICAL_KEY_CASE": "Alphabetical key case",
+    "ALPHABETICAL_KEY_CASE": "Alfabetische key case",
     "ANGULARJS_CUSTOM_CONTROLLERS": "Angular JS custom controllers",
     "APP.DESCRIPTION": "The Open Source Controller",
     "APP.LOG_IN_TO_MESSAGE": "AANMELDEN OP<b>MYCONTROLLER.ORG</b>",
@@ -120,7 +120,7 @@
     "DATE_RANGE": "Datum periode",
     "DAY": "Dag",
     "DAYS": "Dagen",
-    "DEFAULT": "Default",
+    "DEFAULT": "Standaard",
     "DEFAULT_FIRMWARE": "Standaard firmware",
     "DEFAULT_TIME_RANGE": "Standaard tijdsduur",
     "DELAY_TIME_IN_SECONDS": "Vertraging in seconden",
@@ -323,7 +323,7 @@
     "LOG_LEVEL": "Log niveau",
     "LOG_OUT": "Uitloggen",
     "LONGITUDE": "Lengtegraad",
-    "LOWER": "Lower",
+    "LOWER": "Laagste",
     "MANAGEMENT_SPECIFICATION_VERSION": "Management Specificatie Versie",
     "MAX": "Max",
     "MAXIMUM_BLOCK_SIZE": "Maximum block groote",
@@ -654,7 +654,7 @@
     "UPDATE_VARIABLE": "Variable updaten",
     "UPLOADED_ON": "Geüpload op",
     "UPLOAD_FIRMWARE": "Firmware uploaden",
-    "UPPER": "Upper",
+    "UPPER": "Hoogste",
     "UPPER_LIMIT": "Bovengrens",
     "UP_TIME": "Tijd op",
     "URL": "URL",

diff --git a/dist/src/main/package/www/languages/mc_locale_gui-ru_ru.json b/dist/src/main/package/www/languages/mc_locale_gui-ru_ru.json
@@ -120,7 +120,7 @@
     "DATE_RANGE": "Диапазон дат",
     "DAY": "День",
     "DAYS": "Дней",
-    "DEFAULT": "Default",
+    "DEFAULT": "По умолчанию",
     "DEFAULT_FIRMWARE": "Прошивка по умолчанию",
     "DEFAULT_TIME_RANGE": "Диапазон времени по умолчанию",
     "DELAY_TIME_IN_SECONDS": "Время задержки в секундах",
@@ -323,7 +323,7 @@
     "LOG_LEVEL": "Уровень логов",
     "LOG_OUT": "Выйти",
     "LONGITUDE": "Долгота",
-    "LOWER": "Lower",
+    "LOWER": "Нижний",
     "MANAGEMENT_SPECIFICATION_VERSION": "Версия спецификации управления",
     "MAX": "Максимум",
     "MAXIMUM_BLOCK_SIZE": "Максимальный размер блока",

diff --git a/...es/core/src/main/java/org/mycontroller/standalone/operation/model/OperationSendEmail.java b/...es/core/src/main/java/org/mycontroller/standalone/operation/model/OperationSendEmail.java
@@ -140,7 +140,8 @@ public void execute(RuleDefinition ruleDefinition) {
             emailBody = builder.toString();
         }
 
-        HashMap<String, Object> bindings = getTemplateBindings();
+        @SuppressWarnings("unchecked")
+        HashMap<String, Object> bindings = (HashMap<String, Object>) getTemplateBindings().clone();
         bindings.put("notification", notification);
         sendEmail(emailBody, bindings);
         //Update last execution