[Checkins] SVN: z3c.relationfieldui/branches/faassen-relationlist/s Remove old list widget code as we now can fully rely on z3c.listjs.
Martijn Faassen
faassen at infrae.com
Thu Jan 8 13:19:09 EST 2009
Log message for revision 94636:
Remove old list widget code as we now can fully rely on z3c.listjs.
Changed:
U z3c.relationfieldui/branches/faassen-relationlist/setup.py
U z3c.relationfieldui/branches/faassen-relationlist/src/z3c/relationfieldui/__init__.py
U z3c.relationfieldui/branches/faassen-relationlist/src/z3c/relationfieldui/configure.zcml
U z3c.relationfieldui/branches/faassen-relationlist/src/z3c/relationfieldui/widget.py
-=-
Modified: z3c.relationfieldui/branches/faassen-relationlist/setup.py
===================================================================
--- z3c.relationfieldui/branches/faassen-relationlist/setup.py 2009-01-08 18:14:28 UTC (rev 94635)
+++ z3c.relationfieldui/branches/faassen-relationlist/setup.py 2009-01-08 18:19:08 UTC (rev 94636)
@@ -36,7 +36,7 @@
'grokcore.view',
'hurry.resource',
'hurry.zoperesource >= 0.3',
- 'hurry.js.wforms',
+ 'z3c.listjs',
],
entry_points={},
)
Modified: z3c.relationfieldui/branches/faassen-relationlist/src/z3c/relationfieldui/__init__.py
===================================================================
--- z3c.relationfieldui/branches/faassen-relationlist/src/z3c/relationfieldui/__init__.py 2009-01-08 18:14:28 UTC (rev 94635)
+++ z3c.relationfieldui/branches/faassen-relationlist/src/z3c/relationfieldui/__init__.py 2009-01-08 18:19:08 UTC (rev 94636)
@@ -1 +1 @@
-from z3c.relationfieldui.widget import RelationWidget, RelationListWidget, RelationDisplayWidget
+from z3c.relationfieldui.widget import RelationWidget, RelationDisplayWidget
Modified: z3c.relationfieldui/branches/faassen-relationlist/src/z3c/relationfieldui/configure.zcml
===================================================================
--- z3c.relationfieldui/branches/faassen-relationlist/src/z3c/relationfieldui/configure.zcml 2009-01-08 18:14:28 UTC (rev 94635)
+++ z3c.relationfieldui/branches/faassen-relationlist/src/z3c/relationfieldui/configure.zcml 2009-01-08 18:19:08 UTC (rev 94636)
@@ -8,7 +8,7 @@
<include package="hurry.zoperesource" />
<include package="z3c.relationfield" />
- <include package="hurry.js.wforms" />
+ <include package="z3c.listjs" />
<grok:grok package="."/>
Modified: z3c.relationfieldui/branches/faassen-relationlist/src/z3c/relationfieldui/widget.py
===================================================================
--- z3c.relationfieldui/branches/faassen-relationlist/src/z3c/relationfieldui/widget.py 2009-01-08 18:14:28 UTC (rev 94635)
+++ z3c.relationfieldui/branches/faassen-relationlist/src/z3c/relationfieldui/widget.py 2009-01-08 18:19:08 UTC (rev 94636)
@@ -11,7 +11,6 @@
from z3c.objpath.interfaces import IObjectPath
from hurry.resource import Library, ResourceInclusion
-from hurry.js.wforms import wforms
from z3c.relationfield.schema import IRelation, IRelationList
from z3c.relationfield import create_relation
@@ -73,67 +72,3 @@
return '<a href="%s">%s</a>' % (
to_url,
escape(value.to_path))
-
-class RelationListWidget(grok.MultiAdapter, TextWidget):
- grok.adapts(IRelationList, IBrowserRequest)
- grok.provides(IInputWidget)
-
- def __call__(self):
- result = '<fieldset class="repeat" id="%s">' % self.name
- # result += '<div class="oneField">'
- result += TextWidget.__call__(self)
- explorer_url = component.getMultiAdapter((self.context.context,
- self.request),
- name="explorerurl")()
- result += renderElement(
- 'input', type='button', value='get relation',
- onclick="Z3C.relation.popup(this.previousSibling, '%s')" %
- (explorer_url))
-# result += '</div>'
- result += '</fieldset>'
- wforms.need()
- relation_resource.need()
- return result
-
- def hasInput(self):
- # in case of a single response
- if self.name in self.request.form:
- return True
- # if multiple responses are there
- return self.name + '[0]-RC' in self.request.form
-
- def repeatCount(self):
- count = self.request.form.get(self.name + '[0]-RC', None)
- if count is None:
- return None
- return int(count)
-
- def _toFieldValue(self, input):
- c = self.repeatCount()
- if c is None:
- # regular single value input
- if not input:
- return []
- paths = [input]
- else:
- # multi-value input
- paths = []
- for i in range(c):
- v = self.request.form.get(self.name + '[%s]' % i, None)
- if v is None:
- continue
- paths.append(v)
- result = []
- object_path = component.getUtility(IObjectPath)
- resolve = object_path.resolve
- for path in paths:
- obj = resolve(path)
- result.append(create_relation(obj))
- return result
-
- def _toFormValue(self, value):
- if value is None:
- return ''
- return ''
-
- # return value.to_path
More information about the Checkins
mailing list