svn commit: r1633101 - in /ofbiz/branches/release13.07: ./ applications/content/entitydef/entitymodel.xml

Author: jleroux
Date: Mon Oct 20 11:08:36 2014
New Revision: 1633101

URL: http://svn.apache.org/r1633101
Log:
"Applied fix from trunk for revision: 1633100  "
------------------------------------------------------------------------
r1633100 | jleroux | 2014-10-20 13:06:59 +0200 (lun. 20 oct. 2014) | 3 lignes

A patch from Deepak Dixit for "The updation and deletion of content meta data tab is not working.Needs a change of entity ContentMetaData." https://issues.apache.org/jira/browse/OFBIZ-4927

MetaDataValue is changed from primary key to non primary key as the value can be updated.
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release13.07/   (props changed)
    ofbiz/branches/release13.07/applications/content/entitydef/entitymodel.xml

Propchange: ofbiz/branches/release13.07/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1633100

Modified: ofbiz/branches/release13.07/applications/content/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/content/entitydef/entitymodel.xml?rev=1633101&r1=1633100&r2=1633101&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/content/entitydef/entitymodel.xml (original)
+++ ofbiz/branches/release13.07/applications/content/entitydef/entitymodel.xml Mon Oct 20 11:08:36 2014
@@ -520,7 +520,6 @@ under the License.
       <field name="dataSourceId" type="id"></field>
       <prim-key field="contentId"/>
       <prim-key field="metaDataPredicateId"/>
-      <prim-key field="metaDataValue"/>
       <relation type="one" fk-name="CONTENTMD_CNTNT" rel-entity-name="Content">
         <key-map field-name="contentId"/>
       </relation>
@@ -893,7 +892,6 @@ under the License.
       <field name="dataSourceId" type="id"></field>
       <prim-key field="dataResourceId"/>
       <prim-key field="metaDataPredicateId"/>
-      <prim-key field="metaDataValue"/>
       <relation type="one" fk-name="DATA_MD_DATREC" rel-entity-name="DataResource">
         <key-map field-name="dataResourceId"/>
       </relation>