[Erp5-report] r38573 ivan - in /erp5/trunk/bt5/erp5_km_ui_test: SkinTemplateItem/portal_ski...

nobody at svn.erp5.org nobody at svn.erp5.org
Thu Sep 23 09:26:09 CEST 2010


Author: ivan
Date: Thu Sep 23 09:26:07 2010
New Revision: 38573

URL: http://svn.erp5.org?rev=38573&view=rev
Log:
Use DMS settings script and clean up KM's own.
Set bt5 dependencies.

Modified:
    erp5/trunk/bt5/erp5_km_ui_test/SkinTemplateItem/portal_skins/erp5_km_ui_test/KMZuite_CommonTemplate.xml
    erp5/trunk/bt5/erp5_km_ui_test/SkinTemplateItem/portal_skins/erp5_km_ui_test/WebSiteModule_createKMSite.xml
    erp5/trunk/bt5/erp5_km_ui_test/bt/dependency_list
    erp5/trunk/bt5/erp5_km_ui_test/bt/revision

Modified: erp5/trunk/bt5/erp5_km_ui_test/SkinTemplateItem/portal_skins/erp5_km_ui_test/KMZuite_CommonTemplate.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_km_ui_test/SkinTemplateItem/portal_skins/erp5_km_ui_test/KMZuite_CommonTemplate.xml?rev=38573&r1=38572&r2=38573&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_km_ui_test/SkinTemplateItem/portal_skins/erp5_km_ui_test/KMZuite_CommonTemplate.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_km_ui_test/SkinTemplateItem/portal_skins/erp5_km_ui_test/KMZuite_CommonTemplate.xml [utf8] Thu Sep 23 09:26:07 2010
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -74,19 +71,6 @@
 \n
 <tal:block metal:define-macro="deleteKMWebSite">\n
     <!-- delete the web_site XXX: not used anymore as no need to delete site -->\n
-    <!--\n
-    <tr>\n
-      <td>open</td>\n
-      <td>${base_url}/web_site_module/WebSiteModule_deleteKMSite?site_id=km_test_web_site</td>\n
-      <td></td>\n
-      <td>Delete KM site</td>\n
-    </tr>\n
-    <tr>\n
-      <td>assertTextPresent</td>\n
-      <td>Deleted Successfully.</td>\n
-      <td></td>\n
-    </tr>\n
-    -->\n
 </tal:block>\n
 \n
 \n

Modified: erp5/trunk/bt5/erp5_km_ui_test/SkinTemplateItem/portal_skins/erp5_km_ui_test/WebSiteModule_createKMSite.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_km_ui_test/SkinTemplateItem/portal_skins/erp5_km_ui_test/WebSiteModule_createKMSite.xml?rev=38573&r1=38572&r2=38573&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_km_ui_test/SkinTemplateItem/portal_skins/erp5_km_ui_test/WebSiteModule_createKMSite.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_km_ui_test/SkinTemplateItem/portal_skins/erp5_km_ui_test/WebSiteModule_createKMSite.xml [utf8] Thu Sep 23 09:26:07 2010
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -53,42 +50,13 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string encoding="cdata"><![CDATA[
-
-"""\n
+            <value> <string>"""\n
   Initialize a KM site.\n
 """\n
 portal = context.getPortalObject()\n
-"""\n
-if site_id not in context.objectIds():\n
-  km_website = context.newContent(id = site_id, \\\n
-                                  title = title, \n
-                                  portal_type = \'Web Site\')\n
-  km_website.edit(skin_selection_name = \'KM\',\n
-                  container_layout = \'erp5_km_minimal_layout\',\n
-                  content_layout = \'erp5_km_minimal_content_layout\',\n
-                  custom_render_method_id = \'WebSite_viewKnowledgePad\',\n
-                  layout_configuration_form_id = \'WebSection_viewKMMinimalThemeConfiguration\',\n
-                  static_language_selection = True,\n
-                  visible = True,\n
-                  site_map_section_parent = True,\n
-                  default_available_language = \'en\')\n
-"""\n
 \n
-km_preference_id = \'km_site_test\'\n
-portal_preferences = context.portal_preferences\n
-if km_preference_id not in portal_preferences.objectIds():\n
-  km_preference = portal_preferences.newContent(\n
-                    id = km_preference_id,\n
-                    portal_type = \'System Preference\',\n
-                    priority = 1,\n
-                    preferred_document_reference_regular_expression = \'(?P<reference>[a-zA-Z0-9-_.]+-[a-zA-Z0-9-_.]+)(|-(?P<version>[0-9a-zA-Z.]+))(|-(?P<language>[a-z]{2})[^-]*)?\',\n
-                    preferred_document_file_name_regular_expression = \'(?P<node_reference>[a-zA-Z0-9_-]+)-(?P<local_reference>[a-zA-Z0-9_.]+)-(?P<version>[0-9a-zA-Z.]+)-(?P<language>[a-z]{2})[^-]*?\',\n
-                    preferred_synchronous_metadata_discovery = True,\n
-                    preferred_redirect_to_document = True,\n
-                    preferred_ooodoc_server_address = context.Zuite_getConversionServerDict()["oood_hostname"],\n
-                    preferred_ooodoc_server_port_number = context.Zuite_getConversionServerDict()["oood_port"])\n
-  km_preference.enable()\n
+# setup DMS settings\n
+portal.Zuite_setupDMS()\n
 \n
 # publish the test web page so we can use it in tests for setting default WEb Section page\n
 for reference in (\'minimal_km_footer\', \'km.web.site.test.page\',):\n
@@ -100,9 +68,7 @@ for reference in (\'minimal_km_footer\',
 portal.portal_caches.clearAllCache()\n
 \n
 return "Created Successfully."\n
-
-
-]]></string> </value>
+</string> </value>
         </item>
         <item>
             <key> <string>_code</string> </key>
@@ -151,11 +117,6 @@ return "Created Successfully."\n
                             <string>_getattr_</string>
                             <string>context</string>
                             <string>portal</string>
-                            <string>km_preference_id</string>
-                            <string>portal_preferences</string>
-                            <string>True</string>
-                            <string>_getitem_</string>
-                            <string>km_preference</string>
                             <string>_getiter_</string>
                             <string>reference</string>
                             <string>km_page</string>

Modified: erp5/trunk/bt5/erp5_km_ui_test/bt/dependency_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_km_ui_test/bt/dependency_list?rev=38573&r1=38572&r2=38573&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_km_ui_test/bt/dependency_list [utf8] (original)
+++ erp5/trunk/bt5/erp5_km_ui_test/bt/dependency_list [utf8] Thu Sep 23 09:26:07 2010
@@ -1,2 +1,3 @@
 erp5_ui_test_core
+erp5_dms_ui_test
 erp5_km
\ No newline at end of file

Modified: erp5/trunk/bt5/erp5_km_ui_test/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_km_ui_test/bt/revision?rev=38573&r1=38572&r2=38573&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_km_ui_test/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_km_ui_test/bt/revision [utf8] Thu Sep 23 09:26:07 2010
@@ -1 +1 @@
-99
\ No newline at end of file
+102
\ No newline at end of file




More information about the Erp5-report mailing list