svn commit: r1847403 - in /ofbiz: branches/release16.11/applications/content/data/CompDocData.xml ofbiz-framework/branches/release17.12/applications/content/data/CompDocData.xml

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r1847403 - in /ofbiz: branches/release16.11/applications/content/data/CompDocData.xml ofbiz-framework/branches/release17.12/applications/content/data/CompDocData.xml

jleroux@apache.org
Author: jleroux
Date: Sun Nov 25 09:25:46 2018
New Revision: 1847403

URL: http://svn.apache.org/viewvc?rev=1847403&view=rev
Log:
"Applied fix from trunk for revision: 1847402"
------------------------------------------------------------------------
r1847402 | jleroux | 2018-11-25 10:16:28 +0100 (dim. 25 nov. 2018) | 9 lignes

Fixed: Mime Type not supported Error while generating a Composite Pdf
(OFBIZ-9840)

When generating a Composite Pdf in the Content Manager an Error occurs :
 Mime Type not Supported
 Steps to recreate the Error Message:
Content Manager->CompDoc->Tree->View Instances->Tree-> Generate Composite Pdf

Thanks: Thanks Julian Leichert for report, Aman Mishra for the fix
------------------------------------------------------------------------

Modified:
    ofbiz/branches/release16.11/applications/content/data/CompDocData.xml
    ofbiz/ofbiz-framework/branches/release17.12/applications/content/data/CompDocData.xml

Modified: ofbiz/branches/release16.11/applications/content/data/CompDocData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/content/data/CompDocData.xml?rev=1847403&r1=1847402&r2=1847403&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/content/data/CompDocData.xml (original)
+++ ofbiz/branches/release16.11/applications/content/data/CompDocData.xml Sun Nov 25 09:25:46 2018
@@ -38,10 +38,8 @@ under the License.
 
 
     <DataResource dataResourceId="DR1103b" dataResourceTypeId="OFBIZ_FILE_BIN" objectInfo="/applications/content/data/pdftest2.pdf" mimeTypeId="application/pdf" dataResourceName="Personal Profile"/>
-    <DataResource dataResourceId="DR1105b" dataResourceTypeId="OFBIZ_FILE_BIN" objectInfo="/applications/content/data/mswordtest2.doc" mimeTypeId="application/msword" dataResourceName="2nd Quarter Review"/>
 
     <DataResource dataResourceId="DR1103a" dataResourceTypeId="OFBIZ_FILE_BIN" objectInfo="/applications/content/data/pdftest2.pdf" mimeTypeId="application/pdf" dataResourceName="Personal Profile"/>
-    <DataResource dataResourceId="DR1105a" dataResourceTypeId="OFBIZ_FILE_BIN" objectInfo="/applications/content/data/mswordtest2.doc" mimeTypeId="application/msword" dataResourceName="2nd Quarter Review"/>
 
     <DataResource dataResourceId="DR1101"  mimeTypeId="application/pdf" dataResourceName="Letter of inquiry"/>
     <DataResource dataResourceId="DR1102"  mimeTypeId="application/pdf" dataResourceName="POA Contract"/>
@@ -101,11 +99,9 @@ under the License.
         <!-- sample instances CDT CDT1201 -->
     <Content contentId="CDI1201" instanceOfContentId="CDT1201" contentTypeId="COMPDOC_INSTANCE" contentName="Demo Instance Root (CDI) 1201"  ownerContentId=""/>
     <Content contentId="CDI1103" instanceOfContentId="CDT1103" dataResourceId="DR1103b" contentTypeId="DOCUMENT" contentName="Personal Profile"  ownerContentId=""/>
-    <Content contentId="CDI1105" instanceOfContentId="CDT1105" dataResourceId="DR1105b" contentTypeId="DOCUMENT" contentName="2nd Quarter Review"  ownerContentId=""/>
 
     <ContentAssoc contentIdTo="CDT1201" contentId="CDI1201" contentAssocTypeId="INSTANCE" fromDate="2006-01-12 01:01:01" sequenceNum="0020"/>
     <ContentAssoc contentIdTo="CDI1201" contentId="CDI1103" contentAssocTypeId="COMPDOC_PART" fromDate="2006-01-12 01:01:01" sequenceNum="00130"/>
