Merge branch 'develop' into feature/multifield-textarea

wcm-io · Sep 25, 2024 · dc58338 · dc58338
2 parents 18f3a82 + 6bbdc0a
commit dc58338
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/bundle/src/main/webapp/app-root/clientlibs/io.wcm.caconfig.editor/js/editor/editor.module.js b/bundle/src/main/webapp/app-root/clientlibs/io.wcm.caconfig.editor/js/editor/editor.module.js
@@ -60,7 +60,7 @@
     const currentController = current?.$$route?.controller;
     const currentConfigName = current?.pathParams?.configName;
     const nextController = next?.$$route?.controller;
-    const nextConfigName = current?.pathParams?.configName;
+    const nextConfigName = next?.pathParams?.configName;
     return currentController !== undefined && currentController === nextController && currentConfigName === nextConfigName;
   }
 

diff --git a/changes.xml b/changes.xml
@@ -30,6 +30,9 @@
       <action type="fix" dev="sseifert" issue="44">
         Textarea widget: Apply custom number of rows also in readonly/disabled state.
       </action>
+      <action type="fix" dev="sseifert" issue="45">
+        Fix non-working edit button for nested configurations (Regression from version 1.16.2).
+      </action>
     </release>
 
     <release version="1.16.4" date="2024-08-26">