Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
erp5
Commits
c97ca158
Commit
c97ca158
authored
13 years ago
by
Ivan Tyagov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix testDms to not call stepTic which is not required.
Start preconversion in a separate serialize able activity.
parent
e82f7689
master
bk_erp5ish_actions_tool
bk_officejs
bk_officejs.170922
bk_officejs.backup_new_bt
bk_officejs.backup_new_bt_second
bk_officejs_AttachmentSyncOff
bk_officejs_setVolatileSetting
bk_onlyoffice.170926
bk_onlyoffice.170926.test
bk_onlyoffice.170926.test.notpassed
bk_onlyoffice_fix_tests.171017
bk_onlyoffice_fix_tests.171017.test
bk_onlyoffice_in_skins.171120
bk_sqlcatalog
bootstrap_design
erp5_only_office
onlyoffice_gui_for_xmla
onlyoffice_tests_fix
raskon
schema_editor
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
4 deletions
+5
-4
bt5/erp5_dms_conversion_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/SQLCatalog_preConvertDocumentList.xml
...g/erp5_mysql_innodb/SQLCatalog_preConvertDocumentList.xml
+4
-2
bt5/erp5_dms_conversion_catalog/bt/revision
bt5/erp5_dms_conversion_catalog/bt/revision
+1
-1
product/ERP5OOo/tests/testDms.py
product/ERP5OOo/tests/testDms.py
+0
-1
No files found.
bt5/erp5_dms_conversion_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/SQLCatalog_preConvertDocumentList.xml
View file @
c97ca158
...
@@ -52,14 +52,16 @@
...
@@ -52,14 +52,16 @@
<key>
<string>
_body
</string>
</key>
<key>
<string>
_body
</string>
</key>
<value>
<string>
portal = context.getPortalObject()\n
<value>
<string>
portal = context.getPortalObject()\n
portal_id = portal.getId()\n
portal_id = portal.getId()\n
MARKER = (None, \'\',)\n
\n
\n
for index_uid in range(len(uid)):\n
for index_uid in range(len(uid)):\n
document_relative_url = getPath[index_uid].replace("/%s/" %portal_id, "")\n
document_relative_url = getPath[index_uid].replace("/%s/" %portal_id, "")\n
document = portal.restrictedTraverse(document_relative_url)\n
document = portal.restrictedTraverse(document_relative_url)\n
if getattr(document, "convert", None) is not None and \\\n
if getattr(document, "convert", None) is not None and \\\n
getattr(document, "getData", None) is not None and \\\n
getattr(document, "getData", None) is not None and \\\n
(document.getData() not in (None, \'\',) or document.getBaseData() not in (None, \'\',)):\n
(document.getData() not in MARKER or document.getBaseData() not in MARKER):\n
document.Base_preConvert()\n
#context.log("preconvert %s" %document.getRelativeUrl())\n
document.activate(serialize_tag="conversion").Base_preConvert()\n
</string>
</value>
</string>
</value>
</item>
</item>
<item>
<item>
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_dms_conversion_catalog/bt/revision
View file @
c97ca158
1
2
\ No newline at end of file
\ No newline at end of file
This diff is collapsed.
Click to expand it.
product/ERP5OOo/tests/testDms.py
View file @
c97ca158
...
@@ -1350,7 +1350,6 @@ class TestDocument(TestDocumentMixin):
...
@@ -1350,7 +1350,6 @@ class TestDocument(TestDocumentMixin):
# Delete base_data
# Delete base_data
document
.
edit
(
base_data
=
None
)
document
.
edit
(
base_data
=
None
)
self
.
stepTic
()
# As document is not converted, text conversion is impossible
# As document is not converted, text conversion is impossible
self
.
assertRaises
(
NotConvertedError
,
document
.
asText
)
self
.
assertRaises
(
NotConvertedError
,
document
.
asText
)
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment