[Erp5-report] r38278 kazuhiko - in /erp5/trunk/bt5/erp5_software_pdm: DocumentTemplateItem/...
nobody at svn.erp5.org
nobody at svn.erp5.org
Sat Sep 11 22:27:23 CEST 2010
Author: kazuhiko
Date: Sat Sep 11 22:27:21 2010
New Revision: 38278
URL: http://svn.erp5.org?rev=38278&view=rev
Log:
overriding (get)SearchableText method is no longer required.
Modified:
erp5/trunk/bt5/erp5_software_pdm/DocumentTemplateItem/SoftwareLicence.py
erp5/trunk/bt5/erp5_software_pdm/DocumentTemplateItem/SoftwareProduct.py
erp5/trunk/bt5/erp5_software_pdm/PortalTypeTemplateItem/portal_types/Software%20Licence.xml
erp5/trunk/bt5/erp5_software_pdm/PortalTypeTemplateItem/portal_types/Software%20Product.xml
erp5/trunk/bt5/erp5_software_pdm/bt/revision
Modified: erp5/trunk/bt5/erp5_software_pdm/DocumentTemplateItem/SoftwareLicence.py
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_software_pdm/DocumentTemplateItem/SoftwareLicence.py?rev=38278&r1=38277&r2=38278&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_software_pdm/DocumentTemplateItem/SoftwareLicence.py [utf8] (original)
+++ erp5/trunk/bt5/erp5_software_pdm/DocumentTemplateItem/SoftwareLicence.py [utf8] Sat Sep 11 22:27:21 2010
@@ -43,19 +43,3 @@ class SoftwareLicence(TextDocument, Item
# Declarative security
security = ClassSecurityInfo()
security.declareObjectProtected(Permissions.AccessContentsInformation)
-
- def getSearchableText(self):
- """Text for full text search"""
- text_list = []
- for prop in ( self.getTitle(),
- self.getDescription(),
- self.getShortTitle(),
- ):
- if prop:
- text_list.append(str(prop))
- for subject in self.getSubjectList():
- text_list.append(str(subject))
-
- return ' '.join(text_list)
-
- SearchableText = getSearchableText
Modified: erp5/trunk/bt5/erp5_software_pdm/DocumentTemplateItem/SoftwareProduct.py
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_software_pdm/DocumentTemplateItem/SoftwareProduct.py?rev=38278&r1=38277&r2=38278&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_software_pdm/DocumentTemplateItem/SoftwareProduct.py [utf8] (original)
+++ erp5/trunk/bt5/erp5_software_pdm/DocumentTemplateItem/SoftwareProduct.py [utf8] Sat Sep 11 22:27:21 2010
@@ -55,19 +55,3 @@ class SoftwareProduct(Resource):
# content_type property is also a method from PortalFolder, so we need a
# valid type by default.
content_type = ''
-
- security.declareProtected(Permissions.AccessContentsInformation,
- 'SearchableText')
- def SearchableText(self):
- """Text for full text search"""
- text_list = []
- for prop in ( self.getTitle(),
- self.getDescription(),
- self.getUrlString(),
- ):
- if prop:
- text_list.append(str(prop))
- for subject in self.getSubjectList():
- text_list.append(str(subject))
-
- return ' '.join(text_list)
Modified: erp5/trunk/bt5/erp5_software_pdm/PortalTypeTemplateItem/portal_types/Software%20Licence.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_software_pdm/PortalTypeTemplateItem/portal_types/Software%2520Licence.xml?rev=38278&r1=38277&r2=38278&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_software_pdm/PortalTypeTemplateItem/portal_types/Software%20Licence.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_software_pdm/PortalTypeTemplateItem/portal_types/Software%20Licence.xml [utf8] Sat Sep 11 22:27:21 2010
@@ -2,10 +2,7 @@
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
- <tuple>
- <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
- <tuple/>
- </tuple>
+ <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
</pickle>
<pickle>
<dictionary>
@@ -78,15 +75,23 @@
<key> <string>product</string> </key>
<value> <string>ERP5Type</string> </value>
</item>
+ <item>
+ <key> <string>searchable_text_property_id</string> </key>
+ <value>
+ <tuple>
+ <string>title</string>
+ <string>description</string>
+ <string>short_title</string>
+ <string>subject_list</string>
+ </tuple>
+ </value>
+ </item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
- <tuple>
- <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
- <tuple/>
- </tuple>
+ <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
</pickle>
<pickle>
<dictionary>
@@ -103,10 +108,7 @@
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
- <tuple>
- <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
- <tuple/>
- </tuple>
+ <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
</pickle>
<pickle>
<dictionary>
Modified: erp5/trunk/bt5/erp5_software_pdm/PortalTypeTemplateItem/portal_types/Software%20Product.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_software_pdm/PortalTypeTemplateItem/portal_types/Software%2520Product.xml?rev=38278&r1=38277&r2=38278&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_software_pdm/PortalTypeTemplateItem/portal_types/Software%20Product.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_software_pdm/PortalTypeTemplateItem/portal_types/Software%20Product.xml [utf8] Sat Sep 11 22:27:21 2010
@@ -2,10 +2,7 @@
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
- <tuple>
- <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
- <tuple/>
- </tuple>
+ <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
</pickle>
<pickle>
<dictionary>
@@ -92,15 +89,23 @@
<key> <string>product</string> </key>
<value> <string>ERP5Type</string> </value>
</item>
+ <item>
+ <key> <string>searchable_text_property_id</string> </key>
+ <value>
+ <tuple>
+ <string>title</string>
+ <string>description</string>
+ <string>url_string</string>
+ <string>subject_list</string>
+ </tuple>
+ </value>
+ </item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
- <tuple>
- <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
- <tuple/>
- </tuple>
+ <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
</pickle>
<pickle>
<dictionary>
@@ -117,10 +122,7 @@
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
- <tuple>
- <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
- <tuple/>
- </tuple>
+ <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
</pickle>
<pickle>
<dictionary>
@@ -137,10 +139,7 @@
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
- <tuple>
- <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
- <tuple/>
- </tuple>
+ <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
</pickle>
<pickle>
<dictionary>
Modified: erp5/trunk/bt5/erp5_software_pdm/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_software_pdm/bt/revision?rev=38278&r1=38277&r2=38278&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_software_pdm/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_software_pdm/bt/revision [utf8] Sat Sep 11 22:27:21 2010
@@ -1 +1 @@
-66
\ No newline at end of file
+67
\ No newline at end of file
More information about the Erp5-report
mailing list