[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kupu-checkins
Subject:    [kupu-checkins] r5777 - kupu/trunk/kupu/plone/kupu_plone_layer
From:       duncan () codespeak ! net
Date:       2004-07-29 12:14:15
Message-ID: 20040729121415.DE3F15C1A5 () thoth ! codespeak ! net
[Download RAW message or body]

Author: duncan
Date: Thu Jul 29 14:14:15 2004
New Revision: 5777

Modified:
   kupu/trunk/kupu/plone/kupu_plone_layer/kupuInfoForBrains.py
   kupu/trunk/kupu/plone/kupu_plone_layer/kupuInfoForObjects.py
   kupu/trunk/kupu/plone/kupu_plone_layer/resolveuid.py
Log:
kupuInfoForObjects was corrupted when I did the merge, so I've fixed that.
Also added support for query strings in resolveuid.py

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupuInfoForBrains.py
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupuInfoForBrains.py	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupuInfoForBrains.py	Thu Jul 29 14:14:15 2004
@@ -14,7 +14,7 @@
 preview_action = 'kupupreview'
 
 def info(brain):
-    # It owuld be nice to do everything from the brain, but
+    # It would be nice to do everything from the brain, but
     # unfortunately we need to get the object to calculate a UID
     # based URL, and also for the preview size.
     obj = brain.getObject()

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupuInfoForObjects.py
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupuInfoForObjects.py	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupuInfoForObjects.py	Thu Jul 29 14:14:15 2004
@@ -12,16 +12,10 @@
 linkbyuid = kupu_tool.getLinkbyuid()
 preview_action = 'kupupreview'
 
-def maybeGetAttr(obj, name):
-    '''Get an attribute if it exists.
-    Call it if callable
-    '''
-    if not hasattr(obj, name):
-        return None
-    val = getattr(obj, name)
-    if callable(val):
-        return val()
-    return val
+def info(obj):
+    id = obj.getId()
+    portal_type = obj.portal_type
+    collection = portal_type in coll_types
 
     if linkbyuid and not collection and hasattr(obj, 'UID'):
         url = 'resolveuid/%s' % obj.UID()

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/resolveuid.py
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/resolveuid.py	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/resolveuid.py	Thu Jul 29 14:14:15 2004
@@ -22,6 +22,10 @@
     
 if traverse_subpath:
     traverse_subpath.insert(0, obj.absolute_url())
-    return response.redirect('/'.join(traverse_subpath))
+    target = '/'.join(traverse_subpath)
+else:
+    target = obj.absolute_url()
 
-return response.redirect(obj.absolute_url())
+if request.QUERY_STRING:
+    target += '?' + request.QUERY_STRING
+return response.redirect(target)

[prev in list] [next in list] [prev in thread] [next in thread]