diff --git a/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Base_contribute.xml b/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Base_contribute.xml index ecb935ceb2467ed25b67c2573de0bb76b3444e0c..557a996a2764c1e4b6a5c6fdcf383d76e9fe48e7 100644 --- a/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Base_contribute.xml +++ b/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Base_contribute.xml @@ -71,7 +71,7 @@ if redirect_to_document is None:\n if user_login is None:\n # get current authenticated user\n user_login = str(portal.portal_membership.getAuthenticatedMember())\n - \n +\n document_kw = {\'user_login\': user_login,\n \'group\': group,\n \'publication_section\': publication_section,\n @@ -87,12 +87,9 @@ if follow_up_list:\n document_kw[\'follow_up_list\'] = follow_up_list\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 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 document_kw[key] = value\n \n diff --git a/bt5/erp5_ingestion/bt/revision b/bt5/erp5_ingestion/bt/revision index 70e1a64c23f0dc1eb79598f64221bd0c38f18b97..aca544d017fda52bacd14eecff279d5097137c6e 100644 --- a/bt5/erp5_ingestion/bt/revision +++ b/bt5/erp5_ingestion/bt/revision @@ -1 +1 @@ -144 \ No newline at end of file +145 \ No newline at end of file diff --git a/product/ERP5OOo/tests/testDms.py b/product/ERP5OOo/tests/testDms.py index b123a77f7d17395c86b9a24261d9cdbdbeed8d20..e13d14226d0ac804b010772a68bc8d815bba33f9 100644 --- a/product/ERP5OOo/tests/testDms.py +++ b/product/ERP5OOo/tests/testDms.py @@ -1421,17 +1421,6 @@ class TestDocument(TestDocumentMixin): self.tic() 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): """This test perform an PDF conversion of HTML content then to plain text.