Don't set hardcode to configure the conversion server. The hostname and the...

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

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

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

bt5/erp5_configurator_ung/bt/revision

-32
+33
\ No newline at end of file