From a56d578fefb46eec88caf5a9f9517a003165a73f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Thu, 28 Jul 2011 15:48:04 +0200
Subject: [PATCH] Add a RelatedDocs type (not editable ttw at the moment)

---
 themis/fields/__init__.py   | 12 +++++++++++-
 themis/fields/editors.py    |  3 +++
 themis/fields/editors.zcml  |  5 +++++
 themis/fields/handlers.py   |  6 ++++++
 themis/fields/handlers.zcml |  5 +++++
 themis/fields/interfaces.py | 17 ++++++++++++++++-
 themis/fields/widgets.py    | 12 +++++++++++-
 themis/fields/widgets.zcml  |  1 +
 8 files changed, 58 insertions(+), 3 deletions(-)

diff --git a/themis/fields/__init__.py b/themis/fields/__init__.py
index 0a17998..83d7951 100644
--- a/themis/fields/__init__.py
+++ b/themis/fields/__init__.py
@@ -26,6 +26,7 @@ from themis.fields.interfaces import IDateOnly
 from themis.fields.interfaces import IRadioChoice
 from themis.fields.interfaces import ISubjects, ILegisSession, IList
 from themis.fields.interfaces import IRelatedDoc
+from themis.fields.interfaces import IRelatedDocs
 from themis.fields.interfaces import IMailId
 from themis.fields.interfaces import IMailRefId
 
@@ -33,7 +34,7 @@ from themis.fields.vocabs import SubjectsSource
 from themis.fields.vocabs import LegislativeSessionsSource
 
 from plone.formwidget.contenttree import ObjPathSourceBinder
-from z3c.relationfield.schema import Relation
+from z3c.relationfield.schema import Relation, RelationList
 
 
 class Commission(Field):
@@ -355,6 +356,15 @@ class RelatedDoc(Relation):
         return clone
 
 
+class RelatedDocs(RelationList):
+    implements(IRelatedDocs)
+
+    def __init__(self, value_type=None, unique=False, **kw):
+        if value_type is None:
+            value_type = RelatedDoc()
+        super(RelatedDocs, self).__init__(value_type=value_type, unique=unique, **kw)
+
+
 class MailId(TextLine):
     implements(IMailId, IFromUnicode)
 
diff --git a/themis/fields/editors.py b/themis/fields/editors.py
index b7d8460..51206ad 100644
--- a/themis/fields/editors.py
+++ b/themis/fields/editors.py
@@ -13,6 +13,7 @@ from themis.fields import Deputy, Deputies
 from themis.fields import Ministry, Ministries
 from themis.fields import DeputyOrMinistry, DeputiesOrMinistries
 from themis.fields import RelatedDoc
+from themis.fields import RelatedDocs
 from themis.fields import MailId
 from themis.fields import MailRefId
 from plone.schemaeditor.fields import FieldFactory
@@ -47,6 +48,8 @@ RadioChoiceFactory = FieldFactory(RadioChoice, u'Choice (radio)', values=[])
 
 RelatedDocFactory = FieldFactory(RelatedDoc, u'Related Document')
 
+RelatedDocsFactory = FieldFactory(RelatedDocs, u'Related Documents')
+
 MailRefIdFactory = FieldFactory(MailRefId, u'Mail Reference')
 
 MailIdFactory = FieldFactory(MailId, u'Mail Number')
diff --git a/themis/fields/editors.zcml b/themis/fields/editors.zcml
index fc65989..2ba160f 100644
--- a/themis/fields/editors.zcml
+++ b/themis/fields/editors.zcml
@@ -77,6 +77,11 @@
         component=".editors.RelatedDocFactory"
         />
 
+    <utility
+        name="themis.fields.RelatedDocs"
+        component=".editors.RelatedDocsFactory"
+        />
+
     <utility
         name="themis.fields.MailId"
         component=".editors.MailIdFactory"
diff --git a/themis/fields/handlers.py b/themis/fields/handlers.py
index 6b18b6a..9e26d9b 100644
--- a/themis/fields/handlers.py
+++ b/themis/fields/handlers.py
@@ -22,6 +22,7 @@ if HAVE_SUPERMODEL:
     from themis.fields import Contact, Contacts
     from themis.fields import LegisSession
     from themis.fields import RelatedDoc
+    from themis.fields import RelatedDocs
     from themis.fields import MailId
     from themis.fields import MailRefId
 
@@ -100,6 +101,11 @@ if HAVE_SUPERMODEL:
 
     RelatedDocHandler = RelatedDocHandler_(RelatedDoc)
 
+    class RelatedDocsHandler_(BaseHandler):
+        pass
+
+    RelatedDocsHandler = RelatedDocsHandler_(RelatedDocs)
+
     class MailIdHandler_(BaseHandler):
         pass
 
