Author: jleroux
Date: Thu Oct 22 20:22:11 2015 New Revision: 1710093 URL: http://svn.apache.org/viewvc?rev=1710093&view=rev Log: Completes r1709882 for <<Remove tooltip="${uiLabelMap.CommonRequired}" from fields>> https://issues.apache.org/jira/browse/OFBIZ-6691 Removes nonsensical required-field="true" for <display* field types Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml ofbiz/trunk/specialpurpose/scrum/widget/scrumForms.xml Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml?rev=1710093&r1=1710092&r2=1710093&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml Thu Oct 22 20:22:11 2015 @@ -30,7 +30,7 @@ <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}" required-field="true"><display/></field> + <field map-name="workEffort" name="workEffortId" title="${uiLabelMap.WorkEffortWorkEffortId}"><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 --> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=1710093&r1=1710092&r2=1710093&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Thu Oct 22 20:22:11 2015 @@ -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}" required-field="true"><display/></field> + <field name="workEffortName" position="1" title="${uiLabelMap.CommonName}"><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}" required-field="true"><display/></field> + <field name="workEffortName" position="1" title="${uiLabelMap.CommonName}"><display/></field> <field name="projectId" title="${uiLabelMap.ProjectMgrWorkEffortIdFrom}"><lookup target-form-name="LookupWorkEffort"/></field> <field name="fromDate"><date-time/></field> <field name="currentStatusId"> @@ -399,7 +399,7 @@ <field name="projectId"><hidden value="${parameters.projectId}"/></field> <field name="phaseId" parameter-name="workEffortId"><hidden/></field> <field name="phaseSeqNum" parameter-name="sequenceNum" title="${uiLabelMap.FormFieldTitle_sequenceNum}"><text size="3"/></field> - <field name="phaseName" parameter-name="workEffortName" title="${uiLabelMap.CommonName}*"><text/></field> + <field name="phaseName" parameter-name="workEffortName" title="${uiLabelMap.CommonName}" required-field="true"><text/></field> <field name="currentStatusId" title="${uiLabelMap.CommonStatus}" parameter-name="dummy"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field> <field name="priority" title="${uiLabelMap.CommonPriority}"><display/></field> <field name="plannedHours" title="${uiLabelMap.ProjectMgrPlannedHours}"><display/></field> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=1710093&r1=1710092&r2=1710093&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Thu Oct 22 20:22:11 2015 @@ -50,12 +50,12 @@ </entity-options> </drop-down> </field> - <field name="workEffortParentId" use-when="myTask!=void @and parameters.get("workEffortParentId")!=null" title="${uiLabelMap.ProjectMgrTaskPhase}*"> + <field name="workEffortParentId" use-when="myTask!=void @and parameters.get("workEffortParentId")!=null" title="${uiLabelMap.ProjectMgrTaskPhase}" required-field="true"> <display-entity entity-name="WorkEffort" description="${workEffortName}[${workEffortId}]" key-field-name="workEffortId"> <sub-hyperlink target="MyTasks" description="[${uiLabelMap.CommonChange}]"/> </display-entity> </field> - <field name="workEffortParentId" use-when="myTask!=void @and parameters.get("workEffortParentId")==null" title="${uiLabelMap.ProjectMgrTaskPhase}*" + <field name="workEffortParentId" use-when="myTask!=void @and parameters.get("workEffortParentId")==null" title="${uiLabelMap.ProjectMgrTaskPhase}" event="onchange" action="javascript:document.EditTask.submit();" required-field="true"> <drop-down allow-empty="true"> <entity-options entity-name="ProjectPartyAndPhase" key-field-name="phaseId" description="${projectName} -- ${phaseName}"> @@ -705,7 +705,7 @@ <field name="currentStatusId"><hidden value="PTS_CREATED"/></field> <field name="taskName" parameter-name="workEffortName" title="${uiLabelMap.ProjectMgrTaskName}" required-field="true"><text default-value="${custRequest.custRequestName}"/></field> <field name="taskDescription" parameter-name="description" title="${uiLabelMap.CommonDescription}"><text default-value="${custRequest.description}"/></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="false"> <entity-options entity-name="WorkEffortAndChild" description="${workEffortName} -- ${childWorkEffortName}"> <entity-constraint name="workEffortTypeId" value="PROJECT"/> Modified: ofbiz/trunk/specialpurpose/scrum/widget/scrumForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/widget/scrumForms.xml?rev=1710093&r1=1710092&r2=1710093&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/widget/scrumForms.xml (original) +++ ofbiz/trunk/specialpurpose/scrum/widget/scrumForms.xml Thu Oct 22 20:22:11 2015 @@ -644,7 +644,7 @@ under the License. <text size="63" maxlength="255"/> </field> <field name="description" title="${uiLabelMap.ScrumProductBacklogItem}" required-field="true" tooltip="${uiLabelMap.ScrumMax255Chars}" use-when="custRequest!=null&&isTeamMember==false"><text size="63" maxlength="255"/></field> - <field name="description" title="${uiLabelMap.ScrumProductBacklogItem}" required-field="true" use-when="custRequest!=null&&isTeamMember==true"><display/></field> + <field name="description" title="${uiLabelMap.ScrumProductBacklogItem}" use-when="custRequest!=null&&isTeamMember==true"><display/></field> <field name="productId" map-name="product" title="${uiLabelMap.ScrumProjectMoveToProduct}" use-when="custRequest!=null&&isTeamMember==false"> <drop-down> <entity-options description="${groupName} ${internalName}[${productId}]" entity-name="ProductAndRole" key-field-name="productId"> @@ -2674,7 +2674,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="createButton"><submit button-type="button"/></field> </form> <form name="ListCustRequestContent" type="list" list-name="custRequestAndContents" |
Free forum by Nabble | Edit this page |