svn commit: r996606 - in /ofbiz/branches/jquery: ./ applications/accounting/webapp
Locked
svn commit: r996606 - in /ofbiz/branches/jquery: ./ applications/accounting/webapp
 
|
Author: jleroux
Date: Mon Sep 13 17:17:47 2010 New Revision: 996606 URL: http://svn.apache.org/viewvc?rev=996606&view=rev Log: Merges the trunk at r996565 Modified: ofbiz/branches/jquery/ (props changed) ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResult.fo.ftl ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml (props changed) ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy (props changed) ofbiz/branches/jquery/applications/party/widget/partymgr/CommunicationEventForms.xml ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml (props changed) ofbiz/branches/jquery/framework/common/config/CommonUiLabels.xml ofbiz/branches/jquery/framework/common/webcommon/WEB-INF/common-controller.xml ofbiz/branches/jquery/framework/common/widget/HelpScreens.xml (props changed) ofbiz/branches/jquery/framework/common/widget/LookupForms.xml ofbiz/branches/jquery/framework/example/widget/example/FormWidgetExampleForms.xml ofbiz/branches/jquery/framework/testtools/webapp/testtools/WEB-INF/controller.xml ofbiz/branches/jquery/specialpurpose/ebaystore/lib/ (props changed) ofbiz/branches/jquery/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy (props changed) ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy (props changed) ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy (props changed) Propchange: ofbiz/branches/jquery/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Sep 13 17:17:47 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310:921280-927264 -/ofbiz/trunk:951708-996145 +/ofbiz/trunk:951708-996600 Modified: ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResult.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResult.fo.ftl?rev=996606&r1=996605&r2=996606&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResult.fo.ftl (original) +++ ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResult.fo.ftl Mon Sep 13 17:17:47 2010 @@ -82,7 +82,7 @@ under the License. <fo:block text-align="center" font-size="6pt">${uiLabelMap.FormFieldTitle_shipmentId}</fo:block> </fo:table-cell> <fo:table-cell border="1pt solid" border-width=".1mm"> - <fo:block text-align="center" font-size="6pt">${uiLabelMap.CommonPartyID}</fo:block> + <fo:block text-align="center" font-size="6pt">${uiLabelMap.CommonPartyId}</fo:block> </fo:table-cell> <fo:table-cell border="1pt solid" border-width=".1mm"> <fo:block text-align="center" font-size="6pt">${uiLabelMap.AccountingProductId}</fo:block> Propchange: ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Sep 13 17:17:47 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CheckoutMapProcs.xml:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:921280-927264 -/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:951708-996145 +/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:951708-996600 Propchange: ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Sep 13 17:17:47 2010 @@ -1,3 +1,3 @@ /incubator/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:418499-490456 /ofbiz/branches/multitenant20100310/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:921280-927264 -/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:951708-996145 +/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:951708-996600 Modified: ofbiz/branches/jquery/applications/party/widget/partymgr/CommunicationEventForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/widget/partymgr/CommunicationEventForms.xml?rev=996606&r1=996605&r2=996606&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/party/widget/partymgr/CommunicationEventForms.xml (original) +++ ofbiz/branches/jquery/applications/party/widget/partymgr/CommunicationEventForms.xml Mon Sep 13 17:17:47 2010 @@ -349,9 +349,9 @@ under the License. <field name="communicationEventId" position="1"><text-find/></field> <field name="parentCommEventId" position="2"><text-find/></field> <!-- <field name="origCommEventId"><text-find/></field--> - <field name="partyIdFrom" position="1" title="${uiLabelMap.CommonPartyID} ${uiLabelMap.CommonFrom}"><lookup target-form-name="LookupPartyName"/></field> - <field name="partyIdTo" position="2" title="${uiLabelMap.CommonPartyID} ${uiLabelMap.CommonTo}"><lookup target-form-name="LookupPartyName"/></field> - <field name="partyId" position="1" title="${uiLabelMap.CommonPartyID} ${uiLabelMap.PartyAnyRole}"><lookup target-form-name="LookupPartyName"/></field> + <field name="partyIdFrom" position="1" title="${uiLabelMap.CommonPartyId} ${uiLabelMap.CommonFrom}"><lookup target-form-name="LookupPartyName"/></field> + <field name="partyIdTo" position="2" title="${uiLabelMap.CommonPartyId} ${uiLabelMap.CommonTo}"><lookup target-form-name="LookupPartyName"/></field> + <field name="partyId" position="1" title="${uiLabelMap.CommonPartyId} ${uiLabelMap.PartyAnyRole}"><lookup target-form-name="LookupPartyName"/></field> <field name="roleTypeId" position="2"> <drop-down allow-empty="true"> <entity-options description="${description}" entity-name="RoleType"> @@ -419,7 +419,7 @@ under the License. <field name="statusId"> <display-entity description="${description}" entity-name="StatusItem" key-field-name="statusId"/> </field> - <field name="partyId" title="${uiLabelMap.CommonPartyID}"> + <field name="partyId" title="${uiLabelMap.CommonPartyId}"> <display-entity description="${firstName} ${middleName} ${lastName} ${groupName}" entity-name="PartyNameView" key-field-name="partyId"> <sub-hyperlink target="/partymgr/control/viewprofile" description="[${partyIdFrom}]" target-type="inter-app"> <parameter param-name="partyId" from-field="partyIdFrom"/> @@ -441,9 +441,9 @@ 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="orderId" position="1"><text-find/></field> <field name="communicationEventId" position="1"><text-find/></field> - <field name="partyIdFrom" position="1" title="${uiLabelMap.CommonPartyID} ${uiLabelMap.CommonFrom}"><lookup target-form-name="LookupPartyName"/></field> - <field name="partyIdTo" position="2" title="${uiLabelMap.CommonPartyID} ${uiLabelMap.CommonTo}"><lookup target-form-name="LookupPartyName"/></field> - <field name="partyId" position="1" title="${uiLabelMap.CommonPartyID} ${uiLabelMap.PartyAnyRole}"><lookup target-form-name="LookupPartyName"/></field> + <field name="partyIdFrom" position="1" title="${uiLabelMap.CommonPartyId} ${uiLabelMap.CommonFrom}"><lookup target-form-name="LookupPartyName"/></field> + <field name="partyIdTo" position="2" title="${uiLabelMap.CommonPartyId} ${uiLabelMap.CommonTo}"><lookup target-form-name="LookupPartyName"/></field> + <field name="partyId" position="1" title="${uiLabelMap.CommonPartyId} ${uiLabelMap.PartyAnyRole}"><lookup target-form-name="LookupPartyName"/></field> <field name="communicationEventTypeId" position="2"> <drop-down allow-empty="true"> <entity-options description="${description}" entity-name="CommunicationEventType" key-field-name="communicationEventTypeId"/> @@ -524,14 +524,14 @@ under the License. <field name="communicationEventTypeId"> <display-entity entity-name="CommunicationEventType" description="${description}"/> </field> - <field name="partyIdFrom" title="${uiLabelMap.CommonPartyID} ${uiLabelMap.CommonFrom}" sort-field="true"> + <field name="partyIdFrom" title="${uiLabelMap.CommonPartyId} ${uiLabelMap.CommonFrom}" sort-field="true"> <display-entity description="${firstName} ${middleName} ${lastName} ${groupName}" entity-name="PartyNameView" key-field-name="partyId"> <sub-hyperlink target="/partymgr/control/viewprofile" description="[${partyIdFrom}]" target-type="inter-app"> <parameter param-name="partyId" from-field="partyIdFrom"/> </sub-hyperlink> </display-entity> </field> - <field name="partyIdTo" title="${uiLabelMap.CommonPartyID} ${uiLabelMap.CommonTo}" sort-field="true"> + <field name="partyIdTo" title="${uiLabelMap.CommonPartyId} ${uiLabelMap.CommonTo}" sort-field="true"> <display-entity description="${firstName} ${middleName} ${lastName} ${groupName}" entity-name="PartyNameView" key-field-name="partyId"> <sub-hyperlink target="/partymgr/control/viewprofile" description="[${partyIdTo}]" target-type="inter-app"> <parameter param-name="partyId" from-field="partyIdTo"/> Propchange: ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Sep 13 17:17:47 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt/applications/product/script/org/ofbiz/shipment/test/FacilityTests.xml:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:921280-927264 -/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:951708-996145 +/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:951708-996600 Modified: ofbiz/branches/jquery/framework/common/config/CommonUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/config/CommonUiLabels.xml?rev=996606&r1=996605&r2=996606&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/common/config/CommonUiLabels.xml (original) +++ ofbiz/branches/jquery/framework/common/config/CommonUiLabels.xml Mon Sep 13 17:17:47 2010 @@ -5136,7 +5136,7 @@ <value xml:lang="it">Padre</value> <value xml:lang="zh">ä¸çº§</value> </property> - <property key="CommonPartyID"> + <property key="CommonPartyId"> <value xml:lang="ar">دÙÙ٠اÙطرÙ</value> <value xml:lang="de">Akteur ID</value> <value xml:lang="en">Party Id</value> @@ -5152,6 +5152,37 @@ <value xml:lang="zh">ä¼åæ è¯</value> <value xml:lang="zh_CN">å¢ä½æ è¯</value> </property> + <property key="CommonPartyGroupName"> + <value xml:lang="de">Gruppenname</value> + <value xml:lang="en">Group Name</value> + <value xml:lang="es">Nombre del grupo</value> + <value xml:lang="fr">Nom du groupe</value> + <value xml:lang="hi_IN">समà¥à¤¹ à¤à¤¾ नाम</value> + <value xml:lang="it">Nome gruppo</value> + <value xml:lang="nl">Groepnaam</value> + <value xml:lang="pt_BR">Nome do grupo</value> + <value xml:lang="ro">Nome Grup</value> + <value xml:lang="ru">ÐÐ¼Ñ Ð³ÑÑппÑ</value> + <value xml:lang="th">à¸à¸·à¹à¸à¸à¸¥à¸¸à¹à¸¡</value> + <value xml:lang="zh">ç»å称</value> + </property> + <property key="CommonPartyName"> + <value xml:lang="cs">Jméno</value> + <value xml:lang="de">Name</value> + <value xml:lang="en">Name</value> + <value xml:lang="es">Nombre</value> + <value xml:lang="fr">Nom</value> + <value xml:lang="hi_IN">नाम</value> + <value xml:lang="it">Nome</value> + <value xml:lang="ja">Name</value> + <value xml:lang="nl">Naam</value> + <value xml:lang="pt_BR">Nome</value> + <value xml:lang="pt_PT">Nome</value> + <value xml:lang="ro">Nume</value> + <value xml:lang="ru">ÐмÑ</value> + <value xml:lang="th">à¸à¸·à¹à¸</value> + <value xml:lang="zh">åå</value> + </property> <property key="CommonPartySkills"> <value xml:lang="de">Teilnehmerfähigkeiten</value> <value xml:lang="en">Party Skills</value> Modified: ofbiz/branches/jquery/framework/common/webcommon/WEB-INF/common-controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/webcommon/WEB-INF/common-controller.xml?rev=996606&r1=996605&r2=996606&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/common/webcommon/WEB-INF/common-controller.xml (original) +++ ofbiz/branches/jquery/framework/common/webcommon/WEB-INF/common-controller.xml Mon Sep 13 17:17:47 2010 @@ -159,10 +159,6 @@ under the License. <response name="success" type="view" value="viewBlocked"/> </request-map> - <request-map uri="geoLocation"> - <response name="success" type="view" value="geoLocation"/> - </request-map> - <request-map uri="LookupTimeDuration"> <response name="success" type="view" value="LookupTimeDuration"/> </request-map> @@ -240,7 +236,6 @@ under the License. <view-map name="help" type="screen" page="component://common/widget/CommonScreens.xml#help"/> <view-map name="showHelp" type="screen" page="component://common/widget/HelpScreens.xml#ShowHelp"/> <view-map name="ShowDocument" type="screen" page="component://common/widget/HelpScreens.xml#showDocument"/> - <view-map name="geoLocation" type="screen" page="component://common/widget/CommonScreens.xml#geoLocation"/> <view-map name="viewBlocked" type="screen" page="component://common/widget/CommonScreens.xml#viewBlocked"/> </site-conf> Propchange: ofbiz/branches/jquery/framework/common/widget/HelpScreens.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Sep 13 17:17:47 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt/applications/commonext/widget/HelpScreens.xml:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310/framework/common/widget/HelpScreens.xml:921280-927264 -/ofbiz/trunk/framework/common/widget/HelpScreens.xml:951708-996145 +/ofbiz/trunk/framework/common/widget/HelpScreens.xml:951708-996600 Modified: ofbiz/branches/jquery/framework/common/widget/LookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/widget/LookupForms.xml?rev=996606&r1=996605&r2=996606&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/common/widget/LookupForms.xml (original) +++ ofbiz/branches/jquery/framework/common/widget/LookupForms.xml Mon Sep 13 17:17:47 2010 @@ -33,7 +33,7 @@ under the License. <field name="geoName" title="${uiLabelMap.CommonSegmentGroupGeoName}"><text-find/></field> <field name="geoCode" title="${uiLabelMap.CommonSegmentGroupGeoCode}"><text-find/></field> <field name="geoSecCode" title="${uiLabelMap.CommonSegmentGroupGeoSecCode}"><text-find/></field> - <field name="geoAbbr" title="${uiLabelMap.CommonSegmentGroupGeoAbbr}"><text-find/></field> + <field name="abbreviation" title="${uiLabelMap.CommonSegmentGroupGeoAbbr}"><text-find/></field> <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="smallSubmit"><submit button-type="button"/></field> </form> @@ -56,6 +56,6 @@ under the License. <field name="geoName" title="${uiLabelMap.CommonSegmentGroupGeoName}"><display/></field> <field name="geoCode" title="${uiLabelMap.CommonSegmentGroupGeoCode}"><display/></field> <field name="geoSecCode" title="${uiLabelMap.CommonSegmentGroupGeoSecCode}"><display/></field> - <field name="geoAbbr" title="${uiLabelMap.CommonSegmentGroupGeoAbbr}"><display/></field> + <field name="abbreviation" title="${uiLabelMap.CommonSegmentGroupGeoAbbr}"><display/></field> </form> </forms> Modified: ofbiz/branches/jquery/framework/example/widget/example/FormWidgetExampleForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/example/widget/example/FormWidgetExampleForms.xml?rev=996606&r1=996605&r2=996606&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/example/widget/example/FormWidgetExampleForms.xml (original) +++ ofbiz/branches/jquery/framework/example/widget/example/FormWidgetExampleForms.xml Mon Sep 13 17:17:47 2010 @@ -318,24 +318,24 @@ under the License. <!-- Lookup Examples --> <form name="ExampleLookupFields" type="single" title=""> <!-- Old style lookup (in a popup window) --> - <field name="partyIdTo"><!-- we use partyIdTo here only to differentiate from the other partyId field we use below--> + <field name="partyId" title="${uiLabelMap.CommonPartyId}"> <lookup target-form-name="LookupPartyName" presentation="window"/> </field> <!-- Standard lookup (in a layer)--> - <!-- passes the name in one field and the id in another --> - <field name="partyName" title="${uiLabelMap.CommonName}"> - <lookup target-form-name="LookupPartyGroupByName" description-field-name="partyId"/> + <!-- passes the name in one field and the id in another, this does not work yet with autcompletion, WIP... --> + <field name="partyName" title="${uiLabelMap.CommonPartyGroupName}"> + <lookup target-form-name="LookupPartyGroupByName" description-field-name="partyGroupId"/> </field> - <!-- This field may be hidden and the name rendered in partyName using default-value if partyId is known when loading the form--> - <field name="partyId" title="${uiLabelMap.CommonPartyID}"><text/></field><!-- the text field is only used for rendering. In the "real life" you would use the hidden fiels commented below to pass the data to the request --> - <!--field name="partyId"><hidden/></field--> + <!-- This field may be hidden and the name rendered in partyName using default-value if partyGroupId is known when loading the form--> + <field name="partyGroupId" title="${uiLabelMap.CommonPartyId}"><text/></field><!-- the text field is only used for rendering. In the "real life" you would use the hidden field commented below to pass the data to the request --> + <!--field name="partyGroupId"><hidden/></field--> <sort-order> <field-group> - <sort-field name="partyIdTo"/> + <sort-field name="partyId"/> </field-group> <field-group> <sort-field name="partyName"/> - <sort-field name="partyId"/> + <sort-field name="partyGroupId"/> </field-group> </sort-order> </form> Modified: ofbiz/branches/jquery/framework/testtools/webapp/testtools/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/testtools/webapp/testtools/WEB-INF/controller.xml?rev=996606&r1=996605&r2=996606&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/testtools/webapp/testtools/WEB-INF/controller.xml (original) +++ ofbiz/branches/jquery/framework/testtools/webapp/testtools/WEB-INF/controller.xml Mon Sep 13 17:17:47 2010 @@ -71,5 +71,4 @@ <!-- selenium Test Case --> <view-map name="selenium" type="screen" page="component://testtools/widget/CommonScreens.xml#selenium"/> - <view-map name="runSelenium" type="screen" page="component://testtools/widget/CommonScreens.xml#runSelenium"/> </site-conf> \ No newline at end of file Propchange: ofbiz/branches/jquery/specialpurpose/ebaystore/lib/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Sep 13 17:17:47 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt/specialpurpose/ebay/lib:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310/specialpurpose/ebaystore/lib:921280-927264 -/ofbiz/trunk/specialpurpose/ebaystore/lib:951708-996145 +/ofbiz/trunk/specialpurpose/ebaystore/lib:951708-996600 Modified: ofbiz/branches/jquery/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml?rev=996606&r1=996605&r2=996606&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml (original) +++ ofbiz/branches/jquery/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml Mon Sep 13 17:17:47 2010 @@ -913,21 +913,30 @@ under the License. </call-bsh> <set field="parameters.userLogin" from-field="userLogin"/> <else> - <if-not-empty field="parameters.currentPassword"> - <call-map-processor xml-resource="component://securityext/script/org/ofbiz/securityext/login/LoginMapProcs.xml" - processor-name="updatePassword" in-map-name="parameters" out-map-name="passwordMap"/> - <check-errors/> - <set-service-fields service-name="updatePassword" map="passwordMap" to-map="passwordCtx"/> - <call-service service-name="updatePassword" in-map-name="passwordCtx"> - <result-to-field result-name="updatedUserLogin"/> - </call-service> - <set-current-user-login value-field="updatedUserLogin"/> - <session-to-field field="userLogin"/> - <if-compare field="userLogin.userLoginId" operator="equals" value="${updatedUserLogin.userLoginId}"> - <field-to-session field="updatedUserLogin" session-name="userLogin"/> - </if-compare> - <session-to-field field="userLogin"/> - </if-not-empty> + <if> + <condition> + <or> + <not><if-empty field="parameters.currentPassword"></if-empty></not> + <not><if-empty field="parameters.newPassword"></if-empty></not> + <not><if-empty field="parameters.newPasswordVerify"> </if-empty></not> + </or> + </condition> + <then> + <call-map-processor xml-resource="component://securityext/script/org/ofbiz/securityext/login/LoginMapProcs.xml" + processor-name="updatePassword" in-map-name="parameters" out-map-name="passwordMap"/> + <check-errors/> + <set-service-fields service-name="updatePassword" map="passwordMap" to-map="passwordCtx"/> + <call-service service-name="updatePassword" in-map-name="passwordCtx"> + <result-to-field result-name="updatedUserLogin"/> + </call-service> + <set-current-user-login value-field="updatedUserLogin"/> + <session-to-field field="userLogin"/> + <if-compare field="userLogin.userLoginId" operator="equals" value="${updatedUserLogin.userLoginId}"> + <field-to-session field="updatedUserLogin" session-name="userLogin"/> + </if-compare> + <session-to-field field="userLogin"/> + </then> + </if> </else> </if-empty> </simple-method> Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Sep 13 17:17:47 2010 @@ -1,3 +1,3 @@ /incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:418499-490456 /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:921280-927264 -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:951708-996145 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:951708-996600 Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Sep 13 17:17:47 2010 @@ -1,3 +1,3 @@ /incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:418499-490456 /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:921280-927264 -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:951708-996145 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:951708-996600 Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Sep 13 17:17:47 2010 @@ -1,3 +1,3 @@ /incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:418499-490456 /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:921280-927264 -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:951708-996145 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:951708-996600 |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |