[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit][feature/HSTTWO-3792] HSTTWO-3792 Account for feedback from Oscar:
Ard Schrijvers pushed to branch feature/HSTTWO-3792 at cms-community /
hippo-site-toolkit
Commits:
7d97bafe by Ard Schrijvers at 2016-09-07T11:24:52+02:00
HSTTWO-3792 Account for feedback from Oscar:
- correct javadoc
- rename hst:formId to hst:formid to be more in sync with other hst prop defs
- - - - -
3 changed files:
- client/src/main/java/org/hippoecm/hst/component/support/forms/FormField.java
- client/src/main/java/org/hippoecm/hst/component/support/forms/FormUtils.java
- toolkit-resources/addon/toolkit-cnd/cnd/src/main/resources/hst-types.cnd
Changes:
=
client/src/main/java/org/hippoecm/hst/component/support/forms/FormField.java
=
---
a/client/src/main/java/org/hippoecm/hst/component/support/forms/FormField.java
+++
b/client/src/main/java/org/hippoecm/hst/component/support/forms/FormField.java
@@ -28,7 +28,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * Simple value wrapper for form fields (name and data). Supports multiple
value fields
+ * Simple value wrapper for form fields (name, label, data where the data can
be submitted form field values and
+ * possible messages). Supports multiple value fields
*
* @version $Id$
*/
=
client/src/main/java/org/hippoecm/hst/component/support/forms/FormUtils.java
=
---
a/client/src/main/java/org/hippoecm/hst/component/support/forms/FormUtils.java
+++
b/client/src/main/java/org/hippoecm/hst/component/support/forms/FormUtils.java
@@ -64,7 +64,7 @@ public class FormUtils {
public final static String DEFAULT_FORMDATA_CONTAINER =
"hst:formdatacontainer";
public final static String DEFAULT_FORMDATA_TYPE = "hst:formdata";
-public static final String HST_FORM_ID = "hst:formId";
+public static final String HST_FORM_ID = "hst:formid";
public final static String HST_CREATIONTIME = "hst:creationtime";
public final static String HST_PREDECESSOR = "hst:predecessor";
public final static String HST_FORM_DATA_NODE = "hst:formfieldvalue";
=
toolkit-resources/addon/toolkit-cnd/cnd/src/main/resources/hst-types.cnd
=
--- a/toolkit-resources/addon/toolkit-cnd/cnd/src/main/resources/hst-types.cnd
+++ b/toolkit-resources/addon/toolkit-cnd/cnd/src/main/resources/hst-types.cnd
@@ -462,7 +462,7 @@
- hst:predecessor (string)
- hst:sealed (boolean)
// optional property pointing to the identifier of the backing form
-- hst:formId (string)
+- hst:formid (string)
[hst:formdatacontainer]
+ * (hst:formdatacontainer)
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/7d97bafe8ae29e5816668bb400c8f76d502e6295
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit][feature/HSTTWO-3792] HSTTWO-3792 Account for feedback from Oscar:
Ard Schrijvers pushed to branch feature/HSTTWO-3792 at cms-community /
hippo-site-toolkit
Commits:
b9924de4 by Ard Schrijvers at 2016-09-07T10:25:55+02:00
HSTTWO-3792 Account for feedback from Oscar:
- mixin MIXIN_FORM_DATA_PAYLOAD should only be set if the flat structure
feature is enabled
- remove usage of FormField#getValues
- - - - -
1 changed file:
- client/src/main/java/org/hippoecm/hst/component/support/forms/FormUtils.java
Changes:
=
client/src/main/java/org/hippoecm/hst/component/support/forms/FormUtils.java
=
---
a/client/src/main/java/org/hippoecm/hst/component/support/forms/FormUtils.java
+++
b/client/src/main/java/org/hippoecm/hst/component/support/forms/FormUtils.java
@@ -46,6 +46,7 @@ import org.hippoecm.hst.site.HstServices;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static javax.jcr.nodetype.NodeType.MIX_REFERENCEABLE;
import static org.hippoecm.hst.core.component.HstRequest.RESOURCE_PHASE;
import static org.hippoecm.hst.site.HstServices.getComponentManager;
import static org.onehippo.repository.util.JcrConstants.MIX_REFERENCEABLE;
@@ -263,9 +264,9 @@ public class FormUtils {
}
postedFormDataNode.addMixin(MIX_REFERENCEABLE);
-postedFormDataNode.addMixin(MIXIN_FORM_DATA_PAYLOAD);
if
(getComponentManager().getContainerConfiguration().getBoolean(FORM_DATA_FLAT_STORAGE_CONFIG_PROP,
true)) {
+postedFormDataNode.addMixin(MIXIN_FORM_DATA_PAYLOAD);
final String json = new
ObjectMapper().writeValueAsString(formMap.getFormMap());
postedFormDataNode.setProperty(PROPERTY_FORM_DATA_PAYLOAD,
json);
} else {
@@ -273,9 +274,9 @@ public class FormUtils {
FormField field = entry.getValue();
Node fieldNode =
postedFormDataNode.addNode(HST_FORM_DATA_NODE, HST_FORM_DATA_NODE);
fieldNode.setProperty(HST_FORM_FIELD_NAME,
field.getName());
-Map values = field.getValues();
-if (values.size() > 0) {
-fieldNode.setProperty(HST_FORM_FIELD_DATA,
values.values().toArray(new String[values.size()]));
+List valueList = field.getValueList();
+if (valueList.size() > 0) {
+fieldNode.setProperty(HST_FORM_FIELD_DATA,
valueList.toArray(new String[valueList.size()]));
}
List messages = field.getMessages();
if (messages.size() > 0) {
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/b9924de4fd91c0cd58f8aea0f125f7b1af9ea1e4
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
