Close #246

Author: Open Lowcode SAS

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

@@ -831,6 +831,7 @@ public void generateToFile(SourceGenerator sg, Module module) throws IOException
 			sg.wl("		objectdisplaydefinition.setReducedDisplay(false);");
 			sg.wl("		detailstab.addElement(objectdisplaydefinition);");
 			if (companion != null) {
+				sg.wl("		objectdisplaydefinition.overridesLabel(\""+companion.getLabel()+"\");");
 				sg.wl("		SObjectDisplay<" + companionclass + "> companionobjectdisplay = new SObjectDisplay<"
 						+ companionclass + ">(\"COMPANION\",this.get" + companionclass + "()," + companionclass
 						+ ".getDefinition(), this, true);");
@@ -849,11 +850,13 @@ public void generateToFile(SourceGenerator sg, Module module) throws IOException
 			sg.wl("		SObjectDisplay<" + objectclass + "> objectdisplaydefinition = new SObjectDisplay<" + objectclass
 					+ ">(\"" + objectclass.toUpperCase() + "\", this.get" + objectclass + "()," + objectclass
 					+ ".getDefinition(),this, true);");
+			
 			sg.wl("		mainband.addElement(objectdisplaydefinition);");
 			if (hasworkflow)
 				sg.wl("		objectdisplaydefinition.addPageNodeRightOfTitle(activetaskband);");
 			sg.wl("");
 			if (companion != null) {
+				sg.wl("		objectdisplaydefinition.overridesLabel(\""+companion.getLabel()+"\");");
 				sg.wl("		SObjectDisplay<" + companionclass + "> companionobjectdisplay = new SObjectDisplay<"
 						+ companionclass + ">(\"COMPANION\",this.get" + companionclass + "()," + companionclass
 						+ ".getDefinition(), this, true);");

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

@@ -175,7 +175,7 @@ public void generateToFile(SourceGenerator sg, Module module) throws IOException
 		sg.wl("	@Override");
 		sg.wl("	protected SPageNode getContent()  {");
 		sg.wl("		SComponentBand mainband = new SComponentBand(SComponentBand.DIRECTION_DOWN,this);");
-		sg.wl("		mainband.addElement(new SPageText(\"Update " + objectclass + "\",SPageText.TYPE_TITLE,this));");
+		sg.wl("		mainband.addElement(new SPageText(\"Update " + (companionobject!=null?companionobject.getLabel():dataobject.getLabel()) + "\",SPageText.TYPE_TITLE,this));");
 		sg.wl("		AtgUpdate" + (companionobject != null ? companionvariable : objectvariable)
 				+ "Action.ActionRef update" + objectvariable + "actionref = AtgUpdate"
 				+ (companionobject != null ? companionvariable : objectvariable) + "Action.get().getActionRef();");
@@ -190,6 +190,7 @@ public void generateToFile(SourceGenerator sg, Module module) throws IOException
 		sg.wl("		SObjectDisplay<" + objectclass + "> objectupdatedefinition = new SObjectDisplay<" + objectclass
 				+ ">(\"" + dataobject.getName().toUpperCase() + "\", this.get" + objectclass + "()," + objectclass
 				+ ".getDefinition(),this, false);");
+		sg.wl("		objectupdatedefinition.setReducedDisplay(false);");
 		sg.wl("		update" + objectvariable + "actionref.set" + objectclass
 				+ "(objectupdatedefinition.getObjectInput()); ");
 		if (companionobject != null) {

src/org/openlowcode/server/graphic/widget/SObjectDisplay.java

@@ -70,6 +70,7 @@ public class SObjectDisplay<E extends DataObject<E>>
 	private ArrayList<DataObjectFieldMarker<E>> hiddenfields;
 	private HashMap<DataObjectFieldMarker<E>, TextDataElt> overridenlabels;
 	private HashMap<DataObjectFieldMarker<E>, ArrayDataElt<TextDataElt>> suggestionsfortextfields;
+	private String overrideslabel;
 
 	/**
 	 * creates an object display
@@ -290,10 +291,19 @@ public String getPathName() {
 		return this.name;
 	}
 
+	/**
+	 * Replaces the object type label by another label
+	 * 
+	 * @param overrideslabel alternative label
+	 */
+	public void overridesLabel(String overrideslabel) {
+		this.overrideslabel = overrideslabel;
+	}
+	
 	@Override
 	public void WritePayloadToCDL(MessageWriter writer, SPageData input, SecurityBuffer buffer) throws IOException {
 		writer.addStringField("NAME", this.name);
-		writer.addStringField("LABEL", this.objectmodel.getLabel());
+		writer.addStringField("LABEL",(overrideslabel!=null?overrideslabel: this.objectmodel.getLabel()));
 		writer.addBooleanField("SOT", this.showtitle);
 		writer.addBooleanField("SOC", this.showcontent);