From 1e1ea59ccb58fcf1fbaa13e0b8978d700d32546b Mon Sep 17 00:00:00 2001 From: Gabriel Monnerat <gabriel@tiolive.com> Date: Mon, 4 Apr 2011 20:15:50 +0000 Subject: [PATCH] Don't set hardcode to configure the conversion server. The hostname and the port must be got from System Preference enabled git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@45072 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../BusinessConfiguration_setupUNGPreferences.xml | 4 +--- .../TestTemplateItem/testUNGConfigurationWorkflow.py | 8 ++++++++ bt5/erp5_configurator_ung/bt/revision | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/bt5/erp5_configurator_ung/SkinTemplateItem/portal_skins/erp5_configurator_ung/BusinessConfiguration_setupUNGPreferences.xml b/bt5/erp5_configurator_ung/SkinTemplateItem/portal_skins/erp5_configurator_ung/BusinessConfiguration_setupUNGPreferences.xml index b388016126..9c62bbf0b5 100644 --- a/bt5/erp5_configurator_ung/SkinTemplateItem/portal_skins/erp5_configurator_ung/BusinessConfiguration_setupUNGPreferences.xml +++ b/bt5/erp5_configurator_ung/SkinTemplateItem/portal_skins/erp5_configurator_ung/BusinessConfiguration_setupUNGPreferences.xml @@ -103,9 +103,7 @@ system_prefs = dict(\n \'-_.]+-[a-zA-Z0-9-_.]+)(|-(?P<version>[0-9a-zA-Z.]+))(|-(?P<language>[a\'\n \'-z]{2})[^-]*)?\',\n preferred_synchronous_metadata_discovery = True,\n - preferred_redirect_to_document = True,\n - preferred_ooodoc_server_address = "localhost",\n - preferred_ooodoc_server_port_number = 8011)\n + preferred_redirect_to_document = True)\n \n configuration_save.addConfigurationItem(\'System Preference Configurator Item\',\n object_id = \'default_configurator_system_preference\',\n diff --git a/bt5/erp5_configurator_ung/TestTemplateItem/testUNGConfigurationWorkflow.py b/bt5/erp5_configurator_ung/TestTemplateItem/testUNGConfigurationWorkflow.py index 76c01d23dd..080088cf48 100644 --- a/bt5/erp5_configurator_ung/TestTemplateItem/testUNGConfigurationWorkflow.py +++ b/bt5/erp5_configurator_ung/TestTemplateItem/testUNGConfigurationWorkflow.py @@ -64,6 +64,7 @@ class TestUNGConfiguratorWorkflowMixin(ERP5TypeTestCase): 'erp5_web_ung_role') DEFAULT_SEQUENCE_LIST = """ + stepSetupConversionServer stepCreateBusinessConfiguration stepSetUNGWorkflow stepConfiguratorNext @@ -114,6 +115,13 @@ class TestUNGConfiguratorWorkflowMixin(ERP5TypeTestCase): self.portal.portal_templates.updateRepositoryBusinessTemplateList( ['http://www.erp5.org/dists/snapshot/bt5/']) + def stepSetupConversionServer(self, sequence=None, sequence_list=None, **kw): + """ Setup conversion server in portal_preference """ + preference = self.portal.portal_preferences.newContent(portal_type="System Preference") + preference.setPreferredOoodocServerAddress("localhost") + preference.setPreferredOoodocServerPortNumber(8011) + preference.enable() + def stepCreateBusinessConfiguration(self, sequence=None, sequence_list=None, **kw): """ Create one Business Configuration """ module = self.portal.business_configuration_module diff --git a/bt5/erp5_configurator_ung/bt/revision b/bt5/erp5_configurator_ung/bt/revision index 1758dddcce..dc7b54ad01 100644 --- a/bt5/erp5_configurator_ung/bt/revision +++ b/bt5/erp5_configurator_ung/bt/revision @@ -1 +1 @@ -32 \ No newline at end of file +33 \ No newline at end of file -- 2.30.9