From 13fe5fd4d801d3824e26ab47c5659a68fb23d6f5 Mon Sep 17 00:00:00 2001
From: helmutm <helmutm@fd906abe-77d9-0310-91a1-e0d9ade77398>
Date: Fri, 17 Oct 2008 09:39:44 +0000
Subject: [PATCH] show concept states on listings (if appropriate)

git-svn-id: svn://svn.cy55.de/Zope3/src/loops/trunk@2922 fd906abe-77d9-0310-91a1-e0d9ade77398
---
 browser/common.py                |   7 ++++++-
 browser/configure.zcml           |   8 ++++++++
 browser/resource.py              |   2 ++
 common.py                        |   3 ++-
 config/base.py                   |  11 +++++++++--
 config/configure.zcml            |   5 +++++
 locales/de/LC_MESSAGES/loops.mo  | Bin 7392 -> 7495 bytes
 locales/de/LC_MESSAGES/loops.po  |   5 ++++-
 organize/README.txt              |   7 ++++++-
 organize/browser/event.py        |   8 ++++++--
 organize/stateful/browser.py     |   5 +++--
 organize/stateful/view_macros.pt |  30 +++++++++++++++++-------------
 search/search.pt                 |   2 +-
 13 files changed, 69 insertions(+), 24 deletions(-)

diff --git a/browser/common.py b/browser/common.py
index 1cab9a0..3b787c1 100644
--- a/browser/common.py
+++ b/browser/common.py
@@ -39,7 +39,7 @@ from zope.formlib.namedtemplate import NamedTemplate
 from zope.interface import Interface, implements
 from zope.proxy import removeAllProxies
 from zope.publisher.browser import applySkin
-from zope.publisher.interfaces.browser import IBrowserSkinType
+from zope.publisher.interfaces.browser import IBrowserSkinType, IBrowserView
 from zope import schema
 from zope.schema.vocabulary import SimpleTerm
 from zope.security import canAccess, checkPermission
@@ -139,6 +139,9 @@ class BaseView(GenericView, I18NView):
         self.checkLanguage()
         return result
 
+    def registerPortlets(self):
+        pass
+
     @Lazy
     def target(self):
         # allow for having a separate object the view acts upon
@@ -289,6 +292,8 @@ class BaseView(GenericView, I18NView):
         request = self.request
         for o in objs:
             view = component.queryMultiAdapter((o, request), name='index.html')
+            #if view is None:
+            #    view = component.queryMultiAdapter((o, request), IBrowserView)
             if view is None:
                 view = BaseView(o, request)
             yield view
diff --git a/browser/configure.zcml b/browser/configure.zcml
index 729893d..619d031 100644
--- a/browser/configure.zcml
+++ b/browser/configure.zcml
@@ -208,6 +208,14 @@
       menu="zmi_views" title="View"
       />
 
+  <page
+      name="index.html"
+      for="loops.interfaces.IConcept"
+      class=".concept.ConceptView"
+      template="concept.pt"
+      permission="zope.View"
+      />
+
   <defaultView
       for="loops.interfaces.IConcept"
       name="concept.html"
diff --git a/browser/resource.py b/browser/resource.py
index 6218ae3..25d8ccb 100644
--- a/browser/resource.py
+++ b/browser/resource.py
@@ -210,6 +210,8 @@ class ResourceRelationView(ResourceView, ConceptRelationView):
     def __init__(self, relation, request, contextIsSecond=False):
         ConceptRelationView.__init__(self, relation, request, contextIsSecond)
 
+    getActions = ResourceView.getActions
+
 
 class ResourceConfigureView(ResourceView, ConceptConfigureView):
 
diff --git a/common.py b/common.py
index 46068c0..4099081 100644
--- a/common.py
+++ b/common.py
@@ -371,6 +371,7 @@ class ChildRelationSetProperty(RelationSetProperty):
 
 
 class ParentRelation(object):
+    # TODO: provide special method for supplying relevance and order
 
     def __init__(self, predicateName):
         self.predicateName = predicateName
@@ -388,7 +389,7 @@ class ParentRelation(object):
             if current != value:
                 s.remove(current)
         if value is not None:
