From 9c9a504feac039819b2d4adf100d337337303dd0 Mon Sep 17 00:00:00 2001 From: Helmut Merz Date: Mon, 25 Jun 2012 09:37:59 +0200 Subject: [PATCH] allow editing of resources via pop-up dialog directly from list; use in section view of book --- browser/form.py | 5 ++++- browser/form_macros.pt | 4 +++- browser/resource_macros.pt | 4 ++-- compound/book/view_macros.pt | 20 ++++++++++++++++++++ 4 files changed, 29 insertions(+), 4 deletions(-) diff --git a/browser/form.py b/browser/form.py index e7ac588..aa59167 100644 --- a/browser/form.py +++ b/browser/form.py @@ -500,6 +500,9 @@ class EditObject(FormController, I18NView): @Lazy def target(self): + targetUid = self.request.form.get('targetUid') + if targetUid: + return self.view.getObjectForUid(targetUid) return self.view.virtualTargetObject or self.context @Lazy @@ -694,7 +697,7 @@ class CreateObject(EditObject): obj.setType(self.loopsRoot.loopsTraverse(tc)) notify(ObjectCreatedEvent(obj)) #notify(ObjectAddedEvent(obj)) - self.object = obj + self.object = self.view.object = obj formState = self.updateFields() # TODO: suppress validation self.view.formState = formState # TODO: error handling diff --git a/browser/form_macros.pt b/browser/form_macros.pt index eeec0bd..47f56b1 100644 --- a/browser/form_macros.pt +++ b/browser/form_macros.pt @@ -19,7 +19,9 @@ + tal:attributes="value request/version|nothing" /> +

Edit Information Object

diff --git a/browser/resource_macros.pt b/browser/resource_macros.pt index 2a8b9fb..406e519 100644 --- a/browser/resource_macros.pt +++ b/browser/resource_macros.pt @@ -83,8 +83,8 @@ - Open for editing diff --git a/compound/book/view_macros.pt b/compound/book/view_macros.pt index 3ded0de..ec1e68c 100644 --- a/compound/book/view_macros.pt +++ b/compound/book/view_macros.pt @@ -4,6 +4,26 @@
+
+ + + + +