svn commit: r1851321 - in /ofbiz/ofbiz-framework/branches/release17.12: ./ applications/order/template/entry/CheckoutPayment.ftl applications/party/template/party/EditCreditCard.ftl applications/party
Author: jleroux Date: Tue Jan 15 07:44:33 2019 New Revision: 1851321 URL: http://svn.apache.org/viewvc?rev=1851321=rev Log: "Applied fix from trunk for revision: 1851319" r1851319 | jleroux | 2019-01-15 08:43:36 +0100 (mar. 15 janv. 2019) | 12 lignes Fixed: partyId misses in EditEftAccount.ftl (party) when you create an EFT account from the quick finalize page (OFBIZ-10680) If you split the payment and want to create an EFT account you get an error in EditEftAccount.ftl (party) at line 40 colum 50: the partyId is missing. Adds the patch to add the partyId field that was missing while creating an EFT account or credit card in split payment mode. Added proper checks to avoid the broken screen in case the parameter is missing. Thanks: Ankit Joshi for the fix Modified: ofbiz/ofbiz-framework/branches/release17.12/ (props changed) ofbiz/ofbiz-framework/branches/release17.12/applications/order/template/entry/CheckoutPayment.ftl ofbiz/ofbiz-framework/branches/release17.12/applications/party/template/party/EditCreditCard.ftl ofbiz/ofbiz-framework/branches/release17.12/applications/party/template/party/EditEftAccount.ftl Propchange: ofbiz/ofbiz-framework/branches/release17.12/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jan 15 07:44:33 2019 @@ -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,1819947,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,1826780,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,1849191,1849193,1849275,1849467,1849528,1849540,1849567,1849693,1850015,1850023,1850530,1850647,1850685,1850694,1850914,1850918,1850948,1850953,1851006,1851068,1851074,1851130,1851158,1851163,1851200,1851247 +/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1819947,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,1826780,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,1849191,1849193,1849275,1849467,1849528,1849540,1849567,1849693,1850015,1850023,1850530,1850647,1850685,1850694,1850914,1850918,1850948,1850953,1851006,1851068,1851074,1851130,1851158,1851163,1851200,1851247,1851319 Modified: ofbiz/ofbiz-framework/branches/release17.12/applications/order/template/entry/CheckoutPayment.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/order/template/entry/CheckoutPayment.ftl?rev=1851321=1851320=1851321=diff == --- ofbiz/ofbiz-framework/branches/release17.12/applications/order/template/entry/CheckoutPayment.ftl (original) +++ ofbiz/ofbiz-framework/branches/release17.12/applications/order/template/entry/CheckoutPayment.ftl Tue Jan 15 07:44:33 2019 @@ -32,7 +32,7 @@ function submitForm(form,
svn commit: r1851322 - in /ofbiz/branches/release16.11: ./ applications/order/template/entry/CheckoutPayment.ftl applications/party/template/party/EditCreditCard.ftl applications/party/template/party/
Author: jleroux Date: Tue Jan 15 07:44:35 2019 New Revision: 1851322 URL: http://svn.apache.org/viewvc?rev=1851322=rev Log: "Applied fix from trunk framework for revision: 1851319" r1851319 | jleroux | 2019-01-15 08:43:36 +0100 (mar. 15 janv. 2019) | 12 lignes Fixed: partyId misses in EditEftAccount.ftl (party) when you create an EFT account from the quick finalize page (OFBIZ-10680) If you split the payment and want to create an EFT account you get an error in EditEftAccount.ftl (party) at line 40 colum 50: the partyId is missing. Adds the patch to add the partyId field that was missing while creating an EFT account or credit card in split payment mode. Added proper checks to avoid the broken screen in case the parameter is missing. Thanks: Ankit Joshi for the fix Modified: ofbiz/branches/release16.11/ (props changed) ofbiz/branches/release16.11/applications/order/template/entry/CheckoutPayment.ftl ofbiz/branches/release16.11/applications/party/template/party/EditCreditCard.ftl ofbiz/branches/release16.11/applications/party/template/party/EditEftAccount.ftl Propchange: ofbiz/branches/release16.11/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jan 15 07:44:35 2019 @@ -10,5 +10,5 @@ /ofbiz/branches/json-integration-refactoring:1634077-1635900 /ofbiz/branches/multitenant20100310:921280-927264 /ofbiz/branches/release13.07:1547657 -/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1793300,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262-1801263,1801273-1801274,1801303,1801318-1801319,1801336,1801340,1801346,1801349-1801350,1801359,1801742,1802657,1802766,1803525,1804656,1804843,1804847,1804859,1805143,1805558,1805880,1806036,1806220,1806266,1806269,1806951,1807597,1807890,1808834,1809399,1809429,1809594,1809741,1810102,1811794,1812387,1813600,1813617,1813647,1813833,1814277,1814319,1814349,1814392,1814501,1814591,1814642,1814644,1814709,1814873,1814928,1814934,1815059,1816264,1816273,1816289, 1816291,1816297,1816369,1816373,1816461,1816635,1816795,1818101,1818269,1818273,1818402,1819122,1819136,1819144,1819811,1820823,1820949,1820966,1821012,1821036,1821613,1821965,1822310,1822377,1822383,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825233,1825262,1825444,1825450,1826374,1826592,1826671,1826805,1826938,1828255,1830936,1831234,1831608,1831831,1832577,1832662,1832756,1832944,1833211,1834181,1834191,1835235,1836144,1838032,1840189,1840199,1840828,1841657,1841662,1842372,1842921,1843225,1843893,1845418,1845420,1845466,1845544,1845552,1846214,1846594,1846632,1847398,1848263,1848336,1848398,1848444,1848449,1849191,1849193,1849275,1849528,1849540,1849567,1849693,1850015,1850023,1850530,1850685,1850914,1850918,1850948,1851200,1851247 +/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1793300,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262-1801263,1801273-1801274,1801303,1801318-1801319,1801336,1801340,1801346,1801349-1801350,1801359,1801742,1802657,1802766,1803525,1804656,1804843,1804847,1804859,1805143,1805558,1805880,1806036,1806220,1806266,1806269,1806951,1807597,1807890,1808834,1809399,1809429,1809594,1809741,1810102,1811794,1812387,1813600,1813617,1813647,1813833,1814277,1814319,1814349,1814392,1814501,1814591,1814642,1814644,1814709,1814873,1814928,1814934,1815059,1816264,1816273,1816289,
svn commit: r1851320 - in /ofbiz/ofbiz-framework/branches/release18.12: ./ applications/order/template/entry/CheckoutPayment.ftl applications/party/template/party/EditCreditCard.ftl applications/party
Author: jleroux
Date: Tue Jan 15 07:44:31 2019
New Revision: 1851320
URL: http://svn.apache.org/viewvc?rev=1851320=rev
Log:
"Applied fix from trunk for revision: 1851319"
r1851319 | jleroux | 2019-01-15 08:43:36 +0100 (mar. 15 janv. 2019) | 12 lignes
Fixed: partyId misses in EditEftAccount.ftl (party) when you create an EFT
account from the quick finalize page
(OFBIZ-10680)
If you split the payment and want to create an EFT account you get an error in
EditEftAccount.ftl (party) at line 40 colum 50: the partyId is missing.
Adds the patch to add the partyId field that was missing while creating an EFT
account or credit card in split payment mode. Added proper checks to avoid the
broken screen in case the parameter is missing.
Thanks: Ankit Joshi for the fix
Modified:
ofbiz/ofbiz-framework/branches/release18.12/ (props changed)
ofbiz/ofbiz-framework/branches/release18.12/applications/order/template/entry/CheckoutPayment.ftl
ofbiz/ofbiz-framework/branches/release18.12/applications/party/template/party/EditCreditCard.ftl
ofbiz/ofbiz-framework/branches/release18.12/applications/party/template/party/EditEftAccount.ftl
Propchange: ofbiz/ofbiz-framework/branches/release18.12/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 15 07:44:31 2019
@@ -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:1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850914,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158,1851200,1851224,1851247,1851254,1851315
+/ofbiz/ofbiz-framework/trunk:1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850914,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158,1851200,1851224,1851247,1851254,1851315,1851319
Modified:
ofbiz/ofbiz-framework/branches/release18.12/applications/order/template/entry/CheckoutPayment.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/applications/order/template/entry/CheckoutPayment.ftl?rev=1851320=1851319=1851320=diff
==
---
ofbiz/ofbiz-framework/branches/release18.12/applications/order/template/entry/CheckoutPayment.ftl
(original)
+++
ofbiz/ofbiz-framework/branches/release18.12/applications/order/template/entry/CheckoutPayment.ftl
Tue Jan 15 07:44:31 2019
@@ -32,7 +32,7 @@ function submitForm(form, mode, value) {
form.submit();
} else if ("NC" == mode) {
// new credit card
-
form.action="<@ofbizUrl>updateCheckoutOptions/editcreditcard?DONE_PAGE=checkoutpayment";
+
form.action="<@ofbizUrl>updateCheckoutOptions/editcreditcard?DONE_PAGE=checkoutpayment=${shoppingCart.getPartyId()}";
form.submit();
} else if ("EC" == mode) {
// edit credit card
@@ -40,19 +40,19 @@ function submitForm(form, mode, value) {
form.submit();
} else if ("GC" == mode) {
// edit gift card
-
form.action="<@ofbizUrl>updateCheckoutOptions/editgiftcard?paymentMethodId="+value+"";
+
form.action="<@ofbizUrl>updateCheckoutOptions/editgiftcard?partyId=${shoppingCart.getPartyId()}="+value+"";
form.submit();
} else if ("NE" == mode) {
// new eft account
-
form.action="<@ofbizUrl>updateCheckoutOptions/editeftaccount?DONE_PAGE=checkoutpayment";
+
form.action="<@ofbizUrl>updateCheckoutOptions/editeftaccount?DONE_PAGE=checkoutpayment=${shoppingCart.getPartyId()}";
form.submit();
} else if ("EE" == mode) {
// edit eft account
-
form.action="<@ofbizUrl>updateCheckoutOptions/editeftaccount?DONE_PAGE=checkoutpayment="+value+"";
+
form.action="<@ofbizUrl>updateCheckoutOptions/editeftaccount?DONE_PAGE=checkoutpayment=${shoppingCart.getPartyId()}="+value+"";
form.submit();
}else if(mode = "EG")
//edit gift card
-
form.action="<@ofbizUrl>updateCheckoutOptions/editgiftcard?DONE_PAGE=checkoutpayment="+value+"";
+
form.action="<@ofbizUrl>updateCheckoutOptions/editgiftcard?DONE_PAGE=checkoutpayment=${shoppingCart.getPartyId()}="+value+"";
form.submit();
}
//]]>
Modified:
ofbiz/ofbiz-framework/branches/release18.12/applications/party/template/party/EditCreditCard.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/applications/party/template/party/EditCreditCard.ftl?rev=1851320=1851319=1851320=diff
==
---
ofbiz/ofbiz-framework/branches/release18.12/applications/party/template/party/EditCreditCard.ftl
(original)
+++
svn commit: r1851319 - in /ofbiz/ofbiz-framework/trunk/applications: order/template/entry/CheckoutPayment.ftl party/template/party/EditCreditCard.ftl party/template/party/EditEftAccount.ftl
Author: jleroux
Date: Tue Jan 15 07:43:36 2019
New Revision: 1851319
URL: http://svn.apache.org/viewvc?rev=1851319=rev
Log:
Fixed: partyId misses in EditEftAccount.ftl (party) when you create an EFT
account from the quick finalize page
(OFBIZ-10680)
If you split the payment and want to create an EFT account you get an error in
EditEftAccount.ftl (party) at line 40 colum 50: the partyId is missing.
Adds the patch to add the partyId field that was missing while creating an EFT
account or credit card in split payment mode. Added proper checks to avoid the
broken screen in case the parameter is missing.
Thanks: Ankit Joshi for the fix
Modified:
ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CheckoutPayment.ftl
ofbiz/ofbiz-framework/trunk/applications/party/template/party/EditCreditCard.ftl
ofbiz/ofbiz-framework/trunk/applications/party/template/party/EditEftAccount.ftl
Modified:
ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CheckoutPayment.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CheckoutPayment.ftl?rev=1851319=1851318=1851319=diff
==
---
ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CheckoutPayment.ftl
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CheckoutPayment.ftl
Tue Jan 15 07:43:36 2019
@@ -32,7 +32,7 @@ function submitForm(form, mode, value) {
form.submit();
} else if ("NC" == mode) {
// new credit card
-
form.action="<@ofbizUrl>updateCheckoutOptions/editcreditcard?DONE_PAGE=checkoutpayment";
+
form.action="<@ofbizUrl>updateCheckoutOptions/editcreditcard?DONE_PAGE=checkoutpayment=${shoppingCart.getPartyId()}";
form.submit();
} else if ("EC" == mode) {
// edit credit card
@@ -40,19 +40,19 @@ function submitForm(form, mode, value) {
form.submit();
} else if ("GC" == mode) {
// edit gift card
-
form.action="<@ofbizUrl>updateCheckoutOptions/editgiftcard?paymentMethodId="+value+"";
+
form.action="<@ofbizUrl>updateCheckoutOptions/editgiftcard?partyId=${shoppingCart.getPartyId()}="+value+"";
form.submit();
} else if ("NE" == mode) {
// new eft account
-
form.action="<@ofbizUrl>updateCheckoutOptions/editeftaccount?DONE_PAGE=checkoutpayment";
+
form.action="<@ofbizUrl>updateCheckoutOptions/editeftaccount?DONE_PAGE=checkoutpayment=${shoppingCart.getPartyId()}";
form.submit();
} else if ("EE" == mode) {
// edit eft account
-
form.action="<@ofbizUrl>updateCheckoutOptions/editeftaccount?DONE_PAGE=checkoutpayment="+value+"";
+
form.action="<@ofbizUrl>updateCheckoutOptions/editeftaccount?DONE_PAGE=checkoutpayment=${shoppingCart.getPartyId()}="+value+"";
form.submit();
}else if(mode = "EG")
//edit gift card
-
form.action="<@ofbizUrl>updateCheckoutOptions/editgiftcard?DONE_PAGE=checkoutpayment="+value+"";
+
form.action="<@ofbizUrl>updateCheckoutOptions/editgiftcard?DONE_PAGE=checkoutpayment=${shoppingCart.getPartyId()}="+value+"";
form.submit();
}
//]]>
Modified:
ofbiz/ofbiz-framework/trunk/applications/party/template/party/EditCreditCard.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/template/party/EditCreditCard.ftl?rev=1851319=1851318=1851319=diff
==
---
ofbiz/ofbiz-framework/trunk/applications/party/template/party/EditCreditCard.ftl
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/party/template/party/EditCreditCard.ftl
Tue Jan 15 07:43:36 2019
@@ -28,7 +28,7 @@ under the License.
- ${uiLabelMap.CommonCancelDone}
+ ${uiLabelMap.CommonCancelDone}
${uiLabelMap.CommonSave}
<#if !creditCard??>
@@ -37,7 +37,7 @@ under the License.
-
+
${screens.render("component://accounting/widget/CommonScreens.xml#creditCardFields")}
Modified:
ofbiz/ofbiz-framework/trunk/applications/party/template/party/EditEftAccount.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/template/party/EditEftAccount.ftl?rev=1851319=1851318=1851319=diff
==
---
ofbiz/ofbiz-framework/trunk/applications/party/template/party/EditEftAccount.ftl
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/party/template/party/EditEftAccount.ftl
Tue Jan 15 07:43:36 2019
@@ -28,7 +28,7 @@ under the License.
- ${uiLabelMap.CommonCancelDone}
+ ${uiLabelMap.CommonCancelDone}
${uiLabelMap.CommonSave}
<#if !eftAccount??>
@@ -37,7 +37,7 @@ under the License.
-
svn commit: r1851318 - in /ofbiz/ofbiz-plugins/branches/release18.12: ./ example/config/ExampleUiLabels.xml example/widget/example/FormWidgetExampleForms.xml
Author: adityasharma
Date: Tue Jan 15 04:59:33 2019
New Revision: 1851318
URL: http://svn.apache.org/viewvc?rev=1851318=rev
Log:
Applied fix from trunk for revision: 1851316
===
Improved: Replace Inline js with External js in renderDateFindField macro
(OFBIZ-9850)
Added an example in FormWidgetExamples for the field.
Modified:
ofbiz/ofbiz-plugins/branches/release18.12/ (props changed)
ofbiz/ofbiz-plugins/branches/release18.12/example/config/ExampleUiLabels.xml
ofbiz/ofbiz-plugins/branches/release18.12/example/widget/example/FormWidgetExampleForms.xml
Propchange: ofbiz/ofbiz-plugins/branches/release18.12/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 15 04:59:33 2019
@@ -10,4 +10,4 @@
/ofbiz/branches/json-integration-refactoring/plugins:1634077-1635900
/ofbiz/branches/multitenant20100310/plugins:921280-927264
/ofbiz/branches/release13.07/plugins:1547657
-/ofbiz/ofbiz-plugins/trunk:1851002,1851009,1851068,1851135,1851139-1851140,1851185
+/ofbiz/ofbiz-plugins/trunk:1851002,1851009,1851068,1851135,1851139-1851140,1851185,1851316
Modified:
ofbiz/ofbiz-plugins/branches/release18.12/example/config/ExampleUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release18.12/example/config/ExampleUiLabels.xml?rev=1851318=1851317=1851318=diff
==
---
ofbiz/ofbiz-plugins/branches/release18.12/example/config/ExampleUiLabels.xml
(original)
+++
ofbiz/ofbiz-plugins/branches/release18.12/example/config/ExampleUiLabels.xml
Tue Jan 15 04:59:33 2019
@@ -175,6 +175,15 @@
使ç¨æ¥é¿=1 (缺ç), 5, 10, 15, 30
使ç¨æ¥é·=1 (é è¨), 5, 10, 15, 30
+
+Field13: Date Find Field (Default type:
timestamp)
+
+
+Field14: Date Find Field of type date
+
+
+Field14: Date Find Field of type time
+
Field1: date and time selection field
Champ 1 : sélection de date et temps
Modified:
ofbiz/ofbiz-plugins/branches/release18.12/example/widget/example/FormWidgetExampleForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release18.12/example/widget/example/FormWidgetExampleForms.xml?rev=1851318=1851317=1851318=diff
==
---
ofbiz/ofbiz-plugins/branches/release18.12/example/widget/example/FormWidgetExampleForms.xml
(original)
+++
ofbiz/ofbiz-plugins/branches/release18.12/example/widget/example/FormWidgetExampleForms.xml
Tue Jan 15 04:59:33 2019
@@ -113,6 +113,27 @@ under the License.
tooltip="${uiLabelMap.ExampleDateField12Tooltip}"
tooltip-style="button-text">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
svn commit: r1851317 - in /ofbiz/ofbiz-framework/branches/release18.12: ./ themes/common-theme/template/macro/HtmlFormMacroLibrary.ftl
Author: adityasharma
Date: Tue Jan 15 04:58:24 2019
New Revision: 1851317
URL: http://svn.apache.org/viewvc?rev=1851317=rev
Log:
Applied fix from trunk for revision: 1851315
===
Improved: Replace Inline js with External js in renderDateFindField macro
(OFBIZ-9850)
Modified:
ofbiz/ofbiz-framework/branches/release18.12/ (props changed)
ofbiz/ofbiz-framework/branches/release18.12/themes/common-theme/template/macro/HtmlFormMacroLibrary.ftl
Propchange: ofbiz/ofbiz-framework/branches/release18.12/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 15 04:58:24 2019
@@ -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:1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850914,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158,1851200,1851224,1851247,1851254
+/ofbiz/ofbiz-framework/trunk:1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850914,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158,1851200,1851224,1851247,1851254,1851315
Modified:
ofbiz/ofbiz-framework/branches/release18.12/themes/common-theme/template/macro/HtmlFormMacroLibrary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/themes/common-theme/template/macro/HtmlFormMacroLibrary.ftl?rev=1851317=1851316=1851317=diff
==
---
ofbiz/ofbiz-framework/branches/release18.12/themes/common-theme/template/macro/HtmlFormMacroLibrary.ftl
(original)
+++
ofbiz/ofbiz-framework/branches/release18.12/themes/common-theme/template/macro/HtmlFormMacroLibrary.ftl
Tue Jan 15 04:58:24 2019
@@ -402,31 +402,20 @@ under the License.
<#if conditionGroup?has_content>
+ <#if dateType != "time">
+<#local className = className + " date-time-picker"/>
+
+ <#local shortDateInput = "date" == dateType/>
-<#if name?has_content> name="${name?html}_fld0_value"<#if
localizedInputTitle?has_content> title="${localizedInputTitle}"<#if
value?has_content> value="${value}"<#if size?has_content>
size="${size}"<#if maxlength?has_content>
maxlength="${maxlength}"/><#if tabindex?has_content>
tabindex="${tabindex}"<#rt/>
-<#if dateType != "time">
-
-<#if "date" == dateType>
- jQuery("#${id}_fld0_value").datepicker({
-<#else>
- jQuery("#${id}_fld0_value").datetimepicker({
-showSecond: true,
-<#-- showMillisec: true, -->
-timeFormat: 'HH:mm:ss',
-stepHour: 1,
-stepMinute: 5,
-stepSecond: 10,
-
-showWeek: true,
-showOn: 'button',
-buttonImage: '',
-buttonText: '',
-buttonImageOnly: false,
-dateFormat: 'yy-mm-dd'
- });
-
- <#rt/>
-
+
+<#if name?has_content> name="${name?html}_fld0_value"
+<#if localizedInputTitle?has_content>
title="${localizedInputTitle}"
+<#if value?has_content> value="${value}"
+<#if size?has_content> size="${size}"
+<#if maxlength?has_content> maxlength="${maxlength}"
+<#if tabindex?has_content> tabindex="${tabindex}"<#rt/>
+ data-shortdate="${shortDateInput?string}"
+/>
<#if titleStyle?has_content>
<#rt/>
@@ -440,30 +429,14 @@ under the License.
<#rt/>
<#rt/>
-<#if name?has_content> name="${name}_fld1_value"<#if
localizedInputTitle??> title="${localizedInputTitle?html}"<#if
value2?has_content> value="${value2}"<#if size?has_content>
size="${size}"<#if maxlength?has_content>
maxlength="${maxlength}"/><#rt/>
-<#if dateType != "time">
-
-<#if "date" == dateType>
- jQuery("#${id}_fld1_value").datepicker({
-<#else>
- jQuery("#${id}_fld1_value").datetimepicker({
-showSecond: true,
-<#-- showMillisec: true, -->
-timeFormat: 'HH:mm:ss',
-stepHour: 1,
-stepMinute: 5,
-stepSecond: 10,
-
-showWeek: true,
-showOn: 'button',
-buttonImage: '',
-buttonText: '',
-buttonImageOnly: false,
-dateFormat: 'yy-mm-dd'
- });
-
- <#rt/>
-
+
+<#if name?has_content> name="${name}_fld1_value"
+<#if localizedInputTitle??> title="${localizedInputTitle?html}"
+<#if value2?has_content> value="${value2}"
+<#if size?has_content> size="${size}"
+<#if maxlength?has_content> maxlength="${maxlength}"
+ data-shortdate="${shortDateInput?string}"
+/><#rt/>
<#if titleStyle?has_content>
<#rt/>
svn commit: r1851316 - in /ofbiz/ofbiz-plugins/trunk/example: config/ExampleUiLabels.xml widget/example/FormWidgetExampleForms.xml
Author: adityasharma
Date: Tue Jan 15 04:57:08 2019
New Revision: 1851316
URL: http://svn.apache.org/viewvc?rev=1851316=rev
Log:
Improved: Replace Inline js with External js in renderDateFindField macro
(OFBIZ-9850)
Added an example in FormWidgetExamples for the field.
Modified:
ofbiz/ofbiz-plugins/trunk/example/config/ExampleUiLabels.xml
ofbiz/ofbiz-plugins/trunk/example/widget/example/FormWidgetExampleForms.xml
Modified: ofbiz/ofbiz-plugins/trunk/example/config/ExampleUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/example/config/ExampleUiLabels.xml?rev=1851316=1851315=1851316=diff
==
--- ofbiz/ofbiz-plugins/trunk/example/config/ExampleUiLabels.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/example/config/ExampleUiLabels.xml Tue Jan 15
04:57:08 2019
@@ -175,6 +175,15 @@
使ç¨æ¥é¿=1 (缺ç), 5, 10, 15, 30
使ç¨æ¥é·=1 (é è¨), 5, 10, 15, 30
+
+Field13: Date Find Field (Default type:
timestamp)
+
+
+Field14: Date Find Field of type date
+
+
+Field14: Date Find Field of type time
+
Field1: date and time selection field
Champ 1 : sélection de date et temps
Modified:
ofbiz/ofbiz-plugins/trunk/example/widget/example/FormWidgetExampleForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/example/widget/example/FormWidgetExampleForms.xml?rev=1851316=1851315=1851316=diff
==
--- ofbiz/ofbiz-plugins/trunk/example/widget/example/FormWidgetExampleForms.xml
(original)
+++ ofbiz/ofbiz-plugins/trunk/example/widget/example/FormWidgetExampleForms.xml
Tue Jan 15 04:57:08 2019
@@ -113,6 +113,27 @@ under the License.
tooltip="${uiLabelMap.ExampleDateField12Tooltip}"
tooltip-style="button-text">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
svn commit: r1851315 - /ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/HtmlFormMacroLibrary.ftl
Author: adityasharma
Date: Tue Jan 15 04:55:27 2019
New Revision: 1851315
URL: http://svn.apache.org/viewvc?rev=1851315=rev
Log:
Improved: Replace Inline js with External js in renderDateFindField macro
(OFBIZ-9850)
Modified:
ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/HtmlFormMacroLibrary.ftl
Modified:
ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/HtmlFormMacroLibrary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/HtmlFormMacroLibrary.ftl?rev=1851315=1851314=1851315=diff
==
---
ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/HtmlFormMacroLibrary.ftl
(original)
+++
ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/HtmlFormMacroLibrary.ftl
Tue Jan 15 04:55:27 2019
@@ -402,31 +402,20 @@ under the License.
<#if conditionGroup?has_content>
+ <#if dateType != "time">
+<#local className = className + " date-time-picker"/>
+
+ <#local shortDateInput = "date" == dateType/>
-<#if name?has_content> name="${name?html}_fld0_value"<#if
localizedInputTitle?has_content> title="${localizedInputTitle}"<#if
value?has_content> value="${value}"<#if size?has_content>
size="${size}"<#if maxlength?has_content>
maxlength="${maxlength}"/><#if tabindex?has_content>
tabindex="${tabindex}"<#rt/>
-<#if dateType != "time">
-
-<#if "date" == dateType>
- jQuery("#${id}_fld0_value").datepicker({
-<#else>
- jQuery("#${id}_fld0_value").datetimepicker({
-showSecond: true,
-<#-- showMillisec: true, -->
-timeFormat: 'HH:mm:ss',
-stepHour: 1,
-stepMinute: 5,
-stepSecond: 10,
-
-showWeek: true,
-showOn: 'button',
-buttonImage: '',
-buttonText: '',
-buttonImageOnly: false,
-dateFormat: 'yy-mm-dd'
- });
-
- <#rt/>
-
+
+<#if name?has_content> name="${name?html}_fld0_value"
+<#if localizedInputTitle?has_content>
title="${localizedInputTitle}"
+<#if value?has_content> value="${value}"
+<#if size?has_content> size="${size}"
+<#if maxlength?has_content> maxlength="${maxlength}"
+<#if tabindex?has_content> tabindex="${tabindex}"<#rt/>
+ data-shortdate="${shortDateInput?string}"
+/>
<#if titleStyle?has_content>
<#rt/>
@@ -440,30 +429,14 @@ under the License.
<#rt/>
<#rt/>
-<#if name?has_content> name="${name}_fld1_value"<#if
localizedInputTitle??> title="${localizedInputTitle?html}"<#if
value2?has_content> value="${value2}"<#if size?has_content>
size="${size}"<#if maxlength?has_content>
maxlength="${maxlength}"/><#rt/>
-<#if dateType != "time">
-
-<#if "date" == dateType>
- jQuery("#${id}_fld1_value").datepicker({
-<#else>
- jQuery("#${id}_fld1_value").datetimepicker({
-showSecond: true,
-<#-- showMillisec: true, -->
-timeFormat: 'HH:mm:ss',
-stepHour: 1,
-stepMinute: 5,
-stepSecond: 10,
-
-showWeek: true,
-showOn: 'button',
-buttonImage: '',
-buttonText: '',
-buttonImageOnly: false,
-dateFormat: 'yy-mm-dd'
- });
-
- <#rt/>
-
+
+<#if name?has_content> name="${name}_fld1_value"
+<#if localizedInputTitle??> title="${localizedInputTitle?html}"
+<#if value2?has_content> value="${value2}"
+<#if size?has_content> size="${size}"
+<#if maxlength?has_content> maxlength="${maxlength}"
+ data-shortdate="${shortDateInput?string}"
+/><#rt/>
<#if titleStyle?has_content>
<#rt/>
svn commit: r1851258 - /ofbiz/ofbiz-framework/branches/release17.12/applications/product/src/main/java/org/apache/ofbiz/product/config/ProductConfigWrapper.java
Author: mbrohl
Date: Mon Jan 14 14:32:22 2019
New Revision: 1851258
URL: http://svn.apache.org/viewvc?rev=1851258=rev
Log:
Fixed: Blank page is displayed on ecommerce
(OFBIZ-10741)
Fixed recursions in hashCode methods introduced wth OFBIZ-9774.
Thanks Arpit Mor for reporting, Jacques Le Roux amd Priya Sharma for
review and helpful hints.
Modified:
ofbiz/ofbiz-framework/branches/release17.12/applications/product/src/main/java/org/apache/ofbiz/product/config/ProductConfigWrapper.java
Modified:
ofbiz/ofbiz-framework/branches/release17.12/applications/product/src/main/java/org/apache/ofbiz/product/config/ProductConfigWrapper.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/product/src/main/java/org/apache/ofbiz/product/config/ProductConfigWrapper.java?rev=1851258=1851257=1851258=diff
==
---
ofbiz/ofbiz-framework/branches/release17.12/applications/product/src/main/java/org/apache/ofbiz/product/config/ProductConfigWrapper.java
(original)
+++
ofbiz/ofbiz-framework/branches/release17.12/applications/product/src/main/java/org/apache/ofbiz/product/config/ProductConfigWrapper.java
Mon Jan 14 14:32:22 2019
@@ -21,14 +21,7 @@ package org.apache.ofbiz.product.config;
import java.io.Serializable;
import java.math.BigDecimal;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.UtilMisc;
@@ -524,25 +517,18 @@ public class ProductConfigWrapper implem
}
@Override
-public boolean equals(Object obj) {
-if (obj == null || !(obj instanceof ConfigItem)) {
-return false;
-}
-ConfigItem ci = (ConfigItem)obj;
-if
(!configItem.getString("configItemId").equals(ci.getConfigItem().getString("configItemId")))
{
-return false;
-}
-List opts = ci.getOptions();
-if (options.size() != opts.size()) {
-return false;
-}
-for (int i = 0; i < options.size(); i++) {
-ConfigOption co = options.get(i);
-if (!co.equals(opts.get(i))) {
-return false;
-}
-}
-return true;
+public boolean equals(Object o) {
+if (this == o) return true;
+if (o == null || getClass() != o.getClass()) return false;
+ConfigItem that = (ConfigItem) o;
+return Objects.equals(getConfigItem(), that.getConfigItem()) &&
+Objects.equals(getConfigItemAssoc(),
that.getConfigItemAssoc()) &&
+Objects.equals(getOptions(), that.getOptions());
+}
+
+@Override
+public int hashCode() {
+return Objects.hash(getConfigItem(), getConfigItemAssoc(),
getOptions());
}
@Override
@@ -786,41 +772,27 @@ public class ProductConfigWrapper implem
return componentOptions;
}
-
@Override
-public int hashCode() {
-final int prime = 31;
-int result = 1;
-result = prime * result + getOuterType().hashCode();
-result = prime * result + ((componentList == null) ? 0 :
componentList.hashCode());
-result = prime * result + ((componentOptions == null) ? 0 :
componentOptions.hashCode());
-return result;
+public boolean equals(Object o) {
+if (this == o) return true;
+if (o == null || getClass() != o.getClass()) return false;
+ConfigOption that = (ConfigOption) o;
+return Objects.equals(availabilityDate, that.availabilityDate) &&
+Objects.equals(componentList, that.componentList) &&
+Objects.equals(getComponentOptions(),
that.getComponentOptions()) &&
+Objects.equals(configOption, that.configOption);
}
-
@Override
-public boolean equals(Object obj) {
-if (obj == null || !(obj instanceof ConfigOption)) {
-return false;
-}
-ConfigOption co = (ConfigOption)obj;
-if (componentOptions != null &&
!componentOptions.equals(co.getComponentOptions())) {
-return false;
-}
-
-return isSelected() == co.isSelected();
+public int hashCode() {
+return Objects.hash(availabilityDate, componentList,
getComponentOptions(), configOption);
}
-
@Override
public String toString() {
return configOption.getString("configItemId") + "/" +
configOption.getString("configOptionId") + (isSelected()? "*": "");
buildbot failure in on ofbizTrunkFramework
The Buildbot has detected a new failure on builder ofbizTrunkFramework while building . Full details are available at: https://ci.apache.org/builders/ofbizTrunkFramework/builds/635 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'onTrunkFrameworkCommit' triggered this build Build Source Stamp: [branch ofbiz/ofbiz-framework/trunk] 1851254 Blamelist: mbrohl BUILD FAILED: failed shell_2 Sincerely, -The Buildbot
svn commit: r1851255 - in /ofbiz/ofbiz-framework/branches/release18.12: ./ applications/product/src/main/java/org/apache/ofbiz/product/config/ProductConfigWrapper.java
Author: mbrohl
Date: Mon Jan 14 14:13:27 2019
New Revision: 1851255
URL: http://svn.apache.org/viewvc?rev=1851255=rev
Log:
Applied fix from trunk for revision: 1851254
===
Fixed: Blank page is displayed on ecommerce
(OFBIZ-10741)
Fixed recursions in hashCode methods introduced wth OFBIZ-9774.
Thanks Arpit Mor for reporting, Jacques Le Roux amd Priya Sharma for
review and helpful hints.
Modified:
ofbiz/ofbiz-framework/branches/release18.12/ (props changed)
ofbiz/ofbiz-framework/branches/release18.12/applications/product/src/main/java/org/apache/ofbiz/product/config/ProductConfigWrapper.java
Propchange: ofbiz/ofbiz-framework/branches/release18.12/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 14 14:13:27 2019
@@ -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:1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850914,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158,1851200,1851224,1851247
+/ofbiz/ofbiz-framework/trunk:1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850914,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158,1851200,1851224,1851247,1851254
Modified:
ofbiz/ofbiz-framework/branches/release18.12/applications/product/src/main/java/org/apache/ofbiz/product/config/ProductConfigWrapper.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/applications/product/src/main/java/org/apache/ofbiz/product/config/ProductConfigWrapper.java?rev=1851255=1851254=1851255=diff
==
---
ofbiz/ofbiz-framework/branches/release18.12/applications/product/src/main/java/org/apache/ofbiz/product/config/ProductConfigWrapper.java
(original)
+++
ofbiz/ofbiz-framework/branches/release18.12/applications/product/src/main/java/org/apache/ofbiz/product/config/ProductConfigWrapper.java
Mon Jan 14 14:13:27 2019
@@ -531,36 +531,25 @@ public class ProductConfigWrapper implem
}
@Override
-public boolean equals(Object obj) {
-if (obj == null || !(obj instanceof ConfigItem)) {
-return false;
-}
-ConfigItem ci = (ConfigItem)obj;
-if
(!configItem.getString("configItemId").equals(ci.getConfigItem().getString("configItemId")))
{
-return false;
-}
-List opts = ci.getOptions();
-if (options.size() != opts.size()) {
-return false;
-}
-for (int i = 0; i < options.size(); i++) {
-ConfigOption co = options.get(i);
-if (!co.equals(opts.get(i))) {
-return false;
-}
-}
-return true;
+public boolean equals(Object o) {
+if (this == o) return true;
+if (o == null || getClass() != o.getClass()) return false;
+ConfigItem that = (ConfigItem) o;
+return Objects.equals(getConfigItem(), that.getConfigItem()) &&
+Objects.equals(getConfigItemAssoc(),
that.getConfigItemAssoc()) &&
+Objects.equals(getOptions(), that.getOptions());
}
@Override
-public String toString() {
-return configItem.getString("configItemId");
+public int hashCode() {
+return Objects.hash(getConfigItem(), getConfigItemAssoc(),
getOptions());
}
@Override
-public int hashCode() {
-return Objects.hash(configItem, configItemAssoc, content, options,
first);
+public String toString() {
+return configItem.getString("configItemId");
}
+
}
public class ConfigOption implements java.io.Serializable {
@@ -815,41 +804,27 @@ public class ProductConfigWrapper implem
return componentOptions;
}
-
@Override
-public int hashCode() {
-final int prime = 31;
-int result = 1;
-result = prime * result + getOuterType().hashCode();
-result = prime * result + ((componentList == null) ? 0 :
componentList.hashCode());
-result = prime * result + ((componentOptions == null) ? 0 :
componentOptions.hashCode());
-return result;
+public boolean equals(Object o) {
+if (this == o) return true;
+if (o == null || getClass() != o.getClass()) return false;
+ConfigOption that = (ConfigOption) o;
+return Objects.equals(availabilityDate, that.availabilityDate) &&
+Objects.equals(componentList, that.componentList) &&
+Objects.equals(getComponentOptions(),
that.getComponentOptions()) &&
+
svn commit: r1851254 - /ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/config/ProductConfigWrapper.java
Author: mbrohl
Date: Mon Jan 14 14:07:35 2019
New Revision: 1851254
URL: http://svn.apache.org/viewvc?rev=1851254=rev
Log:
Fixed: Blank page is displayed on ecommerce
(OFBIZ-10741)
Fixed recursions in hashCode methods introduced wth OFBIZ-9774.
Thanks Arpit Mor for reporting, Jacques Le Roux amd Priya Sharma for
review and helpful hints.
Modified:
ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/config/ProductConfigWrapper.java
Modified:
ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/config/ProductConfigWrapper.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/config/ProductConfigWrapper.java?rev=1851254=1851253=1851254=diff
==
---
ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/config/ProductConfigWrapper.java
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/config/ProductConfigWrapper.java
Mon Jan 14 14:07:35 2019
@@ -531,36 +531,25 @@ public class ProductConfigWrapper implem
}
@Override
-public boolean equals(Object obj) {
-if (obj == null || !(obj instanceof ConfigItem)) {
-return false;
-}
-ConfigItem ci = (ConfigItem)obj;
-if
(!configItem.getString("configItemId").equals(ci.getConfigItem().getString("configItemId")))
{
-return false;
-}
-List opts = ci.getOptions();
-if (options.size() != opts.size()) {
-return false;
-}
-for (int i = 0; i < options.size(); i++) {
-ConfigOption co = options.get(i);
-if (!co.equals(opts.get(i))) {
-return false;
-}
-}
-return true;
+public boolean equals(Object o) {
+if (this == o) return true;
+if (o == null || getClass() != o.getClass()) return false;
+ConfigItem that = (ConfigItem) o;
+return Objects.equals(getConfigItem(), that.getConfigItem()) &&
+Objects.equals(getConfigItemAssoc(),
that.getConfigItemAssoc()) &&
+Objects.equals(getOptions(), that.getOptions());
}
@Override
-public String toString() {
-return configItem.getString("configItemId");
+public int hashCode() {
+return Objects.hash(getConfigItem(), getConfigItemAssoc(),
getOptions());
}
@Override
-public int hashCode() {
-return Objects.hash(configItem, configItemAssoc, content, options,
first);
+public String toString() {
+return configItem.getString("configItemId");
}
+
}
public class ConfigOption implements java.io.Serializable {
@@ -815,41 +804,27 @@ public class ProductConfigWrapper implem
return componentOptions;
}
-
@Override
-public int hashCode() {
-final int prime = 31;
-int result = 1;
-result = prime * result + getOuterType().hashCode();
-result = prime * result + ((componentList == null) ? 0 :
componentList.hashCode());
-result = prime * result + ((componentOptions == null) ? 0 :
componentOptions.hashCode());
-return result;
+public boolean equals(Object o) {
+if (this == o) return true;
+if (o == null || getClass() != o.getClass()) return false;
+ConfigOption that = (ConfigOption) o;
+return Objects.equals(availabilityDate, that.availabilityDate) &&
+Objects.equals(componentList, that.componentList) &&
+Objects.equals(getComponentOptions(),
that.getComponentOptions()) &&
+Objects.equals(configOption, that.configOption);
}
-
@Override
-public boolean equals(Object obj) {
-if (obj == null || !(obj instanceof ConfigOption)) {
-return false;
-}
-ConfigOption co = (ConfigOption)obj;
-if (componentOptions != null &&
!componentOptions.equals(co.getComponentOptions())) {
-return false;
-}
-
-return isSelected() == co.isSelected();
+public int hashCode() {
+return Objects.hash(availabilityDate, componentList,
getComponentOptions(), configOption);
}
-
@Override
public String toString() {
return configOption.getString("configItemId") + "/" +
configOption.getString("configOptionId") + (isSelected()? "*": "");
}
-private ProductConfigWrapper getOuterType() {
-return ProductConfigWrapper.this;
-}
-
svn commit: r1851250 - in /ofbiz/branches/release16.11: ./ framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
Author: jleroux Date: Mon Jan 14 13:54:52 2019 New Revision: 1851250 URL: http://svn.apache.org/viewvc?rev=1851250=rev Log: "Applied fix from trunk framework for revision: 1851247" r1851247 | jleroux | 2019-01-14 14:53:18 +0100 (lun. 14 janv. 2019) | 13 lignes Fixed: User's name is displayed on ecommerce even after user logs out (OFBIZ-10666) On further investigation, I found that cookie path and domain are different in the methods of creating the auto-login cookie i.e. LoginWorker.autoLoginSet() and removing the auto-login cookie i.e. LoginWorker.autoLoginRemove(). After following changes the issue seems to be fixed: 1. Removed getMaxAge() check from the condition used in LoginWorker.getAutoUserLoginId() method. 2. Corrected the path and domain in the method LoginWorker.autoLoginRemove(). Thanks: Deepak Nigam for discussion and fix Modified: ofbiz/branches/release16.11/ (props changed) ofbiz/branches/release16.11/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java Propchange: ofbiz/branches/release16.11/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jan 14 13:54:52 2019 @@ -10,5 +10,5 @@ /ofbiz/branches/json-integration-refactoring:1634077-1635900 /ofbiz/branches/multitenant20100310:921280-927264 /ofbiz/branches/release13.07:1547657 -/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1793300,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262-1801263,1801273-1801274,1801303,1801318-1801319,1801336,1801340,1801346,1801349-1801350,1801359,1801742,1802657,1802766,1803525,1804656,1804843,1804847,1804859,1805143,1805558,1805880,1806036,1806220,1806266,1806269,1806951,1807597,1807890,1808834,1809399,1809429,1809594,1809741,1810102,1811794,1812387,1813600,1813617,1813647,1813833,1814277,1814319,1814349,1814392,1814501,1814591,1814642,1814644,1814709,1814873,1814928,1814934,1815059,1816264,1816273,1816289, 1816291,1816297,1816369,1816373,1816461,1816635,1816795,1818101,1818269,1818273,1818402,1819122,1819136,1819144,1819811,1820823,1820949,1820966,1821012,1821036,1821613,1821965,1822310,1822377,1822383,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825233,1825262,1825444,1825450,1826374,1826592,1826671,1826805,1826938,1828255,1830936,1831234,1831608,1831831,1832577,1832662,1832756,1832944,1833211,1834181,1834191,1835235,1836144,1838032,1840189,1840199,1840828,1841657,1841662,1842372,1842921,1843225,1843893,1845418,1845420,1845466,1845544,1845552,1846214,1846594,1846632,1847398,1848263,1848336,1848398,1848444,1848449,1849191,1849193,1849275,1849528,1849540,1849567,1849693,1850015,1850023,1850530,1850685,1850914,1850918,1850948,1851200 +/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1793300,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262-1801263,1801273-1801274,1801303,1801318-1801319,1801336,1801340,1801346,1801349-1801350,1801359,1801742,1802657,1802766,1803525,1804656,1804843,1804847,1804859,1805143,1805558,1805880,1806036,1806220,1806266,1806269,1806951,1807597,1807890,1808834,1809399,1809429,1809594,1809741,1810102,1811794,1812387,1813600,1813617,1813647,1813833,1814277,1814319,1814349,1814392,1814501,1814591,1814642,1814644,1814709,1814873,1814928,1814934,1815059,1816264,1816273,1816289,
svn commit: r1851249 - in /ofbiz/ofbiz-framework/branches/release17.12: ./ framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
Author: jleroux
Date: Mon Jan 14 13:54:42 2019
New Revision: 1851249
URL: http://svn.apache.org/viewvc?rev=1851249=rev
Log:
"Applied fix from trunk for revision: 1851247"
r1851247 | jleroux | 2019-01-14 14:53:18 +0100 (lun. 14 janv. 2019) | 13 lignes
Fixed: User's name is displayed on ecommerce even after user logs out
(OFBIZ-10666)
On further investigation, I found that cookie path and domain are different
in the methods of creating the auto-login cookie i.e.
LoginWorker.autoLoginSet()
and removing the auto-login cookie i.e. LoginWorker.autoLoginRemove().
After following changes the issue seems to be fixed:
1. Removed getMaxAge() check from the condition used in
LoginWorker.getAutoUserLoginId() method.
2. Corrected the path and domain in the method LoginWorker.autoLoginRemove().
Thanks: Deepak Nigam for discussion and fix
Modified:
ofbiz/ofbiz-framework/branches/release17.12/ (props changed)
ofbiz/ofbiz-framework/branches/release17.12/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
Propchange: ofbiz/ofbiz-framework/branches/release17.12/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 14 13:54:42 2019
@@ -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,1819947,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,1826780,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,1849191,1849193,1849275,1849467,1849528,1849540,1849567,1849693,1850015,1850023,1850530,1850647,1850685,1850694,1850914,1850918,1850948,1850953,1851006,1851068,1851074,1851130,1851158,1851163,1851200
+/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1819947,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,1826780,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,1849191,1849193,1849275,1849467,1849528,1849540,1849567,1849693,1850015,1850023,1850530,1850647,1850685,1850694,1850914,1850918,1850948,1850953,1851006,1851068,1851074,1851130,1851158,1851163,1851200,1851247
Modified:
ofbiz/ofbiz-framework/branches/release17.12/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java?rev=1851249=1851248=1851249=diff
==
---
ofbiz/ofbiz-framework/branches/release17.12/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
(original)
+++
ofbiz/ofbiz-framework/branches/release17.12/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
Mon Jan 14 13:54:42 2019
@@ -742,8 +742,7 @@ public class LoginWorker {
}
svn commit: r1851248 - in /ofbiz/ofbiz-framework/branches/release18.12: ./ framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
Author: jleroux
Date: Mon Jan 14 13:54:32 2019
New Revision: 1851248
URL: http://svn.apache.org/viewvc?rev=1851248=rev
Log:
"Applied fix from trunk for revision: 1851247"
r1851247 | jleroux | 2019-01-14 14:53:18 +0100 (lun. 14 janv. 2019) | 13 lignes
Fixed: User's name is displayed on ecommerce even after user logs out
(OFBIZ-10666)
On further investigation, I found that cookie path and domain are different
in the methods of creating the auto-login cookie i.e.
LoginWorker.autoLoginSet()
and removing the auto-login cookie i.e. LoginWorker.autoLoginRemove().
After following changes the issue seems to be fixed:
1. Removed getMaxAge() check from the condition used in
LoginWorker.getAutoUserLoginId() method.
2. Corrected the path and domain in the method LoginWorker.autoLoginRemove().
Thanks: Deepak Nigam for discussion and fix
Modified:
ofbiz/ofbiz-framework/branches/release18.12/ (props changed)
ofbiz/ofbiz-framework/branches/release18.12/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
Propchange: ofbiz/ofbiz-framework/branches/release18.12/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 14 13:54:32 2019
@@ -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:1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850914,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158,1851200,1851224
+/ofbiz/ofbiz-framework/trunk:1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850914,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158,1851200,1851224,1851247
Modified:
ofbiz/ofbiz-framework/branches/release18.12/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java?rev=1851248=1851247=1851248=diff
==
---
ofbiz/ofbiz-framework/branches/release18.12/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
(original)
+++
ofbiz/ofbiz-framework/branches/release18.12/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
Mon Jan 14 13:54:32 2019
@@ -975,8 +975,7 @@ public class LoginWorker {
}
if (cookies != null) {
for (Cookie cookie: cookies) {
-if (cookie.getName().equals(getAutoLoginCookieName(request))
-&& cookie.getMaxAge() > 0) {
+if (cookie.getName().equals(getAutoLoginCookieName(request))) {
autoUserLoginId = cookie.getValue();
break;
}
@@ -1052,9 +1051,11 @@ public class LoginWorker {
// remove the cookie
if (userLogin != null) {
+Delegator delegator = (Delegator)
request.getAttribute("delegator");
Cookie autoLoginCookie = new
Cookie(getAutoLoginCookieName(request), userLogin.getString("userLoginId"));
autoLoginCookie.setMaxAge(0);
-autoLoginCookie.setPath("/");
+
autoLoginCookie.setDomain(EntityUtilProperties.getPropertyValue("url",
"cookie.domain", delegator));
+autoLoginCookie.setPath("/" +
UtilHttp.getApplicationName(request));
response.addCookie(autoLoginCookie);
}
// remove the session attributes
svn commit: r1851247 - /ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
Author: jleroux
Date: Mon Jan 14 13:53:18 2019
New Revision: 1851247
URL: http://svn.apache.org/viewvc?rev=1851247=rev
Log:
Fixed: User's name is displayed on ecommerce even after user logs out
(OFBIZ-10666)
On further investigation, I found that cookie path and domain are different
in the methods of creating the auto-login cookie i.e.
LoginWorker.autoLoginSet()
and removing the auto-login cookie i.e. LoginWorker.autoLoginRemove().
After following changes the issue seems to be fixed:
1. Removed getMaxAge() check from the condition used in
LoginWorker.getAutoUserLoginId() method.
2. Corrected the path and domain in the method LoginWorker.autoLoginRemove().
Thanks: Deepak Nigam for discussion and fix
Modified:
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
Modified:
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java?rev=1851247=1851246=1851247=diff
==
---
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
Mon Jan 14 13:53:18 2019
@@ -975,8 +975,7 @@ public class LoginWorker {
}
if (cookies != null) {
for (Cookie cookie: cookies) {
-if (cookie.getName().equals(getAutoLoginCookieName(request))
-&& cookie.getMaxAge() > 0) {
+if (cookie.getName().equals(getAutoLoginCookieName(request))) {
autoUserLoginId = cookie.getValue();
break;
}
@@ -1052,9 +1051,11 @@ public class LoginWorker {
// remove the cookie
if (userLogin != null) {
+Delegator delegator = (Delegator)
request.getAttribute("delegator");
Cookie autoLoginCookie = new
Cookie(getAutoLoginCookieName(request), userLogin.getString("userLoginId"));
autoLoginCookie.setMaxAge(0);
-autoLoginCookie.setPath("/");
+
autoLoginCookie.setDomain(EntityUtilProperties.getPropertyValue("url",
"cookie.domain", delegator));
+autoLoginCookie.setPath("/" +
UtilHttp.getApplicationName(request));
response.addCookie(autoLoginCookie);
}
// remove the session attributes
