fix field name

aem-design · Mar 5, 2021 · 4c8a482 · 4c8a482
1 parent c89f070
commit 4c8a482
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 59 deletions.
diff --git a/.../apps/aemdesign/components/details/contact-details/v3/contact-details/README.md b/.../apps/aemdesign/components/details/contact-details/v3/contact-details/README.md
@@ -85,8 +85,8 @@ These fields are available for input by the authors. These fields are used in te
         </tr>
         <tr>
             <td>Details / Description</td>
-            <td>Employee</td>
-            <td>employee</td>
+            <td>Employer</td>
+            <td>employer</td>
             <td></td>
             <td></td>
         </tr>
@@ -270,4 +270,4 @@ Following is example schema that should be used as reference for future design,
             Bob Smith</a>
     </div>
 
-<p></p>
+<p></p>
diff --git a/...s/aemdesign/components/details/contact-details/v3/contact-details/_cq_dialog/.content.xml b/...s/aemdesign/components/details/contact-details/v3/contact-details/_cq_dialog/.content.xml
@@ -31,10 +31,8 @@
                         sling:resourceType="granite/ui/components/foundation/container">
                         <items jcr:primaryType="nt:unstructured">
 
-
-                            <title
+                            <basic
                                 jcr:primaryType="nt:unstructured"
-                                jcr:title="Title"
                                 sling:resourceType="granite/ui/components/coral/foundation/form/fieldset">
                                 <items jcr:primaryType="nt:unstructured">
 
@@ -67,53 +65,6 @@
                                         name="./familyName"
                                         required="{Boolean}false"/>
 
-                                </items>
-                            </title>
-
-
-                            <other
-                                jcr:primaryType="nt:unstructured"
-                                jcr:title="Other"
-                                sling:resourceType="granite/ui/components/coral/foundation/form/fieldset">
-                                <items jcr:primaryType="nt:unstructured">
-
-                                    <category
-                                        jcr:primaryType="nt:unstructured"
-                                        jcr:title="Contact Tags"
-                                        path="/apps/aemdesign/global/dialog/touch/page/content/items/pageBasicTab/items/column/items/basic/items/category"
-                                        resourceType="aemdesign/components/coral/common/form/tagfield"
-                                        sling:resourceType="granite/ui/components/coral/foundation/include"/>
-
-                                    <mixinTypes
-                                        jcr:primaryType="nt:unstructured"
-                                        jcr:title="mixinTypes"
-                                        path="/apps/aemdesign/global/dialog/touch/page/content/items/pageBasicTab/items/column/items/basic/items/mixinTypes"
-                                        resourceType="granite/ui/components/foundation/form/hidden"
-                                        sling:resourceType="granite/ui/components/coral/foundation/include"/>
-
-                                    <mixinTypesHint
-                                        jcr:primaryType="nt:unstructured"
-                                        jcr:title="mixinTypesHint"
-                                        path="/apps/aemdesign/global/dialog/touch/page/content/items/pageBasicTab/items/column/items/basic/items/mixinTypesHint"
-                                        resourceType="granite/ui/components/foundation/form/hidden"
-                                        sling:resourceType="granite/ui/components/coral/foundation/include"/>
-
-
-                                </items>
-                            </other>
-                        </items>
-                    </column1>
-                    <column2
-                        jcr:primaryType="nt:unstructured"
-                        sling:resourceType="granite/ui/components/foundation/container">
-                        <items jcr:primaryType="nt:unstructured">
-
-
-                                <description
-                                        jcr:primaryType="nt:unstructured"
-                                        jcr:title="Description"
-                                        sling:resourceType="granite/ui/components/coral/foundation/form/fieldset">
-                                <items jcr:primaryType="nt:unstructured">
 
                                     <jobTitle
                                         jcr:primaryType="nt:unstructured"
@@ -142,16 +93,61 @@
                                         fieldLabel="Email"
                                         name="./email"
                                         required="{Boolean}false"/>