-            s.add(value)
+            s.add(value)    # how to supply additional parameters?
 
 
 # caching (TBD)
diff --git a/config/base.py b/config/base.py
index 7f83470..0f12b9b 100644
--- a/config/base.py
+++ b/config/base.py
@@ -33,7 +33,8 @@ from cybertools.meta.config import GlobalOptions as BaseGlobalOptions
 from cybertools.meta.interfaces import IOptions
 from cybertools.meta.namespace import Executor, ExecutionError
 from cybertools.typology.interfaces import IType
-from loops.interfaces import ILoops
+from loops.interfaces import ILoops, ILoopsObject
+from loops.query import IQueryConcept
 from loops import util
 
 
@@ -46,7 +47,7 @@ class GlobalOptions(BaseGlobalOptions):
 
 class LoopsOptions(Options):
 
-    adapts(ILoops)
+    adapts(ILoopsObject)
 
     builtins = Options.builtins + ('True', 'False')
     True, False = True, False
@@ -86,3 +87,9 @@ class LoopsOptions(Options):
         rc = Executor(self).execute(code)
         if rc:
             raise ExecutionError('\n' + rc)
+
+
+class QueryOptions(LoopsOptions):
+
+    adapts(IQueryConcept)
+
diff --git a/config/configure.zcml b/config/configure.zcml
index aaa1958..7583014 100644
--- a/config/configure.zcml
+++ b/config/configure.zcml
@@ -12,4 +12,9 @@
     <allow interface="cybertools.meta.interfaces.IOptions" />
   </zope:class>
 
+  <zope:adapter factory="loops.config.base.QueryOptions" trusted="True" />
+  <zope:class class="loops.config.base.QueryOptions">
+    <allow interface="cybertools.meta.interfaces.IOptions" />
+  </zope:class>
+
 </configure>
