svn commit: r1710086 - in /ofbiz/trunk: applications/order/widget/ordermgr/ applications/product/widget/catalog/ specialpurpose/assetmaint/widget/forms/ specialpurpose/projectmgr/widget/forms/

Author: jleroux
Date: Thu Oct 22 19:47:33 2015
New Revision: 1710086

URL: http://svn.apache.org/viewvc?rev=1710086&view=rev
Log:
Completes r1709882 for <<Remove tooltip="${uiLabelMap.CommonRequired}" from fields>> https://issues.apache.org/jira/browse/OFBIZ-6691

Replaces all }*" by requiredField but for forms using auto-fields-entity or auto-fields-service for which I created the subtask "Enhance auto-fields-entity and auto-fields-service to generate required fields on PK ones" https://issues.apache.org/jira/browse/OFBIZ-6695

Modified:
    ofbiz/trunk/applications/order/widget/ordermgr/CustRequestForms.xml
    ofbiz/trunk/applications/product/widget/catalog/FeatureForms.xml
    ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml
    ofbiz/trunk/applications/product/widget/catalog/ProductStoreForms.xml
    ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml
    ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/forms/CustRequestForms.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml

Modified: ofbiz/trunk/applications/order/widget/ordermgr/CustRequestForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/CustRequestForms.xml?rev=1710086&r1=1710085&r2=1710086&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/CustRequestForms.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/CustRequestForms.xml Thu Oct 22 19:47:33 2015
@@ -455,9 +455,9 @@ under the License.
         <field name="custRequestId"><hidden/></field>
         <field name="partyId" widget-style="buttontext">
             <display-entity also-hidden="true" entity-name="PartyNameView" key-field-name="partyId" description="${groupName}${firstName} ${lastName}">
-            <sub-hyperlink description="${partyId}" target-type="inter-app" target="/partymgr/control/viewprofile">
-                <parameter param-name="partyId"/>
-            </sub-hyperlink>
+                <sub-hyperlink description="${partyId}" target-type="inter-app" target="/partymgr/control/viewprofile">
+                    <parameter param-name="partyId"/>
+                </sub-hyperlink>
             </display-entity>
         </field>
         <field name="roleTypeId" title="${uiLabelMap.PartyRoleType}">
@@ -611,7 +611,7 @@ under the License.
                 <entity-options entity-name="MimeType" key-field-name="mimeTypeId"/>
             </drop-down>
         </field-->
-        <field name="dataResourceName" title="${uiLabelMap.CommonUpload}*"><file/></field>
+        <field name="dataResourceName" title="${uiLabelMap.CommonUpload}" required-field="true"><file/></field>
        <!-- <field name="dataCategoryId" use-when="dataResource==null">
             <drop-down allow-empty="false">
                 <entity-options description="${categoryName}" entity-name="DataCategory" key-field-name="dataCategoryId"/>

Modified: ofbiz/trunk/applications/product/widget/catalog/FeatureForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/FeatureForms.xml?rev=1710086&r1=1710085&r2=1710086&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/FeatureForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/FeatureForms.xml Thu Oct 22 19:47:33 2015
@@ -319,7 +319,7 @@
     </form>
 
     <form name="CreateProductFeature" type="single" target="CreateFeatureCategory">
-        <field name="description" title="${uiLabelMap.CommonDescription}*"><text size="25"></text></field>
+        <field name="description" title="${uiLabelMap.CommonDescription}" required-field="true"><text size="25"></text></field>
         <field name="parentCategory" title="${uiLabelMap.ProductParentCategory}">
             <drop-down allow-empty="true">
                 <entity-options entity-name="ProductFeatureCategory" key-field-name="description">

Modified: ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml?rev=1710086&r1=1710085&r2=1710086&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml Thu Oct 22 19:47:33 2015
@@ -2213,9 +2213,9 @@ under the License.
         <field name="productId"><hidden/></field>
         <field name="statusId"><hidden value="GO_CREATED"/></field>
         <field name="soldOrderQty"><hidden value="0"/></field>
