[Erp5-report] r28941 - in /erp5/trunk/bt5/erp5_crm: SkinTemplateItem/portal_skins/erp5_crm/...
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Sep 11 13:49:53 CEST 2009
Author: jp
Date: Fri Sep 11 13:49:50 2009
New Revision: 28941
URL: http://svn.erp5.org?rev=28941&view=rev
Log:
Proxify text_content fields. Deprecate Event_getTextContentCorrespondToFormat (wrong naming, wrong implemetation) and replace it with Event_getEditorFieldTextContent
Modified:
erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_getEditorFieldTextContent.xml
erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_getTextContentCorrespondToFormat.xml
erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewPreview/text_content.xml
erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewReportFieldLibrary.xml
erp5/trunk/bt5/erp5_crm/bt/revision
Modified: erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_getEditorFieldTextContent.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_getEditorFieldTextContent.xml?rev=28941&r1=28940&r2=28941&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_getEditorFieldTextContent.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_getEditorFieldTextContent.xml [utf8] Fri Sep 11 13:49:50 2009
@@ -60,15 +60,15 @@
Field expects to be provided valid HTML. It is therefore the responsibility\n
of the Default value script to provide this valid HTML.\n
"""\n
+# Define default editable value\n
+if editable is None:\n
+ editable = context.Event_isTextContentEditable()\n
+\n
# If content is editable, nothing to do\n
-if context.Event_isTextContentEditable():\n
+if editable:\n
return context.getTextContent()\n
\n
-# If content is HTML, nothing to do\n
-if context.getTextFormat() == \'text/html\':\n
- return context.getTextContent()\n
-\n
-# If not, convert it\n
+# If not, convert it to stripped HTML (read-only)\n
return context.asStrippedHTML()\n
</string> </value>
</item>
@@ -80,7 +80,7 @@
</item>
<item>
<key> <string>_params</string> </key>
- <value> <string></string> </value>
+ <value> <string>editable=None</string> </value>
</item>
<item>
<key> <string>errors</string> </key>
@@ -100,12 +100,14 @@
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
- <value> <int>0</int> </value>
+ <value> <int>1</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
<value>
<tuple>
+ <string>editable</string>
+ <string>None</string>
<string>_getattr_</string>
<string>context</string>
</tuple>
@@ -119,7 +121,9 @@
<item>
<key> <string>func_defaults</string> </key>
<value>
- <none/>
+ <tuple>
+ <none/>
+ </tuple>
</value>
</item>
<item>
Modified: erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_getTextContentCorrespondToFormat.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_getTextContentCorrespondToFormat.xml?rev=28941&r1=28940&r2=28941&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_getTextContentCorrespondToFormat.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_getTextContentCorrespondToFormat.xml [utf8] Fri Sep 11 13:49:50 2009
@@ -129,6 +129,10 @@
<value> <string>Event_getTextContentCorrespondToFormat</string> </value>
</item>
<item>
+ <key> <string>title</string> </key>
+ <value> <string>SUPERCEDED by Event_getEditorFieldTextContent</string> </value>
+ </item>
+ <item>
<key> <string>warnings</string> </key>
<value>
<tuple/>
Modified: erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewPreview/text_content.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewPreview/text_content.xml?rev=28941&r1=28940&r2=28941&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewPreview/text_content.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewPreview/text_content.xml [utf8] Fri Sep 11 13:49:50 2009
@@ -3,12 +3,25 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <global name="EditorField" module="Products.ERP5Form.EditorField"/>
+ <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
+ <item>
+ <key> <string>delegated_list</string> </key>
+ <value>
+ <list>
+ <string>css_class</string>
+ <string>default</string>
+ <string>editable</string>
+ <string>enabled</string>
+ <string>title</string>
+ <string>width</string>
+ </list>
+ </value>
+ </item>
<item>
<key> <string>id</string> </key>
<value> <string>text_content</string> </value>
@@ -21,22 +34,6 @@
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
- <item>
- <key> <string>line_too_long</string> </key>
- <value> <string>A line was too long.</string> </value>
- </item>
- <item>
- <key> <string>required_not_found</string> </key>
- <value> <string>Input is required but no input given.</string> </value>
- </item>
- <item>
- <key> <string>too_long</string> </key>
- <value> <string>You entered too many characters.</string> </value>
- </item>
- <item>
- <key> <string>too_many_lines</string> </key>
- <value> <string>You entered too many lines.</string> </value>
- </item>
</dictionary>
</value>
</item>
@@ -45,75 +42,15 @@
<value>
<dictionary>
<item>
- <key> <string>alternate_name</string> </key>
+ <key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>css_class</string> </key>
+ <key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>default</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>description</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>editable</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>enabled</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>external_validator</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>extra</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>height</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>hidden</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>max_length</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>max_linelength</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>max_lines</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>required</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>unicode</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>whitespace_preserve</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>width</string> </key>
+ <key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
@@ -124,85 +61,35 @@
<value>
<dictionary>
<item>
- <key> <string>alternate_name</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>css_class</string> </key>
+ <key> <string>default</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
- <key> <string>default</string> </key>
+ <key> <string>editable</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>enabled</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
- <key> <string>description</string> </key>
+ <key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>editable</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
- </value>
- </item>
- <item>
- <key> <string>enabled</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
- </value>
- </item>
- <item>
- <key> <string>external_validator</string> </key>
+ <key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>extra</string> </key>
+ <key> <string>target</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>height</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>hidden</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>max_length</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>max_linelength</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>max_lines</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>required</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>text_editor</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAY=</string> </persistent>
- </value>
- </item>
- <item>
<key> <string>title</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>unicode</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>whitespace_preserve</string> </key>
<value> <string></string> </value>
</item>
<item>
@@ -217,19 +104,11 @@
<value>
<dictionary>
<item>
- <key> <string>alternate_name</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
<key> <string>css_class</string> </key>
<value> <string>page</string> </value>
</item>
<item>
<key> <string>default</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
@@ -241,48 +120,20 @@
<value> <int>1</int> </value>
</item>
<item>
- <key> <string>external_validator</string> </key>
- <value> <string></string> </value>
+ <key> <string>field_id</string> </key>
+ <value> <string>my_text_content</string> </value>
</item>
<item>
- <key> <string>extra</string> </key>
- <value> <string></string> </value>
+ <key> <string>form_id</string> </key>
+ <value> <string>Event_viewFieldLibrary</string> </value>
</item>
<item>
- <key> <string>height</string> </key>
- <value> <int>18</int> </value>
- </item>
- <item>
- <key> <string>hidden</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>max_length</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>max_linelength</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>max_lines</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>required</string> </key>
- <value> <int>0</int> </value>
+ <key> <string>target</string> </key>
+ <value> <string>Click to edit the target</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Page Content</string> </value>
- </item>
- <item>
- <key> <string>unicode</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>whitespace_preserve</string> </key>
- <value> <int>0</int> </value>
</item>
<item>
<key> <string>width</string> </key>
@@ -305,7 +156,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python:(getattr(here, \'hasFile\', None) is not None and here.hasFile() and \'page\') or \'\'</string> </value>
+ <value> <string>python:here.Event_getEditorFieldTextContent(editable=False)</string> </value>
</item>
</dictionary>
</pickle>
@@ -321,57 +172,9 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python:here.Event_getTextContentCorrespondToFormat(editable=False)</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
- <record id="4" aka="AAAAAAAAAAQ=">
- <pickle>
- <tuple>
- <global name="TALESMethod" module="Products.Formulator.TALESField"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_text</string> </key>
- <value> <string>python:getattr(here, \'hasFile\', None) is not None and not here.hasFile()</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
- <record id="5" aka="AAAAAAAAAAU=">
- <pickle>
- <tuple>
- <global name="TALESMethod" module="Products.Formulator.TALESField"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_text</string> </key>
<value> <string>not:here/getUrlString</string> </value>
</item>
</dictionary>
</pickle>
</record>
- <record id="6" aka="AAAAAAAAAAY=">
- <pickle>
- <tuple>
- <global name="TALESMethod" module="Products.Formulator.TALESField"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_text</string> </key>
- <value> <string>python:(here.getTextFormat() == \'text/html\' and here.portal_preferences.getPreferredTextEditor()) or \'text_area\'</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
</ZopeData>
Modified: erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewReportFieldLibrary.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewReportFieldLibrary.xml?rev=28941&r1=28940&r2=28941&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewReportFieldLibrary.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewReportFieldLibrary.xml [utf8] Fri Sep 11 13:49:50 2009
@@ -61,6 +61,7 @@
<string>center</string>
<string>bottom</string>
<string>hidden</string>
+ <string>not_assigned</string>
</list>
</value>
</item>
@@ -100,6 +101,14 @@
<string>your_report_mode_listbox</string>
<string>your_from_date</string>
<string>your_at_date</string>
+ </list>
+ </value>
+ </item>
+ <item>
+ <key> <string>not_assigned</string> </key>
+ <value>
+ <list>
+ <string>your_reportbox</string>
</list>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_crm/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_crm/bt/revision?rev=28941&r1=28940&r2=28941&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_crm/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_crm/bt/revision [utf8] Fri Sep 11 13:49:50 2009
@@ -1,1 +1,1 @@
-434
+435
More information about the Erp5-report
mailing list