diff --git a/bundle/pom.xml b/bundle/pom.xml index c835dcb..2eb7d8c 100644 --- a/bundle/pom.xml +++ b/bundle/pom.xml @@ -25,13 +25,13 @@ io.wcm io.wcm.caconfig.editor.parent - 1.16.4 + 1.16.6 ../parent/pom.xml io.wcm io.wcm.caconfig.editor - 1.16.4 + 1.16.6 jar Context-Aware Configuration Editor @@ -42,7 +42,7 @@ caconfig/editor/bundle - 2024-08-26T09:52:43Z + 2024-09-30T07:12:41Z diff --git a/bundle/src/main/resources/angularjs-partials/multifield.html b/bundle/src/main/resources/angularjs-partials/multifield.html index 696a84b..9a540c5 100644 --- a/bundle/src/main/resources/angularjs-partials/multifield.html +++ b/bundle/src/main/resources/angularjs-partials/multifield.html @@ -34,8 +34,14 @@ ng-model="effectiveValue.value" /> + @@ -57,8 +63,14 @@ ng-model="value.value" /> + @@ -81,8 +93,16 @@
+
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 index 2fb326f..d81c6ba 100644 --- 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/bundle/src/main/webapp/app-root/clientlibs/io.wcm.caconfig.editor/js/widgets/multifield.directive.js b/bundle/src/main/webapp/app-root/clientlibs/io.wcm.caconfig.editor/js/widgets/multifield.directive.js index e4e5f2a..e7e0aa7 100644 --- a/bundle/src/main/webapp/app-root/clientlibs/io.wcm.caconfig.editor/js/widgets/multifield.directive.js +++ b/bundle/src/main/webapp/app-root/clientlibs/io.wcm.caconfig.editor/js/widgets/multifield.directive.js @@ -55,6 +55,12 @@ scope.validation = props.validation; scope.validationMessage = props.validationMessage ? Granite.I18n.get(props.validationMessage) : undefined; + // special handling for textarea + if (props.widgetType === "textarea") { + scope.type = "textarea"; + scope.textareaRows = props.textareaRows; + } + setValueArray(scope.property.effectiveValue, scope.effectiveValues); setValueArray(scope.property.value, scope.values); diff --git a/changes.xml b/changes.xml index 440fbd8..cdb907f 100644 --- a/changes.xml +++ b/changes.xml @@ -23,6 +23,18 @@ xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd"> + + + Support textarea widget for multifield (array) properties. + + + Textarea widget: Apply custom number of rows also in readonly/disabled state. + + + Fix non-working edit button for nested configurations (Regression from version 1.16.2). + + + Dropdown widget with multiple values: Preserve order of selected items when displaying configuration. diff --git a/package/pom.xml b/package/pom.xml index 649d645..1269e02 100644 --- a/package/pom.xml +++ b/package/pom.xml @@ -25,13 +25,13 @@ io.wcm io.wcm.caconfig.editor.parent - 1.16.4 + 1.16.6 ../parent/pom.xml io.wcm io.wcm.caconfig.editor.package - 1.16.4 + 1.16.6 content-package Context-Aware Configuration Editor Package ${site.url}/caconfig/editor/ @@ -41,7 +41,7 @@ wcm-io - 2024-08-26T09:52:43Z + 2024-09-30T07:12:41Z @@ -50,7 +50,7 @@ io.wcm io.wcm.caconfig.editor compile - 1.16.4 + 1.16.6 diff --git a/parent/pom.xml b/parent/pom.xml index 187fa44..8c25fe7 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -31,7 +31,7 @@ io.wcm io.wcm.caconfig.editor.parent - 1.16.4 + 1.16.6 pom Context-Aware Configuration Editor Parent @@ -49,7 +49,7 @@ - 2024-08-26T09:52:43Z + 2024-09-30T07:12:41Z diff --git a/pom.xml b/pom.xml index 4b6e4d2..7d1b177 100644 --- a/pom.xml +++ b/pom.xml @@ -25,13 +25,13 @@ io.wcm io.wcm.caconfig.editor.parent - 1.16.4 + 1.16.6 parent/pom.xml io.wcm io.wcm.caconfig.editor.root - 1.16.4 + 1.16.6 pom Context-Aware Configuration Editor Root