-        <field name="reqOrderQty" title="${uiLabelMap.ProductDealQuantity}*"><text/></field>
-        <field name="fromDate" title="${uiLabelMap.ProductDealStartDate}*"><date-time/></field>
-        <field name="thruDate" title="${uiLabelMap.ProductDealEndDate}*"><date-time/></field>
+        <field name="reqOrderQty" title="${uiLabelMap.ProductDealQuantity}" required-field="true"><text/></field>
+        <field name="fromDate" title="${uiLabelMap.ProductDealStartDate}" required-field="true"><date-time/></field>
+        <field name="thruDate" title="${uiLabelMap.ProductDealEndDate}" required-field="true"><date-time/></field>
         <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
 
@@ -2224,9 +2224,9 @@ under the License.
         <field name="groupOrderId"><hidden/></field>
         <field name="productId"><hidden/></field>
         <field name="statusId"><hidden/></field>
-        <field name="reqOrderQty" title="${uiLabelMap.ProductDealQuantity}*"><text/></field>
-        <field name="fromDate" title="${uiLabelMap.ProductDealStartDate}*"><date-time/></field>
-        <field name="thruDate" title="${uiLabelMap.ProductDealEndDate}*"><date-time/></field>
+        <field name="reqOrderQty" title="${uiLabelMap.ProductDealQuantity}" required-field="true"><text/></field>
+        <field name="fromDate" title="${uiLabelMap.ProductDealStartDate}" required-field="true"><date-time/></field>
+        <field name="thruDate" title="${uiLabelMap.ProductDealEndDate}" required-field="true"><date-time/></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
 

Modified: ofbiz/trunk/applications/product/widget/catalog/ProductStoreForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ProductStoreForms.xml?rev=1710086&r1=1710085&r2=1710086&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/ProductStoreForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/ProductStoreForms.xml Thu Oct 22 19:47:33 2015
@@ -72,7 +72,7 @@
         </field>
 
         <field name="manualAuthIsCapture">
-            <drop-down allow-empty="false" no-current-selected-key="N"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down>
+            <drop-down allow-empty="false" no-current-selected-key="N"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}" disabled="true"/></drop-down>
         </field>
         <field name="prorateShipping">
             <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down>

Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml?rev=1710086&r1=1710085&r2=1710086&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml Thu Oct 22 19:47:33 2015
@@ -117,7 +117,7 @@
             </drop-down>
         </field>
         <field name="productId" title="${uiLabelMap.AssetMaintPartId}" required-field="true"><lookup  target-form-name="LookupPartsProduct"/></field>
-        <field name="quantity" position="1" title="${uiLabelMap.CommonQuantity}*"><text size="10"/></field>
+        <field name="quantity" position="1" title="${uiLabelMap.CommonQuantity}" required-field="true"><text size="10"/></field>
         <field name="maintHistSeqId"><hidden/></field>
         <field name="fixedAssetId"><hidden/></field>
         <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>

Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml?rev=1710086&r1=1710085&r2=1710086&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml Thu Oct 22 19:47:33 2015
@@ -30,9 +30,9 @@
         <alt-target target="createWorkEffort" use-when="workEffort==null"/>
         <alt-target target="updateWorkEffortAndAssoc" use-when="workEffortIdFrom!=null"/>
         <field name="maintHistSeqId" map-name="fixedAssetMaint"><hidden/></field>
-        <field map-name="workEffort" name="workEffortId" title="${uiLabelMap.WorkEffortWorkEffortId}*"><display/></field>
-        <field map-name="workEffort" name="workEffortName" position="1" title="${uiLabelMap.CommonName}*"><text size="60"/></field>
-        <field map-name="workEffort" name="description" position="1" title="${uiLabelMap.CommonDescription}*"><text size="60"/></field>
+        <field map-name="workEffort" name="workEffortId" title="${uiLabelMap.WorkEffortWorkEffortId}" required-field="true"><display/></field>
+        <field map-name="workEffort" name="workEffortName" position="1" title="${uiLabelMap.CommonName}" required-field="true"><text size="60"/></field>
+        <field map-name="workEffort" name="description" position="1" title="${uiLabelMap.CommonDescription}" required-field="true"><text size="60"/></field>
         <!-- Child workeffort fields -->
         <field name="workEffortIdFrom"><hidden value="${parameters.workEffortIdFrom}"/></field>
         <field name="workEffortIdTo"><hidden value="${parameters.workEffortId}"/></field>
