Fix propagation of currentEntity parameter from input control manif…

…est to
4d · Jan 17, 2024 · 38b894e · 38b894e
1 parent 398742a
commit 38b894e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/models/projecteditor/FieldMapping.kt b/models/projecteditor/FieldMapping.kt
@@ -7,7 +7,8 @@ data class FieldMappingFormatter(
     val imageHeight: Int?,
     val tintable: Boolean?,
     val target: Any?,
-    val capabilities : List<String>?
+    val capabilities : List<String>?,
+    val currentEntity: Boolean?
 ) {
     fun isImageNamed() = this.binding == "imageNamed"
 }
@@ -27,6 +28,7 @@ data class FieldMappingDefaultInputControl(
     var format: String?,
     val imageWidth: Int?,
     val imageHeight: Int?,
+    val currentEntity: Boolean?,
 )
 
 data class FieldMappingLoginForm(

diff --git a/utils/Formatters.kt b/utils/Formatters.kt
@@ -12,7 +12,8 @@ fun getFieldMappingFormatter(manifestContent: JSONObject, format: String): Field
         tintable = manifestContent.getSafeObject("assets")?.getSafeBoolean("tintable"),
         target = manifestContent.getSafeString("target") ?: manifestContent.getSafeArray("target")
             .getStringList(), // target can be a String or a JSONArray,
-        capabilities = manifestContent.getSafeObject("capabilities")?.checkCapabilities()
+        capabilities = manifestContent.getSafeObject("capabilities")?.checkCapabilities(),
+        currentEntity = manifestContent.getSafeBoolean("currentEntity")
     )
 
 fun getFieldMappingKotlinInputControl(manifestContent: JSONObject, format: String): FieldMappingKotlinInputControl =
@@ -44,7 +45,8 @@ fun getFieldMappingDefaultInputControl(manifestContent: JSONObject): FieldMappin
         name = manifestContent.getSafeString("name"),
         format = manifestContent.getSafeString("format"),
         imageWidth = getSize(manifestContent, "width"),
-        imageHeight = getSize(manifestContent, "height")
+        imageHeight = getSize(manifestContent, "height"),
+        currentEntity = manifestContent.getSafeBoolean("currentEntity")
     )
 
 fun getChoiceList(manifestContent: JSONObject): Any {