[Erp5-report] r12484 - in /erp5/trunk/bt5/erp5_dms: SkinTemplateItem/portal_skins/erp5_dms/...

[nobody at svn.erp5.org]

Author: bartek
Date: Wed Jan 31 15:34:41 2007
New Revision: 12484

URL: http://svn.erp5.org?rev=12484&view=rev
Log:
In found text, if no search string was given, show text content (not searchable text). Looks much cleaner.

Modified:
    erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_showFoundText.xml
    erp5/trunk/bt5/erp5_dms/bt/revision

Modified: erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_showFoundText.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_showFoundText.xml?rev=12484&r1=12483&r2=12484&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_showFoundText.xml (original)
+++ erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_showFoundText.xml Wed Jan 31 15:34:41 2007
@@ -85,12 +85,16 @@
 # maximum lines to show\n
 maxlines = 5\n
 \n
-txt = brain.getObject().SearchableText()\n
+try:\n
+  txt = brain.getObject().getTextContent() or \'\'\n
+except AttributeError:\n
+  txt = \'\'\n
+\n
 search_string = selection.params.get(\'SearchableText\')\n
 if search_string is None:\n
   # if the searched text is empty (e.g. because the listbox uses its own method)\n
   # we return something\n
-  return txt[min(len(txt) - 300, 200) : 500] # a somewhat arbitrary choice to trim searchable attrs\n
+  return txt[:300]\n
 \n
 search_argument_list = context.parseSearchString(search_string)\n
 search_words = search_argument_list.get(\'SearchableText\')\n
@@ -152,14 +156,15 @@
                             <string>maxlines</string>
                             <string>_getattr_</string>
                             <string>txt</string>
+                            <string>AttributeError</string>
                             <string>search_string</string>
                             <string>None</string>
                             <string>_getitem_</string>
-                            <string>min</string>
-                            <string>len</string>
                             <string>context</string>
                             <string>search_argument_list</string>
                             <string>search_words</string>
+                            <string>min</string>
+                            <string>len</string>
                             <string>res</string>
                             <string>map</string>
                             <string>str</string>

Modified: erp5/trunk/bt5/erp5_dms/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/bt/revision?rev=12484&r1=12483&r2=12484&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/bt/revision (original)
+++ erp5/trunk/bt5/erp5_dms/bt/revision Wed Jan 31 15:34:41 2007
@@ -1,1 +1,1 @@
-471
+473