OFBiz › OFBiz - Commits

svn commit: r1804027 - in /ofbiz/ofbiz-plugins/trunk: bi/entitydef/ ebay/entitydef/ ebaystore/entitydef/ ecommerce/webapp/ecommerce/error/ example/config/ example/entitydef/ example/widget/example/ passport/entitydef/ pricat/entitydef/ webpos/entitydef/

‹ Previous Topic Next Topic ›
 
classic Classic list List threaded Threaded
♦
♦
 1 message Options
Deepak Dixit-5
Reply | Threaded
Open this post in threaded view
♦
♦
|

svn commit: r1804027 - in /ofbiz/ofbiz-plugins/trunk: bi/entitydef/ ebay/entitydef/ ebaystore/entitydef/ ecommerce/webapp/ecommerce/error/ example/config/ example/entitydef/ example/widget/example/ passport/entitydef/ pricat/entitydef/ webpos/entitydef/

Deepak Dixit-5
Author: deepak
Date: Thu Aug  3 17:54:36 2017
New Revision: 1804027

URL: http://svn.apache.org/viewvc?rev=1804027&view=rev
Log:
Improved: Replace fields with id-ne, id-long-ne and id-vlong-ne by id, id-long and id-vlong respectively which are not primary keys (OFBIZ-9355)
Thanks Aditya Sharma for your contribution.

Modified:
    ofbiz/ofbiz-plugins/trunk/bi/entitydef/entitymodel.xml
    ofbiz/ofbiz-plugins/trunk/ebay/entitydef/entitymodel.xml
    ofbiz/ofbiz-plugins/trunk/ebaystore/entitydef/entitymodel.xml
    ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/error/error.jsp
    ofbiz/ofbiz-plugins/trunk/example/config/ExampleUiLabels.xml
    ofbiz/ofbiz-plugins/trunk/example/entitydef/entitymodel.xml
    ofbiz/ofbiz-plugins/trunk/example/widget/example/FormWidgetExampleForms.xml
    ofbiz/ofbiz-plugins/trunk/passport/entitydef/entitymodel.xml
    ofbiz/ofbiz-plugins/trunk/pricat/entitydef/entitymodel.xml
    ofbiz/ofbiz-plugins/trunk/webpos/entitydef/entitymodel.xml

Modified: ofbiz/ofbiz-plugins/trunk/bi/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/bi/entitydef/entitymodel.xml?rev=1804027&r1=1804026&r2=1804027&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/bi/entitydef/entitymodel.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/bi/entitydef/entitymodel.xml Thu Aug  3 17:54:36 2017
@@ -81,7 +81,7 @@ under the License.
         <field name="dimensionId" type="id">
             <description>Unique identifier of the Currency dimension record</description>
         </field>
-        <field name="currencyId" type="id-ne">
+        <field name="currencyId" type="id">
             <description>The currency id (natural key).</description>
         </field>
         <field name="description" type="description">
@@ -95,7 +95,7 @@ under the License.
         <field name="dimensionId" type="id">
             <description>Unique identifier of the Product dimension record</description>
         </field>
-        <field name="productId" type="id-ne">
+        <field name="productId" type="id">
             <description>The natural key. From Product.productId</description>
         </field>
         <field name="productType" type="description">
@@ -113,11 +113,11 @@ under the License.
         <description>A transaction fact entity with invoice item grain.</description>
         <field name="invoiceId" type="id"></field> <!-- degenerate dimension -->
         <field name="invoiceItemSeqId" type="id"></field> <!-- degenerate dimension -->
-        <field name="orderId" type="id-ne"></field> <!-- degenerate dimension -->
-        <field name="invoiceDateDimId" type="id-ne"></field>
-        <field name="productDimId" type="id-ne"></field>
-        <field name="billToCustomerDimId" type="id-ne"></field> <!-- TODO: implement the dimension -->
-        <field name="origCurrencyDimId" type="id-ne"></field>
+        <field name="orderId" type="id"></field> <!-- degenerate dimension -->
+        <field name="invoiceDateDimId" type="id"></field>
+        <field name="productDimId" type="id"></field>
+        <field name="billToCustomerDimId" type="id"></field> <!-- TODO: implement the dimension -->
+        <field name="origCurrencyDimId" type="id"></field>
 
         <field name="quantity" type="fixed-point">
             <description>Quantity invoiced. From InvoiceItem.quantity</description>
@@ -197,15 +197,15 @@ under the License.
         <description>A transaction fact entity with order item grain.</description>
         <field name="orderId" type="id"></field> <!-- degenerate dimension -->
         <field name="orderItemSeqId" type="id"></field> <!-- degenerate dimension -->
