From 4fba2c1e2741135efc55b5d6a748923a169cf6f1 Mon Sep 17 00:00:00 2001
From: Helmut Merz <helmutm@cy55.de>
Date: Mon, 14 Nov 2011 15:10:11 +0100
Subject: [PATCH] provide field instance with context and request information,
 e.g. for use in persistent vocabularies

---
 browser/concept.py        | 2 +-
 browser/concept_macros.pt | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/browser/concept.py b/browser/concept.py
index c4bf3e6..12a4f58 100644
--- a/browser/concept.py
+++ b/browser/concept.py
@@ -235,7 +235,7 @@ class ConceptView(BaseView):
         return self.adapted.description
 
     def getData(self, omit=('title', 'description')):
-        data = self.instance.applyTemplate()
+        data = self.instance.applyTemplate(context=self.context, request=self.request)
         for k in omit:
             if k in data:
                 del data[k]
diff --git a/browser/concept_macros.pt b/browser/concept_macros.pt
index 15358b3..523be51 100644
--- a/browser/concept_macros.pt
+++ b/browser/concept_macros.pt
@@ -50,7 +50,8 @@
       <tal:row repeat="field fields">
         <tr tal:define="fieldName field/name;
                         value nocall:data/?fieldName;
-                        fieldInstance field/getFieldInstance;
+                        fieldInstance python:field.getFieldInstance(
+                                context=context, request=request);
                         rendererName field/displayRenderer;
                         renderer python:fieldInstance.getRenderer(rendererName) or
                                         view.concept_macros[rendererName]"