svn commit: r1618395 - in /ofbiz/trunk/applications: content/script/org/ofbiz/conte
Locked
 
|
Author: apatel
Date: Sat Aug 16 18:32:50 2014 New Revision: 1618395 URL: http://svn.apache.org/r1618395 Log: [OFBIZ-5456] Reading Logo SystemProperty from database. Tested for working in Multi tenant deployment. Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml?rev=1618395&r1=1618394&r2=1618395&view=diff ============================================================================== --- ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml (original) +++ ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml Sat Aug 16 18:32:50 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/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java?rev=1618395&r1=1618394&r2=1618395&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java Sat Aug 16 18:32:50 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/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml?rev=1618395&r1=1618394&r2=1618395&view=diff ============================================================================== --- ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml (original) +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml Sat Aug 16 18:32:50 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"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |