Skip to content

erp5
erp5
Commit 10de2d49 authored by Bartek Górny's avatar Bartek Górny
Browse files
Options

change handling of contributors into a category-based multirelation (#19) 

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@10330 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 462d0f7c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 1407 deletions
bt5/erp5_dms/CategoryTemplateItem/portal_categories/contributor_related.xml deleted 100644 → 0
View file @ 462d0f7c
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<tuple>
<string>Products.ERP5Type.Document.BaseCategory</string>
<string>BaseCategory</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_count</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>_mt_index</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>_tree</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
<item>
<key> <string>acquisition_portal_type</string> </key>
<value> <string>python: []</string> </value>
</item>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>contributor_related</string>
</tuple>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>contributor_related</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Base Category</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>contributor_related</string> </value>
</item>
<item>
<key> <string>uid</string> </key>
<value>
<none/>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<tuple>
<string>BTrees.Length</string>
<string>Length</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle> <int>0</int> </pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<tuple>
<tuple>
<string>BTrees.OOBTree</string>
<string>OOBTree</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<none/>
</pickle>
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<tuple>
<tuple>
<string>BTrees.OOBTree</string>
<string>OOBTree</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<none/>
</pickle>
</record>
</ZopeData>
bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMSFile_view.xml
View file @ 10de2d49
...@@ -79,9 +79,6 @@ ...@@ -79,9 +79,6 @@
<list> <list>
<string>my_description</string> <string>my_description</string>
<string>my_subject_list</string> <string>my_subject_list</string>
<string>my_contributor_name_list</string>
<string>my_contributor_related_title_list</string>
<string>my_contributor_list</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -111,6 +108,7 @@ ...@@ -111,6 +108,7 @@
<string>my_validation_state</string> <string>my_validation_state</string>
<string>my_file</string> <string>my_file</string>
<string>my_source_reference</string> <string>my_source_reference</string>
<string>my_contributor_title_list</string>
</list> </list>
</value> </value>
</item> </item>
......
bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/OOoDocument_view/my_contributor_related_title_list.xml → bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMSFile_view/my_contributor_title_list.xml
View file @ 10de2d49
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>my_contributor_related_title_list</string> </value> <value> <string>my_contributor_title_list</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
...@@ -391,7 +391,7 @@ ...@@ -391,7 +391,7 @@
</item> </item>
<item> <item>
<key> <string>base_category</string> </key> <key> <string>base_category</string> </key>
<value> <string>contributor_related</string> </value> <value> <string>contributor</string> </value>
</item> </item>
<item> <item>
<key> <string>catalog_index</string> </key> <key> <string>catalog_index</string> </key>
......
bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/OOoDocument_view.xml
View file @ 10de2d49
...@@ -79,9 +79,6 @@ ...@@ -79,9 +79,6 @@
<list> <list>
<string>my_description</string> <string>my_description</string>
<string>my_subject_list</string> <string>my_subject_list</string>
<string>my_contributor_list</string>
<string>my_contributor_name_list</string>
<string>my_contributor_related_title_list</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -111,6 +108,7 @@ ...@@ -111,6 +108,7 @@
<string>my_validation_state</string> <string>my_validation_state</string>
<string>my_file</string> <string>my_file</string>
<string>my_source_reference</string> <string>my_source_reference</string>
<string>my_contributor_title_list</string>
</list> </list>
</value> </value>
</item> </item>
......
bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMSFile_view/my_contributor_related_title_list.xml → bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/OOoDocument_view/my_contributor_title_list.xml
View file @ 10de2d49
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>my_contributor_related_title_list</string> </value> <value> <string>my_contributor_title_list</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
...@@ -391,7 +391,7 @@ ...@@ -391,7 +391,7 @@
</item> </item>
<item> <item>
<key> <string>base_category</string> </key> <key> <string>base_category</string> </key>
<value> <string>contributor_related</string> </value> <value> <string>contributor</string> </value>
</item> </item>
<item> <item>
<key> <string>catalog_index</string> </key> <key> <string>catalog_index</string> </key>
......
bt5/erp5_dms/bt/revision
View file @ 10de2d49
187 188
\ No newline at end of file \ No newline at end of file
product/ERP5OOo/Document/DMSFile.py
View file @ 10de2d49
...@@ -272,24 +272,6 @@ class DMSFile(XMLObject,File): ...@@ -272,24 +272,6 @@ class DMSFile(XMLObject,File):
#id='DMSFile_getWikiPredecessorValueList') #id='DMSFile_getWikiPredecessorValueList')
#return cached_getWikiPredecessorValueList() #return cached_getWikiPredecessorValueList()
security.declareProtected(Permissions.View,'getContributorList')
def getContributorList(self):
'''
override
'''
return (self.getContributorRelatedTitleList() or [])+(self.getContributorNameList() or [])
getContributorsList=getContributorList
getContributorTitleList=getContributorList
security.declarePrivate('setContributorList')
def setContributorList(self,*args,**kwargs):
'''
just in case
'''
pass
setContributorsList=setContributorList
# BG copied from File in case # BG copied from File in case
index_html = CMFFile.index_html index_html = CMFFile.index_html
PUT = CMFFile.PUT PUT = CMFFile.PUT
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7