-        <field name="orderDateDimId" type="id-ne"></field>
-        <field name="productDimId" type="id-ne"></field>
-        <field name="origCurrencyDimId" type="id-ne"></field>
-        <field name="billToCustomerDimId" type="id-ne"></field> <!-- TODO: implement the dimension -->
-
-        <field name="productCategoryId" type="id-ne"></field>
-        <field name="productStoreId" type="id-ne"></field>
-        <field name="salesChannelEnumId" type="id-ne"></field>
-        <field name="statusId" type="id-ne"></field>
+        <field name="orderDateDimId" type="id"></field>
+        <field name="productDimId" type="id"></field>
+        <field name="origCurrencyDimId" type="id"></field>
+        <field name="billToCustomerDimId" type="id"></field> <!-- TODO: implement the dimension -->
+
+        <field name="productCategoryId" type="id"></field>
+        <field name="productStoreId" type="id"></field>
+        <field name="salesChannelEnumId" type="id"></field>
+        <field name="statusId" type="id"></field>
 
         <field name="brand" type="name"></field>
         <field name="pod" type="name"></field>
@@ -259,7 +259,7 @@ under the License.
         <field name="countOrder" type="fixed-point">
             <description>Count of order.</description>
         </field>
-        <field name="productPromoCode" type="id-ne">
+        <field name="productPromoCode" type="id">
             <description>Product promotion Code.</description>
         </field>
 
@@ -281,10 +281,10 @@ under the License.
     <entity entity-name="InventoryItemFact" package-name="org.apache.ofbiz.bi.fact.product" title="Inventory Item Fact">
         <description>A transaction fact entity with inventory item.</description>
         <field name="inventoryItemId" type="id"></field>
-        <field name="facilityId" type="id-ne"></field>
-        <field name="productDimId" type="id-ne"></field>
-        <field name="origCurrencyDimId" type="id-ne"></field>
-        <field name="inventoryDateDimId" type="id-ne"></field>
+        <field name="facilityId" type="id"></field>
+        <field name="productDimId" type="id"></field>
+        <field name="origCurrencyDimId" type="id"></field>
+        <field name="inventoryDateDimId" type="id"></field>
 
         <field name="quantityOnHandTotal" type="fixed-point"></field>
         <field name="availableToPromiseTotal" type="fixed-point"></field>

Modified: ofbiz/ofbiz-plugins/trunk/ebay/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ebay/entitydef/entitymodel.xml?rev=1804027&r1=1804026&r2=1804027&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ebay/entitydef/entitymodel.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/ebay/entitydef/entitymodel.xml Thu Aug  3 17:54:36 2017
@@ -50,7 +50,7 @@ under the License.
         <field name="siteId" type="id"></field>
         <field name="xmlGatewayUri" type="value"></field>
         <field name="customXml" type="very-long"></field>
-        <field name="webSiteId" type="id-ne"></field>
+        <field name="webSiteId" type="id"></field>
         <prim-key field="productStoreId"/>      
         <relation type="one" fk-name="EBY_PROD_STORE" rel-entity-name="ProductStore">
             <key-map field-name="productStoreId"/>
@@ -68,9 +68,9 @@ under the License.
         <field name="amount" type="currency-amount"></field>
         <field name="additionalAmount" type="currency-amount"></field>
         <field name="additionalPercent" type="fixed-point"></field>
-        <field name="methodTypeEnumId" type="id-ne"></field>
-        <field name="carrierPartyId" type="id-ne"></field>
-        <field name="shipmentMethodTypeId" type="id-ne"></field>      
+        <field name="methodTypeEnumId" type="id"></field>
+        <field name="carrierPartyId" type="id"></field>
+        <field name="shipmentMethodTypeId" type="id"></field>      
         <prim-key field="shipmentMethodName"/>
         <prim-key field="productStoreId"/>
         <relation type="one" fk-name="EBYSM_PRD_STRE" rel-entity-name="ProductStore">

Modified: ofbiz/ofbiz-plugins/trunk/ebaystore/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ebaystore/entitydef/entitymodel.xml?rev=1804027&r1=1804026&r2=1804027&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ebaystore/entitydef/entitymodel.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/ebaystore/entitydef/entitymodel.xml Thu Aug  3 17:54:36 2017
@@ -37,7 +37,7 @@ under the License.
         <field name="productStoreId" type="id"></field>
         <field name="facilityId" type="id"></field>
         <field name="productId" type="id"></field>
-        <field name="folderId" type="id-ne"></field>
+        <field name="folderId" type="id"></field>
         <field name="ebayProductId" type="numeric"></field>
         <field name="quantityReserved" type="fixed-point"></field>
         <field name="availableToPromiseListing" type="fixed-point"></field>
@@ -59,12 +59,12 @@ under the License.
          title="Ebay store and Preference">
         <field name="productStoreId" type="id"/>
         <field name="autoPrefEnumId" type="id"/>