-    <ContentAssoc contentIdTo="CDI1201" contentId="CDI1105" contentAssocTypeId="COMPDOC_PART" fromDate="2006-01-12 01:01:01" sequenceNum="0050"/>
 
         <!-- sample revision entries for CDT CDT1201 -->
     <ContentRevision contentId="CDT1201" contentRevisionSeqId="000002"/>
@@ -130,22 +126,18 @@ under the License.
 
     <ContentRevision contentId="CDT1201" contentRevisionSeqId="000013"/>
     <ContentRevisionItem contentId="CDT1201" contentRevisionSeqId="000013" itemContentId="CDT1103" oldDataResourceId="DR1103a" newDataResourceId="DR1103b"/>
-    <ContentRevisionItem contentId="CDT1201" contentRevisionSeqId="000013" itemContentId="CDT1105" oldDataResourceId="DR1105a" newDataResourceId="DR1105b"/>
 
     <ContentRevision contentId="CDI1201" contentRevisionSeqId="000005"/>
     <ContentRevisionItem contentId="CDI1201" contentRevisionSeqId="000005" itemContentId="CDI1103" newDataResourceId="DR1103a"/>
     <ContentRevision contentId="CDI1201" contentRevisionSeqId="000006"/>
-    <ContentRevisionItem contentId="CDI1201" contentRevisionSeqId="000006" itemContentId="CDI1105" newDataResourceId="DR1105a"/>
 
     <ContentRevision contentId="CDI1201" contentRevisionSeqId="000009"/>
     <ContentRevisionItem contentId="CDI1201" contentRevisionSeqId="000009" itemContentId="CDI1103" oldDataResourceId="DR1103a" newDataResourceId="DR1103b"/>
     <ContentRevision contentId="CDI1201" contentRevisionSeqId="000010"/>
-    <ContentRevisionItem contentId="CDI1201" contentRevisionSeqId="000010" itemContentId="CDI1105" oldDataResourceId="DR1105a" newDataResourceId="DR1105b"/>
 
     <ContentRevision contentId="CDI1201" contentRevisionSeqId="000013"/>
     <ContentRevisionItem contentId="CDI1201" contentRevisionSeqId="000013" itemContentId="CDI1103" oldDataResourceId="DR1103a" newDataResourceId="DR1103b"/>
     <ContentRevision contentId="CDI1201" contentRevisionSeqId="000014"/>
-    <ContentRevisionItem contentId="CDI1201" contentRevisionSeqId="000014" itemContentId="CDI1105" oldDataResourceId="DR1105a" newDataResourceId="DR1105b"/>
 
 
     <!-- sample approval entries for CDT CD0001 -->

