For #2437: fix new grids/cells annotation

orbeon · Oct 10, 2017 · 202a4d1 · 202a4d1
1 parent 045928f
commit 202a4d1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/form-builder/jvm/src/main/scala/org/orbeon/oxf/fb/GridOps.scala b/form-builder/jvm/src/main/scala/org/orbeon/oxf/fb/GridOps.scala
@@ -48,7 +48,7 @@ trait GridOps extends ContainerOps {
     }
 
     // All grids and grid cells with no existing id
-    val grids = startElem descendant GridTest
+    val grids = startElem descendantOrSelf GridTest
 
     annotate("tmp", grids descendant CellTest filterNot (_.hasId))
     annotate("tmp", grids filterNot (_.hasId))

diff --git a/form-builder/jvm/src/main/scala/org/orbeon/oxf/fb/ToolboxOps.scala b/form-builder/jvm/src/main/scala/org/orbeon/oxf/fb/ToolboxOps.scala
@@ -648,6 +648,7 @@ object ToolboxOps {
     // Update ancestor templates if any
     updateTemplatesCheckContainers(findAncestorRepeatNames(into, includeSelf = true).to[Set])
 
+    // Make sure new grids and cells are annotated
     annotateGridsAndCells(newContainerElem)
 
     // Select first grid cell