[ofbiz-framework] branch trunk updated: Improved: Status ID checkbox for FindDataResource and FindContent forms (OFBIZ-11934)

[akashjain]

This is an automated email from the ASF dual-hosted git repository.

akashjain pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 019b54a  Improved: Status ID checkbox for FindDataResource and FindContent forms (OFBIZ-11934)
019b54a is described below

commit 019b54aceb9729cd56f75613e59bd1a320b18e98
Author: Akash Jain <[hidden email]>
AuthorDate: Mon Aug 3 16:11:03 2020 +0530

    Improved: Status ID checkbox for FindDataResource and FindContent forms (OFBIZ-11934)
---
 applications/content/widget/content/ContentForms.xml        | 6 +++---
 applications/content/widget/content/ContentScreens.xml      | 9 +++++++++
 applications/content/widget/content/DataResourceForms.xml   | 6 +++---
 applications/content/widget/content/DataResourceScreens.xml | 9 +++++++++
 4 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/applications/content/widget/content/ContentForms.xml b/applications/content/widget/content/ContentForms.xml
index 6525c8c..d13f7a2 100644
--- a/applications/content/widget/content/ContentForms.xml
+++ b/applications/content/widget/content/ContentForms.xml
@@ -21,7 +21,7 @@ under the License.
 <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xmlns="http://ofbiz.apache.org/Widget-Form" xsi:schemaLocation="http://ofbiz.apache.org/Widget-Form http://ofbiz.apache.org/dtds/widget-form.xsd">
 
-    <form name="FindContent" target="findContent" title="" type="single"
+    <form name="FindContent" target="findContent" title="" type="single" default-map-name="parameters"
         header-row-style="header-row" default-table-style="basic-table">
         <!--auto-fields-entity entity-name="Content" default-field-type="find" /-->
         <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
@@ -49,12 +49,12 @@ under the License.
             <lookup target-form-name="LookupContent"/>
         </field>
         <field name="statusId">
-            <check all-checked="false">
+            <drop-down allow-multiple="true">
                 <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="CONTENT_STATUS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
-            </check>
+            </drop-down>
         </field>
         <field name="createdByUserLogin" position="2"><lookup target-form-name="LookupUserLoginAndPartyDetails"/></field>
         <field name="localeString">
diff --git a/applications/content/widget/content/ContentScreens.xml b/applications/content/widget/content/ContentScreens.xml
index 5ddb421..fd032a5 100644
--- a/applications/content/widget/content/ContentScreens.xml
+++ b/applications/content/widget/content/ContentScreens.xml
@@ -34,6 +34,12 @@ under the License.
                 <set field="queryString" from-field="result.queryString"/>
                 <set field="viewIndex" from-field="requestParameters.VIEW_INDEX" type="Integer"/>
                 <set field="viewSize" from-field="requestParameters.VIEW_SIZE" type="Integer" default-value="30"/>
+                <set field="asm_multipleSelectForm" value="FindContent"/>
+                <set field="asm_asmListItemPercentOfForm" value="110"/>
+                <set field="statusId.asm_multipleSelect" value="FindContent_statusId"/>
+                <set field="statusId.asm_sortable" value="true"/>
+                <set field="statusId.asm_title" value=" "/>
+                <set field="asm_listField[]" from-field="statusId"/>
             </actions>
             <widgets>
                 <decorator-screen name="contentDecorator" location="${parameters.mainDecoratorLocation}">
@@ -49,6 +55,9 @@ under the License.
                                         </container>
                                     </decorator-section>
                                     <decorator-section name="search-options">
+                                        <platform-specific>
+                                            <html><html-template multi-block="true" location="component://common-theme/template/includes/SetMultipleSelectJsList.ftl"/></html>
+                                        </platform-specific>
                                         <include-form name="FindContent" location="component://content/widget/content/ContentForms.xml"/>
                                     </decorator-section>
                                     <decorator-section name="search-results">
diff --git a/applications/content/widget/content/DataResourceForms.xml b/applications/content/widget/content/DataResourceForms.xml
index 07d87f5..9ef9fc2 100644
--- a/applications/content/widget/content/DataResourceForms.xml
+++ b/applications/content/widget/content/DataResourceForms.xml
@@ -21,7 +21,7 @@ under the License.
 <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xmlns="http://ofbiz.apache.org/Widget-Form" xsi:schemaLocation="http://ofbiz.apache.org/Widget-Form http://ofbiz.apache.org/dtds/widget-form.xsd">
     <!-- DataResource forms -->
-    <form name="FindDataResource" target="findDataResource" type="single"
+    <form name="FindDataResource" target="findDataResource" type="single" default-map-name="parameters"
         header-row-style="header-row" default-table-style="basic-table">
         <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
         <field name="dataResourceId" title="${uiLabelMap.ContentDataResourceId}"><text-find ignore-case="true"/></field>
@@ -41,12 +41,12 @@ under the License.
             </drop-down>
         </field>
         <field name="statusId">
-            <check all-checked="false">
+            <drop-down allow-multiple="true">
                 <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="CONTENT_STATUS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
-            </check>
+            </drop-down>
         </field>
         <field name="localeString" position="2">
             <lookup target-form-name="LookupLocale"></lookup>
diff --git a/applications/content/widget/content/DataResourceScreens.xml b/applications/content/widget/content/DataResourceScreens.xml
index cce9afd..6801690 100644
--- a/applications/content/widget/content/DataResourceScreens.xml
+++ b/applications/content/widget/content/DataResourceScreens.xml
@@ -28,6 +28,12 @@ under the License.
                 <set field="labelTitleProperty" value="PageTitleFindDataResource"/>
                 <set field="viewIndex" from-field="requestParameters.VIEW_INDEX" type="Integer"/>
                 <set field="viewSize" from-field="requestParameters.VIEW_SIZE" type="Integer" default-value="30"/>
+                <set field="asm_multipleSelectForm" value="FindDataResource"/>
+                <set field="asm_asmListItemPercentOfForm" value="110"/>
+                <set field="statusId.asm_multipleSelect" value="FindDataResource_statusId"/>
+                <set field="statusId.asm_sortable" value="true"/>
+                <set field="statusId.asm_title" value=" "/>
+                <set field="asm_listField[]" from-field="statusId"/>
             </actions>
             <widgets>
                 <decorator-screen name="commonDataResourceDecorator"  location="${parameters.mainDecoratorLocation}">
@@ -37,6 +43,9 @@ under the License.
                                 <container style="button-bar"><link target="EditDataResource" text="${uiLabelMap.CommonCreate}" style="buttontext create"/></container>
                             </decorator-section>
                             <decorator-section name="search-options">
+                                <platform-specific>
+                                    <html><html-template multi-block="true" location="component://common-theme/template/includes/SetMultipleSelectJsList.ftl"/></html>
+                                </platform-specific>
                                 <include-form name="FindDataResource" location="component://content/widget/content/DataResourceForms.xml"/>
                             </decorator-section>
                             <decorator-section name="search-results">