svn commit: r947991 - in /ofbiz/branches/release10.04: ./ framework/webtools/webapp/webtools/WEB-INF/actions/artifactinfo/ArtifactInfo.groovy

Author: jleroux
Date: Tue May 25 10:00:07 2010
New Revision: 947991

URL: http://svn.apache.org/viewvc?rev=947991&view=rev
Log:
"Applied fix from trunk for revision: 947988"
------------------------------------------------------------------------
r947988 | jleroux | 2010-05-25 11:53:56 +0200 (mar. 25 mai 2010) | 1 ligne

Fix a bug due to multi-tenant introduction. I guess this bug appears only if you use the multi-tenant mode.
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release10.04/   (props changed)
    ofbiz/branches/release10.04/framework/webtools/webapp/webtools/WEB-INF/actions/artifactinfo/ArtifactInfo.groovy

Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 25 10:00:07 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
+/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

Modified: ofbiz/branches/release10.04/framework/webtools/webapp/webtools/WEB-INF/actions/artifactinfo/ArtifactInfo.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/webtools/webapp/webtools/WEB-INF/actions/artifactinfo/ArtifactInfo.groovy?rev=947991&r1=947990&r2=947991&view=diff
==============================================================================
--- ofbiz/branches/release10.04/framework/webtools/webapp/webtools/WEB-INF/actions/artifactinfo/ArtifactInfo.groovy (original)
+++ ofbiz/branches/release10.04/framework/webtools/webapp/webtools/WEB-INF/actions/artifactinfo/ArtifactInfo.groovy Tue May 25 10:00:07 2010
@@ -26,8 +26,11 @@ name = parameters.name;
 location = parameters.location;
 type = parameters.type;
 uniqueId = parameters.uniqueId;
-
-aif = ArtifactInfoFactory.getArtifactInfoFactory(delegator.getDelegatorName());
+delegatorName = delegator.getDelegatorName()
+if (delegatorName.contains("default#")) {
+    delegatorName = "default";
+}
+aif = ArtifactInfoFactory.getArtifactInfoFactory(delegatorName);
 context.aif = aif;
 artifactInfo = null;
 if ("search".equals(parameters.findType)) {