Author: deepak
Date: Sun Dec 16 11:38:42 2018
New Revision: 1849022
URL: http://svn.apache.org/viewvc?rev=1849022&view=rev
Log:
Applied fix from trunk for revision: 1849021
===
Improved: request map to create party content in controller.xml exists twice
(OFBIZ-10699)
Renamed ambiguous controller request CreatePartyContent to EditPartyContent as
per OOTB pattern.
Thanks Pierre Smits for reporting the issue and Jacques Le Roux for the the
details and discussion
Modified:
ofbiz/ofbiz-framework/branches/release17.12/ (props changed)
ofbiz/ofbiz-framework/branches/release17.12/applications/party/webapp/partymgr/WEB-INF/controller.xml
ofbiz/ofbiz-framework/branches/release17.12/applications/party/widget/partymgr/PartyScreens.xml
Propchange: ofbiz/ofbiz-framework/branches/release17.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Dec 16 11:38:42 2018
@@ -10,4 +10,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1823467,1823562,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,1825450,1826374,1826502,1826592,1826671,1826674,1826805,1826938,1826997,1827439,1828255,1828316,1828346,1828424,1828512,1828514,1829690,1830936,1831074,1831078,1831234,1831608,1831831,1832577,1832662,1832756,1832800,1832944,1833173,1833211,1834181,1834191,1834736,1835235,1835887,1835891,1835953,1835964,1836144,1836871,1837857,1838032,1838256,1838381,1840189,1840199,1840828,1841657,1841662,1842372,1842921,1843225,1843893,1844943,1845418,1845420,1845466,1845544,1845552,1845558,1845933,1845995,1846097,1846107,1846214,1846594,1846632,1847398,1847478,1847670,1847715,1847890,1848263,
1848336,1848386,1848398,1848441,1848444,1848447,1848449,1848467,1848469,1848745,1848849-1848850
+/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1823467,1823562,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,1825450,1826374,1826502,1826592,1826671,1826674,1826805,1826938,1826997,1827439,1828255,1828316,1828346,1828424,1828512,1828514,1829690,1830936,1831074,1831078,1831234,1831608,1831831,1832577,1832662,1832756,1832800,1832944,1833173,1833211,1834181,1834191,1834736,1835235,1835887,1835891,1835953,1835964,1836144,1836871,1837857,1838032,1838256,1838381,1840189,1840199,1840828,1841657,1841662,1842372,1842921,1843225,1843893,1844943,1845418,1845420,1845466,1845544,1845552,1845558,1845933,1845995,1846097,1846107,1846214,1846594,1846632,1847398,1847478,1847670,1847715,1847890,1848263,
1848336,1848386,1848398,1848441,1848444,1848447,1848449,1848467,1848469,1848745,1848849-1848850,1849021
Modified:
ofbiz/ofbiz-framework/branches/release17.12/applications/party/webapp/partymgr/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/party/webapp/partymgr/WEB-INF/controller.xml?rev=1849022&r1=1849021&r2=1849022&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/branches/release17.12/applications/party/webapp/partymgr/WEB-INF/controller.xml
(original)
+++
ofbiz/ofbiz-framework/branches/release17.12/applications/party/webapp/partymgr/WEB-INF/controller.xml
Sun Dec 16 11:38:42 2018
@@ -943,9 +943,9 @@ under the License.
</request-map>
<!-- Create and Upload Party Content -->
- <request-map uri="CreatePartyContent">
+ <request-map uri="EditPartyContent">
<security auth="true" https="true"/>
- <response name="success" type="view" value="CreatePartyContent"/>
+ <response name="success" type="view" value="EditPartyContent"/>
</request-map>
<request-map uri="EditPartyContents">
<security auth="true" https="true"/>
@@ -1411,7 +1411,7 @@ under the License.
<view-map name="PartyExportCsv" type="screencsv"
page="component://party/widget/partymgr/PartyScreens.xml#PartyExportCsv"
content-type="text/csv" encoding="none"/>
<view-map name="EditPartyContents" type="screen"
page="component://party/widget/partymgr/PartyScreens.xml#EditPartyContents"/>
- <view-map name="CreatePartyContent" type="screen"
page="component://party/widget/partymgr/PartyScreens.xml#CreatePartyContent"/>
+ <view-map name="EditPartyContent" type="screen"
page="component://party/widget/partymgr/PartyScreens.xml#EditPartyContent"/>
<view-map name="editCarrierAccount" type="screen"
page="component://party/widget/partymgr/PartyScreens.xml#editCarrierAccount"/>
<view-map name="partyInvitation" type="screen"
page="component://party/widget/partymgr/PartyInvitationScreens.xml#FindPartyInvitations"/>
<view-map name="editPartyInvitation" type="screen"
page="component://party/widget/partymgr/PartyInvitationScreens.xml#EditPartyInvitation"/>
Modified:
ofbiz/ofbiz-framework/branches/release17.12/applications/party/widget/partymgr/PartyScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/party/widget/partymgr/PartyScreens.xml?rev=1849022&r1=1849021&r2=1849022&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/branches/release17.12/applications/party/widget/partymgr/PartyScreens.xml
(original)
+++
ofbiz/ofbiz-framework/branches/release17.12/applications/party/widget/partymgr/PartyScreens.xml
Sun Dec 16 11:38:42 2018
@@ -911,7 +911,7 @@ under the License.
<decorator-screen name="CommonPartyDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<container style="button-bar">
- <link target="CreatePartyContent"
text="${uiLabelMap.CommonCreateNew}" style="smallSubmit">
+ <link target="EditPartyContent"
text="${uiLabelMap.CommonCreateNew}" style="smallSubmit">
<parameter param-name="partyId"/>
</link>
</container>
@@ -926,7 +926,7 @@ under the License.
</widgets>
</section>
</screen>
- <screen name="CreatePartyContent">
+ <screen name="EditPartyContent">
<section>
<actions>
<set field="titleProperty" value="PageTitleListContent"/>
@@ -938,7 +938,7 @@ under the License.
<decorator-screen name="CommonPartyDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<container style="button-bar">
- <link target="CreatePartyContent"
text="${uiLabelMap.CommonCreateNew}" style="smallSubmit">
+ <link target="EditPartyContent"
text="${uiLabelMap.CommonCreateNew}" style="smallSubmit">
<parameter param-name="partyId"/>
</link>
</container>
