[Plone-cvs] r34404 - in Plone/trunk: Products/CMFPlone/skins/plone_content docs

[Eric S. <svn...@pl...>]

Author: esteele
Date: Sat Feb 27 03:49:23 2010
New Revision: 34404

Modified:
   Plone/trunk/Products/CMFPlone/skins/plone_content/folder_listing.pt
   Plone/trunk/Products/CMFPlone/skins/plone_content/folder_tabular_view.pt
   Plone/trunk/docs/CHANGES.txt
Log:
Update the check for body text in folder_listing and folder_tabular_view. Closes #10226

Modified: Plone/trunk/Products/CMFPlone/skins/plone_content/folder_listing.pt
==============================================================================
--- Plone/trunk/Products/CMFPlone/skins/plone_content/folder_listing.pt	(original)
+++ Plone/trunk/Products/CMFPlone/skins/plone_content/folder_listing.pt	Sat Feb 27 03:49:23 2010
@@ -18,8 +18,7 @@
          id="parent-fieldname-text" class="stx"
          tal:define="kss_class python:getKssClasses('text', 
                      templateId=templateId, macro='text-field-view');
-                     has_text exists:context/aq_base/getText;
-                     text python:has_text and here.getText() or ''"
+                     text here/aq_explicit/getText|nothing"
          tal:condition="text"
          tal:attributes="class python:test(context.Format() in ('text/structured',
                                                'text/x-rst', ), 'stx' + kss_class, 'plain' + kss_class)">

Modified: Plone/trunk/Products/CMFPlone/skins/plone_content/folder_tabular_view.pt
==============================================================================
--- Plone/trunk/Products/CMFPlone/skins/plone_content/folder_tabular_view.pt	(original)
+++ Plone/trunk/Products/CMFPlone/skins/plone_content/folder_tabular_view.pt	Sat Feb 27 03:49:23 2010
@@ -16,8 +16,7 @@
              id="parent-fieldname-text" class="stx"
              tal:define="kss_class python:getKssClasses('text', 
                          templateId=templateId, macro='text-field-view');
-                         has_text exists:context/aq_base/getText;
-                         text python:has_text and here.getText() or ''"
+                         text here/aq_explicit/getText|nothing"
              tal:condition="text"
              tal:attributes="class python:test(context.Format() in ('text/structured',
                                                    'text/x-rst', ), 'stx' + kss_class, 'plain' + kss_class)">

Modified: Plone/trunk/docs/CHANGES.txt
==============================================================================
--- Plone/trunk/docs/CHANGES.txt	(original)
+++ Plone/trunk/docs/CHANGES.txt	Sat Feb 27 03:49:23 2010
@@ -8,6 +8,10 @@
 4.0b1 - Unreleased
 ------------------
 
+- Update the check for body text in folder_listing and folder_tabular_view.
+  Closes http://dev.plone.org/plone/ticket/10226
+  [esteele]
+  
 - Added markup to give styling to document ByLine in folder_summary_view.
   This fixes http://dev.plone.org/plone/ticket/6094
   [dunlapm]