diff --git a/bt5/erp5_software_pdm/DocumentTemplateItem/SoftwareLicence.py b/bt5/erp5_software_pdm/DocumentTemplateItem/SoftwareLicence.py index c85bffd9afe1031a59504877a183655d1f9e6e29..147abb150331a7c54399a1b6499a90a60e924647 100644 --- a/bt5/erp5_software_pdm/DocumentTemplateItem/SoftwareLicence.py +++ b/bt5/erp5_software_pdm/DocumentTemplateItem/SoftwareLicence.py @@ -32,7 +32,7 @@ from Products.ERP5Type import Permissions, PropertySheet 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 diff --git a/bt5/erp5_software_pdm/SkinTemplateItem/portal_skins/erp5_software_pdm/SoftwareLicenceModule_viewSoftwareLicenceList.xml b/bt5/erp5_software_pdm/SkinTemplateItem/portal_skins/erp5_software_pdm/SoftwareLicenceModule_viewSoftwareLicenceList.xml index 0489b449882b7bf81136f19a4c859f07017c4d76..cf22726c4cb14a722145889af9befbde2c4c85dc 100644 --- a/bt5/erp5_software_pdm/SkinTemplateItem/portal_skins/erp5_software_pdm/SoftwareLicenceModule_viewSoftwareLicenceList.xml +++ b/bt5/erp5_software_pdm/SkinTemplateItem/portal_skins/erp5_software_pdm/SoftwareLicenceModule_viewSoftwareLicenceList.xml @@ -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> diff --git a/bt5/erp5_software_pdm/SkinTemplateItem/portal_skins/erp5_software_pdm/SoftwareLicence_view.xml b/bt5/erp5_software_pdm/SkinTemplateItem/portal_skins/erp5_software_pdm/SoftwareLicence_view.xml index 52d641129c830e457e3b34e94deff41c243a0059..9eca2a9cf2ce69e32694d199fe8d2e5a7ab991f0 100644 --- a/bt5/erp5_software_pdm/SkinTemplateItem/portal_skins/erp5_software_pdm/SoftwareLicence_view.xml +++ b/bt5/erp5_software_pdm/SkinTemplateItem/portal_skins/erp5_software_pdm/SoftwareLicence_view.xml @@ -81,7 +81,7 @@ <value> <list> <string>iframe_content</string> - <string>text_content</string> + <string>my_text_content</string> </list> </value> </item> diff --git a/bt5/erp5_software_pdm/SkinTemplateItem/portal_skins/erp5_software_pdm/SoftwareLicence_view/text_content.xml b/bt5/erp5_software_pdm/SkinTemplateItem/portal_skins/erp5_software_pdm/SoftwareLicence_view/my_text_content.xml similarity index 86% rename from bt5/erp5_software_pdm/SkinTemplateItem/portal_skins/erp5_software_pdm/SoftwareLicence_view/text_content.xml rename to bt5/erp5_software_pdm/SkinTemplateItem/portal_skins/erp5_software_pdm/SoftwareLicence_view/my_text_content.xml index 5761ed2d0c984884897cd6c84579d7719e61bbc7..694d4260dcb72acda34332e6d3feb529c87761f0 100644 --- a/bt5/erp5_software_pdm/SkinTemplateItem/portal_skins/erp5_software_pdm/SoftwareLicence_view/text_content.xml +++ b/bt5/erp5_software_pdm/SkinTemplateItem/portal_skins/erp5_software_pdm/SoftwareLicence_view/my_text_content.xml @@ -12,12 +12,14 @@ <item> <key> <string>delegated_list</string> </key> <value> - <list/> + <list> + <string>enabled</string> + </list> </value> </item> <item> <key> <string>id</string> </key> - <value> <string>text_content</string> </value> + <value> <string>my_text_content</string> </value> </item> <item> <key> <string>message_values</string> </key> @@ -53,6 +55,10 @@ <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> @@ -72,6 +78,10 @@ <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> diff --git a/bt5/erp5_software_pdm/bt/revision b/bt5/erp5_software_pdm/bt/revision index b2412e34dff05e77952f3f930772631cac5a3be7..4e9e288487445d1193130dba3e3c6af29b242115 100644 --- a/bt5/erp5_software_pdm/bt/revision +++ b/bt5/erp5_software_pdm/bt/revision @@ -1 +1 @@ -62 \ No newline at end of file +63 \ No newline at end of file