From aa6838faa609c54a674d268cf7391e90e78bf090 Mon Sep 17 00:00:00 2001
From: helmutm <helmutm@fd906abe-77d9-0310-91a1-e0d9ade77398>
Date: Tue, 4 Dec 2007 12:54:49 +0000
Subject: [PATCH] improve MyStuff query

git-svn-id: svn://svn.cy55.de/Zope3/src/loops/trunk@2214 fd906abe-77d9-0310-91a1-e0d9ade77398
---
 browser/common.py         |  3 ++-
 browser/concept_macros.pt |  2 +-
 knowledge/browser.py      |  5 +++--
 organize/browser.py       | 19 ++++++++++++++-----
 organize/party.py         |  3 ---
 organize/view_macros.pt   |  9 +++++++++
 6 files changed, 29 insertions(+), 12 deletions(-)
 create mode 100644 organize/view_macros.pt

diff --git a/browser/common.py b/browser/common.py
index 9493567..a1bb085 100644
--- a/browser/common.py
+++ b/browser/common.py
@@ -59,7 +59,8 @@ from loops.util import _
 from loops.versioning.interfaces import IVersionable
 
 
-conceptMacrosTemplate = ViewPageTemplateFile('concept_macros.pt')
+concept_macros = ViewPageTemplateFile('concept_macros.pt')
+conceptMacrosTemplate = concept_macros      # "old" name
 
 
 class NameField(schema.ASCIILine):
diff --git a/browser/concept_macros.pt b/browser/concept_macros.pt
index 9d386c8..3c5f0ba 100644
--- a/browser/concept_macros.pt
+++ b/browser/concept_macros.pt
@@ -1,6 +1,6 @@
 <metal:data define-macro="conceptdata">
   <div tal:attributes="class string:content-$level;">
-          <metal:fields use-macro="item/template/macros/concepttitle" />
+          <metal:fields use-macro="item/template/macros/concepttitle" /><br />
           <metal:fields use-macro="item/template/macros/conceptfields" /><br />
           <metal:fields use-macro="item/template/macros/conceptchildren" /><br />
           <metal:fields use-macro="item/template/macros/conceptresources" />
diff --git a/knowledge/browser.py b/knowledge/browser.py
index aecfee9..e00a951 100644
--- a/knowledge/browser.py
+++ b/knowledge/browser.py
@@ -27,7 +27,7 @@ from zope import interface, component
 from zope.app import zapi
 from zope.app.pagetemplate import ViewPageTemplateFile
 from zope.cachedescriptors.property import Lazy
-from zope.formlib.namedtemplate import NamedTemplate
+#from zope.formlib.namedtemplate import NamedTemplate
 from zope.i18nmessageid import MessageFactory
 
 from cybertools.typology.interfaces import IType
@@ -40,7 +40,8 @@ _ = MessageFactory('zope')
 
 class MyKnowledge(BaseView):
 
-    template = NamedTemplate('loops.knowledge_macros')
+    #template = NamedTemplate('loops.knowledge_macros')
+    template = ViewPageTemplateFile('knowledge_macros.pt')
 
     @Lazy
     def macro(self):
diff --git a/organize/browser.py b/organize/browser.py
index 4683c49..9ae3c3f 100644
--- a/organize/browser.py
+++ b/organize/browser.py
@@ -26,11 +26,9 @@ $Id$
 from zope import interface, component
 from zope.app.authentication.principalfolder import InternalPrincipal
 from zope.app.form.browser.textwidgets import PasswordWidget as BasePasswordWidget
-from zope.app.form.interfaces import WidgetInputError
+from zope.app.pagetemplate import ViewPageTemplateFile
 from zope.app.principalannotation import annotations
 from zope.cachedescriptors.property import Lazy
-from zope.formlib.form import Form as FormlibForm, FormFields, action
-from zope.formlib.namedtemplate import NamedTemplate
 from zope.i18nmessageid import MessageFactory
 
 from cybertools.composer.interfaces import IInstance
@@ -38,9 +36,9 @@ from cybertools.composer.schema.browser.common import schema_macros
 from cybertools.composer.schema.browser.form import Form, CreateForm
 from cybertools.composer.schema.schema import FormState, FormError
 from cybertools.typology.interfaces import IType
-from loops.browser.concept import ConceptView
+from loops.browser.common import concept_macros
+from loops.browser.concept import ConceptView, ConceptRelationView
 from loops.browser.node import NodeView
-from loops.browser.concept import ConceptRelationView
 from loops.concept import Concept
 from loops.organize.interfaces import ANNOTATION_KEY, IMemberRegistrationManager
 from loops.organize.interfaces import IMemberRegistration, IPasswordChange
@@ -50,6 +48,9 @@ import loops.browser.util
 from loops.util import _
 
 
+organize_macros = ViewPageTemplateFile('view_macros.pt')
+
+
 class MyStuff(ConceptView):
 
     def __init__(self, context, request):
@@ -59,6 +60,14 @@ class MyStuff(ConceptView):
         if self.person is not None:
             self.context = self.person
 
+    @Lazy
+    def macro(self):
+        return organize_macros.macros['conceptdata']
+
+    @Lazy
+    def concept_macros(self):
+        return concept_macros
+
     @Lazy
     def view(self):
         return self
diff --git a/organize/party.py b/organize/party.py
index 1849279..def0701 100644
--- a/organize/party.py
+++ b/organize/party.py
@@ -78,7 +78,6 @@ class Person(AdapterBase, BasePerson):
     def getUserId(self):
         return getattr(self.context, '_userId', None)
     def setUserId(self, userId):
-        #auth = self.authentication
         if userId:
             principal = self.getPrincipalForUserId(userId)
             person = getPersonForUser(self.context, principal=principal)
@@ -87,8 +86,6 @@ class Person(AdapterBase, BasePerson):
                     'There is alread a person (%s) assigned to user %s.'
                     % (zapi.getName(person), userId))
             pa = annotations(principal)
-            #pa[ANNOTATION_KEY] = self.context
-            #intIds = component.getUtility(IRelationRegistry, context=self.context)
             loopsId = util.getUidForObject(self.context.getLoopsRoot())
             ann = pa.get(ANNOTATION_KEY)
             if ann is None:
diff --git a/organize/view_macros.pt b/organize/view_macros.pt
new file mode 100644
index 0000000..619cfe3
--- /dev/null
+++ b/organize/view_macros.pt
@@ -0,0 +1,9 @@
+<metal:data define-macro="conceptdata">
+  <tal:person condition="item/person">
+    <metal:block use-macro="item/concept_macros/macros/conceptdata" />
+  </tal:person>
+  <tal:person condition="not:item/person">
+    <metal:block use-macro="item/concept_macros/macros/concepttitle" /><br />
+    <div i18n:translate="">No Person object associated with your user account.</div>
+  </tal:person>
+</metal:data>