Modified: ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/permission/WorkEffortPermissionServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/permission/WorkEffortPermissionServices.xml?rev=730369&r1=730368&r2=730369&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/permission/WorkEffortPermissionServices.xml (original) +++ ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/permission/WorkEffortPermissionServices.xml Wed Dec 31 02:40:29 2008 @@ -157,7 +157,7 @@ <else> <log level="info" message="Party ${userLogin.partyId} is not in ${roleTypeId} role with workEffort: ${workEffortId}"/> - <property-to-field resource="WorkEffortUiLabels" property="WorkEffortNotInRolePermissionError" field-name="failMessage"/> + <property-to-field resource="WorkEffortUiLabels" property="WorkEffortNotInRolePermissionError" field="failMessage"/> <set field="hasPermission" type="Boolean" value="false"/> <field-to-result field="hasPermission"/> <field-to-result field="failMessage"/> @@ -198,7 +198,7 @@ <else> <log level="info" message="Party ${userLogin.partyId} is not associated with workEffort: ${workEffortId}"/> - <property-to-field resource="WorkEffortUiLabels" property="WorkEffortNotInRolePermissionError" field-name="failMessage"/> + <property-to-field resource="WorkEffortUiLabels" property="WorkEffortNotInRolePermissionError" field="failMessage"/> <set field="hasPermission" type="Boolean" value="false"/> <field-to-result field="hasPermission"/> <field-to-result field="failMessage"/> @@ -222,7 +222,7 @@ <call-simple-method method-name="workEffortGenericPermission"/> <check-errors/> <if-compare-field operator="not-equals" field="parameters.partyId" to-field="userLogin.partyId"> - <property-to-field resource="WorkEffortUiLabels" property="WorkEffortTimeSheetNotInRolePermissionError" field-name="failMessage"/> + <property-to-field resource="WorkEffortUiLabels" property="WorkEffortTimeSheetNotInRolePermissionError" field="failMessage"/> <set field="hasPermission" type="Boolean" value="false"/> <field-to-result field="hasPermission"/> <field-to-result field="failMessage"/> @@ -233,7 +233,7 @@ <find-by-and entity-name="WorkEffortPartyAssignByRole" map="lookupRoleWorkEffortMap" list="roleParties"/> <filter-list-by-date list-name="roleParties"/> <if-empty field="roleParties"> - <property-to-field resource="WorkEffortUiLabels" property="WorkEffortTimeSheetNotInRolePermissionError" field-name="failMessage"/> + <property-to-field resource="WorkEffortUiLabels" property="WorkEffortTimeSheetNotInRolePermissionError" field="failMessage"/> <set field="hasPermission" type="Boolean" value="false"/> <field-to-result field="hasPermission"/> <field-to-result field="failMessage"/> @@ -286,7 +286,7 @@ <clear-field field="workEffortId"/> <else> <log level="info" message="Party ${userLogin.partyId} is not associated with workEffort: ${workEffortId}"/> - <property-to-field resource="WorkEffortUiLabels" property="WorkEffortNotInRolePermissionError" field-name="failMessage"/> + <property-to-field resource="WorkEffortUiLabels" property="WorkEffortNotInRolePermissionError" field="failMessage"/> <set field="hasPermission" type="Boolean" value="false"/> <field-to-result field="hasPermission"/> <field-to-result field="failMessage"/> Modified: ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml?rev=730369&r1=730368&r2=730369&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml (original) +++ ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml Wed Dec 31 02:40:29 2008 @@ -136,7 +136,7 @@ <set field="updateInvoiceMap.currencyUomId" from-field="party.preferredCurrencyUomId"/> <now-timestamp field="updateInvoiceMap.invoiceDate"/> <if-empty field="updateInvoiceMap.currencyUomId"> - <property-to-field field-name="invoice.currencyUomId" resource="general" property="currency.uom.id.default" default="USD"/> + <property-to-field field="invoice.currencyUomId" resource="general" property="currency.uom.id.default" default="USD"/> </if-empty> <call-service service-name="updateInvoice" in-map-name="updateInvoiceMap"/> <entity-one entity-name="Invoice" value-field="invoice"/> Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/EnumerationServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/EnumerationServices.xml?rev=730369&r1=730368&r2=730369&view=diff ============================================================================== --- ofbiz/trunk/framework/common/script/org/ofbiz/common/EnumerationServices.xml (original) +++ ofbiz/trunk/framework/common/script/org/ofbiz/common/EnumerationServices.xml Wed Dec 31 02:40:29 2008 @@ -31,6 +31,6 @@ <simple-method method-name="updateEnumeration" short-description="update a Enumeration"> <entity-one entity-name="Enumeration" value-field="lookedUpValue"/> <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> - <store-value value-name="lookedUpValue"/> + <store-value value-field="lookedUpValue"/> </simple-method> </simple-methods> Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/period/PeriodServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/period/PeriodServices.xml?rev=730369&r1=730368&r2=730369&view=diff ============================================================================== --- ofbiz/trunk/framework/common/script/org/ofbiz/common/period/PeriodServices.xml (original) +++ ofbiz/trunk/framework/common/script/org/ofbiz/common/period/PeriodServices.xml Wed Dec 31 02:40:29 2008 @@ -42,7 +42,7 @@ <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> - <store-value value-name="lookedUpValue"/> + <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="deleteCustomTimePeriod" short-description="Delete a CustomTimePeriod"> <check-permission permission="PERIOD_MAINT"><fail-message message="Security Error: to run deleteCustomTimePeriod you must have the PERIOD_MAINT permission"/></check-permission> Modified: ofbiz/trunk/framework/example/script/org/ofbiz/example/ExamplePermissionServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/script/org/ofbiz/example/ExamplePermissionServices.xml?rev=730369&r1=730368&r2=730369&view=diff ============================================================================== --- ofbiz/trunk/framework/example/script/org/ofbiz/example/ExamplePermissionServices.xml (original) +++ ofbiz/trunk/framework/example/script/org/ofbiz/example/ExamplePermissionServices.xml Wed Dec 31 02:40:29 2008 @@ -31,7 +31,7 @@ <set field="hasPermission" type="Boolean" value="true"/> <field-to-result field="hasPermission"/> <else> - <property-to-field resource="ExampleUiLabels" property="ExamplePermissionError" field-name="failMessage"/> + <property-to-field resource="ExampleUiLabels" property="ExamplePermissionError" field="failMessage"/> <set field="hasPermission" type="Boolean" value="false"/> <field-to-result field="hasPermission"/> <field-to-result field="failMessage"/> Modified: ofbiz/trunk/specialpurpose/googleCheckout/script/org/ofbiz/googleCheckout/ShoppingCartServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googleCheckout/script/org/ofbiz/googleCheckout/ShoppingCartServices.xml?rev=730369&r1=730368&r2=730369&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/googleCheckout/script/org/ofbiz/googleCheckout/ShoppingCartServices.xml (original) +++ ofbiz/trunk/specialpurpose/googleCheckout/script/org/ofbiz/googleCheckout/ShoppingCartServices.xml Wed Dec 31 02:40:29 2008 @@ -45,9 +45,9 @@ </simple-method> <simple-method method-name="createCheckoutFlowSupport" short-description=""> - <property-to-field resource="googleCheckout" property="editCartUrl" field-name="editCartUrl" map-name="flowSupport"/> - <property-to-field resource="googleCheckout" property="continueShoppingUrl" field-name="continueShoppingUrl" map-name="flowSupport"/> - <property-to-field resource="googleCheckout" property="requestPhone" field-name="requestPhone" map-name="flowSupport"/> + <property-to-field resource="googleCheckout" property="editCartUrl" field="editCartUrl" map-name="flowSupport"/> + <property-to-field resource="googleCheckout" property="continueShoppingUrl" field="continueShoppingUrl" map-name="flowSupport"/> + <property-to-field resource="googleCheckout" property="requestPhone" field="requestPhone" map-name="flowSupport"/> <call-simple-method method-name="getTaxTables"/> <set field="flowSupport.taxTables" from-field="taxTables"/> Modified: ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml?rev=730369&r1=730368&r2=730369&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml Wed Dec 31 02:40:29 2008 @@ -91,7 +91,7 @@ <return/> </then> <else> - <property-to-field resource="ProjectMgrUiLabels" property="ProjectMgrNoAccessToProject" field-name="failMessage"/> + <property-to-field resource="ProjectMgrUiLabels" property="ProjectMgrNoAccessToProject" field="failMessage"/> <field-to-result field="failMessage"/> <field-to-result field="hasNoPermission" result-name="hasPermission"/> <return/> @@ -133,7 +133,7 @@ <return/> </then> <else> - <property-to-field resource="ProjectMgrUiLabels" property="ProjectMgrNoAccessToProject" field-name="failMessage"/> + <property-to-field resource="ProjectMgrUiLabels" property="ProjectMgrNoAccessToProject" field="failMessage"/> <field-to-result field="failMessage"/> <field-to-result field="hasNoPermission" result-name="hasPermission"/> <return/> @@ -218,7 +218,7 @@ <return/> </then> <else> - <property-to-field resource="ProjectMgrUiLabels" property="ProjectMgrNoAccessToTask" field-name="failMessage"/> + <property-to-field resource="ProjectMgrUiLabels" property="ProjectMgrNoAccessToTask" field="failMessage"/> <field-to-result field="hasNoPermission" result-name="hasPermission"/> <field-to-result field="failMessage"/> <field-to-result field="hasNoPermission" result-name="hasPermission"/> @@ -265,7 +265,7 @@ <return/> </then> <else> - <property-to-field resource="ProjectMgrUiLabels" property="ProjectMgrNoAccessToTimesheet" field-name="failMessage"/> + <property-to-field resource="ProjectMgrUiLabels" property="ProjectMgrNoAccessToTimesheet" field="failMessage"/> <field-to-result field="hasNoPermission" result-name="hasPermission"/> <field-to-result field="failMessage"/> <return/> @@ -322,7 +322,7 @@ <return/> </then> <else> - <property-to-field resource="ProjectMgrUiLabels" property="ProjectMgrNoAccessToTimesheet" field-name="failMessage"/> + <property-to-field resource="ProjectMgrUiLabels" property="ProjectMgrNoAccessToTimesheet" field="failMessage"/> <field-to-result field="hasNoPermission" result-name="hasPermission"/> <field-to-result field="failMessage"/> <return/> @@ -332,7 +332,7 @@ <!-- should never arrive here..... --> <log level="error" message="======ProjectMGR Security UNCHECKED ACTION===== action: ${parameters.mainAction} object: ${sec_object} value: ${parameters.projectId}${parameters.workEffortId}${parameters.taskId}${parameters.timesheetId}${parameters.timeEntryId} resourceDescription: ${parameters.resourceDescription}"/> - <property-to-field resource="CommonUiLabels" property="CommonPermissionThisOperation" field-name="resourceDescription"/> + <property-to-field resource="CommonUiLabels" property="CommonPermissionThisOperation" field="resourceDescription"/> <field-to-result field="failMessage"/> <field-to-result field="hasNoPermission" result-name="hasPermission"/> </simple-method> |
Free forum by Nabble | Edit this page |