diff --git a/themis/fields/handlers.zcml b/themis/fields/handlers.zcml
index 4fe2c3e..9e2d5d2 100644
--- a/themis/fields/handlers.zcml
+++ b/themis/fields/handlers.zcml
@@ -79,6 +79,11 @@
         name="themis.fields.RelatedDoc"
         />
 
+    <utility
+        component=".handlers.RelatedDocsHandler"
+        name="themis.fields.RelatedDocs"
+        />
+
     <utility
         component=".handlers.MailIdHandler"
         name="themis.fields.MailId"
diff --git a/themis/fields/interfaces.py b/themis/fields/interfaces.py
index f8dc902..991cc2a 100644
--- a/themis/fields/interfaces.py
+++ b/themis/fields/interfaces.py
@@ -3,7 +3,7 @@ from zope.interface import Interface
 from zope.schema.interfaces import IChoice, IField, IList, IDate
 from zope import schema
 from z3c.form.interfaces import IOrderedSelectWidget, ITextWidget
-from z3c.relationfield.interfaces import IRelation
+from z3c.relationfield.interfaces import IRelation, IRelationList
 
 class ICommission(IField):
     '''Field containing a unicode string without newlines that is a commission.'''
@@ -94,6 +94,21 @@ class IRelatedDoc(IRelation):
         description=IField['missing_value'].description,
         required=False)
 
+
+class IRelatedDocs(IRelationList):
+    default = schema.Text(
+        title=IField['default'].title,
+        description=IField['default'].description,
+        required=False)
+
+    missing_value = schema.Text(
+        title=IField['missing_value'].title,
+        description=IField['missing_value'].description,
+        required=False)
+
+
+
+
 class IMailId(IField):
     default = schema.Text(
         description=IField['default'].description,
diff --git a/themis/fields/widgets.py b/themis/fields/widgets.py
index 7548e80..0292cbc 100644
--- a/themis/fields/widgets.py
+++ b/themis/fields/widgets.py
@@ -21,6 +21,7 @@ from themis.fields.interfaces import IMinistry, IMinistries
 from themis.fields.interfaces import IDeputyOrMinistry, IDeputiesOrMinistries
 from themis.fields.interfaces import IOrderedSelectAndAddWidget
 from themis.fields.interfaces import IRelatedDoc
+from themis.fields.interfaces import IRelatedDocs
 from themis.fields.interfaces import IMailId, IMailIdWidget
 from themis.fields.interfaces import IMailRefId, IMailRefIdWidget
 
@@ -33,7 +34,7 @@ from z3c.form.browser.checkbox import CheckBoxWidget
 from z3c.form.browser.select import SelectWidget
 from z3c.form.browser.text import TextWidget
 from z3c.form.browser.radio import RadioWidget
-from plone.formwidget.contenttree.widget import ContentTreeWidget
+from plone.formwidget.contenttree.widget import ContentTreeWidget, MultiContentTreeWidget
 
 @adapter(ICommission, IFormLayer)
 @implementer(IFieldWidget)
@@ -188,6 +189,7 @@ class OrderedSelectAndAddWidget(OrderedSelectWidget):
             self._bound_source = source
         return self._bound_source
 
+
 @adapter(IRelatedDoc, IFormLayer)
 @implementer(IFieldWidget)
 def RelatedDocFieldWidget(field, request):
@@ -195,6 +197,14 @@ def RelatedDocFieldWidget(field, request):
     return FieldWidget(field, ContentTreeWidget(request))
 
 
+@adapter(IRelatedDocs, IFormLayer)
+@implementer(IFieldWidget)
+def RelatedDocsFieldWidget(field, request):
+    '''IFieldWidget factory for RelatedDocsWidget'''
+    return FieldWidget(field, MultiContentTreeWidget(request))
+
+
+
 class MailIdWidget(TextWidget):
     implements(IMailIdWidget)
 
diff --git a/themis/fields/widgets.zcml b/themis/fields/widgets.zcml
index 0d650ec..3e81e58 100644
--- a/themis/fields/widgets.zcml
+++ b/themis/fields/widgets.zcml
@@ -30,6 +30,7 @@
     <adapter factory=".widgets.DateFieldWidget"/>
     <adapter factory=".widgets.RadioChoiceFieldWidget"/>
     <adapter factory=".widgets.RelatedDocFieldWidget"/>
+    <adapter factory=".widgets.RelatedDocsFieldWidget"/>
     <adapter factory=".widgets.MailIdFieldWidget"/>
     <adapter factory=".widgets.MailRefIdFieldWidget"/>