[Erp5-report] r37084 fabien - in /erp5/trunk/bt5/erp5_software_pdm: DocumentTemplateItem/ S...
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Jul 13 16:03:34 CEST 2010
Author: fabien
Date: Tue Jul 13 16:03:26 2010
New Revision: 37084
URL: http://svn.erp5.org?rev=37084&view=rev
Log:
unify Licence from my project (wich is more advanced) with Licence from erp5_software_pdm
Added:
erp5/trunk/bt5/erp5_software_pdm/SkinTemplateItem/portal_skins/erp5_software_pdm/SoftwareLicence_view/my_text_content.xml
Modified:
erp5/trunk/bt5/erp5_software_pdm/DocumentTemplateItem/SoftwareLicence.py
erp5/trunk/bt5/erp5_software_pdm/SkinTemplateItem/portal_skins/erp5_software_pdm/SoftwareLicenceModule_viewSoftwareLicenceList.xml
erp5/trunk/bt5/erp5_software_pdm/SkinTemplateItem/portal_skins/erp5_software_pdm/SoftwareLicence_view.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=37084&r1=37083&r2=37084&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_software_pdm/DocumentTemplateItem/SoftwareLicence.py [utf8] (original)
+++ erp5/trunk/bt5/erp5_software_pdm/DocumentTemplateItem/SoftwareLicence.py [utf8] Tue Jul 13 16:03:26 2010
@@ -32,7 +32,7 @@ from Products.ERP5Type import Permission
from Products.ERP5.Document.Item import Item
from Products.ERP5.Document.TextDocument import TextDocument
-class SoftwareLicence(Item, TextDocument):
+class SoftwareLicence(TextDocument, Item):
"""
"""
@@ -43,3 +43,19 @@ class SoftwareLicence(Item, TextDocument
# 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/SkinTemplateItem/portal_skins/erp5_software_pdm/SoftwareLicenceModule_viewSoftwareLicenceList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_software_pdm/SkinTemplateItem/portal_skins/erp5_software_pdm/SoftwareLicenceModule_viewSoftwareLicenceList.xml?rev=37084&r1=37083&r2=37084&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_software_pdm/SkinTemplateItem/portal_skins/erp5_software_pdm/SoftwareLicenceModule_viewSoftwareLicenceList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_software_pdm/SkinTemplateItem/portal_skins/erp5_software_pdm/SoftwareLicenceModule_viewSoftwareLicenceList.xml [utf8] Tue Jul 13 16:03:26 2010
@@ -77,7 +77,9 @@
<item>
<key> <string>bottom</string> </key>
<value>
- <list/>
+ <list>
+ <string>listbox</string>
+ </list>
</value>
</item>
<item>
@@ -95,9 +97,7 @@
<item>
<key> <string>left</string> </key>
<value>
- <list>
- <string>listbox</string>
- </list>
+ <list/>
</value>
</item>
<item>
Modified: erp5/trunk/bt5/erp5_software_pdm/SkinTemplateItem/portal_skins/erp5_software_pdm/SoftwareLicence_view.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_software_pdm/SkinTemplateItem/portal_skins/erp5_software_pdm/SoftwareLicence_view.xml?rev=37084&r1=37083&r2=37084&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_software_pdm/SkinTemplateItem/portal_skins/erp5_software_pdm/SoftwareLicence_view.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_software_pdm/SkinTemplateItem/portal_skins/erp5_software_pdm/SoftwareLicence_view.xml [utf8] Tue Jul 13 16:03:26 2010
@@ -81,7 +81,7 @@
<value>
<list>
<string>iframe_content</string>
- <string>text_content</string>
+ <string>my_text_content</string>
</list>
</value>
</item>
Added: erp5/trunk/bt5/erp5_software_pdm/SkinTemplateItem/portal_skins/erp5_software_pdm/SoftwareLicence_view/my_text_content.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_software_pdm/SkinTemplateItem/portal_skins/erp5_software_pdm/SoftwareLicence_view/my_text_content.xml?rev=37084&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_software_pdm/SkinTemplateItem/portal_skins/erp5_software_pdm/SoftwareLicence_view/my_text_content.xml (added)
+++ erp5/trunk/bt5/erp5_software_pdm/SkinTemplateItem/portal_skins/erp5_software_pdm/SoftwareLicence_view/my_text_content.xml [utf8] Tue Jul 13 16:03:26 2010
@@ -0,0 +1,103 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>delegated_list</string> </key>
+ <value>
+ <list>
+ <string>enabled</string>
+ </list>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>my_text_content</string> </value>
+ </item>
+ <item>
+ <key> <string>message_values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>external_validator_failed</string> </key>
+ <value> <string>The input failed the external validator.</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>overrides</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>tales</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>enabled</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>enabled</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string>text_content</string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string>WebPage_viewFieldLibrary</string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string>Click to edit the target</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_software_pdm/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_software_pdm/bt/revision?rev=37084&r1=37083&r2=37084&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_software_pdm/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_software_pdm/bt/revision [utf8] Tue Jul 13 16:03:26 2010
@@ -1 +1 @@
-62
\ No newline at end of file
+63
\ No newline at end of file
More information about the Erp5-report
mailing list