Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Bug fixes for GWT Manager Rules Editor

Rich Turnerb1aa003658ac
diff --git a/client/src/main/java/org/openremote/app/client/rules/AbstractRulesEditorActivity.java b/client/src/main/java/org/openremote/app/client/rules/AbstractRulesEditorActivity.java
index 7b43a3e7b..963cc0ad5 100644
--- a/client/src/main/java/org/openremote/app/client/rules/AbstractRulesEditorActivity.java
+++ b/client/src/main/java/org/openremote/app/client/rules/AbstractRulesEditorActivity.java
@@ -139,7 +139,7 @@ public abstract class AbstractRulesEditorActivity<T extends Ruleset, PLACE exten
environment.getApp().getRequests().sendWith(
getEntityWriter(),
createRequestConsumer(),
- 204,
+ 200,
afterCreateRunnable(),
validationErrorHandler
);
diff --git a/model/src/main/java/org/openremote/model/rules/RulesResource.java b/model/src/main/java/org/openremote/model/rules/RulesResource.java
index 35f8ff21d..6c2f5d3ef 100644
--- a/model/src/main/java/org/openremote/model/rules/RulesResource.java
+++ b/model/src/main/java/org/openremote/model/rules/RulesResource.java
@@ -109,7 +109,7 @@ public interface RulesResource {
@POST
@Consumes(APPLICATION_JSON)
@Produces(APPLICATION_JSON)
- @SuccessStatusCode(204)
+ @SuccessStatusCode(200)
@RolesAllowed({Constants.WRITE_RULES_ROLE})
@SuppressWarnings("unusable-by-js")
long createGlobalRuleset(@BeanParam RequestParams requestParams, @Valid GlobalRuleset ruleset);
@@ -160,7 +160,7 @@ public interface RulesResource {
@Path("tenant")
@Consumes(APPLICATION_JSON)
@Produces(APPLICATION_JSON)
- @SuccessStatusCode(204)
+ @SuccessStatusCode(200)
@RolesAllowed({Constants.WRITE_RULES_ROLE})
@SuppressWarnings("unusable-by-js")
long createTenantRuleset(@BeanParam RequestParams requestParams, @Valid TenantRuleset ruleset);
@@ -212,7 +212,7 @@ public interface RulesResource {
@Path("asset")
@Consumes(APPLICATION_JSON)
@Produces(APPLICATION_JSON)
- @SuccessStatusCode(204)
+ @SuccessStatusCode(200)
@RolesAllowed({Constants.WRITE_RULES_ROLE})
@SuppressWarnings("unusable-by-js")
long createAssetRuleset(@BeanParam RequestParams requestParams, @Valid AssetRuleset ruleset);
diff --git a/model/src/main/java/org/openremote/model/rules/Ruleset.java b/model/src/main/java/org/openremote/model/rules/Ruleset.java
index 48070f11f..8eb6fa3b3 100644
--- a/model/src/main/java/org/openremote/model/rules/Ruleset.java
+++ b/model/src/main/java/org/openremote/model/rules/Ruleset.java
@@ -207,7 +207,9 @@ public abstract class Ruleset {
protected Ruleset(String name, Lang language, String rules) {
this.name = name;
- this.lang = language;
+ if (language != null) {
+ this.lang = language;
+ }
this.rules = rules;
}