+                                </items>
+                            </basic>
+
+
+                        </items>
+                    </column1>
+                    <column2
+                        jcr:primaryType="nt:unstructured"
+                        class="u-coral-padding u-coral-noMargin"
+                        sling:resourceType="granite/ui/components/foundation/container">
+                        <granite:rendercondition
+                            jcr:primaryType="nt:unstructured"
+                            sling:resourceType="granite/ui/components/coral/foundation/renderconditions/not">
+                            <granite:rendercondition
+                                jcr:primaryType="nt:unstructured"
+                                sling:resourceType="aemdesign/components/coral/renderconditions/iscurrentuseringroup"
+                                groups="[content-authors-advanced]"/>
+                        </granite:rendercondition>
+                        <items jcr:primaryType="nt:unstructured">
+                            <advanced
+                                        jcr:primaryType="nt:unstructured"
+                                        sling:resourceType="granite/ui/components/coral/foundation/form/fieldset">
+                                <items jcr:primaryType="nt:unstructured">
+
 
-                                    <employee
+                                    <employer
                                         jcr:primaryType="nt:unstructured"
                                         sling:resourceType="granite/ui/components/coral/foundation/form/textfield"
-                                        fieldLabel="Employee"
-                                        name="./employee"
+                                        fieldLabel="Employer"
+                                        name="./employer"
                                         required="{Boolean}false"/>
 
+                                    <category
+                                        jcr:primaryType="nt:unstructured"
+                                        jcr:title="Contact Tags"
+                                        path="/apps/aemdesign/global/dialog/touch/page/content/items/pageBasicTab/items/column/items/basic/items/category"
+                                        resourceType="aemdesign/components/coral/common/form/tagfield"
+                                        sling:resourceType="granite/ui/components/coral/foundation/include"/>
+
+                                    <mixinTypes
+                                        jcr:primaryType="nt:unstructured"
+                                        jcr:title="mixinTypes"
+                                        path="/apps/aemdesign/global/dialog/touch/page/content/items/pageBasicTab/items/column/items/basic/items/mixinTypes"
+                                        resourceType="granite/ui/components/foundation/form/hidden"
+                                        sling:resourceType="granite/ui/components/coral/foundation/include"/>
+
+                                    <mixinTypesHint
+                                        jcr:primaryType="nt:unstructured"
+                                        jcr:title="mixinTypesHint"
+                                        path="/apps/aemdesign/global/dialog/touch/page/content/items/pageBasicTab/items/column/items/basic/items/mixinTypesHint"
+                                        resourceType="granite/ui/components/foundation/form/hidden"
+                                        sling:resourceType="granite/ui/components/coral/foundation/include"/>
+
                                 </items>
-                            </description>
+                            </advanced>
 
                         </items>
                     </column2>
@@ -163,7 +159,14 @@
                 jcr:primaryType="nt:unstructured"
                 jcr:title="Layout"
                 sling:resourceType="granite/ui/components/foundation/section">
-
+                <granite:rendercondition
+                    jcr:primaryType="nt:unstructured"
+                    sling:resourceType="granite/ui/components/coral/foundation/renderconditions/not">
+                    <granite:rendercondition
+                        jcr:primaryType="nt:unstructured"
+                        sling:resourceType="aemdesign/components/coral/renderconditions/iscurrentuseringroup"
+                        groups="[content-authors-advanced]"/>
+                </granite:rendercondition>
                 <layout jcr:primaryType="nt:unstructured"
                         margin="{Boolean}false"
                         sling:resourceType="granite/ui/components/foundation/layouts/fixedcolumns"/>

diff --git a/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/ContactDetails.java b/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/ContactDetails.java
@@ -66,7 +66,7 @@ protected void setFields() {
             {"givenName", StringUtils.EMPTY},
             {"familyName", StringUtils.EMPTY},
             {"jobTitle", StringUtils.EMPTY},
-            {"employee", StringUtils.EMPTY},
+            {"employer", StringUtils.EMPTY},
             {"email", StringUtils.EMPTY},
             {"contactNumber", StringUtils.EMPTY},
             {"contactNumberMobile", StringUtils.EMPTY},