[Erp5-report] r45072 gabriel - in /erp5/trunk/bt5/erp5_configurator_ung: SkinTemplateItem/p...

[nobody at svn.erp5.org]

Author: gabriel
Date: Mon Apr  4 22:15:50 2011
New Revision: 45072

URL: http://svn.erp5.org?rev=45072&view=rev
Log:
Don't set hardcode to configure the conversion server. The hostname and the port must be got from System Preference enabled

Modified:
    erp5/trunk/bt5/erp5_configurator_ung/SkinTemplateItem/portal_skins/erp5_configurator_ung/BusinessConfiguration_setupUNGPreferences.xml
    erp5/trunk/bt5/erp5_configurator_ung/TestTemplateItem/testUNGConfigurationWorkflow.py
    erp5/trunk/bt5/erp5_configurator_ung/bt/revision

Modified: erp5/trunk/bt5/erp5_configurator_ung/SkinTemplateItem/portal_skins/erp5_configurator_ung/BusinessConfiguration_setupUNGPreferences.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_configurator_ung/SkinTemplateItem/portal_skins/erp5_configurator_ung/BusinessConfiguration_setupUNGPreferences.xml?rev=45072&r1=45071&r2=45072&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_configurator_ung/SkinTemplateItem/portal_skins/erp5_configurator_ung/BusinessConfiguration_setupUNGPreferences.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_configurator_ung/SkinTemplateItem/portal_skins/erp5_configurator_ung/BusinessConfiguration_setupUNGPreferences.xml [utf8] Mon Apr  4 22:15:50 2011
@@ -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

Modified: erp5/trunk/bt5/erp5_configurator_ung/TestTemplateItem/testUNGConfigurationWorkflow.py
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_configurator_ung/TestTemplateItem/testUNGConfigurationWorkflow.py?rev=45072&r1=45071&r2=45072&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_configurator_ung/TestTemplateItem/testUNGConfigurationWorkflow.py [utf8] (original)
+++ erp5/trunk/bt5/erp5_configurator_ung/TestTemplateItem/testUNGConfigurationWorkflow.py [utf8] Mon Apr  4 22:15:50 2011
@@ -64,6 +64,7 @@ class TestUNGConfiguratorWorkflowMixin(E
                        'erp5_web_ung_role')
 
   DEFAULT_SEQUENCE_LIST = """
+     stepSetupConversionServer
      stepCreateBusinessConfiguration
      stepSetUNGWorkflow
      stepConfiguratorNext
@@ -114,6 +115,13 @@ class TestUNGConfiguratorWorkflowMixin(E
     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

Modified: erp5/trunk/bt5/erp5_configurator_ung/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_configurator_ung/bt/revision?rev=45072&r1=45071&r2=45072&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_configurator_ung/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_configurator_ung/bt/revision [utf8] Mon Apr  4 22:15:50 2011
@@ -1 +1 @@
-32
\ No newline at end of file
+33
\ No newline at end of file