-        <field name="autoPrefJobId" type="id-ne"/>
+        <field name="autoPrefJobId" type="id"/>
         <field name="enabled" type="indicator"/>
         <field name="condition1" type="value"/>
         <field name="condition2" type="value"/>
         <field name="condition3" type="value"/>
-        <field name="parentPrefCondId" type="id-ne"></field>
+        <field name="parentPrefCondId" type="id"></field>
         <prim-key field="productStoreId"/>
         <prim-key field="autoPrefEnumId"/>
         <relation type="one" fk-name="EBY_STR_PREF" rel-entity-name="ProductStore">
@@ -81,10 +81,10 @@ under the License.
         title="eBay Product Listing">
         <field name="productListingId" type="id"/>
         <field name="itemId" type="id-long"/>
-        <field name="productStoreId" type="id-ne"/>
-        <field name="productId" type="id-ne"/>
+        <field name="productStoreId" type="id"/>
+        <field name="productId" type="id"/>
         <field name="userLoginId" type="id-vlong"/>
-        <field name="statusId" type="id-ne"/>
+        <field name="statusId" type="id"/>
         <field name="listingXml" type="very-long"/>
         <field name="startDateTime" type="date-time"/>
         <field name="endDateTime" type="date-time"/>
@@ -136,7 +136,7 @@ under the License.
         <field name="itemId" type="value"/>
         <field name="userId" type="value"/>
         <field name="bestOfferId" type="value"/>
