Author: erwan
Date: Thu Jul 15 20:11:35 2010
New Revision: 964560
URL:
http://svn.apache.org/viewvc?rev=964560&view=revLog:
Applied fix from trunk for revision: 964558
A patch from Bob Morley - OFBIZ-3857 - Fix bad field reference projectIdId should be projectId
Modified:
ofbiz/branches/release10.04/ (props changed)
ofbiz/branches/release10.04/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml
Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 15 20:11:35 2010
@@ -1,3 +1,3 @@
/ofbiz/branches/addbirt:831210-885099,885686-886087
/ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958953,960491,960997,963610
+/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958953,960491,960997,963610,964558
Modified: ofbiz/branches/release10.04/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml?rev=964560&r1=964559&r2=964560&view=diff==============================================================================
--- ofbiz/branches/release10.04/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml (original)
+++ ofbiz/branches/release10.04/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml Thu Jul 15 20:11:35 2010
@@ -75,7 +75,7 @@
<or>
<and>
<!-- view a project with a null id is a null operation, so ok... -->
- <if-empty field="parameters.projectIdId"/>
+ <if-empty field="parameters.projectId"/>
<if-compare field="parameters.mainAction" value="VIEW" operator="equals"/>
</and>
<and>