ofbiz-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jler...@apache.org
Subject svn commit: r1846108 - in /ofbiz/ofbiz-framework/branches/release17.12: ./ applications/product/config/ProductUiLabels.xml applications/product/widget/catalog/StoreForms.xml
Date Thu, 08 Nov 2018 09:19:53 GMT
Author: jleroux
Date: Thu Nov  8 09:19:53 2018
New Revision: 1846108

URL: http://svn.apache.org/viewvc?rev=1846108&view=rev
Log:
"Applied fix from trunk for revision: 1846107  " 
------------------------------------------------------------------------
r1846107 | jleroux | 2018-11-08 10:17:37 +0100 (jeu. 08 nov. 2018) | 6 lignes

Fixed: Stores can't be modified at catalog/control/updateProductStore
(OFBIZ-10567)

I forgot the label, here it is.
I kept the old one, could be useful elsewhere. 
I amended the English version.
------------------------------------------------------------------------

Modified:
    ofbiz/ofbiz-framework/branches/release17.12/   (props changed)
    ofbiz/ofbiz-framework/branches/release17.12/applications/product/config/ProductUiLabels.xml
    ofbiz/ofbiz-framework/branches/release17.12/applications/product/widget/catalog/StoreForms.xml

Propchange: ofbiz/ofbiz-framework/branches/release17.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov  8 09:19:53 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
+/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

Modified: ofbiz/ofbiz-framework/branches/release17.12/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/product/config/ProductUiLabels.xml?rev=1846108&r1=1846107&r2=1846108&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/applications/product/config/ProductUiLabels.xml
(original)
+++ ofbiz/ofbiz-framework/branches/release17.12/applications/product/config/ProductUiLabels.xml
Thu Nov  8 09:19:53 2018
@@ -30106,6 +30106,15 @@
         <value xml:lang="zh">店铺</value>
         <value xml:lang="zh-TW">商店</value>
     </property>
+    <property key="ProductStoreEcomThemeId">
+        <value xml:lang="de">Steuert das Aussehen Ihres Online-Shops.</value>
+        <value xml:lang="en">For controlling the look and feel of the web-based store.</value>
+        <value xml:lang="fr">Thème visuel pour la boutique en ligne.</value>
+        <value xml:lang="ja">ルック&フィールおよびWebベース店舗の設定。</value>
+        <value xml:lang="vi">Để kiểm soát cách nhìn và cảm
quan và cửa hàng trực tuyến</value>
+        <value xml:lang="zh">用于控制一个网店的外观感受。</value>
+        <value xml:lang="zh-TW">用於控制一個網店的外觀感受.</value>
+    </property>        
     <property key="ProductStoresFor">
         <value xml:lang="de">Läden für</value>
         <value xml:lang="en">Stores For</value>

Modified: ofbiz/ofbiz-framework/branches/release17.12/applications/product/widget/catalog/StoreForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/product/widget/catalog/StoreForms.xml?rev=1846108&r1=1846107&r2=1846108&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/applications/product/widget/catalog/StoreForms.xml
(original)
+++ ofbiz/ofbiz-framework/branches/release17.12/applications/product/widget/catalog/StoreForms.xml
Thu Nov  8 09:19:53 2018
@@ -222,7 +222,7 @@ under the License.
         </field>
         
         <!-- visualThemeId must be replaced by ecomThemeId because of Entity.field names
conflict. See OFBIZ-10567 -->
-        <field name="ecomThemeId" entry-name="visualThemeId">
+        <field name="ecomThemeId" entry-name="visualThemeId" title="${uiLabelMap.ProductStoreEcomThemeId}">
             <drop-down allow-empty="true">
                 <entity-options key-field-name="visualThemeId" description="${visualThemeId}
- ${description}" entity-name="VisualTheme">
                     <entity-constraint name="visualThemeSetId" operator="equals" value="ECOMMERCE"/>



Mime
View raw message