[Erp5-report] r45383 gabriel - in /erp5/trunk/bt5/erp5_web_ung_theme: SkinTemplateItem/port...
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Apr 13 15:23:12 CEST 2011
Author: gabriel
Date: Wed Apr 13 15:23:12 2011
New Revision: 45383
URL: http://svn.erp5.org?rev=45383&view=rev
Log:
rename script and add test for this script
Added:
erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebPage_updateWebDocument.xml
Removed:
erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/Base_updateWebDocument.xml
Modified:
erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml
erp5/trunk/bt5/erp5_web_ung_theme/TestTemplateItem/testUNG.py
erp5/trunk/bt5/erp5_web_ung_theme/bt/revision
Removed: erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/Base_updateWebDocument.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/Base_updateWebDocument.xml?rev=45382&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/Base_updateWebDocument.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/Base_updateWebDocument.xml (removed)
@@ -1,83 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>Script_magic</string> </key>
- <value> <int>3</int> </value>
- </item>
- <item>
- <key> <string>_bind_names</string> </key>
- <value>
- <object>
- <klass>
- <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_asgns</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>name_container</string> </key>
- <value> <string>container</string> </value>
- </item>
- <item>
- <key> <string>name_context</string> </key>
- <value> <string>context</string> </value>
- </item>
- <item>
- <key> <string>name_m_self</string> </key>
- <value> <string>script</string> </value>
- </item>
- <item>
- <key> <string>name_subpath</string> </key>
- <value> <string>traverse_subpath</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
- <item>
- <key> <string>_body</string> </key>
- <value> <string>from json import dumps\n
-\n
-catalog_object = context.portal_catalog.getResultValue(path=document_path)\n
-document = context.restrictedTraverse(catalog_object.getPath())\n
-\n
-catalog_object = context.portal_catalog.getResultValue(path=webpage_path)\n
-webpage_document = context.restrictedTraverse(catalog_object.getPath())\n
-\n
-webpage_document.setTextContent(document.asStrippedHTML())\n
-webpage_document.setTitle(document.getTitle())\n
-\n
-if document.getTitle() != webpage_document.getTitle() or document.getId() == webpage_document.getTitle():\n
- print dumps(dict(status=400))\n
- return printed\n
- \n
-print dumps(dict(status=200))\n
-return printed\n
-</string> </value>
- </item>
- <item>
- <key> <string>_params</string> </key>
- <value> <string>document_path, webpage_path</string> </value>
- </item>
- <item>
- <key> <string>id</string> </key>
- <value> <string>Base_updateWebDocument</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
Added: erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebPage_updateWebDocument.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebPage_updateWebDocument.xml?rev=45383&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebPage_updateWebDocument.xml (added)
+++ erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebPage_updateWebDocument.xml [utf8] Wed Apr 13 15:23:12 2011
@@ -0,0 +1,78 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>Script_magic</string> </key>
+ <value> <int>3</int> </value>
+ </item>
+ <item>
+ <key> <string>_bind_names</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>_asgns</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>name_container</string> </key>
+ <value> <string>container</string> </value>
+ </item>
+ <item>
+ <key> <string>name_context</string> </key>
+ <value> <string>context</string> </value>
+ </item>
+ <item>
+ <key> <string>name_m_self</string> </key>
+ <value> <string>script</string> </value>
+ </item>
+ <item>
+ <key> <string>name_subpath</string> </key>
+ <value> <string>traverse_subpath</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>_body</string> </key>
+ <value> <string>from json import dumps\n
+\n
+catalog_object = context.portal_catalog.getResultValue(path=document_path)\n
+document = context.restrictedTraverse(catalog_object.getPath())\n
+\n
+context.setTextContent(document.asStrippedHTML())\n
+context.setTitle(document.getTitle())\n
+\n
+if document.getTitle() != context.getTitle() or document.getId() == context.getTitle():\n
+ return dumps(dict(status=400))\n
+ \n
+return dumps(dict(status=200))\n
+</string> </value>
+ </item>
+ <item>
+ <key> <string>_params</string> </key>
+ <value> <string>document_path</string> </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>WebPage_updateWebDocument</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml?rev=45383&r1=45382&r2=45383&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml [utf8] Wed Apr 13 15:23:12 2011
@@ -72,9 +72,8 @@ function showNotImplementedMessage(tag){
\n
function updateWebPage(){\n
var parameterList = getUrlParameterList();\n
- url = "Base_updateWebDocument?document_path=" + \n
- parameterList.document_path + \n
- "&webpage_path=" + parameterList.webpage_path;\n
+ url = "WebPage_updateWebDocument?document_path=" + \n
+ parameterList.document_path;\n
$.get(url, {}, function(data, textStatus, XMLHttpRequest){\n
response = jQuery.parseJSON(data);\n
if (response.status != 200){\n
Modified: erp5/trunk/bt5/erp5_web_ung_theme/TestTemplateItem/testUNG.py
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/TestTemplateItem/testUNG.py?rev=45383&r1=45382&r2=45383&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/TestTemplateItem/testUNG.py [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/TestTemplateItem/testUNG.py [utf8] Wed Apr 13 15:23:12 2011
@@ -27,7 +27,11 @@
##############################################################################
from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
+from Products.ERP5Type.tests.utils import FileUpload
+from Products.ERP5Type.tests.ERP5TypeTestCase import _getConversionServerDict
from DateTime import DateTime
+import os.path
+import Products.ERP5.tests
import re
import json
@@ -73,6 +77,14 @@ class TestUNG(ERP5TypeTestCase):
"""Clean up form"""
self.portal.REQUEST.form.clear()
+ def getDocumentPath(self):
+ """ It returns a full path of document """
+ folder_path = os.path.dirname(Products.ERP5.tests.__file__)
+ filename = "tiolive-ERP5.Freedom.TioLive.Spreadsheet-001-en.ods"
+ return os.path.join(folder_path,
+ "test_data",
+ filename), filename
+
def assertCreateDocumentUsingTemplate(self, template, **kw):
web_page_module = self.portal.web_page_module
self.portal.ERP5Site_createNewWebDocument(template)
@@ -418,4 +430,26 @@ class TestUNG(ERP5TypeTestCase):
kw["portal_type"] = "Web Table"
result_list = self.portal.web_site_module.ung.WebSection_getWebPageObjectList(**kw)
self.assertEquals(len(result_list), 1)
- self.assertEquals(result_list[0].getPortalType(), "Web Table")
\ No newline at end of file
+ self.assertEquals(result_list[0].getPortalType(), "Web Table")
+
+ def testWebPage_updateWebDocument(self):
+ """ """
+ portal = self.portal
+ portal_preferences = portal.portal_preferences
+ web_page_module = portal.web_page_module
+ portal_contributions = portal.portal_contributions
+ system_preference = portal_preferences.newContent(portal_type='System Preference')
+ conversion_dict = _getConversionServerDict()
+ system_preference.setPreferredOoodocServerAddress(conversion_dict["hostname"])
+ system_preference.setPreferredOoodocServerPortNumber(conversion_dict["port"])
+ system_preference.enable()
+ self.stepTic()
+ document_path, filename = self.getDocumentPath()
+ file = FileUpload(document_path, filename)
+ document = portal_contributions.newContent(file=file)
+ web_page = web_page_module.newContent(portal_type="Web Page")
+ self.stepTic()
+ web_page.WebPage_updateWebDocument(document.getPath())
+ self.stepTic()
+ self.assertTrue(re.search("\>tiolive\<", web_page.getTextContent()) is not None)
+ self.assertEquals(web_page.getTitle(), document.getTitle())
Modified: erp5/trunk/bt5/erp5_web_ung_theme/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/bt/revision?rev=45383&r1=45382&r2=45383&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/bt/revision [utf8] Wed Apr 13 15:23:12 2011
@@ -1 +1 @@
-351
\ No newline at end of file
+352
\ No newline at end of file
More information about the Erp5-report
mailing list