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
Xiaowu Zhang
erp5
Commits
44338f01
Commit
44338f01
authored
Oct 25, 2012
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Base_contribute: don't get values from REQUEST
parent
1e55357b
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
17 deletions
+3
-17
bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Base_contribute.xml
...plateItem/portal_skins/erp5_ingestion/Base_contribute.xml
+2
-5
bt5/erp5_ingestion/bt/revision
bt5/erp5_ingestion/bt/revision
+1
-1
product/ERP5OOo/tests/testDms.py
product/ERP5OOo/tests/testDms.py
+0
-11
No files found.
bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Base_contribute.xml
View file @
44338f01
...
@@ -71,7 +71,7 @@ if redirect_to_document is None:\n
...
@@ -71,7 +71,7 @@ if redirect_to_document is None:\n
if user_login is None:\n
if user_login is None:\n
# get current authenticated user\n
# get current authenticated user\n
user_login = str(portal.portal_membership.getAuthenticatedMember())\n
user_login = str(portal.portal_membership.getAuthenticatedMember())\n
\n
\n
document_kw = {\'user_login\': user_login,\n
document_kw = {\'user_login\': user_login,\n
\'group\': group,\n
\'group\': group,\n
\'publication_section\': publication_section,\n
\'publication_section\': publication_section,\n
...
@@ -87,12 +87,9 @@ if follow_up_list:\n
...
@@ -87,12 +87,9 @@ if follow_up_list:\n
document_kw[\'follow_up_list\'] = follow_up_list\n
document_kw[\'follow_up_list\'] = follow_up_list\n
\n
\n
\n
\n
form = portal.REQUEST.form\n
# Lookup for input values in request.form or kw to try to get values in two available modes: the\n
# script coulbe be called from ERP5 Form or directly from Python.\n
# FIXME: this list of properties should not be hardcoded.\n
# FIXME: this list of properties should not be hardcoded.\n
for key in (\'title\', \'short_title\', \'reference\', \'language\', \'version\', \'description\', ):\n
for key in (\'title\', \'short_title\', \'reference\', \'language\', \'version\', \'description\', ):\n
value =
form.get(key, kw.get(key, None)
)\n
value =
kw.get(key, None
)\n
if value not in MARKER:\n
if value not in MARKER:\n
document_kw[key] = value\n
document_kw[key] = value\n
\n
\n
...
...
bt5/erp5_ingestion/bt/revision
View file @
44338f01
144
145
\ No newline at end of file
\ No newline at end of file
product/ERP5OOo/tests/testDms.py
View file @
44338f01
...
@@ -1421,17 +1421,6 @@ class TestDocument(TestDocumentMixin):
...
@@ -1421,17 +1421,6 @@ class TestDocument(TestDocumentMixin):
self
.
tic
()
self
.
tic
()
self
.
assertEquals
(
'user supplied title'
,
contributed_document
.
getTitle
())
self
.
assertEquals
(
'user supplied title'
,
contributed_document
.
getTitle
())
def
test_Base_contribute_input_parameter_dict_request
(
self
):
"""Test contributing while entering input parameters through the dialog.
"""
person
=
self
.
portal
.
person_module
.
newContent
(
portal_type
=
'Person'
)
self
.
portal
.
REQUEST
.
form
[
'title'
]
=
'user supplied title'
contributed_document
=
person
.
Base_contribute
(
file
=
makeFileUpload
(
'TEST-en-002.pdf'
))
self
.
tic
()
self
.
assertEquals
(
'user supplied title'
,
contributed_document
.
getTitle
())
def
test_HTML_to_ODT_conversion_keep_enconding
(
self
):
def
test_HTML_to_ODT_conversion_keep_enconding
(
self
):
"""This test perform an PDF conversion of HTML content
"""This test perform an PDF conversion of HTML content
then to plain text.
then to plain text.
...
...
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