svn commit: r1761102 - in /ofbiz/trunk/applications: marketing/widget/sfa/forms/Eve
Locked
svn commit: r1761102 - in /ofbiz/trunk/applications: marketing/widget/sfa/forms/Eve
 
|
Author: mbrohl
Date: Fri Sep 16 22:06:42 2016 New Revision: 1761102 URL: http://svn.apache.org/viewvc?rev=1761102&view=rev Log: Improved: Workeffort: Consistent form name. (OFBIZ-8090) Change all form names to upper camel case for consistency. Thanks: Tanmay Muley for reporting and providing the patch. Modified: ofbiz/trunk/applications/marketing/widget/sfa/forms/EventForms.xml ofbiz/trunk/applications/workeffort/widget/CalendarForms.xml ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml ofbiz/trunk/applications/workeffort/widget/LookupForms.xml ofbiz/trunk/applications/workeffort/widget/LookupScreens.xml Modified: ofbiz/trunk/applications/marketing/widget/sfa/forms/EventForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/forms/EventForms.xml?rev=1761102&r1=1761101&r2=1761102&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/sfa/forms/EventForms.xml (original) +++ ofbiz/trunk/applications/marketing/widget/sfa/forms/EventForms.xml Fri Sep 16 22:06:42 2016 @@ -71,7 +71,7 @@ under the License. <sort-field name="complete"/> </sort-order> </form> - <form name="EditEvent" extends="editCalEvent" extends-resource="component://workeffort/widget/CalendarForms.xml"> + <form name="EditEvent" extends="EditCalEvent" extends-resource="component://workeffort/widget/CalendarForms.xml"> <field name="workEffortTypeId"><hidden value="TASK"/></field> <field name="statusId"><hidden value="PRTYASGN_ASSIGNED"/></field> <field name="currentStatusId"><hidden value="CAL_ACCEPTED"/></field> Modified: ofbiz/trunk/applications/workeffort/widget/CalendarForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/CalendarForms.xml?rev=1761102&r1=1761101&r2=1761102&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/CalendarForms.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/CalendarForms.xml Fri Sep 16 22:06:42 2016 @@ -70,7 +70,7 @@ under the License. <field name="updateButton"><submit/></field> </form> - <form name="editCalEvent" type="single" default-map-name="workEffort"> + <form name="EditCalEvent" type="single" default-map-name="workEffort"> <actions> <set field="statusTypeIds[]" value="EVENT_STATUS"/> <set field="statusTypeIds[]" value="CALENDAR_STATUS"/> @@ -127,13 +127,13 @@ under the License. <field name="updateButton" use-when="workEffort!=null"><submit /></field> </form> - <form name="cancelEvent" type="single" target="updateWorkEffort"> + <form name="CancelEvent" type="single" target="updateWorkEffort"> <field name="workEffortId"><hidden value="${parameters.workEffortId}"/></field> <field name="currentStatusId"><hidden value="CAL_CANCELLED"/></field> <field name="cancel" title="${uiLabelMap.WorkEffortCancelCalendarEvent}"><submit/></field> </form> - <form name="showCalEvent" type="single" default-map-name="workEffort"> + <form name="ShowCalEvent" type="single" default-map-name="workEffort"> <field name="workEffortName" title="${uiLabelMap.WorkEffortEventName}"><display/></field> <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field> <field name="workEffortTypeId" title="${uiLabelMap.PartyEventType}"> @@ -171,7 +171,7 @@ under the License. <grid name="showCalEventRolesDel" extends="showCalEventRoles" target="deleteWorkEffortPartyAssign"> <field name="remove" title="${uiLabelMap.CommonRemove}"><submit/></field> </grid> - <form name="addCalEventRole" type="single" target="createWorkEffortPartyAssign"> + <form name="AddCalEventRole" type="single" target="createWorkEffortPartyAssign"> <field name="workEffortId"><hidden value="${parameters.workEffortId}"/></field> <field name="statusId"><hidden value="PRTYASGN_ASSIGNED"/></field> <field name="partyId" position="1"><lookup target-form-name="LookupPartyName" size="10"></lookup></field> Modified: ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml?rev=1761102&r1=1761101&r2=1761102&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml Fri Sep 16 22:06:42 2016 @@ -187,10 +187,10 @@ under the License. <not><if-empty field="workEffort" /></not> </condition> <widgets> - <include-form name="cancelEvent" location="component://workeffort/widget/CalendarForms.xml" /> + <include-form name="CancelEvent" location="component://workeffort/widget/CalendarForms.xml" /> </widgets> </section> - <include-form name="editCalEvent" location="component://workeffort/widget/CalendarForms.xml" /> + <include-form name="EditCalEvent" location="component://workeffort/widget/CalendarForms.xml" /> </screenlet> </container> <container style="righthalf"> @@ -206,7 +206,7 @@ under the License. </and> </condition> <widgets> - <include-form name="addCalEventRole" location="component://workeffort/widget/CalendarForms.xml" /> + <include-form name="AddCalEventRole" location="component://workeffort/widget/CalendarForms.xml" /> </widgets> </section> </screenlet> @@ -216,7 +216,7 @@ under the License. <fail-widgets> <container style="lefthalf"> <screenlet title="${uiLabelMap.WorkEffortSummary}"> - <include-form name="showCalEvent" location="component://workeffort/widget/CalendarForms.xml" /> + <include-form name="ShowCalEvent" location="component://workeffort/widget/CalendarForms.xml" /> </screenlet> </container> <container style="righthalf"> Modified: ofbiz/trunk/applications/workeffort/widget/LookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/LookupForms.xml?rev=1761102&r1=1761101&r2=1761102&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/LookupForms.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/LookupForms.xml Fri Sep 16 22:06:42 2016 @@ -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"> <!-- WorkEffort Lookup forms --> - <form name="lookupWorkEffort" target="LookupWorkEffort" title="" type="single" + <form name="LookupWorkEffort" target="LookupWorkEffort" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> <auto-fields-entity entity-name="WorkEffort" default-field-type="find"/> <field name="workEffortId" title="${uiLabelMap.WorkEffortWorkEffortId}"><text-find/></field> @@ -90,7 +90,7 @@ under the License. <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="buttontext"><submit button-type="button"/></field> </form> - <form name="lookupWorkEffortShort" target="LookupWorkEffortShort" title="" type="single" + <form name="LookupWorkEffortShort" target="LookupWorkEffortShort" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> <field name="workEffortId" title="${uiLabelMap.WorkEffortWorkEffortId}"><text-find/></field> <field name="workEffortParentId"><text-find/></field> @@ -132,7 +132,7 @@ under the License. <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="buttontext"><submit button-type="text-link"/></field> </form> - <form name="listLookupWorkEffort" list-name="listIt" target="" title="" type="list" paginate-target="LookupWorkEffort" + <form name="ListLookupWorkEffort" list-name="listIt" target="" title="" type="list" paginate-target="LookupWorkEffort" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <service service-name="performFind" result-map="result" result-map-list="listIt"> @@ -153,7 +153,7 @@ under the License. </form> <!-- Timesheet Lookup forms --> - <form name="lookupTimesheet" target="LookupTimesheet" title="" type="single" + <form name="LookupTimesheet" target="LookupTimesheet" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> <auto-fields-entity entity-name="Timesheet" default-field-type="find"/> <field name="timesheetId" title="${uiLabelMap.WorkEffortTimesheetTimesheetId}"><text-find/></field> @@ -163,7 +163,7 @@ under the License. <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="buttontext"><submit button-type="button"/></field> </form> - <form name="listLookupTimesheet" list-name="listIt" target="" title="" type="list" paginate-target="LookupPerson" + <form name="ListLookupTimesheet" list-name="listIt" target="" title="" type="list" paginate-target="LookupPerson" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <service service-name="performFind" result-map="result" result-map-list="listIt"> Modified: ofbiz/trunk/applications/workeffort/widget/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/LookupScreens.xml?rev=1761102&r1=1761101&r2=1761102&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/LookupScreens.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/LookupScreens.xml Fri Sep 16 22:06:42 2016 @@ -38,10 +38,10 @@ under the License. <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="lookupWorkEffort" location="component://workeffort/widget/LookupForms.xml"/> + <include-form name="LookupWorkEffort" location="component://workeffort/widget/LookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listLookupWorkEffort" location="component://workeffort/widget/LookupForms.xml"/> + <include-form name="ListLookupWorkEffort" location="component://workeffort/widget/LookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -66,10 +66,10 @@ under the License. <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="lookupTimesheet" location="component://workeffort/widget/LookupForms.xml"/> + <include-form name="LookupTimesheet" location="component://workeffort/widget/LookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listLookupTimesheet" location="component://workeffort/widget/LookupForms.xml"/> + <include-form name="ListLookupTimesheet" location="component://workeffort/widget/LookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -94,10 +94,10 @@ under the License. <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="lookupWorkEffortShort" location="component://workeffort/widget/LookupForms.xml"/> + <include-form name="LookupWorkEffortShort" location="component://workeffort/widget/LookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listLookupWorkEffort" location="component://workeffort/widget/LookupForms.xml"/> + <include-form name="ListLookupWorkEffort" location="component://workeffort/widget/LookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |