[Checkins] SVN: z3c.reference/branches/flash/src/z3c/reference/
Improve view reference widget and editor
Roger Ineichen
roger at projekt01.ch
Thu Sep 6 05:39:22 EDT 2007
Log message for revision 79491:
Improve view reference widget and editor
Changed:
U z3c.reference/branches/flash/src/z3c/reference/browser/configure.zcml
U z3c.reference/branches/flash/src/z3c/reference/browser/editor.pt
U z3c.reference/branches/flash/src/z3c/reference/browser/resources/reference.editor.js
U z3c.reference/branches/flash/src/z3c/reference/browser/views.py
U z3c.reference/branches/flash/src/z3c/reference/demo/browser/configure.zcml
U z3c.reference/branches/flash/src/z3c/reference/demo/browser/views.py
-=-
Modified: z3c.reference/branches/flash/src/z3c/reference/browser/configure.zcml
===================================================================
--- z3c.reference/branches/flash/src/z3c/reference/browser/configure.zcml 2007-09-06 09:33:13 UTC (rev 79490)
+++ z3c.reference/branches/flash/src/z3c/reference/browser/configure.zcml 2007-09-06 09:39:21 UTC (rev 79491)
@@ -86,14 +86,5 @@
permission="zope.ManageContent"
attribute="__call__"
/>
-
- <!-- imagetool -->
- <browser:page
- for="z3c.reference.demo.interfaces.IDemoFolder"
- name="imagetool.html"
- class=".views.ImageTool"
- permission="zope.ManageContent"
- template="imagetool.pt"
- />
</configure>
\ No newline at end of file
Modified: z3c.reference/branches/flash/src/z3c/reference/browser/editor.pt
===================================================================
--- z3c.reference/branches/flash/src/z3c/reference/browser/editor.pt 2007-09-06 09:33:13 UTC (rev 79490)
+++ z3c.reference/branches/flash/src/z3c/reference/browser/editor.pt 2007-09-06 09:39:21 UTC (rev 79491)
@@ -73,16 +73,14 @@
</style>
<script type="text/javascript"
- tal:condition="view/settingName"
- tal:define="settingName view/settingName"
+ tal:define="settingNameStr view/settingNameStr;
+ targetStr view/targetStr;
+ viewStr view/viewStr"
tal:content="string:
- var settingName = ${settingName};">
+ var settingName = '${settingNameStr}';
+ var targetStr = '${targetStr}';
+ var viewStr = '${viewStr}';">
</script>
-<script type="text/javascript"
- tal:condition="not:view/settingName"
- tal:content="string:
- var settingName = '';">
-</script>
<script src="jquery"
type="text/javascript"
tal:attributes="src context/++resource++jquery.js">
Modified: z3c.reference/branches/flash/src/z3c/reference/browser/resources/reference.editor.js
===================================================================
--- z3c.reference/branches/flash/src/z3c/reference/browser/resources/reference.editor.js 2007-09-06 09:33:13 UTC (rev 79490)
+++ z3c.reference/branches/flash/src/z3c/reference/browser/resources/reference.editor.js 2007-09-06 09:39:21 UTC (rev 79491)
@@ -1,5 +1,3 @@
-var settingName = '';
-
// user selects an item
function setIntId(uid) {
// reset values
@@ -13,13 +11,19 @@
}
function loadEditorSearch() {
- $.get("viewReferenceEditorSearch", {'settingName':settingName}, function () {
+ settings = {'settingName':settingName,
+ 'target': targetStr,
+ 'view': viewStr}
+ $.get("viewReferenceEditorSearch", settings, function () {
$("#editorSearch").append($(data));
});
}
-function loadEditorEdit() {
- $.get("viewReferenceEditorEdit", {'settingName':settingName}, function () {
+function loadEditorEdit(target, view) {
+ settings = {'settingName':settingName,
+ 'target': target,
+ 'view': view}
+ $.get("viewReferenceEditorEdit", settings, function () {
$("#editorEdit").append($(data));
});
}
@@ -30,5 +34,5 @@
loadEditorSearch();
// load edit form
- loadEditorEdit();
+ loadEditorEdit(targetStr, viewStr);
});
\ No newline at end of file
Modified: z3c.reference/branches/flash/src/z3c/reference/browser/views.py
===================================================================
--- z3c.reference/branches/flash/src/z3c/reference/browser/views.py 2007-09-06 09:33:13 UTC (rev 79490)
+++ z3c.reference/branches/flash/src/z3c/reference/browser/views.py 2007-09-06 09:39:21 UTC (rev 79491)
@@ -101,33 +101,18 @@
target = referenced object
"""
- settingName = u''
- searchForm = None
- editForm = None
+ settingNameStr = u''
+ viewStr = u''
+ targetStr = u''
- def update(self):
- super(ViewReferenceEditor, self).update()
+ def __call__(self):
+ """Setup JS variables."""
+ self.settingNameStr = self.request.get('settingName', u'')
+ self.viewStr = self.request.get('view', u'')
+ self.targetStr = self.request.get('target', u'')
+ return super(ViewReferenceEditor, self).__call__()
- self.settingName = self.request.get('settingName', u'')
-# target = self.request.get('target')
-# searchFormName = self.request.get('search')
-# editFormName = self.request.get('edit')
-#
-# # prepare search form
-# if target is not None and searchFormName is not None:
-# self.searchForm = component.getMultiAdapter(
-# (self.context, self.request), name=searchFormName)
-#
-# # prepare edit form
-# if target is not None and editFormName is not None:
-# self.editForm = component.getMultiAdapter(
-# (self.context, self.target, self.request), name=editFormName)
-#
-# @property
-# def url(self):
-# return absoluteURL(self.context, self.request)
-
class ViewReferenceEditorSearch(object):
"""Return the search form"""
@@ -138,11 +123,11 @@
def __call__(self):
settingName = self.request.get('settingName')
if settingName is not None:
- view = component.getMultiAdapter((self.context, self.request),
+ view = component.queryMultiAdapter((self.context, self.request),
interfaces.IViewReferenceEditorSearch, name=settingName)
- return view()
- else:
- return u''
+ if view is not None:
+ return view()
+ return u''
class ViewReferenceEditorEdit(object):
@@ -155,11 +140,11 @@
def __call__(self):
settingName = self.request.get('settingName')
if settingName is not None:
- view = component.getMultiAdapter((self.context, self.request),
+ view = component.queryMultiAdapter((self.context, self.request),
interfaces.IViewReferenceEditorEdit, name=settingName)
- return view()
- else:
- return u''
+ if view is not None:
+ return view()
+ return u''
class ImageTool(object):
Modified: z3c.reference/branches/flash/src/z3c/reference/demo/browser/configure.zcml
===================================================================
--- z3c.reference/branches/flash/src/z3c/reference/demo/browser/configure.zcml 2007-09-06 09:33:13 UTC (rev 79490)
+++ z3c.reference/branches/flash/src/z3c/reference/demo/browser/configure.zcml 2007-09-06 09:39:21 UTC (rev 79491)
@@ -65,8 +65,8 @@
name=""
for="z3c.reference.demo.interfaces.IDemoFolder
zope.publisher.interfaces.browser.IDefaultBrowserLayer"
- provides="z3c.reference.interfaces.IViewReferenceEditorEdit"
- factory=".views.ViewReferenceEditorEdit"
+ provides="z3c.reference.interfaces.IViewReferenceEditorSearch"
+ factory=".views.ViewReferenceEditorSearch"
permission="zope.ManageContent"
/>
@@ -74,8 +74,8 @@
name=""
for="z3c.reference.demo.interfaces.IDemoFolder
zope.publisher.interfaces.browser.IDefaultBrowserLayer"
- provides="z3c.reference.interfaces.IViewReferenceEditorSearch"
- factory=".views.ViewReferenceEditorSearch"
+ provides="z3c.reference.interfaces.IViewReferenceEditorEdit"
+ factory=".views.ViewReferenceEditorEdit"
permission="zope.ManageContent"
/>
Modified: z3c.reference/branches/flash/src/z3c/reference/demo/browser/views.py
===================================================================
--- z3c.reference/branches/flash/src/z3c/reference/demo/browser/views.py 2007-09-06 09:33:13 UTC (rev 79490)
+++ z3c.reference/branches/flash/src/z3c/reference/demo/browser/views.py 2007-09-06 09:39:21 UTC (rev 79491)
@@ -88,6 +88,9 @@
"""Represents the IViewReferenceEditorSearch form."""
template = ViewPageTemplateFile('editor_search.pt')
+ settingNameStr = u''
+ viewStr = u''
+ targetStr = u''
def __init__(self, context, request):
self.context = context
@@ -101,6 +104,9 @@
uid=intIds.getId(o))
def __call__(self):
+ self.settingName = self.request.get('settingName')
+ self.targetStr = self.request.get('target')
+ self.viewStr = self.request.get('view')
return self.template()
@@ -108,12 +114,16 @@
"""Represents the IViewReferenceEditorEdit form."""
template = ViewPageTemplateFile('editor_edit.pt')
+ settingNameStr = u''
+ viewStr = u''
+ targetStr = u''
def __init__(self, context, request):
self.context = context
self.request = request
def __call__(self):
- settingName = self.request.get('settingName')
-
+ self.settingName = self.request.get('settingName')
+ self.targetStr = self.request.get('target')
+ self.viewStr = self.request.get('view')
return self.template()
More information about the Checkins
mailing list