@@ -48,7 +48,7 @@
                 </entity-options>
             </drop-down>
         </field>
-        <field map-name="workEffort" name="currentStatusId" title="${uiLabelMap.CommonStatus}*" position="1">
+        <field map-name="workEffort" name="currentStatusId" title="${uiLabelMap.CommonStatus}" required-field="true" position="1">
             <drop-down>
                 <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" value="TASK_STATUS"/>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/CustRequestForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/CustRequestForms.xml?rev=1710086&r1=1710085&r2=1710086&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/CustRequestForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/CustRequestForms.xml Thu Oct 22 19:47:33 2015
@@ -38,7 +38,7 @@ under the License.
         <field name="workEffortTypeId"><hidden value="TASK"/></field>
         <field name="currentStatusId"><hidden value="PTS_CREATED"/></field>
         <!--field name="communicationEventId"><hidden value="${communicationEvent.communicationEventId}"/></field-->
-        <field name="childWorkEffortId" parameter-name="workEffortParentId" title="${uiLabelMap.ProjectMgrProjectAndPhaseName}*">
+        <field name="childWorkEffortId" parameter-name="workEffortParentId" title="${uiLabelMap.ProjectMgrProjectAndPhaseName}" required-field="true">
             <drop-down allow-empty="true">
                 <entity-options entity-name="WorkEffortAndChild" description="${workEffortName} -- ${childWorkEffortName}">
                     <entity-constraint name="workEffortTypeId" value="PROJECT"/>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=1710086&r1=1710085&r2=1710086&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Thu Oct 22 19:47:33 2015
@@ -47,7 +47,7 @@
                 </entity-options>
             </drop-down>
         </field>
-        <field name="projectName" parameter-name="workEffortName" title="${uiLabelMap.ProjectMgrProjectName}*"><text/></field>
+        <field name="projectName" parameter-name="workEffortName" title="${uiLabelMap.ProjectMgrProjectName}" required-field="true"><text/></field>
         <field name="projectDescription" parameter-name="description" title="${uiLabelMap.CommonDescription}"><text/></field>
         <field name="currentStatusId" use-when="projectId!=null" title="${uiLabelMap.CommonStatus}" parameter-name="dummy"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
         <field name="currentStatusId" use-when="projectId==null"><hidden value="_NA_"/></field>
@@ -272,7 +272,7 @@
         <field name="fromDate"><hidden/></field>
         <field name="workEffortAssocTypeId"><hidden/></field>
         <field name="workEffortIdTo" entry-name="workEffortId"><hidden/></field>
-        <field name="workEffortName" position="1" title="${uiLabelMap.CommonName}*"><display/></field>
+        <field name="workEffortName" position="1" title="${uiLabelMap.CommonName}" required-field="true"><display/></field>
 
         <field name="currentStatusId">
             <drop-down allow-empty="false" current-description="${currentStatus.description}">
@@ -367,7 +367,7 @@
         <field name="workEffortId"><hidden/></field>
         <field name="workEffortAssocTypeId"><hidden/></field>
         <field name="workEffortIdTo" entry-name="workEffortId"><hidden/></field>
-        <field name="workEffortName" position="1" title="${uiLabelMap.CommonName}*"><display/></field>
+        <field name="workEffortName" position="1" title="${uiLabelMap.CommonName}" required-field="true"><display/></field>
         <field name="projectId" title="${uiLabelMap.ProjectMgrWorkEffortIdFrom}"><lookup target-form-name="LookupWorkEffort"/></field>
         <field name="fromDate"><date-time/></field>
         <field name="currentStatusId">