svn commit: r1809742 - in /ofbiz/branches/release16.11: ./ framework/webtools/config/WebtoolsUiLabels.xml framework/webtools/widget/ServiceScreens.xml

Author: jleroux
Date: Tue Sep 26 13:19:46 2017
New Revision: 1809742

URL: http://svn.apache.org/viewvc?rev=1809742&view=rev
Log:
"Applied fix from trunk framework for revision: 1809741  "
------------------------------------------------------------------------
r1809741 | jleroux | 2017-09-26 15:15:12 +0200 (mar., 26 sept. 2017) | 7 lines

Fixed: Transaction Timeout in JavaEventHandler
(OFBIZ-9725)

When you run a service from webtools (not scheduling it) the the duration of the
 service is limited to the transaction default timeout (60 seconds)

Thanks: Jeffrey Breault for report
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release16.11/   (props changed)
    ofbiz/branches/release16.11/framework/webtools/config/WebtoolsUiLabels.xml
    ofbiz/branches/release16.11/framework/webtools/widget/ServiceScreens.xml

Propchange: ofbiz/branches/release16.11/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 26 13:19:46 2017
@@ -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,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,1801359,1801742,1802657,1802766,1803525,1804319,1804656,1804843,1804847,1804859,1805143,1805558,1805880,1806036,1806220,1806266,1806269,1806951,1807597,1807890,1808834,1809399,1809429,1809594
+/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,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,1801359,1801742,1802657,1802766,1803525,1804319,1804656,1804843,1804847,1804859,1805143,1805558,1805880,1806036,1806220,1806266,1806269,1806951,1807597,1807890,1808834,1809399,1809429,1809594,1809741
 /ofbiz/trunk:1770481,1770490,1770540,1771440,1771448,1771516,1771935,1772346,1772880,1774772,1775441,1779724,1780659,1781109,1781125,1781979,1782498,1782520

Modified: ofbiz/branches/release16.11/framework/webtools/config/WebtoolsUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/framework/webtools/config/WebtoolsUiLabels.xml?rev=1809742&r1=1809741&r2=1809742&view=diff
==============================================================================
--- ofbiz/branches/release16.11/framework/webtools/config/WebtoolsUiLabels.xml (original)
+++ ofbiz/branches/release16.11/framework/webtools/config/WebtoolsUiLabels.xml Tue Sep 26 13:19:46 2017
@@ -4734,6 +4734,10 @@
         <value xml:lang="zh">服务</value>
         <value xml:lang="zh-TW">服務</value>
     </property>
+    <property key="WebtoolsServiceLimitedTime">
+        <value xml:lang="en">Note: the duration of the service is limited to the transaction default timeout (60 seconds)</value>
+        <value xml:lang="fr">A noter : la durée du service est limitée à la valeur par défaut des transactions (60 secondes)</value>
+    </property>
     <property key="WebtoolsServiceClearPreviousParams">
         <value xml:lang="de">Vorige Parameter löschen</value>
         <value xml:lang="en">Clear previous params</value>

Modified: ofbiz/branches/release16.11/framework/webtools/widget/ServiceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/framework/webtools/widget/ServiceScreens.xml?rev=1809742&r1=1809741&r2=1809742&view=diff
==============================================================================
--- ofbiz/branches/release16.11/framework/webtools/widget/ServiceScreens.xml (original)
+++ ofbiz/branches/release16.11/framework/webtools/widget/ServiceScreens.xml Tue Sep 26 13:19:46 2017
@@ -152,6 +152,7 @@ under the License.
                 <decorator-screen name="CommonServiceDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <screenlet>
+                            <label style="h3">${uiLabelMap.WebtoolsServiceLimitedTime}</label>
                             <include-form name="RunService" location="component://webtools/widget/ServiceForms.xml"/>
                         </screenlet>
                     </decorator-section>