Author: apatel
Date: Sat Aug 16 18:36:05 2014
New Revision: 1618396
URL: http://svn.apache.org/r1618396
Log:
Applied fix from trunk for revision: 1618395
===
[OFBIZ-5456] Reading Logo SystemProperty from database. Tested for working in
Multi tenant deployment.
Modified:
ofbiz/branches/release13.07/ (props changed)
ofbiz/branches/release13.07/applications/content/script/org/ofbiz/content/data/DataServices.xml
ofbiz/branches/release13.07/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java
ofbiz/branches/release13.07/applications/party/script/org/ofbiz/party/party/PartyServices.xml
ofbiz/branches/release13.07/framework/base/src/org/ofbiz/base/json/
(props changed)
Propchange: ofbiz/branches/release13.07/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1618395
Modified:
ofbiz/branches/release13.07/applications/content/script/org/ofbiz/content/data/DataServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/content/script/org/ofbiz/content/data/DataServices.xml?rev=1618396&r1=1618395&r2=1618396&view=diff
==============================================================================
---
ofbiz/branches/release13.07/applications/content/script/org/ofbiz/content/data/DataServices.xml
(original)
+++
ofbiz/branches/release13.07/applications/content/script/org/ofbiz/content/data/DataServices.xml
Sat Aug 16 18:36:05 2014
@@ -724,8 +724,11 @@ under the License.
</then>
</if>
<check-errors/>
-
- <call-class-method
class-name="org.ofbiz.content.data.DataResourceWorker"
method-name="getDataResourceContentUploadPath" ret-field="uploadPath"/>
+ <set field="absolute" value="true" type="Boolean"/>
+ <call-class-method method-name="getDataResourceContentUploadPath"
class-name="org.ofbiz.content.data.DataResourceWorker" ret-field="uploadPath">
+ <field field="delegator" type="org.ofbiz.entity.Delegator"/>
+ <field field="absolute" type="boolean"/>
+ </call-class-method>
<log level="info" message="[attachLocalFileToDataResource] - Found
Subdir : ${uploadPath}"/>
<set from-field="parameters._uploadedFile_contentType"
field="extenLookup.mimeTypeId"/>
@@ -792,7 +795,8 @@ under the License.
<check-errors/>
<set field="absolute" value="false" type="Boolean"/>
- <call-class-method
class-name="org.ofbiz.content.data.DataResourceWorker"
method-name="getDataResourceContentUploadPath" ret-field="uploadPath">
+ <call-class-method method-name="getDataResourceContentUploadPath"
class-name="org.ofbiz.content.data.DataResourceWorker" ret-field="uploadPath">
+ <field field="delegator" type="org.ofbiz.entity.Delegator"/>
<field field="absolute" type="boolean"/>
</call-class-method>
<log level="info" message="[attachLocalFileToDataResource] - Found
Subdir : ${uploadPath}"/>
Modified:
ofbiz/branches/release13.07/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java?rev=1618396&r1=1618395&r2=1618396&view=diff
==============================================================================
---
ofbiz/branches/release13.07/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java
(original)
+++
ofbiz/branches/release13.07/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java
Sat Aug 16 18:36:05 2014
@@ -483,6 +483,16 @@ public class DataResourceWorker impleme
return getDataResourceContentUploadPath(initialPath, maxFiles,
absolute);
}
+ public static String getDataResourceContentUploadPath(Delegator delegator,
boolean absolute) {
+ String initialPath =
EntityUtilProperties.getPropertyValue("content.properties",
"content.upload.path.prefix", delegator);
+ double maxFiles =
UtilProperties.getPropertyNumber("content.properties",
"content.upload.max.files");
+ if (maxFiles < 1) {
+ maxFiles = 250;
+ }
+
+ return getDataResourceContentUploadPath(initialPath, maxFiles,
absolute);
+ }
+
public static String getDataResourceContentUploadPath(String initialPath,
double maxFiles) {
return getDataResourceContentUploadPath(initialPath, maxFiles, true);
}
Modified:
ofbiz/branches/release13.07/applications/party/script/org/ofbiz/party/party/PartyServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/party/script/org/ofbiz/party/party/PartyServices.xml?rev=1618396&r1=1618395&r2=1618396&view=diff
==============================================================================
---
ofbiz/branches/release13.07/applications/party/script/org/ofbiz/party/party/PartyServices.xml
(original)
+++
ofbiz/branches/release13.07/applications/party/script/org/ofbiz/party/party/PartyServices.xml
Sat Aug 16 18:36:05 2014
@@ -330,7 +330,11 @@ under the License.
</if-not-empty>
</if-empty>
<if-not-empty field="parameters._uploadedFile_fileName">
- <call-class-method
class-name="org.ofbiz.content.data.DataResourceWorker"
method-name="getDataResourceContentUploadPath" ret-field="uploadPath"/>
+ <set field="absolute" value="true" type="Boolean"/>
+ <call-class-method method-name="getDataResourceContentUploadPath"
class-name="org.ofbiz.content.data.DataResourceWorker" ret-field="uploadPath">
+ <field field="delegator" type="org.ofbiz.entity.Delegator"/>
+ <field field="absolute" type="boolean"/>
+ </call-class-method>
<log level="always" message="[createPartyContent] - Found Subdir :
${uploadPath}"/>
<!-- locate the file extension to use based on mime-type -->
<set from-field="parameters._uploadedFile_contentType"
field="extenLookup.mimeTypeId"/>
@@ -420,7 +424,11 @@ under the License.
<set from-field="content.dataResourceId"
field="lookup.dataResourceId"/>
<find-by-primary-key use-cache="true"
entity-name="DataResource" value-field="dataResourceMap" map="lookup"/>
<else>
- <call-class-method
class-name="org.ofbiz.content.data.DataResourceWorker"
method-name="getDataResourceContentUploadPath" ret-field="uploadPath"/>
+ <set field="absolute" value="true" type="Boolean"/>
+ <call-class-method
method-name="getDataResourceContentUploadPath"
class-name="org.ofbiz.content.data.DataResourceWorker" ret-field="uploadPath">
+ <field field="delegator" type="org.ofbiz.entity.Delegator"/>
+ <field field="absolute" type="boolean"/>
+ </call-class-method>
<log level="always" message="[createPartyContent] - Found
Subdir : ${uploadPath}"/>
<!-- locate the file extension to use based on mime-type -->
<set from-field="parameters._uploadedFile_contentType"
field="extenLookup.mimeTypeId"/>
Propchange: ofbiz/branches/release13.07/framework/base/src/org/ofbiz/base/json/
------------------------------------------------------------------------------
Merged /ofbiz/trunk/framework/base/src/org/ofbiz/base/json:r1618395
