diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/PDF_getContentPassword.py b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/PDF_getContentPassword.py
new file mode 100644
index 0000000000000000000000000000000000000000..78274679432968b4464bde827214cec2336490d8
--- /dev/null
+++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/PDF_getContentPassword.py
@@ -0,0 +1,11 @@
+# type: () -> bytes
+"""Returns the password for this PDF file, if it is known by the system.
+
+This is a customization entry point, used to display the PDF content to
+logged in users, if they have the permission to view the PDF.
+
+Note that this is not used for full-text extraction, password protected
+PDFs are not indexed, in order not to leak the content.
+"""
+assert REQUEST is None and not container.REQUEST.args
+return None
diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/PDF_getContentPassword.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/PDF_getContentPassword.xml
new file mode 100644
index 0000000000000000000000000000000000000000..28cb885daf96aa9b24e756cfa041066c30f9dbe1
--- /dev/null
+++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/PDF_getContentPassword.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>Script_magic</string> </key>
+ <value> <int>3</int> </value>
+ </item>
+ <item>
+ <key> <string>_bind_names</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>_asgns</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>name_container</string> </key>
+ <value> <string>container</string> </value>
+ </item>
+ <item>
+ <key> <string>name_context</string> </key>
+ <value> <string>context</string> </value>
+ </item>
+ <item>
+ <key> <string>name_m_self</string> </key>
+ <value> <string>script</string> </value>
+ </item>
+ <item>
+ <key> <string>name_subpath</string> </key>
+ <value> <string>traverse_subpath</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>_params</string> </key>
+ <value> <string>REQUEST=None</string> </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>PDF_getContentPassword</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/PDF_viewPDFJSPreview/my_data.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/PDF_viewPDFJSPreview/my_data.xml
index b9d3fdc9617944d322cf870dd4ad448580b70965..79002b86b2f3a7d0e4b82700bf581643ceffcb87 100644
--- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/PDF_viewPDFJSPreview/my_data.xml
+++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/PDF_viewPDFJSPreview/my_data.xml
@@ -12,6 +12,7 @@
<list>
<string>data_url</string>
<string>default</string>
+ <string>renderjs_extra</string>
</list>
</value>
</item>
@@ -67,6 +68,12 @@
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
+ <item>
+ <key> <string>renderjs_extra</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+ </value>
+ </item>
</dictionary>
</value>
</item>
@@ -90,6 +97,12 @@
<key> <string>form_id</string> </key>
<value> <string>Base_viewFieldLibrary</string> </value>
</item>
+ <item>
+ <key> <string>renderjs_extra</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
</dictionary>
</value>
</item>
@@ -109,4 +122,17 @@
</dictionary>
</pickle>
</record>
+ <record id="3" aka="AAAAAAAAAAM=">
+ <pickle>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_text</string> </key>
+ <value> <string>python: field.getTemplateField().get_value("renderjs_extra") + [(\'password\', context.getTypeBasedMethod(\'getContentPassword\')())]</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
</ZopeData>
diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/pdf_js/pdf.gadget.js.js b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/pdf_js/pdf.gadget.js.js
index 275e0c1d0089b70e5be074488859c515fc985d20..440977b48f11dc99b0e0a5a47efb8f0d073b0da5 100644
--- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/pdf_js/pdf.gadget.js.js
+++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/pdf_js/pdf.gadget.js.js
@@ -1,7 +1,7 @@
/*jslint indent: 2, nomen: true */
-/*global window, rJS, RSVP, PDFJS, webViewerLoad, Uint8Array,
- ArrayBuffer, PDFViewerApplication, FileReader */
-(function (window, rJS, RSVP, PDFJS, webViewerLoad) {
+/*global window, rJS, RSVP, PDFJS, configure, webViewerInitialized,
+ PDFViewerApplication, FileReader, PasswordPrompt */
+(function (window, rJS, RSVP, PDFJS, configure, webViewerInitialized, PDFViewerApplication, PasswordPrompt) {
"use strict";
rJS(window)
@@ -17,6 +17,17 @@
gadget.props.key = options.key;
configure(PDFJS);
PDFJS.locale = options.language;
+ if (options.password) {
+ PasswordPrompt._original_open = PasswordPrompt.open;
+ var retries = 0;
+ PasswordPrompt.open = function () {
+ if (retries) {
+ return this._original_open();
+ }
+ retries++;
+ return this.updatePassword(options.password);
+ };
+ }
return PDFViewerApplication.initialize().then(function() {
webViewerInitialized(options.value);
// hide some buttons that do not make sense for us
@@ -52,4 +63,4 @@
return form_data;
});
});
-}(window, rJS, RSVP, PDFJS, webViewerLoad, PDFViewerApplication));
+}(window, rJS, RSVP, PDFJS, configure, webViewerInitialized, PDFViewerApplication, PasswordPrompt));
diff --git a/bt5/erp5_dms_ui_test/PathTemplateItem/document_module/test_ERP5_Logo_Encrypted_PDF.pdf b/bt5/erp5_dms_ui_test/PathTemplateItem/document_module/test_ERP5_Logo_Encrypted_PDF.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..0f21cbddd7052b41fd6135db84a9e65bcc669e03
Binary files /dev/null and b/bt5/erp5_dms_ui_test/PathTemplateItem/document_module/test_ERP5_Logo_Encrypted_PDF.pdf differ
diff --git a/bt5/erp5_dms_ui_test/PathTemplateItem/document_module/test_ERP5_Logo_Encrypted_PDF.xml b/bt5/erp5_dms_ui_test/PathTemplateItem/document_module/test_ERP5_Logo_Encrypted_PDF.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8b41e02d9ebebf7197f68d4a2607c7979ae14d79
--- /dev/null
+++ b/bt5/erp5_dms_ui_test/PathTemplateItem/document_module/test_ERP5_Logo_Encrypted_PDF.xml
@@ -0,0 +1,253 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <global name="PDF" module="erp5.portal_type"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_Access_contents_information_Permission</string> </key>
+ <value>
+ <tuple>
+ <string>Anonymous</string>
+ <string>Assignee</string>
+ <string>Assignor</string>
+ <string>Associate</string>
+ <string>Auditor</string>
+ <string>Manager</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>_Add_portal_content_Permission</string> </key>
+ <value>
+ <tuple>
+ <string>Assignor</string>
+ <string>Manager</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>_Change_local_roles_Permission</string> </key>
+ <value>
+ <tuple>
+ <string>Assignor</string>
+ <string>Manager</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>_EtagSupport__etag</string> </key>
+ <value> <string>ts54848644.25</string> </value>
+ </item>
+ <item>
+ <key> <string>_Modify_portal_content_Permission</string> </key>
+ <value>
+ <tuple>
+ <string>Manager</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>_View_Permission</string> </key>
+ <value>
+ <tuple>
+ <string>Anonymous</string>
+ <string>Assignee</string>
+ <string>Assignor</string>
+ <string>Associate</string>
+ <string>Auditor</string>
+ <string>Manager</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>_count</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>_mt_index</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>_tree</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>content_md5</string> </key>
+ <value> <string>e0751dd9b313aa3cc08d7cbfebf0d100</string> </value>
+ </item>
+ <item>
+ <key> <string>content_type</string> </key>
+ <value> <string>application/pdf</string> </value>
+ </item>
+ <item>
+ <key> <string>default_reference</string> </key>
+ <value> <string>test-ERP5.Logo.Encrypted.PDF</string> </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string>A sample PDF with text and an image, encrypted with password "secret"</string> </value>
+ </item>
+ <item>
+ <key> <string>filename</string> </key>
+ <value> <string>test-ERP5.Logo.encrypted.PDF.pdf</string> </value>
+ </item>
+ <item>
+ <key> <string>height</string> </key>
+ <value> <int>-1</int> </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>test_ERP5_Logo_Encrypted_PDF</string> </value>
+ </item>
+ <item>
+ <key> <string>language</string> </key>
+ <value> <string>en</string> </value>
+ </item>
+ <item>
+ <key> <string>portal_type</string> </key>
+ <value> <string>PDF</string> </value>
+ </item>
+ <item>
+ <key> <string>short_title</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>size</string> </key>
+ <value> <int>7745</int> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>version</string> </key>
+ <value> <string>001</string> </value>
+ </item>
+ <item>
+ <key> <string>width</string> </key>
+ <value> <int>-1</int> </value>
+ </item>
+ <item>
+ <key> <string>workflow_history</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <global name="Length" module="BTrees.Length"/>
+ </pickle>
+ <pickle> <int>0</int> </pickle>
+ </record>
+ <record id="3" aka="AAAAAAAAAAM=">
+ <pickle>
+ <global name="OOBTree" module="BTrees.OOBTree"/>
+ </pickle>
+ <pickle>
+ <none/>
+ </pickle>
+ </record>
+ <record id="4" aka="AAAAAAAAAAQ=">
+ <pickle>
+ <global name="OOBTree" module="BTrees.OOBTree"/>
+ </pickle>
+ <pickle>
+ <none/>
+ </pickle>
+ </record>
+ <record id="5" aka="AAAAAAAAAAU=">
+ <pickle>
+ <global name="PersistentMapping" module="Persistence.mapping"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>data</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>document_publication_workflow</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAY=</string> </persistent>
+ </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="6" aka="AAAAAAAAAAY=">
+ <pickle>
+ <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_log</string> </key>
+ <value>
+ <list>
+ <dictionary>
+ <item>
+ <key> <string>action</string> </key>
+ <value> <string>publish</string> </value>
+ </item>
+ <item>
+ <key> <string>actor</string> </key>
+ <value> <string>ERP5TypeTestCase</string> </value>
+ </item>
+ <item>
+ <key> <string>comment</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>error_message</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>time</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="DateTime" module="DateTime.DateTime"/>
+ </klass>
+ <tuple>
+ <none/>
+ </tuple>
+ <state>
+ <tuple>
+ <float>1655084957.23</float>
+ <string>GMT+2</string>
+ </tuple>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>validation_state</string> </key>
+ <value> <string>published</string> </value>
+ </item>
+ </dictionary>
+ </list>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
diff --git a/bt5/erp5_dms_ui_test/PathTemplateItem/portal_tests/dms_zuite/testEncryptedPDFPreview.xml b/bt5/erp5_dms_ui_test/PathTemplateItem/portal_tests/dms_zuite/testEncryptedPDFPreview.xml
new file mode 100644
index 0000000000000000000000000000000000000000..198110c03890a54b20aceb133b9affdc5d01b2ba
--- /dev/null
+++ b/bt5/erp5_dms_ui_test/PathTemplateItem/portal_tests/dms_zuite/testEncryptedPDFPreview.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_bind_names</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>_asgns</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>name_subpath</string> </key>
+ <value> <string>traverse_subpath</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>content_type</string> </key>
+ <value> <string>text/html</string> </value>
+ </item>
+ <item>
+ <key> <string>expand</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>testEncryptedPDFPreview</string> </value>
+ </item>
+ <item>
+ <key> <string>output_encoding</string> </key>
+ <value> <string>utf-8</string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <unicode>Encrypted PDF Preview</unicode> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
diff --git a/bt5/erp5_dms_ui_test/PathTemplateItem/portal_tests/dms_zuite/testEncryptedPDFPreview.zpt b/bt5/erp5_dms_ui_test/PathTemplateItem/portal_tests/dms_zuite/testEncryptedPDFPreview.zpt
new file mode 100644
index 0000000000000000000000000000000000000000..7e355fc0aa21afdc9e0477e45ff1123ddf7f1533
--- /dev/null
+++ b/bt5/erp5_dms_ui_test/PathTemplateItem/portal_tests/dms_zuite/testEncryptedPDFPreview.zpt
@@ -0,0 +1,99 @@
+<html xmlns:tal="http://xml.zope.org/namespaces/tal"
+ xmlns:metal="http://xml.zope.org/namespaces/metal">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title tal:content="template/title_and_id"></title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3" tal:content="template/title_and_id"></td></tr>
+</thead><tbody>
+
+<tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/init" />
+<tr>
+ <td>openAndWait</td>
+ <td>${base_url}/document_module/test_ERP5_Logo_Encrypted_PDF</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>link=Preview</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//iframe[contains(@src, "pdfjs.gadget.html")]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>selectFrame</td>
+ <td>//iframe[contains(@src, "pdfjs.gadget.html")]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForText</td>
+ <td>//body//div[@class='textLayer']/div[1]</td>
+ <td>This is a sample PDF with some text and an image</td>
+</tr>
+<tr>
+ <td>selectFrame</td>
+ <td>relative=top</td>
+ <td></td>
+</tr>
+
+<!--
+ This PDF is automatically decrypted because of the ID
+ (see portal_skins/erp5_dms_ui_test/PDF_getContentPassword)
+ Make a clone, that will not be automatically decrypted (because Id will be different)
+ It is still possible for user to enter a password and view.
+-->
+<tr>
+ <td>clickAndWait</td>
+ <td>Base_createCloneDocument:method</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertPortalStatusMessage</td>
+ <td>Created Clone PDF.</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//iframe[contains(@src, "pdfjs.gadget.html")]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>selectFrame</td>
+ <td>//iframe[contains(@src, "pdfjs.gadget.html")]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@id="passwordOverlay" and not(contains(@class, "hidden"))]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>password</td>
+ <td>secret</td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>passwordSubmit</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForText</td>
+ <td>//body//div[@class='textLayer']/div[1]</td>
+ <td>This is a sample PDF with some text and an image</td>
+</tr>
+<tr>
+ <td>selectFrame</td>
+ <td>relative=top</td>
+ <td></td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
\ No newline at end of file
diff --git a/bt5/erp5_dms_ui_test/SkinTemplateItem/portal_skins/erp5_dms_ui_test.xml b/bt5/erp5_dms_ui_test/SkinTemplateItem/portal_skins/erp5_dms_ui_test.xml
index 83fb936ba8c89c01b27dcf86fdf347098b1674a0..f3c9ea2650b837d143dd09c4fc4ab4a7684b0c04 100644
--- a/bt5/erp5_dms_ui_test/SkinTemplateItem/portal_skins/erp5_dms_ui_test.xml
+++ b/bt5/erp5_dms_ui_test/SkinTemplateItem/portal_skins/erp5_dms_ui_test.xml
@@ -6,12 +6,33 @@
</pickle>
<pickle>
<dictionary>
+ <item>
+ <key> <string>_local_properties</string> </key>
+ <value>
+ <tuple>
+ <dictionary>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>business_template_skin_layer_priority</string> </value>
+ </item>
+ <item>
+ <key> <string>type</string> </key>
+ <value> <string>float</string> </value>
+ </item>
+ </dictionary>
+ </tuple>
+ </value>
+ </item>
<item>
<key> <string>_objects</string> </key>
<value>
<tuple/>
</value>
</item>
+ <item>
+ <key> <string>business_template_skin_layer_priority</string> </key>
+ <value> <float>40.0</float> </value>
+ </item>
<item>
<key> <string>id</string> </key>
<value> <string>erp5_dms_ui_test</string> </value>
diff --git a/bt5/erp5_dms_ui_test/SkinTemplateItem/portal_skins/erp5_dms_ui_test/PDF_getContentPassword.py b/bt5/erp5_dms_ui_test/SkinTemplateItem/portal_skins/erp5_dms_ui_test/PDF_getContentPassword.py
new file mode 100644
index 0000000000000000000000000000000000000000..24634a72bb8eefe7acad7e1d70143781a45feccb
--- /dev/null
+++ b/bt5/erp5_dms_ui_test/SkinTemplateItem/portal_skins/erp5_dms_ui_test/PDF_getContentPassword.py
@@ -0,0 +1,4 @@
+# type: () -> bytes
+if context.getId() == 'test_ERP5_Logo_Encrypted_PDF':
+ return 'secret'
+return context.skinSuper('erp5_dms_ui_test', 'PDF_getContentPassword')(REQUEST=REQUEST)
diff --git a/bt5/erp5_dms_ui_test/SkinTemplateItem/portal_skins/erp5_dms_ui_test/PDF_getContentPassword.xml b/bt5/erp5_dms_ui_test/SkinTemplateItem/portal_skins/erp5_dms_ui_test/PDF_getContentPassword.xml
new file mode 100644
index 0000000000000000000000000000000000000000..28cb885daf96aa9b24e756cfa041066c30f9dbe1
--- /dev/null
+++ b/bt5/erp5_dms_ui_test/SkinTemplateItem/portal_skins/erp5_dms_ui_test/PDF_getContentPassword.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>Script_magic</string> </key>
+ <value> <int>3</int> </value>
+ </item>
+ <item>
+ <key> <string>_bind_names</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>_asgns</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>name_container</string> </key>
+ <value> <string>container</string> </value>
+ </item>
+ <item>
+ <key> <string>name_context</string> </key>
+ <value> <string>context</string> </value>
+ </item>
+ <item>
+ <key> <string>name_m_self</string> </key>
+ <value> <string>script</string> </value>
+ </item>
+ <item>
+ <key> <string>name_subpath</string> </key>
+ <value> <string>traverse_subpath</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>_params</string> </key>
+ <value> <string>REQUEST=None</string> </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>PDF_getContentPassword</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
diff --git a/bt5/erp5_dms_ui_test/bt/template_keep_last_workflow_history_only_path_list b/bt5/erp5_dms_ui_test/bt/template_keep_last_workflow_history_only_path_list
index 9c72373c4b8dc6dcbea6dfdd0904353612c2361e..6a59a9087937989f9a4e3c426d69b6dee7edb70f 100644
--- a/bt5/erp5_dms_ui_test/bt/template_keep_last_workflow_history_only_path_list
+++ b/bt5/erp5_dms_ui_test/bt/template_keep_last_workflow_history_only_path_list
@@ -1 +1,2 @@
-document_module/test_ERP5_Logo_PDF
\ No newline at end of file
+document_module/test_ERP5_Logo_PDF
+document_module/test_ERP5_Logo_Encrypted_PDF
\ No newline at end of file
diff --git a/bt5/erp5_dms_ui_test/bt/template_path_list b/bt5/erp5_dms_ui_test/bt/template_path_list
index bf9df341e67c5756cca869c8fdbf41df13fa037d..4501f418b8844d9c4af4a1f3cd4f0d75e179b9a4 100644
--- a/bt5/erp5_dms_ui_test/bt/template_path_list
+++ b/bt5/erp5_dms_ui_test/bt/template_path_list
@@ -1,3 +1,4 @@
+document_module/test_ERP5_Logo_Encrypted_PDF
document_module/test_ERP5_Logo_PDF
portal_categories/classification/**
portal_tests/dms_zuite
diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_dms_zuite/testEncryptedPDFPreview.xml b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_dms_zuite/testEncryptedPDFPreview.xml
new file mode 100644
index 0000000000000000000000000000000000000000..198110c03890a54b20aceb133b9affdc5d01b2ba
--- /dev/null
+++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_dms_zuite/testEncryptedPDFPreview.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_bind_names</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>_asgns</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>name_subpath</string> </key>
+ <value> <string>traverse_subpath</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>content_type</string> </key>
+ <value> <string>text/html</string> </value>
+ </item>
+ <item>
+ <key> <string>expand</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>testEncryptedPDFPreview</string> </value>
+ </item>
+ <item>
+ <key> <string>output_encoding</string> </key>
+ <value> <string>utf-8</string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <unicode>Encrypted PDF Preview</unicode> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_dms_zuite/testEncryptedPDFPreview.zpt b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_dms_zuite/testEncryptedPDFPreview.zpt
new file mode 100644
index 0000000000000000000000000000000000000000..2bd660fd37bc7cfc1b73bac0e75c52f57f3539b3
--- /dev/null
+++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_dms_zuite/testEncryptedPDFPreview.zpt
@@ -0,0 +1,119 @@
+<html xmlns:tal="http://xml.zope.org/namespaces/tal"
+ xmlns:metal="http://xml.zope.org/namespaces/metal">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title tal:content="template/title_and_id"></title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3" tal:content="template/title_and_id"></td></tr>
+</thead><tbody>
+<tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/init" />
+<tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/wait_for_activities" />
+
+<!-- Access a PDF provided by erp5_dms_ui_test -->
+<tr>
+ <td>open</td>
+ <td>${base_url}/web_site_module/renderjs_runner/#/document_module/test_ERP5_Logo_Encrypted_PDF?editable=1</td>
+ <td></td>
+</tr>
+<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_app_loaded" />
+
+<tal:block tal:define="click_configuration python: {'text': 'Views'}">
+ <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/click_on_header_link" />
+</tal:block>
+<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded" />
+<tal:block tal:define="click_configuration python: {'text': 'Preview'}">
+ <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/click_on_page_link" />
+</tal:block>
+<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded" />
+
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//iframe[contains(@src, "pdfjs.gadget.html")]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>selectFrame</td>
+ <td>//iframe[contains(@src, "pdfjs.gadget.html")]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForText</td>
+ <td>//body//div[@class='textLayer']/div[1]</td>
+ <td>This is a sample PDF with some text and an image</td>
+</tr>
+<tr>
+ <td>selectFrame</td>
+ <td>relative=top</td>
+ <td></td>
+</tr>
+
+<!--
+ This PDF is automatically decrypted because of the ID
+ (see portal_skins/erp5_dms_ui_test/PDF_getContentPassword)
+ Make a clone, that will not be automatically decrypted (because Id will be different)
+ It is still possible for user to enter a password and view.
+-->
+<tal:block tal:define="click_configuration python: {'text': 'Actions'}">
+ <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/click_on_header_link" />
+</tal:block>
+<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded" />
+<tal:block tal:define="click_configuration python: {'text': 'Clone Document'}">
+ <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/click_on_page_link" />
+</tal:block>
+<tal:block tal:define="notification_configuration python: {'class': 'success',
+ 'text': 'Created Clone PDF.'}">
+ <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_notification" />
+</tal:block>
+<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded" />
+<tal:block tal:define="click_configuration python: {'text': 'Views'}">
+ <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/click_on_header_link" />
+</tal:block>
+<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded" />
+<tal:block tal:define="click_configuration python: {'text': 'Preview'}">
+ <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/click_on_page_link" />
+</tal:block>
+<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded" />
+
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//iframe[contains(@src, "pdfjs.gadget.html")]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>selectFrame</td>
+ <td>//iframe[contains(@src, "pdfjs.gadget.html")]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@id="passwordOverlay" and not(contains(@class, "hidden"))]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>password</td>
+ <td>secret</td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>passwordSubmit</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForText</td>
+ <td>//body//div[@class='textLayer']/div[1]</td>
+ <td>This is a sample PDF with some text and an image</td>
+</tr>
+<tr>
+ <td>selectFrame</td>
+ <td>relative=top</td>
+ <td></td>
+</tr>
+
+
+</tbody></table>
+</body>
+</html>
\ No newline at end of file
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/gadget_editor.js.js b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/gadget_editor.js.js
index 2d320c3a684ac2bb3ac3b820eb81894e0a75802e..78d1e4c3eca0ad61aa1492a688232c9d45df0d68 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/gadget_editor.js.js
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/gadget_editor.js.js
@@ -14,6 +14,7 @@
* can modify the content, false for a "read only" editor
* @property {string} language the user language, if the editor supports
* localisation it will be displayed in this language
+ * @property {string} password a password to decrypt the content
* @property {boolean} run a hack for jsmd editor
* @property {string} key Key for ERP5 form
*/
@@ -88,6 +89,7 @@
//this is temporary until the viewer becomes editable
run: options.run || false,
key: options.key,
+ password: options.password,
// Force calling subfield render
// as user may have modified the input value
render_timestamp: new Date().getTime()