You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2014/11/15 13:16:01 UTC
svn commit: r1639864 - in /ofbiz/branches/release13.07: ./
applications/marketing/entitydef/entitymodel.xml
framework/entity/entitydef/entitymodel.xml
framework/security/entitydef/entitymodel.xml
Author: jleroux
Date: Sat Nov 15 12:16:01 2014
New Revision: 1639864
URL: http://svn.apache.org/r1639864
Log:
"Applied fix from trunk for revision: 1639863"
------------------------------------------------------------------------
r1639863 | jleroux | 2014-11-15 13:14:37 +0100 (sam. 15 nov. 2014) | 3 lignes
Following changes for "PortalPage entity definition wrong. ownerUserLoginId field must be id-vlong-ne" https://issues.apache.org/jira/browse/OFBIZ-5110
Fixes other cases as well
------------------------------------------------------------------------
Modified:
ofbiz/branches/release13.07/ (props changed)
ofbiz/branches/release13.07/applications/marketing/entitydef/entitymodel.xml
ofbiz/branches/release13.07/framework/entity/entitydef/entitymodel.xml
ofbiz/branches/release13.07/framework/security/entitydef/entitymodel.xml
Propchange: ofbiz/branches/release13.07/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1639863
Modified: ofbiz/branches/release13.07/applications/marketing/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/marketing/entitydef/entitymodel.xml?rev=1639864&r1=1639863&r2=1639864&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/marketing/entitydef/entitymodel.xml (original)
+++ ofbiz/branches/release13.07/applications/marketing/entitydef/entitymodel.xml Sat Nov 15 12:16:01 2014
@@ -276,7 +276,7 @@ under the License.
<field name="fromDate" type="date-time"></field>
<field name="statusDate" type="date-time"></field>
<field name="statusId" type="id"></field>
- <field name="setByUserLoginId" type="description"></field>
+ <field name="setByUserLoginId" type="id-vlong"></field>
<field name="optInVerifyCode" type="short-varchar"><!-- if statusId is CLPT_PENDING, set optInVerifyCode; else if statusId is CLPT_ACCEPTED, make sure optInVerifyCode is the same as the last CLPT_PENDING --></field>
<prim-key field="contactListId"/>
<prim-key field="partyId"/>
Modified: ofbiz/branches/release13.07/framework/entity/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/entity/entitydef/entitymodel.xml?rev=1639864&r1=1639863&r2=1639864&view=diff
==============================================================================
--- ofbiz/branches/release13.07/framework/entity/entitydef/entitymodel.xml (original)
+++ ofbiz/branches/release13.07/framework/entity/entitydef/entitymodel.xml Sat Nov 15 12:16:01 2014
@@ -121,7 +121,7 @@ under the License.
get a list of tenants per user
<entity entity-name="TenantUserLogin" package-name="org.ofbiz.entity.tenant">
<field name="tenantId" type="id-ne"/>
- <field name="userLoginId" type="name"/>
+ <field name="userLoginId" type="id-vlong-ne"/>
<field name="fromDate" type="date-time"/>
<field name="thruDate" type="date-time"/>
<prim-key field="tenantId"/>
Modified: ofbiz/branches/release13.07/framework/security/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/security/entitydef/entitymodel.xml?rev=1639864&r1=1639863&r2=1639864&view=diff
==============================================================================
--- ofbiz/branches/release13.07/framework/security/entitydef/entitymodel.xml (original)
+++ ofbiz/branches/release13.07/framework/security/entitydef/entitymodel.xml Sat Nov 15 12:16:01 2014
@@ -226,7 +226,7 @@ under the License.
title="Security Component - Protected View Entity">
<description>Login View couple currently tarpitted : any access to the view for the login is denied</description>
<field name="viewNameId" type="id-long-ne"><description>name of view protected from data theft</description></field>
- <field name="userLoginId" type="id-ne"/>
+ <field name="userLoginId" type="id-vlong-ne"/>
<field name="tarpitReleaseDateTime" type="numeric"><description>Date/Time at which the login will gain anew access to the view (in milliseconds from midnight, January 1, 1970 UTC , 0 meaning no tarpit to allow the admin to free a view and to keep history</description></field>
<prim-key field="viewNameId"/>
<prim-key field="userLoginId"/>