Modified: ofbiz/trunk/applications/product/widget/facility/FacilityGroupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityGroupForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/facility/FacilityGroupForms.xml (original) +++ ofbiz/trunk/applications/product/widget/facility/FacilityGroupForms.xml Sat Nov 5 14:14:04 2016 @@ -67,7 +67,7 @@ under the License. <field name="fromDate"><display/></field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> <field name="deleteLink" title=" " widget-style="buttontext"> - <hyperlink target="removeFacilityGroupFromGroup" description="${uiLabelMap.CommonDelete}" also-hidden="false"> + <hyperlink description="${uiLabelMap.CommonDelete}" target="removeFacilityGroupFromGroup" also-hidden="false"> <parameter param-name="showFacilityGroupId" from-field="facilityGroupId"/> <parameter param-name="facilityGroupId"/> <parameter param-name="parentFacilityGroupId"/> @@ -104,7 +104,7 @@ under the License. <field name="fromDate"><display/></field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> <field name="deleteLink" title=" " widget-style="buttontext"> - <hyperlink target="removeFacilityGroupFromGroup" description="${uiLabelMap.CommonDelete}" also-hidden="false"> + <hyperlink description="${uiLabelMap.CommonDelete}" target="removeFacilityGroupFromGroup" also-hidden="false"> <parameter param-name="showFacilityGroupId" from-field="parentFacilityGroupId"/> <parameter param-name="facilityGroupId"/> <parameter param-name="parentFacilityGroupId"/> @@ -141,7 +141,7 @@ under the License. <field name="fromDate"><display/></field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> <field name="deleteLink" title=" " widget-style="buttontext"> - <hyperlink target="removeFacilityFromGroup" description="${uiLabelMap.CommonRemove}" also-hidden="false"> + <hyperlink description="${uiLabelMap.CommonRemove}" target="removeFacilityFromGroup" also-hidden="false"> <parameter param-name="facilityGroupId"/> <parameter param-name="facilityId"/> <parameter param-name="fromDate"/> @@ -177,7 +177,7 @@ under the License. <display-entity entity-name="RoleType" key-field-name="roleTypeId"/> </field> <field name="deleteLink" title=" " widget-style="buttontext"> - <hyperlink target="removePartyFromFacilityGroup" description="${uiLabelMap.CommonRemove}" also-hidden="false"> + <hyperlink description="${uiLabelMap.CommonRemove}" target="removePartyFromFacilityGroup" also-hidden="false"> <parameter param-name="facilityGroupId"/> <parameter param-name="partyId"/> <parameter param-name="roleTypeId"/>
Modified: ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml Sat Nov 5 14:14:04 2016 @@ -1073,15 +1073,15 @@ under the License. <property-map resource="ProductUiLabels" map-name="uiLabelMap"/> <set field="title" value="${uiLabelMap.PageTitleTransferInventoryItem}"/> - <entity-one value-field="inventoryItem" entity-name="InventoryItem"/> - <entity-one value-field="inventoryItemType" entity-name="InventoryItemType"> + <entity-one entity-name="InventoryItem" value-field="inventoryItem"/> + <entity-one entity-name="InventoryItemType" value-field="inventoryItemType"> <field-map field-name="inventoryItemTypeId" value="${inventoryItem.inventoryItemTypeId}"/> </entity-one> - <entity-one value-field="statusItem" entity-name="StatusItem"> + <entity-one entity-name="StatusItem" value-field="statusItem"> <field-map field-name="statusId" value="${inventoryItem.statusId}"/> </entity-one> - <entity-one value-field="inventoryTransfer" entity-name="InventoryTransfer"/> - <entity-one value-field="product" entity-name="Product"/> + <entity-one entity-name="InventoryTransfer" value-field="inventoryTransfer"/> + <entity-one entity-name="Product" value-field="product"/> </actions> <widgets> <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}"> Modified: ofbiz/trunk/applications/product/widget/facility/FieldLookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FieldLookupForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/facility/FieldLookupForms.xml (original) +++ ofbiz/trunk/applications/product/widget/facility/FieldLookupForms.xml Sat Nov 5 14:14:04 2016 @@ -48,7 +48,7 @@ under the License. </service> </actions> <field name="facilityId" title=" " widget-style="buttontext"> - <hyperlink also-hidden="false" target-type="plain" description="${facilityId}" target="javascript:set_values('${facilityId}', '${facilityName}')"/> + <hyperlink description="${facilityId}" target="javascript:set_values('${facilityId}', '${facilityName}')" also-hidden="false" target-type="plain"/> </field> <field name="facilityName"><display/></field> <field name="facilityTypeId"><display/></field> @@ -59,7 +59,7 @@ under the License. <field name="facilityId" use-when="facilityId != null"><hidden/></field> <field name="facilityId" use-when="facilityId == null"> <drop-down allow-empty="false"> - <entity-options entity-name="Facility" description="${facilityName}" key-field-name="facilityId"> + <entity-options entity-name="Facility" key-field-name="facilityId" description="${facilityName}"> <entity-order-by field-name="facilityName"/> </entity-options> </drop-down> @@ -88,7 +88,7 @@ under the License. </actions> <auto-fields-entity entity-name="FacilityLocation" default-field-type="display"/> <field name="locationSeqId" title=" " widget-style="buttontext"> - <hyperlink also-hidden="false" target-type="plain" description="${locationSeqId}" target="javascript:set_value('${locationSeqId}')"/> + <hyperlink description="${locationSeqId}" target="javascript:set_value('${locationSeqId}')" also-hidden="false" target-type="plain"/> </field> <field name="facilityId"><hidden/></field> <field name="locationTypeEnumId"> @@ -129,7 +129,7 @@ under the License. </service> </actions> <field name="shipmentId" widget-style="buttontext"> - <hyperlink also-hidden="false" target-type="plain" description="${shipmentId}" target="javascript:set_value('${shipmentId}')"/> + <hyperlink description="${shipmentId}" target="javascript:set_value('${shipmentId}')" also-hidden="false" target-type="plain"/> </field> <field name="shipmentTypeId"><display-entity entity-name="ShipmentType"/></field> <field name="statusId"><display-entity entity-name="StatusItem"/></field> @@ -140,7 +140,7 @@ under the License. odd-row-style="alternate-row" default-table-style="basic-table hover-bar" view-size="20"> <field name="inventoryItemId"><display/></field> <field name="locationSeqId" title=" " widget-style="buttontext" > - <hyperlink also-hidden="false" target-type="plain" description="${locationSeqId}" target="javascript:set_value('${locationSeqId}')"/> + <hyperlink description="${locationSeqId}" target="javascript:set_value('${locationSeqId}')" also-hidden="false" target-type="plain"/> </field> <field name="locationTypeEnumId"> <display-entity entity-name="Enumeration" key-field-name="enumId"/> Modified: ofbiz/trunk/applications/product/widget/facility/InventoryForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/InventoryForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/facility/InventoryForms.xml (original) +++ ofbiz/trunk/applications/product/widget/facility/InventoryForms.xml Sat Nov 5 14:14:04 2016 @@ -81,7 +81,7 @@ under the License. <field name="expireDate" title="${uiLabelMap.ProductExpireDate}"/> <field name="facilityId"> <drop-down allow-empty="true"> - <entity-options entity-name="Facility" description="${facilityName}" key-field-name="facilityId"> + <entity-options entity-name="Facility" key-field-name="facilityId" description="${facilityName}"> <entity-order-by field-name="facilityName"/> </entity-options> <sub-hyperlink use-when="facilityId!=null" target="EditFacility" description="${uiLabelMap.ProductEditFacility} [${facilityId}]"> @@ -191,12 +191,12 @@ under the License. <auto-fields-entity entity-name="InventoryItemDetail" map-name="inventoryItemDetail" default-field-type="display"/> <field name="inventoryItemId"><hidden/></field> <!-- this field is redundant --> <field name="orderId" widget-style="buttontext"> - <hyperlink target="/ordermgr/control/orderview" target-type="inter-app" description="${orderId}" > + <hyperlink description="${orderId}" target="/ordermgr/control/orderview" target-type="inter-app" > <parameter param-name="orderId"/> </hyperlink> </field> <field name="shipmentId" widget-style="buttontext"> - <hyperlink target="ViewShipment" description="${shipmentId}" > + <hyperlink description="${shipmentId}" target="ViewShipment" > <parameter param-name="shipmentId"/> </hyperlink> </field> @@ -211,7 +211,7 @@ under the License. <auto-fields-entity entity-name="OrderItemShipGrpInvRes" default-field-type="display"/> <field name="inventoryItemId"><hidden/></field> <field name="orderId" widget-style="buttontext"> - <hyperlink target="/ordermgr/control/orderview" target-type="inter-app" description="${orderId}" > + <hyperlink description="${orderId}" target="/ordermgr/control/orderview" target-type="inter-app" > <parameter param-name="orderId"/> </hyperlink> </field> @@ -221,7 +221,7 @@ under the License. odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <auto-fields-service service-name="updateInventoryItemLabelAppl"/> <field name="inventoryItemLabelId" title=" " widget-style="buttontext"> - <hyperlink target="EditInventoryItemLabel" description="${inventoryItemLabelId}" also-hidden="true"> + <hyperlink description="${inventoryItemLabelId}" target="EditInventoryItemLabel" also-hidden="true"> <parameter param-name="inventoryItemLabelId"/> </hyperlink> </field> @@ -232,7 +232,7 @@ under the License. </field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> <field name="deleteLink" title=" " widget-style="buttontext"> - <hyperlink target="deleteInventoryItemLabelApplFromItem" description="${uiLabelMap.CommonDelete}" also-hidden="false"> + <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteInventoryItemLabelApplFromItem" also-hidden="false"> <parameter param-name="inventoryItemId"/> <parameter param-name="inventoryItemLabelTypeId"/> <parameter param-name="inventoryItemLabelId"/> Modified: ofbiz/trunk/applications/product/widget/facility/InventoryItemLabelForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/InventoryItemLabelForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/facility/InventoryItemLabelForms.xml (original) +++ ofbiz/trunk/applications/product/widget/facility/InventoryItemLabelForms.xml Sat Nov 5 14:14:04 2016 @@ -48,7 +48,7 @@ under the License. </field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> <field name="deleteLink" title=" " widget-style="buttontext"> - <hyperlink target="deleteInventoryItemLabelType" description="${uiLabelMap.CommonDelete}" also-hidden="false"> + <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteInventoryItemLabelType" also-hidden="false"> <parameter param-name="inventoryItemLabelTypeId"/> </hyperlink> </field> @@ -57,7 +57,7 @@ under the License. odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <auto-fields-entity entity-name="InventoryItemLabel" default-field-type="display"/> <field name="inventoryItemLabelId" widget-style="buttontext"> - <hyperlink target="EditInventoryItemLabel" description="${inventoryItemLabelId}" also-hidden="true"> + <hyperlink description="${inventoryItemLabelId}" target="EditInventoryItemLabel" also-hidden="true"> <parameter param-name="inventoryItemLabelId"/> </hyperlink> </field> @@ -65,7 +65,7 @@ under the License. <display-entity entity-name="InventoryItemLabelType" description="${description} [${inventoryItemLabelTypeId}]" also-hidden="true"/> </field> <field name="deleteLink" title=" " widget-style="buttontext"> - <hyperlink target="deleteInventoryItemLabel" description="${uiLabelMap.CommonDelete}" also-hidden="false"> + <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteInventoryItemLabel" also-hidden="false"> <parameter param-name="inventoryItemLabelId"/> </hyperlink> </field> @@ -101,7 +101,7 @@ under the License. </field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> <field name="deleteLink" title=" " widget-style="buttontext"> - <hyperlink target="deleteInventoryItemLabelAppl" description="${uiLabelMap.CommonDelete}" also-hidden="false"> + <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteInventoryItemLabelAppl" also-hidden="false"> <parameter param-name="inventoryItemId"/> <parameter param-name="inventoryItemLabelTypeId"/> <parameter param-name="inventoryItemLabelId"/> Modified: ofbiz/trunk/applications/product/widget/facility/ShipmentForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/ShipmentForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/facility/ShipmentForms.xml (original) +++ ofbiz/trunk/applications/product/widget/facility/ShipmentForms.xml Sat Nov 5 14:14:04 2016 @@ -71,7 +71,7 @@ under the License. </service> </actions> <field name="shipmentId" title="${uiLabelMap.ProductShipmentId}" widget-style="buttontext"> - <hyperlink target="EditShipment" description="${shipmentId}"> + <hyperlink description="${shipmentId}" target="EditShipment"> <parameter param-name="shipmentId" from-field="shipmentId"/> </hyperlink> </field> @@ -144,13 +144,13 @@ under the License. </field> <field name="estimatedShipWorkEffId" title="${uiLabelMap.ProductEstimatedShipWorkEffId}" widget-style="buttontext"> - <hyperlink target="/workeffort/control/WorkEffortSummary" also-hidden="false" description="${shipment.estimatedShipWorkEffId}" target-type="inter-app"> + <hyperlink description="${shipment.estimatedShipWorkEffId}" target="/workeffort/control/WorkEffortSummary" also-hidden="false" target-type="inter-app"> <parameter param-name="workEffortId" from-field="shipment.estimatedShipWorkEffId"/> </hyperlink> </field> <field name="estimatedArrivalDate" title="${uiLabelMap.ProductEstimatedArrivalDate}"><date-time/></field> <field name="estimatedArrivalWorkEffId" title="${uiLabelMap.ProductEstimatedArrivalWorkEffId}" widget-style="buttontext"> - <hyperlink target="/workeffort/control/WorkEffortSummary" also-hidden="false" description="${shipment.estimatedArrivalWorkEffId}" target-type="inter-app"> + <hyperlink description="${shipment.estimatedArrivalWorkEffId}" target="/workeffort/control/WorkEffortSummary" also-hidden="false" target-type="inter-app"> <parameter param-name="workEffortId" from-field="shipment.estimatedArrivalWorkEffId"/> </hyperlink> </field> @@ -221,7 +221,7 @@ under the License. <field name="volume" title="${uiLabelMap.CommonVolume}"><display/></field> <field name="volumeUom" title="${uiLabelMap.CommonUom}"><display/></field> <field name="deleteLink" title=" " widget-style="buttontext"> - <hyperlink target="removeOrderShipmentFromShipment" description="${uiLabelMap.CommonDelete}" also-hidden="false"> + <hyperlink description="${uiLabelMap.CommonDelete}" target="removeOrderShipmentFromShipment" also-hidden="false"> <parameter param-name="shipmentId"/> <parameter param-name="shipmentItemSeqId"/> <parameter param-name="orderId"/> @@ -282,12 +282,12 @@ under the License. <field name="shipmentId"><hidden/></field> <field name="orderItemSeqId"><hidden/></field> <field name="orderId" widget-style="buttontext"> - <hyperlink target="/ordermgr/control/orderview" target-type="inter-app" description="${orderId} - ${orderItemSeqId}" > + <hyperlink description="${orderId} - ${orderItemSeqId}" target="/ordermgr/control/orderview" target-type="inter-app" > <parameter param-name="orderId"/> </hyperlink> </field> <field name="inventoryItemId" widget-style="buttontext"> - <hyperlink target="EditInventoryItem" description="${inventoryItemId}"> + <hyperlink description="${inventoryItemId}" target="EditInventoryItem"> <parameter param-name="inventoryItemId"/> </hyperlink> </field> Modified: ofbiz/trunk/applications/workeffort/minilang/permission/WorkEffortPermissionServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/minilang/permission/WorkEffortPermissionServices.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/minilang/permission/WorkEffortPermissionServices.xml (original) +++ ofbiz/trunk/applications/workeffort/minilang/permission/WorkEffortPermissionServices.xml Sat Nov 5 14:14:04 2016 @@ -319,9 +319,9 @@ under the License. <then> <set field="hasPermission" value="false" type="Boolean"/> <set field="workEffortId" from-field="parameters.workEffortId"/> - <entity-one value-field="workEffort" entity-name="WorkEffort"/> + <entity-one entity-name="WorkEffort" value-field="workEffort"/> <if-not-empty field="workEffort"> - <entity-condition list="partyAssignments" entity-name="WorkEffortPartyAssignment" filter-by-date="true"> + <entity-condition entity-name="WorkEffortPartyAssignment" list="partyAssignments" filter-by-date="true"> <condition-list combine="and"> <condition-expr field-name="workEffortId" from-field="workEffortId"/> <condition-expr field-name="partyId" from-field="userLogin.partyId"/> Modified: ofbiz/trunk/applications/workeffort/minilang/timesheet/TimesheetServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/minilang/timesheet/TimesheetServices.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/minilang/timesheet/TimesheetServices.xml (original) +++ ofbiz/trunk/applications/workeffort/minilang/timesheet/TimesheetServices.xml Sat Nov 5 14:14:04 2016 @@ -79,7 +79,7 @@ under the License. <simple-method method-name="createTimesheets" short-description="Creates Timesheet multiple parties at a time"> <iterate list="parameters.partyIdList" entry="partyId"> <set field="parameters.partyId" from-field="partyId"/> - <set-service-fields to-map="createParams" service-name="createTimesheet" map="parameters"/> + <set-service-fields service-name="createTimesheet" map="parameters" to-map="createParams"/> <call-service service-name="createTimesheet" in-map-name="createParams"/> </iterate> </simple-method> @@ -160,7 +160,7 @@ under the License. <set field="invoiceItemMap.description" value="${workEffort.workEffortName} [Task:${workEffort.workEffortId}]"/> <get-related value-field="workEffort" relation-name="CustRequestWorkEffort" list="custRequestWorkEfforts"/> <if-not-empty field="custRequestWorkEfforts"> - <first-from-list entry="custRequestWorkEffort" list="custRequestWorkEfforts"/> + <first-from-list list="custRequestWorkEfforts" entry="custRequestWorkEffort"/> <get-related-one value-field="custRequestWorkEffort" relation-name="CustRequest" to-value-field="custRequest"/> <if-not-empty field="custRequest"> <set field="invoiceItemDescription" value="${custRequest.custRequestName} [CRQ:${custRequest.custRequestId}] ${custRequest.description}"/> @@ -199,7 +199,7 @@ under the License. <field-map field-name="partyId" from-field="timeEntry.partyId"/> </entity-and> <if-not-empty field="partyRates"> - <first-from-list entry="partyRate" list="partyRates"/> + <first-from-list list="partyRates" entry="partyRate"/> <if-not-empty field="partyRate.percentageUsed"> <calculate field="timeEntry.hours" type="Double"> <calcop operator="multiply" field="timeEntry.hours"> Modified: ofbiz/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml (original) +++ ofbiz/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml Sat Nov 5 14:14:04 2016 @@ -231,7 +231,7 @@ under the License. <if-empty field="targetWorkEffortId"> <sequenced-id sequence-name="WorkEffort" field="targetWorkEffortId" /> </if-empty> - <set-service-fields service-name="createWorkEffort" to-map="createWorkEffortCtx" map="sourceWorkEffort" /> + <set-service-fields service-name="createWorkEffort" map="sourceWorkEffort" to-map="createWorkEffortCtx"/> /> <set field="createWorkEffortCtx.workEffortId" from-field="targetWorkEffortId" /> <set field="createWorkEffortCtx.userLogin" from-field="parameters.userLogin" /> <call-service service-name="createWorkEffort" in-map-name="createWorkEffortCtx" /> @@ -241,7 +241,7 @@ under the License. </entity-one> <set field="copyWorkEffortAssocs" from-field="parameters.copyWorkEffortAssocs" default-value="N" /> <if-compare field="copyWorkEffortAssocs" operator="equals" value="Y"> - <set-service-fields service-name="copyWorkEffortAssocs" to-map="copyWorkEffortAssocsCtx" map="parameters" /> + <set-service-fields service-name="copyWorkEffortAssocs" map="parameters" to-map="copyWorkEffortAssocsCtx"/> /> <set field="copyWorkEffortAssocsCtx.targetWorkEffortId" from-field="targetWorkEffortId" /> <call-service service-name="copyWorkEffortAssocs" in-map-name="copyWorkEffortAssocsCtx" /> <check-errors /> @@ -339,7 +339,7 @@ under the License. <field-map field-name="roleTypeId" from-field="parameters.roleTypeId"/> </entity-and> <if-not-empty field="currentAssignments"> - <first-from-list entry="firstAssignment" list="currentAssignments"/> + <first-from-list list="currentAssignments" entry="firstAssignment"/> <add-error> <fail-property resource="WorkEffortUiLabels" property="WorkEffortPartyAssignmentError"/> </add-error> @@ -728,7 +728,7 @@ under the License. <set field="workEffortIdTo" from-field="workEffortAssoc.workEffortIdTo" /> <if-compare field="deepCopy" operator="equals" value="Y"> <clear-field field="copyWorkEffortCtx" /> - <set-service-fields service-name="copyWorkEffort" to-map="copyWorkEffortCtx" map="parameters" /> + <set-service-fields service-name="copyWorkEffort" map="parameters" to-map="copyWorkEffortCtx"/> /> <clear-field field="copyWorkEffortCtx.targetWorkEffortId"/> <set field="copyWorkEffortCtx.sourceWorkEffortId" from-field="workEffortIdTo" /> <set field="copyWorkEffortCtx.copyWorkEffortAssocs" value="Y" /> @@ -750,8 +750,8 @@ under the License. <entity-one entity-name="WorkEffortInventoryAssign" value-field="foundEntity"/> <if-not-empty field="foundEntity"> <calculate field="foundEntity.quantity" type="Double"> - <calcop field="foundEntity.quantity" operator="get"/> - <calcop field="parameters.quantity" operator="get"/> + <calcop operator="get" field="foundEntity.quantity"/> + <calcop operator="get" field="parameters.quantity"/> </calculate> <store-value value-field="foundEntity"/> <else> @@ -1009,7 +1009,7 @@ under the License. </if-empty> <!-- Create the new WorkEffort from the old one and the status --> - <set-service-fields service-name="createWorkEffort" to-map="createWorkEffortCtx" map="oldWorkEffort"/> + <set-service-fields service-name="createWorkEffort" map="oldWorkEffort" to-map="createWorkEffortCtx"/>/> <set field="createWorkEffortCtx.workEffortId" from-field="workEffortId"/> <set field="createWorkEffortCtx.userLogin" from-field="parameters.userLogin"/> <call-service service-name="createWorkEffort" in-map-name="createWorkEffortCtx"/> @@ -1222,7 +1222,7 @@ under the License. </condition-list> </entity-condition> <if-not-empty field="partyRates"> - <first-from-list entry="partyRate" list="partyRates"/> + <first-from-list list="partyRates" entry="partyRate"/> <if-not-empty field="partyRate.percentageUsed"> <calculate field="actual.hours" type="Double"> <calcop operator="multiply" field="actual.hours"> @@ -1314,7 +1314,7 @@ under the License. <simple-method method-name="getICalWorkEfforts" short-description="Get All Work Efforts Related To An iCalendar Publish Point" login-required="false"> <!-- Servlet already confirmed workEffortId is a valid publish point --> <set field="workEffortId" from-field="parameters.workEffortId"/> - <entity-condition list="assignedParties" entity-name="WorkEffortPartyAssignment" filter-by-date="true"> + <entity-condition entity-name="WorkEffortPartyAssignment" list="assignedParties" filter-by-date="true"> <condition-list combine="and"> <condition-expr field-name="workEffortId" from-field="workEffortId"/> <condition-expr field-name="roleTypeId" value="ICAL_MEMBER"/> @@ -1345,7 +1345,7 @@ under the License. </entity-condition> <list-to-list list="resultList" to-list="workEfforts"/> </iterate> - <entity-condition list="resultList" entity-name="WorkEffortAssocToView" filter-by-date="true"> + <entity-condition entity-name="WorkEffortAssocToView" list="resultList" filter-by-date="true"> <condition-list combine="and"> <condition-expr field-name="workEffortIdFrom" operator="equals" from-field="workEffortId"/> <condition-expr field-name="workEffortTypeId" operator="equals" from-field="parameters.workEffortTypeId" ignore-if-empty="true"/> @@ -1359,7 +1359,7 @@ under the License. <simple-method method-name="getPartyICalUrl" short-description="Get The Party iCalendar URL" login-required="false"> <!-- RFC 2445 4.8.4.1 and 4.8.4.3 Value must be a URI (4.3.3) --> <set field="partyId" from-field="parameters.partyId"/> - <entity-condition list="contactMechs" entity-name="PartyContactWithPurpose"> + <entity-condition entity-name="PartyContactWithPurpose" list="contactMechs"> <condition-list combine="and"> <condition-list combine="or"> <condition-expr field-name="contactMechPurposeTypeId" value="ICAL_URL"/> Modified: ofbiz/trunk/applications/workeffort/widget/LookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/LookupForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/LookupForms.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/LookupForms.xml Sat Nov 5 14:14:04 2016 @@ -144,7 +144,7 @@ under the License. </service> </actions> <field name="workEffortId" title="${uiLabelMap.WorkEffortWorkEffortId}" widget-style="buttontext"> - <hyperlink also-hidden="false" target-type="plain" description="${workEffortId}" target="javascript:set_value('${workEffortId}')"/> + <hyperlink description="${workEffortId}" target="javascript:set_value('${workEffortId}')" also-hidden="false" target-type="plain"/> </field> <field name="workEffortName"><display/></field> <field name="workEffortTypeId"><display-entity entity-name="WorkEffortType"/></field> @@ -175,7 +175,7 @@ under the License. </service> </actions> <field name="timesheetId" title="${uiLabelMap.WorkEffortTimesheetTimesheetId}" widget-style="buttontext"> - <hyperlink also-hidden="false" target-type="plain" description="${timesheetId}" target="javascript:set_value('${timesheetId}')"/> + <hyperlink description="${timesheetId}" target="javascript:set_value('${timesheetId}')" also-hidden="false" target-type="plain"/> </field> <field name="partyId"><display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName} [${partyId}]"/></field> <field name="clientPartyId"><display-entity entity-name="PartyNameView" key-field-name="partyId" description="${firstName} ${middleName} ${lastName} ${groupName} [${partyId}]"/></field> Modified: ofbiz/trunk/applications/workeffort/widget/TimesheetForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/TimesheetForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/TimesheetForms.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/TimesheetForms.xml Sat Nov 5 14:14:04 2016 @@ -140,7 +140,7 @@ under the License. </display-entity> </field> <field name="invoiceId" widget-style="buttontext"> - <hyperlink target="/accounting/control/invoiceOverview" target-type="inter-app" description="${invoiceId}"> + <hyperlink description="${invoiceId}" target="/accounting/control/invoiceOverview" target-type="inter-app"> <parameter param-name="invoiceId"/> </hyperlink> </field> @@ -174,7 +174,7 @@ under the License. <field name="partyId" title="${uiLabelMap.PartyParty}"><display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName} [${partyId}]"/></field> <field name="deleteLink" title=" " widget-style="buttontext"> - <hyperlink target="deleteTimesheetRole" description="${uiLabelMap.CommonDelete}" also-hidden="false"> + <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteTimesheetRole" also-hidden="false"> <parameter param-name="timesheetId"/> <parameter param-name="partyId"/> <parameter param-name="roleTypeId"/> @@ -238,7 +238,7 @@ under the License. <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> <field name="deleteLink" title=" " widget-style="buttontext"> - <hyperlink target="deleteTimesheetEntry" description="${uiLabelMap.CommonDelete}" also-hidden="false"> + <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteTimesheetEntry" also-hidden="false"> <parameter param-name="timesheetId"/> <parameter param-name="timeEntryId"/> </hyperlink> Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortCommEventForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortCommEventForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/WorkEffortCommEventForms.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/WorkEffortCommEventForms.xml Sat Nov 5 14:14:04 2016 @@ -31,7 +31,7 @@ under the License. </actions> <field name="workEffortId"><hidden/></field> <field name="communicationEventId" widget-style="buttontext"> - <hyperlink target="/partymgr/control/EditCommunicationEvent" target-type="inter-app" description="${communicationEventId}"> + <hyperlink description="${communicationEventId}" target="/partymgr/control/EditCommunicationEvent" target-type="inter-app"> <parameter param-name="communicationEventId"/> </hyperlink> </field> @@ -40,7 +40,7 @@ under the License. <field name="description"><text size="40"/></field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="buttontext"><submit button-type="text-link"/></field> <field name="deleteLink" title=" " widget-style="buttontext"> - <hyperlink target="deleteCommunicationEventWorkEff" also-hidden="false" description="${uiLabelMap.CommonDelete}"> + <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteCommunicationEventWorkEff" also-hidden="false"> <parameter param-name="workEffortId"/> <parameter param-name="communicationEventId"/> </hyperlink> Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml Sat Nov 5 14:14:04 2016 @@ -277,7 +277,7 @@ under the License. </service> </actions> <field name="workEffortId" title="${uiLabelMap.WorkEffortWorkEffortId}" widget-style="buttontext"> - <hyperlink also-hidden="false" description="${workEffortName}[${workEffortId}]" target="javascript:set_value('${workEffortId}')" target-type="plain"/> + <hyperlink description="${workEffortName}[${workEffortId}]" target="javascript:set_value('${workEffortId}')" also-hidden="false" target-type="plain"/> </field> <field name="workEffortTypeId"><display-entity entity-name="WorkEffortType"/></field> <field name="contactMechTypeId"><display-entity entity-name="ContactMechType"/></field> @@ -331,7 +331,7 @@ under the License. <field name="fromDate"><date-time default-value="${nowTimestamp}"/></field> <field name="thruDate"><date-time/></field> <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit/></field> - <field name="cancelLink" title=" " widget-style="buttontext"><hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"/></field> + <field name="cancelLink" title=" " widget-style="buttontext"><hyperlink description="${uiLabelMap.CommonCancelDone}" target="${donePage}" also-hidden="false"/></field> </form> <form name="EditWorkEffortAssoc" target="updateWorkEffortAssoc" title="" type="single" @@ -357,7 +357,7 @@ under the License. <field name="fromDate" field-name="fromDate" map-name="workEffortAssoc"><display/></field> <field name="thruDate" field-name="thruDate" map-name="workEffortAssoc"><date-time/></field> <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit/></field> - <field name="cancelLink" title=" " widget-style="buttontext"><hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"/></field> + <field name="cancelLink" title=" " widget-style="buttontext"><hyperlink description="${uiLabelMap.CommonCancelDone}" target="${donePage}" also-hidden="false"/></field> </form> <form name="EditWorkEffortAndAssoc" extends="EditWorkEffort" default-map-name="workEffort" target="updateWorkEffortAndAssoc" title="" type="single" @@ -411,7 +411,7 @@ under the License. </service> </actions> <field name="workEffortId" title="${uiLabelMap.WorkEffortWorkEffortId}" widget-style="buttontext"> - <hyperlink also-hidden="false" description="${workEffortName} [${workEffortId}]" target="EditWorkEffort"> + <hyperlink description="${workEffortName} [${workEffortId}]" target="EditWorkEffort" also-hidden="false"> <parameter param-name="workEffortId"/> </hyperlink> </field> @@ -426,26 +426,26 @@ under the License. <field name="actualCompletionDate"><display type="date"/></field> <!-- These links have been commented because they are (partially or totally) broken <field name="editLink" title=" " widget-style="linktext"> - <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditWorkEffort"> + <hyperlink description="${uiLabelMap.CommonEdit}" target="EditWorkEffort" also-hidden="false"> <parameter param-name="workEffortId"/> <parameter param-name="DONE_PAGE" value="ListWorkEfforts?${queryStringEncoded"/> </hyperlink> </field> <field name="childLink" title=" " widget-style="linktext"> - <hyperlink also-hidden="false" description="${uiLabelMap.CommonEntityChildren}" target="ChildWorkEfforts"> + <hyperlink description="${uiLabelMap.CommonEntityChildren}" target="ChildWorkEfforts" also-hidden="false"> <parameter param-name="trail" from-field="workEffortId"/> <parameter param-name="DONE_PAGE" value="ListWorkEfforts?${queryStringEncoded"/> </hyperlink> </field> <field name="editChildLink" title=" " widget-style="linktext"> - <hyperlink also-hidden="false" description="${uiLabelMap.CommonDetail} + ${uiLabelMap.CommonEntityChildren}" target="EditListWorkEfforts"> + <hyperlink description="${uiLabelMap.CommonDetail} + ${uiLabelMap.CommonEntityChildren}" target="EditListWorkEfforts" also-hidden="false"> <parameter param-name="trail" from-field="workEffortId"/> <parameter param-name="DONE_PAGE" value="ListWorkEfforts?${queryStringEncoded"/> </hyperlink> </field> --> <field name="deleteLink" title=" " widget-style="buttontext"> - <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteWorkEffort"> + <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteWorkEffort" also-hidden="false"> <parameter param-name="workEffortId"/> </hyperlink> </field> @@ -456,19 +456,19 @@ under the License. <form name="WorkEffortTreeLine" hide-header="true" target="ListWorkEfforts" title="" type="list" list-name="listIt" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="workEffortId" title="${uiLabelMap.WorkEffortWorkEffortId}" widget-style="buttontext"> - <hyperlink also-hidden="false" description="${workEffortName} [${workEffortId}]" target="EditWorkEffort"> + <hyperlink description="${workEffortName} [${workEffortId}]" target="EditWorkEffort" also-hidden="false"> <parameter param-name="workEffortId"/> </hyperlink> </field> <field name="workEffortTypeId"><display-entity entity-name="WorkEffortType"/></field> <field name="workEffortPurposeTypeId"><display-entity entity-name="WorkEffortPurposeType"/></field> <field name="detailLink" title=" " widget-style="buttontext"> - <hyperlink also-hidden="false" description="${uiLabelMap.CommonDetail}" target="ListChildWorkEffort"> + <hyperlink description="${uiLabelMap.CommonDetail}" target="ListChildWorkEffort" also-hidden="false"> <parameter param-name="trail" from-field="workEffortId"/> </hyperlink> </field> <field name="deleteLink" title=" " widget-style="buttontext"> - <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeWorkEffort"> + <hyperlink description="${uiLabelMap.CommonDelete}" target="removeWorkEffort" also-hidden="false"> <parameter param-name="workEffortId"/> </hyperlink> </field> @@ -524,7 +524,7 @@ under the License. <field name="statusId"><display-entity entity-name="StatusItem"/></field> <field name="preferredContactMechId"><display/></field> <field name="editLink" title=" " widget-style="buttontext"> - <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditWorkEffortParty"> + <hyperlink description="${uiLabelMap.CommonEdit}" target="EditWorkEffortParty" also-hidden="false"> <parameter param-name="workEffortId"/> <parameter param-name="partyId"/> <parameter param-name="fromDate"/> @@ -635,7 +635,7 @@ under the License. <field name="note" title="${uiLabelMap.CommonNote}"><textarea cols="60" rows="3"/></field> <field name="content" title="${uiLabelMap.CommonContent}"><textarea cols="60" rows="10"/></field> <field name="submitButton" title="${uiLabelMap.CommonSave}"><submit button-type="button"/></field> - <field name="cancelLink" title=" " widget-style="buttontext"><hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"/></field> + <field name="cancelLink" title=" " widget-style="buttontext"><hyperlink description="${uiLabelMap.CommonCancelDone}" target="${donePage}" also-hidden="false"/></field> </form> <form name="FindWorkEffortCommEvents" default-map-name="workEffortCommEvent" target="ListWorkEffortCommEvents" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> @@ -693,7 +693,7 @@ under the License. </entity-and> </actions> <field name="contactMechId" widget-style="buttontext"> - <hyperlink also-hidden="false" description="${contactMechId}" target="javascript:set_value('${contactMechId}')" target-type="plain"/> + <hyperlink description="${contactMechId}" target="javascript:set_value('${contactMechId}')" also-hidden="false" target-type="plain"/> </field> <field name="contactMechTypeId"><display-entity entity-name="ContactMechType"/></field> </form> @@ -740,7 +740,7 @@ under the License. </service> </actions> <field name="communicationEventId" title="${uiLabelMap.WorkEffortCommEventId}" widget-style="buttontext"> - <hyperlink also-hidden="false" description="${communicationEventId}" target="javascript:set_value('${communicationEventId}')" target-type="plain"/> + <hyperlink description="${communicationEventId}" target="javascript:set_value('${communicationEventId}')" also-hidden="false" target-type="plain"/> </field> <field name="partyIdFrom" title="${uiLabelMap.PartyPartyId} ${uiLabelMap.CommonFrom}"> <display-entity description="${firstName} ${lastName} ${groupName} [${partyId}]" entity-name="PartyNameView" key-field-name="partyId"/> @@ -860,7 +860,7 @@ under the License. <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> <field name="deleteLink" title=" " widget-style="buttontext"> - <hyperlink target="deleteWorkEffortTimeEntry" description="${uiLabelMap.CommonDelete}" also-hidden="false"> + <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortTimeEntry" also-hidden="false"> <parameter param-name="workEffortId"/> <parameter param-name="timeEntryId"/> </hyperlink> @@ -919,7 +919,7 @@ under the License. <field name="attrValue"><text/></field> <field name="updateButton"><submit/></field> <field name="deleteLink" title=" " widget-style="buttontext"> - <hyperlink target="deleteWorkEffortAttribute" description="${uiLabelMap.CommonDelete}" also-hidden="false"> + <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortAttribute" also-hidden="false"> <parameter param-name="workEffortId"/> <parameter param-name="attrName"/> </hyperlink> @@ -943,27 +943,27 @@ under the License. </entity-condition> </actions> <field name="noteId"> - <hyperlink target="EditWorkEffortNotes" also-hidden="false" description="${noteId}"> + <hyperlink description="${noteId}" target="EditWorkEffortNotes" also-hidden="false"> <parameter param-name="workEffortId"/> <parameter param-name="noteId"/> </hyperlink> </field> <field name="workEffortId" entity-name="WorkEffort" widget-style="buttontext"> - <hyperlink target="EditWorkEffort" also-hidden="false" description="${workEffortId}"> + <hyperlink description="${workEffortId}" target="EditWorkEffort" also-hidden="false"> <parameter param-name="workEffortId"/> </hyperlink> </field> <field name="noteInfo" title="${uiLabelMap.CommonNote}"><display/></field> <field name="noteParty" title="${uiLabelMap.CommonBy}"><display description="${groovy:org.apache.ofbiz.party.party.PartyHelper.getPartyName(delegator, noteParty, true)} at ${noteDateTime}"/></field> <field name="internalNote" title="${uiLabelMap.WorkEffortPrivatePublic}" widget-style="buttontext" use-when=""N".equals(internalNote)"> - <hyperlink target="updateWorkEffortNote" description="${uiLabelMap.OrderNotesPrivate}"> + <hyperlink description="${uiLabelMap.OrderNotesPrivate}" target="updateWorkEffortNote"> <parameter param-name="workEffortId"/> <parameter param-name="noteId"/> <parameter param-name="internalNote" value="Y"/> </hyperlink> </field> <field name="internalNote" title="${uiLabelMap.WorkEffortPrivatePublic}" widget-style="buttontext" use-when=""Y".equals(internalNote)"> - <hyperlink target="updateWorkEffortNote" description="${uiLabelMap.OrderNotesPublic}"> + <hyperlink description="${uiLabelMap.OrderNotesPublic}" target="updateWorkEffortNote"> <parameter param-name="workEffortId"/> <parameter param-name="noteId"/> <parameter param-name="internalNote" value="N"/> @@ -1028,7 +1028,7 @@ under the License. <field name="fromDate"><display/></field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> <field name="deleteLink" title=" " widget-style="buttontext"> - <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortContent"> + <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortContent" also-hidden="false"> <parameter param-name="workEffortContentTypeId"/> <parameter param-name="fromDate"/> <parameter param-name="workEffortId"/> @@ -1091,7 +1091,7 @@ under the License. </field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> <field name="deleteLink" title=" " widget-style="buttontext"> - <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeWorkEffortGoodStandard"> + <hyperlink description="${uiLabelMap.CommonDelete}" target="removeWorkEffortGoodStandard" also-hidden="false"> <parameter param-name="workEffortGoodStdTypeId"/> <parameter param-name="productId"/> <parameter param-name="fromDate"/> @@ -1147,7 +1147,7 @@ under the License. </field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> <field name="deleteLink" title=" " widget-style="buttontext"> - <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortReview"> + <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortReview" also-hidden="false"> <parameter param-name="workEffortId"/> <parameter param-name="userLoginId"/> <parameter param-name="reviewDate"/> @@ -1174,7 +1174,7 @@ under the License. <field name="keyword" title="${uiLabelMap.WorkEffortKeywords}" ><display/></field> <field name="relevancyWeight"><display/></field> <field name="deleteLink" title="${uiLabelMap.ProductDeleteAllKeywords}" widget-style="buttontext"> - <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortKeyword"> + <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortKeyword" also-hidden="false"> <parameter param-name="workEffortId"/> <parameter param-name="keyword"/> </hyperlink> @@ -1208,7 +1208,7 @@ under the License. <field name="contactMechId" use-when="postalAddress != null" title="${uiLabelMap.CommonDescription}"><display description="${postalAddress.address1} ${postalAddress.address2} ${postalAddress.city} ${postalAddress.stateProvinceGeoId} ${postalAddress.postalCode} ${postalAddress.countryGeoId} "/></field> <field name="contactMechId" use-when="telecomNumber == null && postalAddress == null" title="${uiLabelMap.CommonDescription}"><display description="${contactMech.infoString}"/></field> <field name="deleteLink" title=" " widget-style="buttontext"> - <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortContactMech"> + <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortContactMech" also-hidden="false"> <parameter param-name="workEffortId"/> <parameter param-name="contactMechId"/> <parameter param-name="fromDate"/> @@ -1244,7 +1244,7 @@ under the License. <field name="agreementItemSeqId"><display/></field> <field name="workEffortId"><display/></field> <field name="deleteLink" title=" " widget-style="buttontext"> - <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteAgreementWorkEffortApplic"> + <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteAgreementWorkEffortApplic" also-hidden="false"> <parameter param-name="agreementId"/> <parameter param-name="agreementItemSeqId"/> <parameter param-name="workEffortId"/> @@ -1290,7 +1290,7 @@ under the License. <field name="comments"><text size="60" maxlength="255"/></field> <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="button"/></field> <field name="deleteLink" title=" " widget-style="buttontext"> - <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortFixedAssetAssign"> + <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortFixedAssetAssign" also-hidden="false"> <parameter param-name="workEffortId"/> <parameter param-name="fixedAssetId"/> <parameter param-name="fromDate"/> @@ -1361,7 +1361,7 @@ under the License. <field name="reminderOffset"><lookup target-form-name="LookupTimeDuration" presentation="window"/></field> <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="button"/></field> <field name="deleteLink" title=" " widget-style="buttontext"> - <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortEventReminder"> + <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortEventReminder" also-hidden="false"> <parameter param-name="workEffortId"/> <parameter param-name="contactMechId"/> <parameter param-name="sequenceId"/> @@ -1421,7 +1421,7 @@ under the License. <set field="parameters.fromDate" value=""/> <set field="parameters.thruDate" value=""/> <set field="parameters.comments" value=""/> - <entity-condition list="roleList" entity-name="RoleType"> + <entity-condition entity-name="RoleType" list="roleList"> <condition-list combine="or"> <condition-expr field-name="roleTypeId" operator="equals" value="CAL_DELEGATE"/> <condition-expr field-name="roleTypeId" operator="equals" value="ICAL_MEMBER"/> @@ -1463,12 +1463,12 @@ under the License. <set field="serverRootUrl" value="${groovy: org.apache.ofbiz.base.util.UtilHttp.getServerRootUrl(request)}"/> </actions> <field name="workEffortId" title="${uiLabelMap.WorkEffortWorkEffortId}"> - <hyperlink also-hidden="false" description="${workEffortId}" target="EditICalendar" target-type="plain"> + <hyperlink description="${workEffortId}" target="EditICalendar" also-hidden="false" target-type="plain"> <parameter param-name="workEffortId"/> </hyperlink> </field> <field name="iCalendarUrl" title="${uiLabelMap.WorkEffortICalendarUrl}"> - <hyperlink also-hidden="false" description="${serverRootUrl}/iCalendar/${workEffortId}/" target="${serverRootUrl}/iCalendar/${workEffortId}/" target-type="plain"/> + <hyperlink description="${serverRootUrl}/iCalendar/${workEffortId}/" target="${serverRootUrl}/iCalendar/${workEffortId}/" also-hidden="false" target-type="plain"/> </field> <field name="workEffortName" title="${uiLabelMap.WorkEffortICalendarName}"><display/></field> </form> Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortOrderHeaderForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortOrderHeaderForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/WorkEffortOrderHeaderForms.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/WorkEffortOrderHeaderForms.xml Sat Nov 5 14:14:04 2016 @@ -40,7 +40,7 @@ under the License. <field name="orderDate"><display/></field> <field name="grandTotal"><display/></field> <field name="deleteLink" title=" " widget-style="buttontext"> - <hyperlink target="deleteWorkEffortOrderHeader" also-hidden="false" description="${uiLabelMap.CommonDelete}"> + <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortOrderHeader" also-hidden="false"> <parameter param-name="workEffortId"/> <parameter param-name="orderId"/> </hyperlink> Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortQuoteForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortQuoteForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/WorkEffortQuoteForms.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/WorkEffortQuoteForms.xml Sat Nov 5 14:14:04 2016 @@ -38,7 +38,7 @@ under the License. <field name="statusItemDescription"><display/></field> <field name="issueDate"><display/></field> <field name="deleteLink" title=" " widget-style="linktext"> - <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortQuote"> + <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortQuote" also-hidden="false"> <parameter param-name="workEffortId"/> <parameter param-name="quoteId"/> </hyperlink> @@ -77,7 +77,7 @@ under the License. <field name="estimatedDeliveryDate"><display/></field> <field name="comments"><display/></field> <field name="deleteLink" title=" " widget-style="linktext"> - <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortQuoteItem"> + <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortQuoteItem" also-hidden="false"> <parameter param-name="workEffortId"/> <parameter param-name="quoteId"/> <parameter param-name="quoteItemSeqId"/> Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortRequestForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortRequestForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/WorkEffortRequestForms.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/WorkEffortRequestForms.xml Sat Nov 5 14:14:04 2016 @@ -37,7 +37,7 @@ under the License. <field name="custRequestTypeDescription"><display/></field> <field name="statusItemDescription"><display/></field> <field name="deleteLink" title=" " widget-style="buttontext"> - <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortRequest"> + <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortRequest" also-hidden="false"> <parameter param-name="workEffortId"/> <parameter param-name="custRequestId"/> </hyperlink> @@ -71,7 +71,7 @@ under the License. <field name="productId"><display/></field> <field name="description"><display/></field> <field name="deleteLink" title=" " widget-style="linktext"> - <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortRequestItem"> + <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortRequestItem" also-hidden="false"> <parameter param-name="workEffortId"/> <parameter param-name="custRequestId"/> <parameter param-name="custRequestItemSeqId"/> Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortRequirementForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortRequirementForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/WorkEffortRequirementForms.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/WorkEffortRequirementForms.xml Sat Nov 5 14:14:04 2016 @@ -30,7 +30,7 @@ under the License. </actions> <field name="workEffortId"><hidden/></field> <field name="requirementId" widget-style="linktext"> - <hyperlink target="/ordermgr/control/EditRequirement" target-type="inter-app" description="${requirementId}"> + <hyperlink description="${requirementId}" target="/ordermgr/control/EditRequirement" target-type="inter-app"> <parameter param-name="requirementId"/> </hyperlink> </field> @@ -38,7 +38,7 @@ under the License. <field name="statusItemDescription"><display/></field> <field name="requirementDescription"><display/></field> <field name="deleteLink" title=" " widget-style="buttontext"> - <hyperlink target="deleteWorkEffortRequirement" also-hidden="false" description="${uiLabelMap.CommonDelete}"> + <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortRequirement" also-hidden="false"> <parameter param-name="workEffortId"/> <parameter param-name="requirementId"/> </hyperlink> Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortShopListForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortShopListForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/WorkEffortShopListForms.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/WorkEffortShopListForms.xml Sat Nov 5 14:14:04 2016 @@ -29,7 +29,7 @@ under the License. </actions> <field name="workEffortId"><hidden/></field> <field name="shoppingListId" title="${uiLabelMap.WorkEffortShopListId}" widget-style="buttontext"> - <hyperlink target="/partymgr/control/editShoppingList" target-type="inter-app" description="${shoppingListId}"> + <hyperlink description="${shoppingListId}" target="/partymgr/control/editShoppingList" target-type="inter-app"> <parameter param-name="shoppingListId"/> </hyperlink> </field> @@ -38,7 +38,7 @@ under the License. <field name="description"><display/></field> <field name="partyId" title="${uiLabelMap.PartyParty}"><display-entity entity-name="PartyNameView" description="${firstName} ${lastName} ${groupName} [${partyId}]"/></field> <field name="deleteLink" title=" " widget-style="buttontext"> - <hyperlink target="deleteShoppingListWorkEffort" also-hidden="false" description="${uiLabelMap.CommonDelete}"> + <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteShoppingListWorkEffort" also-hidden="false"> <parameter param-name="workEffortId"/> <parameter param-name="shoppingListId"/> </hyperlink> Modified: ofbiz/trunk/framework/common/minilang/CdyneServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/minilang/CdyneServices.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/framework/common/minilang/CdyneServices.xml (original) +++ ofbiz/trunk/framework/common/minilang/CdyneServices.xml Sat Nov 5 14:14:04 2016 @@ -53,7 +53,7 @@ under the License. </condition-list> </condition-list> </entity-condition> - <first-from-list entry="countyGeo" list="geoList"/> + <first-from-list list="geoList" entry="countyGeo"/> <if-not-empty field="countyGeo"> <!-- We found a county, now just save off the ID --> <set field="postalAddress.countyGeoId" from-field="countyGeo.geoId"/> Modified: ofbiz/trunk/framework/common/minilang/CommonServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/minilang/CommonServices.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/framework/common/minilang/CommonServices.xml (original) +++ ofbiz/trunk/framework/common/minilang/CommonServices.xml Sat Nov 5 14:14:04 2016 @@ -130,7 +130,7 @@ under the License. <!-- Do custom conversion, if we have customMethodId --> <if-not-empty field="uomConversion.customMethodId"> <!-- custom conversion? --> <log level="verbose" message="using custom conversion customMethodId=${uomConversion.customMethodId}"/> - <set-service-fields service-name="convertUomCustom" to-map="customParms" map="parameters"/> + <set-service-fields service-name="convertUomCustom" map="parameters" to-map="customParms"/>/> <set field="customParms.uomConversion" from-field="uomConversion"/> <call-service service-name="convertUomCustom" in-map-name="customParms"> <result-to-field result-name="convertedValue"/> @@ -206,7 +206,7 @@ under the License. <simple-method method-name="getVisualThemeResources" short-description="Get visual theme resources" login-required="false"> <set field="visualThemeId" from-field="parameters.visualThemeId"/> <set field="themeResources" from-field="parameters.themeResources"/> - <entity-condition list="resourceList" entity-name="VisualThemeResource" use-cache="true"> + <entity-condition entity-name="VisualThemeResource" list="resourceList" use-cache="true"> <condition-expr field-name="visualThemeId" from-field="visualThemeId"/> <order-by field-name="resourceTypeEnumId"/> <order-by field-name="sequenceId"/> @@ -214,7 +214,7 @@ under the License. <if-empty field="resourceList"> <!-- if not found use the good old initial ofbiz theme so the system will at least start up and will be usable --> <log level="error" message="Could not find the '${visualThemeId}' theme, reverting back to the good old OFBiz theme..."></log> - <entity-condition list="resourceList" entity-name="VisualThemeResource" use-cache="true"> + <entity-condition entity-name="VisualThemeResource" list="resourceList" use-cache="true"> <condition-expr field-name="visualThemeId" value="FLAT_GREY"/> <order-by field-name="resourceTypeEnumId"/> <order-by field-name="sequenceId"/> Modified: ofbiz/trunk/framework/common/minilang/PortalPageServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/minilang/PortalPageServices.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/framework/common/minilang/PortalPageServices.xml (original) +++ ofbiz/trunk/framework/common/minilang/PortalPageServices.xml Sat Nov 5 14:14:04 2016 @@ -57,7 +57,7 @@ under the License. <field-map field-name="columnSeqId" from-field="column.columnSeqId"/> </entity-and> <iterate list="portalPortletList" entry="portalPortlet"> - <set-service-fields service-name="deletePortalPagePortlet" to-map="deletePortalPagePortletInMap" map="portalPortlet"/> + <set-service-fields service-name="deletePortalPagePortlet" map="portalPortlet" to-map="deletePortalPagePortletInMap"/>/> <call-service service-name="deletePortalPagePortlet" in-map-name="deletePortalPagePortletInMap"/> </iterate> <remove-value value-field="column"/> @@ -70,13 +70,13 @@ under the License. <make-value entity-name="PortalPagePortlet" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> - <entity-condition list="portlets" entity-name="PortalPagePortlet"> + <entity-condition entity-name="PortalPagePortlet" list="portlets"> <condition-expr field-name="portalPageId" operator="equals" from-field="parameters.portalPageId"/> <select-field field-name="sequenceNum"/> <order-by field-name="-sequenceNum"/> <limit-range size="1" start="0"/> </entity-condition> - <first-from-list entry="portalPagePortlet" list="portlets"/> + <first-from-list list="portlets" entry="portalPagePortlet"/> <if-empty field="portalPagePortlet.sequenceNum"> <calculate field="newEntity.sequenceNum" type="Long"><number value="1"/></calculate> @@ -122,7 +122,7 @@ under the License. <field-map field-name="ownerUserLoginId" from-field="parameters.ownerUserLoginId"/> <field-map field-name="portalPortletId" from-field="parameters.portalPortletId"/> </entity-and> - <first-from-list entry="portalPage" list="ppList"/> + <first-from-list list="ppList" entry="portalPage"/> <set field="parameters.portalPageId" from-field="portalPage.portalPageId"/> </if-not-empty> <entity-condition entity-name="PortletAttribute" list="attributeList"> @@ -170,7 +170,7 @@ under the License. <condition-expr field-name="parentPortalPageId" operator="equals" from-field="parameters.parentPortalPageId"/> </condition-list> </entity-condition> - <first-from-list entry="checkSequenceNum" list="checkSequenceNums"/> + <first-from-list list="checkSequenceNums" entry="checkSequenceNum"/> <if-not-empty field="checkSequenceNum.portalPageId"> <set field="first.portalPageId" from-field="checkSequenceNum.portalPageId"/> <set field="first.sequenceNum" from-field="getPortalPage.sequenceNum" type="Long"/> @@ -265,7 +265,7 @@ under the License. <order-by field-name="-sequenceNum"/> </entity-condition> </if-compare> - <first-from-list entry="getData" list="getDatas"/> + <first-from-list list="getDatas" entry="getData"/> <set field="portalPage.sequenceNum" from-field="getData.sequenceNum" type="Long"/> <store-value value-field="portalPage"/> <set field="first.portalPageId" from-field="getData.portalPageId"/> @@ -279,7 +279,7 @@ under the License. <call-simple-method method-name="checkOwnerShip"/> <!-- origin Portlet --> - <entity-one value-field="originPp" entity-name="PortalPagePortlet"> + <entity-one entity-name="PortalPagePortlet" value-field="originPp"> <field-map field-name="portalPageId" from-field="parameters.o_portalPageId"/> <field-map field-name="portalPortletId" from-field="parameters.o_portalPortletId"/> <field-map field-name="portletSeqId" from-field="parameters.o_portletSeqId"/> @@ -297,7 +297,7 @@ under the License. <field-map field-name="portletSeqId" from-field="parameters.d_portletSeqId"/> </entity-one> - <entity-condition list="modifyPpList" entity-name="PortalPagePortlet"> + <entity-condition entity-name="PortalPagePortlet" list="modifyPpList"> <condition-list combine="and"> <condition-expr field-name="portalPageId" operator="equals" from-field="parameters.portalPageId"/> <condition-expr field-name="columnSeqId" operator="equals" from-field="columnSeqId"/> @@ -317,7 +317,7 @@ under the License. <field-map field-name="portletSeqId" from-field="parameters.d_portletSeqId"/> </entity-one> - <entity-condition list="modifyPpList" entity-name="PortalPagePortlet"> + <entity-condition entity-name="PortalPagePortlet" list="modifyPpList"> <condition-list combine="and"> <condition-expr field-name="portalPageId" operator="equals" from-field="parameters.portalPageId"/> <condition-expr field-name="columnSeqId" operator="equals" from-field="columnSeqId"/> Modified: ofbiz/trunk/framework/common/widget/HelpScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/HelpScreens.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/framework/common/widget/HelpScreens.xml (original) +++ ofbiz/trunk/framework/common/widget/HelpScreens.xml Sat Nov 5 14:14:04 2016 @@ -123,9 +123,9 @@ under the License. <actions> <!-- Read portalPage to retrieve helpContentId, if portalPage.originalPortalPageId is not null retrieve originalPortalPage--> - <entity-one value-field="portalPageTmp" entity-name="PortalPage" use-cache="true"/> + <entity-one entity-name="PortalPage" value-field="portalPageTmp" use-cache="true"/> <set field="originalPortalPageId" from-field="portalPageTmp.originalPortalPageId" default-value="${parameters.portalPageId}"/> - <entity-one value-field="portalPage" entity-name="PortalPage" use-cache="true"> + <entity-one entity-name="PortalPage" value-field="portalPage" use-cache="true"> <field-map field-name="portalPageId" from-field="originalPortalPageId"/> </entity-one> </actions> Modified: ofbiz/trunk/framework/common/widget/LookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/LookupForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/framework/common/widget/LookupForms.xml (original) +++ ofbiz/trunk/framework/common/widget/LookupForms.xml Sat Nov 5 14:14:04 2016 @@ -85,7 +85,7 @@ under the License. </service> </actions> <field name="userLoginId" title="${uiLabelMap.CommonUserLoginId}" widget-style="smallSubmit"> - <hyperlink also-hidden="false" target-type="plain" description="${userLoginId}" target="javascript:set_value('${userLoginId}', '${userLoginId}', '${parameters.webSitePublishPoint}')"/> + <hyperlink description="${userLoginId}" target="javascript:set_value('${userLoginId}', '${userLoginId}', '${parameters.webSitePublishPoint}')" also-hidden="false" target-type="plain"/> </field> <field name="enabled"><display/></field> <field name="hasLoggedOut"><display/></field> @@ -111,7 +111,7 @@ under the License. </actions> <auto-fields-entity entity-name="PortalPage" default-field-type="display"/> <field name="portalPageId" widget-style="smallSubmit"> - <hyperlink also-hidden="false" target-type="plain" description="${portalPageId}" target="javascript:set_value('${portalPageId}')"/> + <hyperlink description="${portalPageId}" target="javascript:set_value('${portalPageId}')" also-hidden="false" target-type="plain"/> </field> </form> @@ -124,7 +124,7 @@ under the License. <form name="ListLocales" type="list" list-name="locales" paginate-target="LookupLocale" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="localeString" widget-style="buttontext"> - <hyperlink also-hidden="false" target-type="plain" description="${localeString}" target="javascript:set_value('${localeString}', '${localeName}')"/> + <hyperlink description="${localeString}" target="javascript:set_value('${localeString}', '${localeName}')" also-hidden="false" target-type="plain"/> </field> <field name="localeName" title="${uiLabelMap.CommonLanguageTitle}"><display/></field> </form> Modified: ofbiz/trunk/framework/common/widget/PortalPageForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/PortalPageForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/framework/common/widget/PortalPageForms.xml (original) +++ ofbiz/trunk/framework/common/widget/PortalPageForms.xml Sat Nov 5 14:14:04 2016 @@ -81,13 +81,13 @@ under the License. </field> <field name="originalPortalPageId"><display-entity entity-name="PortalPage" description="${portalPageName} [${portalPageId}]" key-field-name="portalPageId"/></field> <field name="deleteLink" use-when="!ownerUserLoginId.equals("_NA_")" title=" " widget-style="buttontext" > - <hyperlink target="deletePortalPage" description="${uiLabelMap.CommonDelete}"> + <hyperlink description="${uiLabelMap.CommonDelete}" target="deletePortalPage"> <parameter param-name="portalPageId"/> <parameter param-name="parentPortalPageId" from-field="parameters.parentPortalPageId"/> </hyperlink> </field> <field name="deleteLink" use-when="!ownerUserLoginId.equals("_NA_")&&originalPortalPageId!=null" title=" " widget-style="buttontext" > - <hyperlink target="deletePortalPage" description="${uiLabelMap.CommonRevertPortalPage}"> + <hyperlink description="${uiLabelMap.CommonRevertPortalPage}" target="deletePortalPage"> <parameter param-name="portalPageId"/> <parameter param-name="parentPortalPageId" from-field="parameters.parentPortalPageId"/> </hyperlink> Modified: ofbiz/trunk/framework/common/widget/SecurityForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/SecurityForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/framework/common/widget/SecurityForms.xml (original) +++ ofbiz/trunk/framework/common/widget/SecurityForms.xml Sat Nov 5 14:14:04 2016 @@ -85,7 +85,7 @@ under the License. <field name="securityAnswer" title="${uiLabelMap.SecurityAnswer}"><text /></field> <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="text-link"/></field> <field name="cancelLink" title=" " widget-style="smallSubmit"> - <hyperlink target="${cancelPage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"> + <hyperlink description="${uiLabelMap.CommonCancelDone}" target="${cancelPage}" also-hidden="false"> <parameter param-name="partyId"/> </hyperlink> </field> @@ -121,7 +121,7 @@ under the License. <field name="description" title="${uiLabelMap.CommonDescription}"><text size="60" maxlength="250"/></field> <field name="submitButton" title="${uiLabelMap.CommonSave}"><submit button-type="button"/></field> <field name="cancelLink" title=" " widget-style="smallSubmit"> - <hyperlink target="${cancelPage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"> + <hyperlink description="${uiLabelMap.CommonCancelDone}" target="${cancelPage}" also-hidden="false"> <parameter param-name="partyId"/> </hyperlink> </field> @@ -144,7 +144,7 @@ under the License. <field name="groupId"><hidden/></field> <field name="permissionId" title="${uiLabelMap.PermissionId}"><display-entity entity-name="SecurityPermission" description="${permissionId} ${description}"/></field> <field name="deleteLink" title=" " widget-style="buttontext"> - <hyperlink target="removeSecurityPermissionFromSecurityGroup" description="${uiLabelMap.CommonRemove}"> + <hyperlink description="${uiLabelMap.CommonRemove}" target="removeSecurityPermissionFromSecurityGroup"> <parameter param-name="permissionId"/> <parameter param-name="groupId"/> </hyperlink> @@ -181,7 +181,7 @@ under the License. </entity-condition> </actions> <field name="groupId" title="${uiLabelMap.CommonSecurityGroupId}" widget-style="buttontext"> - <hyperlink also-hidden="false" description="${groupId}" target="EditSecurityGroup"> + <hyperlink description="${groupId}" target="EditSecurityGroup" also-hidden="false"> <parameter param-name="groupId"/> </hyperlink> </field> @@ -199,7 +199,7 @@ under the License. </actions> <field name="groupId"><hidden/></field> <field name="userLoginId" sort-field="true"> - <hyperlink also-hidden="false" description="${userLoginId}" target="editlogin"> + <hyperlink description="${userLoginId}" target="editlogin" also-hidden="false"> <parameter param-name="userLoginId"/> </hyperlink> </field> @@ -225,7 +225,7 @@ under the License. </entity-condition> </actions> <field name="userLoginId" widget-style="buttontext" sort-field="true"> - <hyperlink also-hidden="false" description="${userLoginId}" target="editlogin"> + <hyperlink description="${userLoginId}" target="editlogin" also-hidden="false"> <parameter param-name="userLoginId"/> </hyperlink> </field> @@ -285,7 +285,7 @@ under the License. </service> </actions> <field name="userLoginId" title="${uiLabelMap.CommonUserLoginId}" widget-style="smallSubmit"> - <hyperlink also-hidden="false" target-type="plain" description="${userLoginId}" target="javascript:set_value('${userLoginId}', '${userLoginId}', '${parameters.webSitePublishPoint}')"/> + <hyperlink description="${userLoginId}" target="javascript:set_value('${userLoginId}', '${userLoginId}', '${parameters.webSitePublishPoint}')" also-hidden="false" target-type="plain"/> </field> <field name="enabled"><display/></field> <field name="hasLoggedOut"><display/></field> @@ -305,7 +305,7 @@ under the License. <field name="newPasswordVerify"><password/></field> <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="text-link"/></field> <field name="cancelLink" title=" " widget-style="smallSubmit"> - <hyperlink target="${cancelPage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"> + <hyperlink description="${uiLabelMap.CommonCancelDone}" target="${cancelPage}" also-hidden="false"> <parameter param-name="userLoginId"/> <parameter param-name="partyId"/> </hyperlink> @@ -324,7 +324,7 @@ under the License. <field name="userLdapDn" use-when="!"true".equals(ldapEnabled)"><ignored/></field> <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="text-link"/></field> <field name="cancelLink" title=" " widget-style="smallSubmit"> - <hyperlink target="${cancelPage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"> + <hyperlink description="${uiLabelMap.CommonCancelDone}" target="${cancelPage}" also-hidden="false"> <parameter param-name="userLoginId"/> <parameter param-name="partyId"/> </hyperlink> Modified: ofbiz/trunk/framework/webapp/config/url.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/config/url.properties?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/config/url.properties (original) +++ ofbiz/trunk/framework/webapp/config/url.properties Sat Nov 5 14:14:04 2016 @@ -22,11 +22,11 @@ # HTTPS Port (Secure port) port.https.enabled=Y -port.https=8443 +port.https=443 force.https.host= # HTTP Port (Not Secure port) -port.http=8080 +port.http=80 force.http.host= # If you want to use HTTP then set no.http=N. Else all requests will use HTTPS except if put in the http.request-map.list
