For #309: fix regression with NamespaceMapping

orbeon · Mar 29, 2022 · beb6694 · beb6694
1 parent 919c145
commit beb6694
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/form-builder/jvm/src/main/scala/org/orbeon/oxf/fb/ControlOps.scala b/form-builder/jvm/src/main/scala/org/orbeon/oxf/fb/ControlOps.scala
@@ -678,7 +678,10 @@ trait ControlOps extends ResourcesOps {
     def renameNodeContent(elemOrAtt: NodeInfo, avt: Boolean): Unit =
       FormRunnerRename.replaceSingleVarReference(
         xpathString        = elemOrAtt.stringValue,
-        namespaceMapping   = NamespaceMapping(elemOrAtt.namespaceMappings.toMap),
+        namespaceMapping   = NamespaceMapping(elemOrAtt match {
+          case n if n.isAttribute => n.parentUnsafe.namespaceMappings.toMap
+          case n                  => n.namespaceMappings.toMap
+        }),
         functionLibrary    = inScopeContainingDocument.partAnalysis.functionLibrary,
         avt                = avt,
         oldName            = oldName,