Skip to content

Commit 922297a

Browse files
author
Open Lowcode SAS
committed
Close #37
1 parent f952cda commit 922297a

File tree

4 files changed

+11
-4
lines changed

4 files changed

+11
-4
lines changed

src/org/openlowcode/design/data/DataObjectDefinition.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1136,11 +1136,16 @@ private ActionDefinition generateMassiveDeleteActionAndShowParent(LinkedToParent
11361136

11371137
private ActionDefinition generateDeleteLinkAndShowLeft() {
11381138
String deleteactionname = "DELETE" + this.getName() + "ANDSHOWLEFT";
1139+
LinkObject<?, ?> linkobject = (LinkObject<?, ?>) this.getPropertyByName("LINKOBJECT");
11391140
DynamicActionDefinition deleteaction = new DynamicActionDefinition(deleteactionname, true);
1141+
deleteaction.addInputArgumentAsAccessCriteria(
1142+
new ObjectIdArgument("LEFT" + linkobject.getLeftobjectforlink().getName() + "ID",
1143+
linkobject.getLeftobjectforlink()));
11401144
deleteaction.addInputArgument(new ObjectIdArgument(this.getName() + "ID", this));
1141-
LinkObject<?, ?> linkobject = (LinkObject<?, ?>) this.getPropertyByName("LINKOBJECT");
1145+
11421146
deleteaction.addOutputArgument(new ObjectIdArgument(
11431147
"PARENT" + linkobject.getLeftobjectforlink().getName() + "ID", linkobject.getLeftobjectforlink()));
1148+
linkobject.getLeftobjectforlink().addActionToModifyGroup(deleteaction);
11441149
this.addActionToCreateNewGroup(deleteaction);
11451150
return deleteaction;
11461151
}

src/org/openlowcode/design/data/DataObjectDefinitionDeleteAndUpdate.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -311,14 +311,12 @@ public static void generateDeleteLinkAndShowLeftToFile(
311311
sg.wl(" }");
312312
sg.wl("");
313313
sg.wl(" @Override");
314-
sg.wl(" public ActionOutputData executeActionLogic(");
314+
sg.wl(" public ActionOutputData executeActionLogic(DataObjectId<" + leftobjectclass + "> " + leftobjectvariable + "id,");
315315
sg.wl(" DataObjectId<" + objectclass + "> " + objectvariable
316316
+ "id,Function<TableAlias,QueryFilter> datafilter)");
317317
sg.wl(" {");
318318
sg.wl(" " + objectclass + " " + objectvariable + " = " + objectclass + ".readone(" + objectvariable
319319
+ "id);");
320-
sg.wl(" DataObjectId<" + leftobjectclass + "> " + leftobjectvariable + "id = " + objectvariable
321-
+ ".getLfid();");
322320
sg.wl(" " + objectvariable + ".delete();");
323321
sg.wl(" return new ActionOutputData(" + leftobjectvariable + "id);");
324322
sg.wl(" ");

src/org/openlowcode/design/data/DataObjectDefinitionShowPage.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1128,6 +1128,8 @@ public void generateToFile(SourceGenerator sg, Module module) throws IOException
11281128
sg.wl(" AtgDelete" + linkobjectvariable + "andshowleftAction.ActionRef deleteoneofleft"
11291129
+ linkobjectvariable + " = AtgDelete" + linkobjectvariable
11301130
+ "andshowleftAction.get().getActionRef();");
1131+
sg.wl(" deleteoneofleft" + linkobjectvariable + ".setLeft" + objectvariable
1132+
+ "id(objectdisplaydefinition.getAttributeInput(" + objectclass + ".getIdMarker()));");
11311133
sg.wl(" deleteoneofleft" + linkobjectvariable + ".set" + linkobjectclass + "id(left"
11321134
+ linkobjectvariable + "s.getAttributeInput(" + linkobjectclass + ".getIdMarker()));");
11331135
sg.wl(" left" + linkobjectvariable + "s.addDeleteAction(deleteoneofleft" + linkobjectvariable

src/org/openlowcode/design/data/properties/basic/LeftForLink.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -467,6 +467,8 @@ public void generateWidgetCode(SourceGenerator sg, Module module, String locatio
467467
sg.wl(" AtgDelete" + linkobjectvariable + "andshowleftAction.ActionRef deleteoneofleft"
468468
+ linkobjectvariable + " = AtgDelete" + linkobjectvariable
469469
+ "andshowleftAction.get().getActionRef();");
470+
sg.wl(" deleteoneofleft" + linkobjectvariable + ".setLeft" + objectvariable
471+
+ "id(objectdisplaydefinition.getAttributeInput(" + objectclass + ".getIdMarker()));");
470472
sg.wl(" deleteoneofleft" + linkobjectvariable + ".set" + linkobjectclass + "id(left"
471473
+ linkobjectvariable + "s.getAttributeInput(" + linkobjectclass + ".getIdMarker()));");
472474
sg.wl(" SActionButton deleteoneofleft" + linkobjectvariable

0 commit comments

Comments
 (0)