Author: jleroux Date: Thu Jun 13 14:26:15 2013 New Revision: 1492683 URL: http://svn.apache.org/r1492683 Log: "Applied fix from trunk for revision: 1492673 " ------------------------------------------------------------------------ r1492673 | jleroux | 2013-06-13 15:52:07 +0200 (jeu., 13 juin 2013) | 11 lines
A patch from Ankit for "No the date fields showning on edit project page." https://issues.apache.org/jira/browse/OFBIZ-5222 No date fields are showing on Edit project page(https://demo-trunk.ofbiz.apache.org:8443/projectmgr/control/EditProject?projectId=10005 create a new project) for the following: Estimated Start Date Estimated Completion Date Actual Start Date Actual Completion Date Also on the Project Summary page no dates are showing in Project Information. https://demo-trunk.ofbiz.apache.org:8443/projectmgr/control/projectView?projectId=10005 ------------------------------------------------------------------------ Modified: ofbiz/branches/release11.04/ (props changed) ofbiz/branches/release11.04/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml ofbiz/branches/release11.04/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Propchange: ofbiz/branches/release11.04/ ------------------------------------------------------------------------------ Merged /ofbiz/trunk:r1492673 Modified: ofbiz/branches/release11.04/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml?rev=1492683&r1=1492682&r2=1492683&view=diff ============================================================================== --- ofbiz/branches/release11.04/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml (original) +++ ofbiz/branches/release11.04/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml Thu Jun 13 14:26:15 2013 @@ -699,6 +699,10 @@ <set field="highInfo.projectId" from-field="project.workEffortId"/> <set field="highInfo.projectName" from-field="project.workEffortName"/> <set field="highInfo.projectDescription" from-field="project.description"/> + <set field="highInfo.estimatedStartDate" from-field="project.estimatedStartDate"/> + <set field="highInfo.estimatedCompletionDate" from-field="project.estimatedCompletionDate"/> + <set field="highInfo.actualStartDate" from-field="project.actualStartDate"/> + <set field="highInfo.actualCompletionDate" from-field="project.actualCompletionDate"/> <set field="highInfo.scopeEnumId" from-field="project.scopeEnumId"/> <set field="highInfo.createdStamp" from-field="project.createdStamp"/> <entity-one entity-name="StatusItem" value-field="highSeq"> Modified: ofbiz/branches/release11.04/specialpurpose/projectmgr/widget/forms/ProjectForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=1492683&r1=1492682&r2=1492683&view=diff ============================================================================== --- ofbiz/branches/release11.04/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original) +++ ofbiz/branches/release11.04/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Thu Jun 13 14:26:15 2013 @@ -80,10 +80,10 @@ </entity-options> </drop-down> </field> - <field use-when="projectId!=null" name="estimatedStartDate" title="${uiLabelMap.FormFieldTitle_estimatedStartDate}"><display type="date"/></field> - <field use-when="projectId!=null" name="estimatedCompletionDate" title="${uiLabelMap.FormFieldTitle_estimatedCompletionDate}"><display type="date"/></field> - <field use-when="projectId!=null" name="actualStartDate" title="${uiLabelMap.FormFieldTitle_actualStartDate}"><display type="date"/></field> - <field use-when="projectId!=null" name="actualCompletionDate" title="${uiLabelMap.FormFieldTitle_actualCompletionDate}"><display type="date"/></field> + <field use-when="projectId!=null" name="estimatedStartDate" title="${uiLabelMap.FormFieldTitle_estimatedStartDate}"><date-time/></field> + <field use-when="projectId!=null" name="estimatedCompletionDate" title="${uiLabelMap.FormFieldTitle_estimatedCompletionDate}"><date-time/></field> + <field use-when="projectId!=null" name="actualStartDate" title="${uiLabelMap.FormFieldTitle_actualStartDate}"><date-time/></field> + <field use-when="projectId!=null" name="actualCompletionDate" title="${uiLabelMap.FormFieldTitle_actualCompletionDate}"><date-time/></field> <field name="emailAddress" title="${uiLabelMap.FormFieldTitle_mailingListEmail}"><text/></field> <field name="save" title="${uiLabelMap.CommonSave}"><submit/></field> </form>
