diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/engine/EntityAutoEngine.java b/framework/service/src/main/java/org/apache/ofbiz/service/engine/EntityAutoEngine.java index 5bb6701df5..33b19701f8 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/engine/EntityAutoEngine.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/engine/EntityAutoEngine.java @@ -112,18 +112,22 @@ public final class EntityAutoEngine extends GenericAsyncEngine { switch (modelService.invoke) { case "create": result = invokeCreate(dctx, parameters, modelService, modelEntity, allPksInOnly, pkFieldNameOutOnly); + result.put(ModelService.SUCCESS_MESSAGE, UtilProperties.getMessage("ServiceUiLabels", "EntityCreatedSuccessfully", UtilMisc.toMap("entityName", modelEntity.getEntityName()), locale)); break; case "update": result = invokeUpdate(dctx, parameters, modelService, modelEntity, allPksInOnly); + result.put(ModelService.SUCCESS_MESSAGE, UtilProperties.getMessage("ServiceUiLabels", "EntityUpdatedSuccessfully", UtilMisc.toMap("entityName", modelEntity.getEntityName()), locale)); break; case "delete": result = invokeDelete(dctx, parameters, modelService, modelEntity, allPksInOnly); + result.put(ModelService.SUCCESS_MESSAGE, UtilProperties.getMessage("ServiceUiLabels", "EntityDeletedSuccessfully", UtilMisc.toMap("entityName", modelEntity.getEntityName()), locale)); break; case "expire": result = invokeExpire(dctx, parameters, modelService, modelEntity, allPksInOnly); if (ServiceUtil.isSuccess(result)) { result = invokeUpdate(dctx, parameters, modelService, modelEntity, allPksInOnly); } + result.put(ModelService.SUCCESS_MESSAGE, UtilProperties.getMessage("ServiceUiLabels", "EntityExpiredSuccessfully", UtilMisc.toMap("entityName", modelEntity.getEntityName()), locale)); break; default: break; @@ -144,6 +148,7 @@ public final class EntityAutoEngine extends GenericAsyncEngine { private static Map invokeCreate(DispatchContext dctx, Map parameters, ModelService modelService, ModelEntity modelEntity, boolean allPksInOnly, List pkFieldNameOutOnly) throws GeneralException { Locale locale = (Locale) parameters.get("locale"); + Map result = ServiceUtil.returnSuccess(); GenericValue newEntity = dctx.getDelegator().makeValue(modelEntity.getEntityName()); @@ -355,7 +360,6 @@ public final class EntityAutoEngine extends GenericAsyncEngine { } } newEntity.create(); - Map result = ServiceUtil.returnSuccess(UtilProperties.getMessage("ServiceUiLabels", "EntityCreatedSuccessfully", UtilMisc.toMap("entityName", modelEntity.getEntityName()), locale)); result.put("crudValue", newEntity); return result; } @@ -468,7 +472,6 @@ public final class EntityAutoEngine extends GenericAsyncEngine { lookedUpValue.store(); result.put("crudValue", lookedUpValue); - result.put(ModelService.SUCCESS_MESSAGE,ServiceUtil.returnSuccess(UtilProperties.getMessage("ServiceUiLabels", "EntityUpdatedSuccessfully", UtilMisc.toMap("entityName", modelEntity.getEntityName()), locale))); return result; } @@ -499,8 +502,7 @@ public final class EntityAutoEngine extends GenericAsyncEngine { return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ServiceValueNotFoundForRemove", locale)); } lookedUpValue.remove(); - Map result = ServiceUtil.returnSuccess(UtilProperties.getMessage("ServiceUiLabels", "EntityDeletedSuccessfully", UtilMisc.toMap("entityName", modelEntity.getEntityName()), locale)); - return result; + return ServiceUtil.returnSuccess(); } /** @@ -564,7 +566,6 @@ public final class EntityAutoEngine extends GenericAsyncEngine { } if (Debug.infoOn()) Debug.logInfo(" parameters OUT : " + parameters, module); - Map result = ServiceUtil.returnSuccess(UtilProperties.getMessage("ServiceUiLabels", "EntityExpiredSuccessfully", UtilMisc.toMap("entityName", modelEntity.getEntityName()), locale)); - return result; + return ServiceUtil.returnSuccess(); } }