Close #256 Close #262

Limitations to be entered in related tickets

Author: Open Lowcode SAS

src/org/openlowcode/client/action/CPageInlineAction.java

@@ -25,6 +25,7 @@
 import org.openlowcode.tools.structure.DataElt;
 import org.openlowcode.tools.structure.DataEltType;
 import org.openlowcode.tools.structure.MultipleChoiceDataElt;
+import org.openlowcode.tools.structure.ObjectIdDataElt;
 import org.openlowcode.tools.structure.ObjectIdDataEltType;
 import org.openlowcode.tools.structure.TextDataElt;
 import org.openlowcode.tools.structure.TextDataEltType;
@@ -110,6 +111,11 @@ public CActionData getDataContent(CPage page) {
 					treated=true;
 					result.addActionAttribute(new MultipleChoiceDataElt(thisbusinessdataloc.getName()));
 				}
+				if (thisbusinessdataloc.getType().equals("OID")) {
+					treated=true;
+					result.addActionAttribute(new ObjectIdDataElt(thisbusinessdataloc.getName()));
+				}
+				
 				if (thisbusinessdataloc.getType().startsWith("ARR")) {
 					String subtype = thisbusinessdataloc.getType().substring(4);
 					if (subtype.compareTo(CActionDataLoc.CHOICE_TYPE) == 0) {

src/org/openlowcode/design/action/ActionDefinition.java

@@ -1108,7 +1108,7 @@ public void generateToFile(SourceGenerator sg, Module module) throws IOException
 					String objectvariable = StringFormatter.formatForAttribute(thisobjectinarrayarg.getType());
 					String objectclass = StringFormatter.formatForJavaClass(thisobjectinarrayarg.getType());
 
-					sg.wl("if (attribute" + i + ".getArrayPayloadEltType() instanceof ObjectDataEltType) {");
+					sg.wl("			if (attribute" + i + ".getArrayPayloadEltType() instanceof ObjectDataEltType) {");
 					sg.wl("				ArrayList<" + objectclass + "> inputlist = new  ArrayList<" + objectclass
 							+ ">();");
 					sg.wl("				for (int i=0;i<attribute" + i + ".getObjectNumber();i++) {");

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

@@ -39,6 +39,7 @@ public class DataAccessMethod
 	private boolean ismassive = false;
 	private boolean allowsconsumer = false;
 	private ObjectArgument implicitobject;
+	private Property<?> parentproperty;
 
 	/**
 	 * @return true if the method accepts a query condition. This is mostly true for
@@ -168,12 +169,14 @@ public boolean isStatic() {
 		for (int i = 0; i < this.input.getSize(); i++) {
 			ArgumentContent thisargumentcontent = input.get(i).getContent();
 			if (thisargumentcontent instanceof ObjectArgument) {
+				ObjectArgument thisobjectargument = (ObjectArgument) thisargumentcontent;
+				if (thisobjectargument.getMasterObject().equals(this.parentproperty.getParent())) {
 				// note - may need to add a condition on the type of object
 				this.implicitobjectmethod = input.get(i); // as argument is implicit, it will not be an attribute for
 															// the user
 				this.implicitobject = (ObjectArgument) thisargumentcontent;
 				return false;
-
+				}
 			}
 		}
 		return true;
@@ -545,4 +548,12 @@ public String generateMethodArguments(boolean securityarguments) {
 		}
 		return arguments.toString();
 	}
+
+	public void setParentProperty(Property<?> parentproperty) {
+		this.parentproperty = parentproperty;
+		
+	}
+	public Property<?> getParentProperty() {
+		return this.parentproperty;
+	}
 }

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

@@ -2536,13 +2536,14 @@ private ActionDefinition generateCreateLinkAndRightObjectAction(LinkObject<?, ?>
 	}
 
 	private void addAttributesToCreateobject(DynamicActionDefinition action, DataObjectDefinition object) {
-		addAttributesToCreateobject(action, object, false);
+		addAttributesToCreateobject(action, object, false,true);
 	}
 
 	private void addAttributesToCreateobject(
 			DynamicActionDefinition action,
 			DataObjectDefinition object,
-			boolean objectisoptional) {
+			boolean objectisoptional,boolean addlinks) {
+
 		for (int i = 0; i < object.propertylist.getSize(); i++) {
 			Property<?> property = object.propertylist.get(i);
 			for (int j = 0; j < property.getContextDataForCreationSize(); j++) {
@@ -2556,7 +2557,7 @@ private void addAttributesToCreateobject(
 				}
 		}
 		// ---- specific processing for left for links with show as field
-		for (int i = 0; i < object.propertylist.getSize(); i++) {
+		if (addlinks) for (int i = 0; i < object.propertylist.getSize(); i++) {
 			Property<?> property = object.propertylist.get(i);
 			if (property instanceof LeftForLink) {
 				LeftForLink leftforlink = (LeftForLink) property;
@@ -2571,7 +2572,15 @@ private void addAttributesToCreateobject(
 		ObjectArgument mainobject = new ObjectArgument("object", object);
 		mainobject.setOptional(objectisoptional);
 		action.addInputArgumentAsAccessCriteria(mainobject);
+
 	}
+	
+	private void addAttributesToCreateobject(
+			DynamicActionDefinition action,
+			DataObjectDefinition object,
+			boolean objectisoptional) {
+		addAttributesToCreateobject(action,object,objectisoptional,false);
+			}
 
 	private DynamicActionDefinition generateDuplicateAction() {
 		DynamicActionDefinition duplicateaction = new DynamicActionDefinition(