-        <field name="productStoreId" type="id-ne"/>
+        <field name="productStoreId" type="id"/>
         <field name="contactStatus" type="value"/>
         <prim-key field="itemId"/>
         <prim-key field="userId"/>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/error/error.jsp
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/error/error.jsp?rev=1804027&r1=1804026&r2=1804027&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/error/error.jsp (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/error/error.jsp Thu Aug  3 17:54:36 2017
@@ -40,7 +40,7 @@ under the License.
           </tr>
           <tr>
             <td>
-              <div align="left"><font face="Verdana, Arial, Helvetica, sans-serif" size="2"><%=UtilFormatOut.replaceString(errorMsg, "\n", "<br/>")%></font></div>
+              <div align="left"><font face="Verdana, Arial, Helvetica, sans-serif" size="2"><%=UtilFormatOut.replaceString(errorMsg, "\n", "<br/>test message")%></font></div>
             </td>
           </tr>
         </table>

Modified: ofbiz/ofbiz-plugins/trunk/example/config/ExampleUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/example/config/ExampleUiLabels.xml?rev=1804027&r1=1804026&r2=1804027&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/example/config/ExampleUiLabels.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/example/config/ExampleUiLabels.xml Thu Aug  3 17:54:36 2017
@@ -716,6 +716,12 @@
         <value xml:lang="zh">样例首页</value>
         <value xml:lang="zh-TW">範例首頁</value>
     </property>
+    <property key="ExampleMaskField">
+        <value xml:lang="en">Mask Field</value>
+    </property>
+    <property key="ExampleMaskFieldDescription">
+        <value xml:lang="en">Here is a simple example to mask a field with given mask definition as 'a*-999-a999'.</value>
+    </property>
     <property key="ExampleMessage">
         <value xml:lang="en">For something interesting make sure you are logged in, try username:admin, password:ofbiz.</value>
         <value xml:lang="fr">Pour voir les exemples, vérifiez que vous être connecté, essayez l'utilisateur admin et le mot de passe ofbiz</value>

Modified: ofbiz/ofbiz-plugins/trunk/example/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/example/entitydef/entitymodel.xml?rev=1804027&r1=1804026&r2=1804027&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/example/entitydef/entitymodel.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/example/entitydef/entitymodel.xml Thu Aug  3 17:54:36 2017
@@ -41,8 +41,8 @@ under the License.
 
     <entity entity-name="Example" package-name="org.apache.ofbiz.example.example" title="Example Entity">
         <field name="exampleId" type="id"><description>primary sequenced ID</description></field>
-        <field name="exampleTypeId" type="id-ne"></field>
-        <field name="statusId" type="id-ne"></field>
+        <field name="exampleTypeId" type="id"></field>
+        <field name="statusId" type="id"></field>
         <field name="exampleName" type="name"></field>
         <field name="description" type="description"></field>
         <field name="longDescription" type="very-long"></field>
@@ -79,7 +79,7 @@ under the License.
         <field name="statusDate" type="date-time"></field>
         <field name="statusEndDate" type="date-time"></field>
         <field name="changeByUserLoginId" type="id-vlong"></field>
-        <field name="statusId" type="id-ne"></field>
+        <field name="statusId" type="id"></field>
         <prim-key field="exampleId"/>
         <prim-key field="statusDate"/>
         <relation type="one" fk-name="EXMPLST_EXMPL" rel-entity-name="Example">
@@ -112,7 +112,7 @@ under the License.
         package-name="org.apache.ofbiz.example.feature"
         title="Example Feature Entity">
         <field name="exampleFeatureId" type="id"><description>primary sequenced ID</description></field>
-        <field name="featureSourceEnumId" type="id-ne"></field>
+        <field name="featureSourceEnumId" type="id"></field>
         <field name="description" type="description"></field>
         <prim-key field="exampleFeatureId"/>
         <relation type="one" fk-name="EXFT_ENUM" rel-entity-name="Enumeration">
@@ -126,7 +126,7 @@ under the License.
         <field name="exampleFeatureId" type="id"></field>
         <field name="fromDate" type="date-time"></field>
         <field name="thruDate" type="date-time"></field>
-        <field name="exampleFeatureApplTypeId" type="id-ne"></field>
+        <field name="exampleFeatureApplTypeId" type="id"></field>
         <field name="sequenceNum" type="numeric"></field>
         <prim-key field="exampleId"/>
         <prim-key field="exampleFeatureId"/>

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=1804027&r1=1804026&r2=1804027&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/example/widget/example/FormWidgetExampleForms.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/example/widget/example/FormWidgetExampleForms.xml Thu Aug  3 17:54:36 2017
@@ -409,4 +409,8 @@ under the License.
             <hyperlink description="${uiLabelMap.ExampleNewExample} (Layered-modal)" target="EditExampleLayer" also-hidden="false" link-type="layered-modal"/>
         </field>
     </form>
+
+    <form name="MaskFieldExampleForm" type="single">
+        <field name="maskField" className="test" title="${uiLabelMap.ExampleField}"><text mask='a*-999-a999'/></field>
+    </form>
 </forms>

Modified: ofbiz/ofbiz-plugins/trunk/passport/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/passport/entitydef/entitymodel.xml?rev=1804027&r1=1804026&r2=1804027&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/passport/entitydef/entitymodel.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/passport/entitydef/entitymodel.xml Thu Aug  3 17:54:36 2017
@@ -68,7 +68,7 @@ under the License.
             package-name="org.apache.ofbiz.passport"
             title="Store GitHub access token for user">
         <field name="gitHubUserId" type="id-vlong"></field>
-        <field name="productStoreId" type="id-ne"></field>
+        <field name="productStoreId" type="id"></field>
         <field name="envPrefix" type="short-varchar"></field>
         <field name="tokenType" type="short-varchar"></field>
         <field name="accessToken" type="value"></field>
@@ -102,7 +102,7 @@ under the License.
             package-name="org.apache.ofbiz.passport"
             title="Store LinkedIn access token for user">
         <field name="linkedInUserId" type="id-vlong"></field>
-        <field name="productStoreId" type="id-ne"></field>
+        <field name="productStoreId" type="id"></field>
         <field name="envPrefix" type="short-varchar"></field>
         <field name="accessToken" type="value"></field>
         <prim-key field="linkedInUserId"/>

Modified: ofbiz/ofbiz-plugins/trunk/pricat/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/pricat/entitydef/entitymodel.xml?rev=1804027&r1=1804026&r2=1804027&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/pricat/entitydef/entitymodel.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/pricat/entitydef/entitymodel.xml Thu Aug  3 17:54:36 2017
@@ -23,13 +23,13 @@ under the License.
     <entity entity-name="ExcelImportHistory"
             package-name="org.apache.ofbiz.product.catalog"
             title="Excel Import History Entity">
-      <field name="userLoginId" type="id-vlong-ne"></field>
+      <field name="userLoginId" type="id-vlong"></field>
       <field name="sequenceNum" type="numeric"></field>
       <field name="fileName" type="value"></field>
       <field name="fromDate" type="date-time"></field>
       <field name="thruDate" type="date-time"></field>
       <field name="thruReasonId" type="id"></field>
-      <field name="statusId" type="id-ne"></field>
+      <field name="statusId" type="id"></field>
       <field name="threadName" type="name"></field>
       <field name="logFileName" type="value"></field>
       <prim-key field="userLoginId"/>

Modified: ofbiz/ofbiz-plugins/trunk/webpos/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/webpos/entitydef/entitymodel.xml?rev=1804027&r1=1804026&r2=1804027&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/webpos/entitydef/entitymodel.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/webpos/entitydef/entitymodel.xml Thu Aug  3 17:54:36 2017
@@ -50,7 +50,7 @@ under the License.
             package-name="org.apache.ofbiz.plugins.pos"
             title="Pos Terminal Log">
       <field name="posTerminalLogId" type="id"></field>
-      <field name="posTerminalId" type="id-ne"></field>
+      <field name="posTerminalId" type="id"></field>
       <field name="transactionId" type="id"></field>
       <field name="itemCount" type="numeric"></field>
       <field name="orderId" type="id"></field>


Free forum by Nabble Edit this page