Modified: ofbiz/ofbiz-framework/branches/release17.12/applications/content/data/CompDocData.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/content/data/CompDocData.xml?rev=1847403&r1=1847402&r2=1847403&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/applications/content/data/CompDocData.xml (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/applications/content/data/CompDocData.xml Sun Nov 25 09:25:46 2018
@@ -38,10 +38,8 @@ under the License.
 
 
     <DataResource dataResourceId="DR1103b" dataResourceTypeId="OFBIZ_FILE_BIN" objectInfo="/applications/content/data/pdftest2.pdf" mimeTypeId="application/pdf" dataResourceName="Personal Profile"/>
-    <DataResource dataResourceId="DR1105b" dataResourceTypeId="OFBIZ_FILE_BIN" objectInfo="/applications/content/data/mswordtest2.doc" mimeTypeId="application/msword" dataResourceName="2nd Quarter Review"/>
 
     <DataResource dataResourceId="DR1103a" dataResourceTypeId="OFBIZ_FILE_BIN" objectInfo="/applications/content/data/pdftest2.pdf" mimeTypeId="application/pdf" dataResourceName="Personal Profile"/>
-    <DataResource dataResourceId="DR1105a" dataResourceTypeId="OFBIZ_FILE_BIN" objectInfo="/applications/content/data/mswordtest2.doc" mimeTypeId="application/msword" dataResourceName="2nd Quarter Review"/>
 
     <DataResource dataResourceId="DR1101"  mimeTypeId="application/pdf" dataResourceName="Letter of inquiry"/>
     <DataResource dataResourceId="DR1102"  mimeTypeId="application/pdf" dataResourceName="POA Contract"/>
@@ -101,11 +99,9 @@ under the License.
         <!-- sample instances CDT CDT1201 -->
     <Content contentId="CDI1201" instanceOfContentId="CDT1201" contentTypeId="COMPDOC_INSTANCE" contentName="Demo Instance Root (CDI) 1201"  ownerContentId=""/>
     <Content contentId="CDI1103" instanceOfContentId="CDT1103" dataResourceId="DR1103b" contentTypeId="DOCUMENT" contentName="Personal Profile"  ownerContentId=""/>
-    <Content contentId="CDI1105" instanceOfContentId="CDT1105" dataResourceId="DR1105b" contentTypeId="DOCUMENT" contentName="2nd Quarter Review"  ownerContentId=""/>
 
     <ContentAssoc contentIdTo="CDT1201" contentId="CDI1201" contentAssocTypeId="INSTANCE" fromDate="2006-01-12 01:01:01" sequenceNum="0020"/>
     <ContentAssoc contentIdTo="CDI1201" contentId="CDI1103" contentAssocTypeId="COMPDOC_PART" fromDate="2006-01-12 01:01:01" sequenceNum="00130"/>
-    <ContentAssoc contentIdTo="CDI1201" contentId="CDI1105" contentAssocTypeId="COMPDOC_PART" fromDate="2006-01-12 01:01:01" sequenceNum="0050"/>
 
         <!-- sample revision entries for CDT CDT1201 -->
     <ContentRevision contentId="CDT1201" contentRevisionSeqId="000002"/>
@@ -130,22 +126,18 @@ under the License.
 
     <ContentRevision contentId="CDT1201" contentRevisionSeqId="000013"/>
     <ContentRevisionItem contentId="CDT1201" contentRevisionSeqId="000013" itemContentId="CDT1103" oldDataResourceId="DR1103a" newDataResourceId="DR1103b"/>
-    <ContentRevisionItem contentId="CDT1201" contentRevisionSeqId="000013" itemContentId="CDT1105" oldDataResourceId="DR1105a" newDataResourceId="DR1105b"/>
 
     <ContentRevision contentId="CDI1201" contentRevisionSeqId="000005"/>
     <ContentRevisionItem contentId="CDI1201" contentRevisionSeqId="000005" itemContentId="CDI1103" newDataResourceId="DR1103a"/>
     <ContentRevision contentId="CDI1201" contentRevisionSeqId="000006"/>
-    <ContentRevisionItem contentId="CDI1201" contentRevisionSeqId="000006" itemContentId="CDI1105" newDataResourceId="DR1105a"/>
 
     <ContentRevision contentId="CDI1201" contentRevisionSeqId="000009"/>
     <ContentRevisionItem contentId="CDI1201" contentRevisionSeqId="000009" itemContentId="CDI1103" oldDataResourceId="DR1103a" newDataResourceId="DR1103b"/>
     <ContentRevision contentId="CDI1201" contentRevisionSeqId="000010"/>
-    <ContentRevisionItem contentId="CDI1201" contentRevisionSeqId="000010" itemContentId="CDI1105" oldDataResourceId="DR1105a" newDataResourceId="DR1105b"/>
 
     <ContentRevision contentId="CDI1201" contentRevisionSeqId="000013"/>
     <ContentRevisionItem contentId="CDI1201" contentRevisionSeqId="000013" itemContentId="CDI1103" oldDataResourceId="DR1103a" newDataResourceId="DR1103b"/>
     <ContentRevision contentId="CDI1201" contentRevisionSeqId="000014"/>
-    <ContentRevisionItem contentId="CDI1201" contentRevisionSeqId="000014" itemContentId="CDI1105" oldDataResourceId="DR1105a" newDataResourceId="DR1105b"/>
 
 
     <!-- sample approval entries for CDT CD0001 -->