diff --git a/locales/de/LC_MESSAGES/loops.mo b/locales/de/LC_MESSAGES/loops.mo
index 02f43a035d199f6696f24f06217537ee8c94bc41..2125c46d29ce6a6ff8c7a7747b0df1669f625748 100644
GIT binary patch
delta 2768
zcmYk7dra3=7>AFE23|?LWT-%5fk=U(sc42pUMg>BdBKzvgj6s@(2Rb~YG}8uT$66j
zTIp<QE&g$KUCr$Nr@6V2u4OAT=Q3BVTF(Oq=h^S`ea`LszVCU@Ip5#ONk=Cq+6N>(
zA1GVVFm$1N2>amISMs1#_X=Sitbuv(Fm&iN%z(eaRM@X~2z_7%#6%ba`GtbmKLrk=
zJqr$oD_}|piO@);CmoN#{;&m>!Cf#Jo`E{N0Mp<<Z~#ojn~q099T)M?P6@<tm<b(U
z0DW&2)P7U!Z-E2xA6lslVc-C~8Xkc<XpjBpV>_j<FOVfT92UZ>;9QslE1-_6ATfpw
z(10F-F62?z4?YEb?<Lp=|KR`?BRvd_@GI!V6VO0@fu`<X$S<TZ==>~5Y+)>97s52?
z_-v@d#jppgfCjV%8sJ7~z|AmWgxjbT!5wkJhfqVGLk%5^{og~k;%Ddz&PR49YN}xn
z)KNAxlLfIo3+iwYG~lIh6kOAv{JWB;>Co_QsKdRm0KN@f*~vJ52J#EP^KfO|dD%cy
zpcxtheLo-SZ~}CJ#n1q!Lj#--)8X<|^6v{<;>2xn;tn{P{#NJ~d<r#q3>wf0XaJ{S
zF8no)4<;>UCY?t<%!fK!2A$soJwwg0{ak{IDQSf|cmukUH)H?DP>0_@13eC%cM6Vy
zr=iy{jVR6FIH;rI$dcGU1L|ik)J{2^*p2<Kq;eY_ySXF9@CWFG48qKVIq({|5Sqd|
z==j5sS3?W*dc6p}*9V~sI08LvCnA4@Bq^MOE1;9ux<pt>#mH+RW1$hcM^DD~F6bV<
z1)bLh&B%MuYx@~Az;;M7!e5cSiN=72^B4+?BIiK;RKslVe=`*gycYQZ^h<agy0Sl@
z0i@u~!<Gt7<p^j%d9i;S)J_Q`hENX8P(8#%cs%yM3=QC2I28ZkC>0%^iUa>aej$xJ
zq@g@$>PnyiEr6bZDrjJ9p$6-rnQMWbft_*u1vr)V9_ZG!L$~rLnDASDk&1iucbt$!
zzPx6AAzfiO^o0q~6_vtk;bLeewn80lht7KjdUjrcuKWw=ypzxX&cZqH;!yIhqf+wb
zN)|yKltWWn7u!vccfu3UKwpnM2z~Dm)bU492j4<7_Z{@CoP}oQPpJJQ?&K6WB%S<g
zcp)7fhY)J8F|rxDHIK#dSD^;>!y@=T^!}fRW+0u(g)j@+E`tWP1e)n;$keb7y727@
zDjup<=*sp&19=BdfQO)eHs@l0Um6-76qyd4p9MYrxzLpsL#}s6Fa_{lRDrsR+oQiM
zjdhhJRCHP$J2K(zJD*KX+qow>DY1!`t~8&8ETcLR#=^VMT(l4^L+<c{$PKV~>ldNX
z$kT8usz(-cYF;Lxsc12pfmWgW(Q3aGlc|hA9=%57My*HQ4NFNUI-Vx|9&{txjLh+P
zWEs<mOV8!hYS2ow6kT5GXskoG_@&6FQj5rKn2tOFmT8^nc)H7$ah(WjpeM|4?47Ys
zc!3*Y`);@e4MsP_zA9LW*!M8YKKx%QYpIPy3lK*-+=na^(M(i|9zeP1W;6v|fr^pk
zCgjELDjTVI9Ot2dC<ARk-l48i;_>owWuqokj{F?mfh_Y;PDict^HoNDHrk4=L)W*J
z_G;;wQ`S(?P?=d%TUA%TzM`R~t~QfeX7=jJs+!sw+mkc18)_QXwSAeozgv&Og8ahq
dZJP&tl03{8H*L(!xom1~oLkv8DScnJ{{amc?~MQe

delta 2666
zcmYk;drX#99Ki8If)S#^t5FJRm=qwSTr5OUF;l2i6z`Wb#E??U%u8Cmf7q(EVQX0~
zyKIeVZ8~d%@dvgn+iYgFIqAQ0IsT%t)@6-9tkw7Xde}O9f6wPU=Xu_9e&;;rdEx8Y
zpJyenCeq&ul!HV8F*qWGPW<d<4wQzh5Sp+Nr{Qt*(gmE1-(wE`irM%t(nZJ~6#}1-
z!@>3fycJ6@59i@6Atb|UDkEvwf@84_n{hv8;w5yzJ{*TXVgi3d2OdH14ltgB{S+b{
zhhp@4CHlPw(EiuN_BI^P_~8JR+qlqyx8n(PfX`$5<#;}T<7xjJ@4(#A1Ww0vtVai4
zgya^Q(1bRk6WNMma0mLmLzvC@p@WK<9!E1gh2D4;P2?MN>3%{!;ZF|UpT<q(5)#O&
zhso&mQgpx?%)ojyp~Yx|&1k}#FlmM@RI0H(-tYn1(Z^^<J+b{9`Y0}<Gq@b>M?T>%
z4i1#gEL_PP^t=Qea3-2?Ef(S8v8=x{*-3*PzlaX_GS0x)(V2Y_uU|qw;R*+5){iDS
zfUeLG`u)*#>VSFZ1oP1Zr=ST{U_RF6u>O8wUA(a+-q?<%v>!kpK_}W_51P<fG=U4T
z{aZ|}2$s{{j}DMaqxY4gd#5U%H=rxAG)cvdH=r}v5-;pS2Re)<cm%!g7?$CC=<9b8
zUAX~tpx>iIvHc%(pbTbVKMAZ!BRO2id2%K1#%wC@pf~)0)9@-z#4OTw>59<n)#!@U
zA-9Ak^nGqcCvXVeWN$>@MHVBRz|Gi$KC(P+Ch=sLN`<yihCZA6c)kQvn-iU3JGvsf
z(bx5PG{K|DB*Q1sFVTdq-~{|7nogtROv0&Hg%f@M*QP2V>_LA4kDxO<g(h$g&G-Vk
zlznJI*JAqsn#d3`R!ESYD^!d$h1qEP3N(T3Xkss50po{b@j^H92^Tr|g=^^24WS8T
z@=m!23edy~(GH8zm8(PdKx4eV4C^>wjXt`g=%aie{fRz}NuSlH@rGXH4GLc&pKyhP
zUl>GZbRDPQ7}9qoD$oJvqW3LC_f9i9^CWuT+h_uvxD-#L<6NJ>`a6?Rte*oU(4{Sk
z=jF(~VLqDZ`e-Zqy<O<Qd(i=2LRYQ>-7B5w%A7&_@5MRz9olbJKI`v*Q+ZkKuq;}I
zw%4LxT!7WM3QO=cbmrYyfxYp35KZV0bcxg0P*g((I^#lgFIAuunwO;FK#h1GE=T{k
zyc*k2q63|YcE|Q!bl0CpXV{0l)~T|GV<U0bjnhyYl?}1(ezGLZ#!Y0|LAYV=BrI-5
ziwUhD=6FIWBbo>k|9_btPh6>ego#@w5k3z0f=NF@Se|q{Ro<wljzt`wisy6DP4w)W
zxtZgVGpX$&CKF6G93Wia8ALH**-O-?Y9Ty`YYDgOW5jdBa9Kp9itzXE9^xUQjc6f!
z*iRE%2seaflRs01RCW`qh*?A{;a=yJNIl_|xQ+0sx+C0<&k&Cis|m~FgxhXEv6Hxo
zI7qY;mU6;}*-WrQQ)L0i`Tk68r!tS&Ol%|?2!9<cTZy|<HU7`RQsN0>G2ynethqtz
z1-zfS@5yj+=lPphL#!We#1dk;=U!YwxVIlBW)tbeI^tep84<d+WxX=8D=+t>w2T=w
S<&~9P=M(2MyFSc6nf4#upv{c{

diff --git a/locales/de/LC_MESSAGES/loops.po b/locales/de/LC_MESSAGES/loops.po
index 69b1e8b..ffc763d 100644
--- a/locales/de/LC_MESSAGES/loops.po
+++ b/locales/de/LC_MESSAGES/loops.po
@@ -3,7 +3,7 @@ msgstr ""
 
 "Project-Id-Version: $Id$\n"
 "POT-Creation-Date: 2007-05-22 12:00 CET\n"
-"PO-Revision-Date: 2008-08-22 12:00 CET\n"
+"PO-Revision-Date: 2008-10-15 12:00 CET\n"
 "Last-Translator: Helmut Merz <helmutm@cy55.de>\n"
 "Language-Team: loops developers <helmutm@cy55.de>\n"
 "MIME-Version: 1.0\n"
@@ -374,3 +374,6 @@ msgstr "Ende"
 msgid "Create loops Note"
 msgstr "loops-Notiz anlegen"
 
+msgid "State information for $definition: $title"
+msgstr "Status ($definition): $title"
+
diff --git a/organize/README.txt b/organize/README.txt
index 5bc74ff..a0cd7fc 100644
--- a/organize/README.txt
+++ b/organize/README.txt
@@ -348,10 +348,15 @@ Events listing
   ...                           )
 
   >>> from loops.organize.browser.event import Events
-  >>> listing = Events(johnC, TestRequest())
+  >>> events = addAndConfigureObject(concepts, Concept, 'events', title=u'Events',
+  ...                                conceptType=concepts['query'])
+  >>> listing = Events(events, TestRequest())
   >>> listing.getActions('portlet')
   [<loops.browser.action.DialogAction ...>]
 
+  >>> from loops.config.base import QueryOptions
+  >>> component.provideAdapter(QueryOptions)
+
   >>> list(listing.events())
   [<loops.browser.concept.ConceptRelationView ...>]
 
diff --git a/organize/browser/event.py b/organize/browser/event.py
index 58aa961..267eec2 100644
--- a/organize/browser/event.py
+++ b/organize/browser/event.py
@@ -22,11 +22,12 @@ Definition of view classes and other browser related stuff for tasks.
 $Id$
 """
 
-from datetime import datetime
+from datetime import datetime, timedelta
 from zope import interface, component
 from zope.app.pagetemplate import ViewPageTemplateFile
 from zope.cachedescriptors.property import Lazy
 
+from cybertools.meta.interfaces import IOptions
 from loops.browser.action import DialogAction
 from loops.browser.concept import ConceptView
 from loops.common import adapted
@@ -62,10 +63,13 @@ class Events(ConceptView):
         tEvent = cm['event']
         hasType = cm.getTypePredicate()
         now = datetime.today()
+        delta = int(self.request.get('delta',
+                        IOptions(adapted(self.context))('delta', [0])[0]))
         sort = lambda x: x.adapted.start or now
         relViews = (self.childViewFactory(r, self.request, contextIsSecond=True)
                         for r in tEvent.getChildRelations([hasType], sort=None))
         return sorted((rv for rv in relViews
-                          if not rv.adapted.end or rv.adapted.end >= now),
+                          if not rv.adapted.end or
+                             rv.adapted.end >= now - timedelta(delta)),
                       key=sort)
 
diff --git a/organize/stateful/browser.py b/organize/stateful/browser.py
index a2dd73a..a75d9ab 100644
--- a/organize/stateful/browser.py
+++ b/organize/stateful/browser.py
@@ -51,8 +51,9 @@ class StateAction(Action):
 
     @Lazy
     def description(self):
-        return (u'State information for %s: %s' %
-                (self.definition, self.stateObject.title))
+        return _(u'State information for $definition: $title',
+                 mapping=dict(definition=self.definition,
+                              title=self.stateObject.title))
 
     @Lazy
     def stateObject(self):
diff --git a/organize/stateful/view_macros.pt b/organize/stateful/view_macros.pt
index 41aa2c7..edeade9 100644
--- a/organize/stateful/view_macros.pt
+++ b/organize/stateful/view_macros.pt
@@ -21,21 +21,25 @@
                     tal:content="deftype"
                     i18n:translate="" />
             </td>
-            <td tal:content="def/name"
+            <td valign="top"
+                tal:content="def/name"
                 i18n:translate=""></td>
             <td>
-              <tal:state repeat="state def/states">
-                <input type="checkbox"
-                       tal:define="name string:state.$deftype.${def/name};
-                                   value state/name"
-                       tal:attributes="name string:$name:list;
-                                       value value;
-                                       checked python:
-                                           value in item.selectedStates.get(name, ())"
-                    /><span tal:content="state/title"
-                                               i18n:translate="" />
-                &nbsp;
-              </tal:state>
+              <tal:states repeat="state def/states">
+                <tal:state define="name string:state.$deftype.${def/name};
+                                   value state/name">
+                  <input type="checkbox"
+                         tal:attributes="name string:$name:list;
+                                         value value;
+                                         checked python:
+                                             value in item.selectedStates.get(name, ());
+                                         id string:$name.$value"
+                      />&nbsp;<label tal:content="state/title"
+                                     i18n:translate=""
+                                     tal:attributes="for string:$name.$value" />
+                  &nbsp;
+                </tal:state>
+              </tal:states>
             </td>
           </tr>
         </tal:def>
diff --git a/search/search.pt b/search/search.pt
index 670f19e..eecffe8 100644
--- a/search/search.pt
+++ b/search/search.pt
@@ -266,7 +266,7 @@
              url="listConceptsForComboBox.js?searchType=" >
         </div>
         <input dojoType="dijit.form.FilteringSelect" store="conceptSearch"
-               autoComplete="False" labelAttr="label"
+               autoComplete="False" labelAttr="label" style="height: 16px"
                name="concept.search.text" id="concept.search.text"
                tal:attributes="name string:$namePrefix.text;
                                id string:$idPrefix.text" />