misc fixes

euu-rocks · Oct 17, 2023 · 21d1fcc · 21d1fcc
1 parent 0353272
commit 21d1fcc
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 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
@@ -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
@@ -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
@@ -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}"