From 21d1fcccd62ea29bf3f816a283e20df668255dd8 Mon Sep 17 00:00:00 2001
From: seed-master <akira75@gmx.net>
Date: Tue, 17 Oct 2023 23:22:48 +0200
Subject: [PATCH] misc fixes

---
 .../org/seed/core/application/module/ModuleValidator.java   | 2 +-
 src/main/java/org/seed/core/form/FormServiceImpl.java       | 6 +++---
 .../resources/web/zul/admin/datasource/datasourcelist.zul   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/seed/core/application/module/ModuleValidator.java b/src/main/java/org/seed/core/application/module/ModuleValidator.java
index 5e8ca3239..72b0c4424 100644
--- a/src/main/java/org/seed/core/application/module/ModuleValidator.java
+++ b/src/main/java/org/seed/core/application/module/ModuleValidator.java
@@ -210,7 +210,7 @@ private void validateDeleteModuleDependent(Module module, ModuleDependent<? exte
 					errors.addError("val.inuse.moduletransfer", systemEntity.getName());
 					break;
 					
-				case C.TRANSFORMER:
+				case C.TRANSFORM:
 					errors.addError("val.inuse.moduletransformer", systemEntity.getName());
 					break;
 				
diff --git a/src/main/java/org/seed/core/form/FormServiceImpl.java b/src/main/java/org/seed/core/form/FormServiceImpl.java
index bd5ffb283..0d604ae12 100644
--- a/src/main/java/org/seed/core/form/FormServiceImpl.java
+++ b/src/main/java/org/seed/core/form/FormServiceImpl.java
@@ -447,9 +447,6 @@ public void deleteObject(Form form) throws ValidationException {
 				handleException(tx, ex);
 			}
 		}
-		if (form.hasFunctions()) {
-			form.getFunctions().forEach(this::removeFormFunctionClass);
-		}
 	}
 	
 	@Override
@@ -466,6 +463,9 @@ public void deleteObject(Form form, Session session) throws ValidationException
 		if (form.getLayout() != null) {
 			session.delete(form.getLayout());
 		}
+		if (form.hasFunctions()) {
+			form.getFunctions().forEach(this::removeFormFunctionClass);
+		}
 	}
 	
 	@Override
diff --git a/src/main/resources/web/zul/admin/datasource/datasourcelist.zul b/src/main/resources/web/zul/admin/datasource/datasourcelist.zul
index dd2a71135..3c75c2bda 100644
--- a/src/main/resources/web/zul/admin/datasource/datasourcelist.zul
+++ b/src/main/resources/web/zul/admin/datasource/datasourcelist.zul
@@ -38,7 +38,7 @@
 						   visible="@load(!empty vm.object)"/>
 			<toolbarbutton iconSclass="delete-button z-icon-remove alpha-icon-lg" 
 						   label="${labels.admin.datasource.delete}" 
-						   onClick="@command('deleteDatasourceObject', elem=self)"
+						   onClick="@command('deleteDataSource', elem=self)"
 						   visible="@load(!empty vm.object)"/>
 			<toolbarbutton iconSclass="run-button z-icon-play alpha-icon-lg" 
 						   label="${labels.button.start}"