Author: pw
Date: 2008-08-12 19:17:19 -0400 (Tue, 12 Aug 2008)
New Revision: 19796
Modified:
opencore/trunk/opencore/browser/blankslate.py
opencore/trunk/opencore/listen/feed/discussions.py
Log:
FIXED: merge r19773 from 0.13 branch, somehow I got only the test changes in my
previous merge.
Modified: opencore/trunk/opencore/browser/blankslate.py
===================================================================
--- opencore/trunk/opencore/browser/blankslate.py 2008-08-12 23:10:55 UTC
(rev 19795)
+++ opencore/trunk/opencore/browser/blankslate.py 2008-08-12 23:17:19 UTC
(rev 19796)
@@ -16,6 +16,7 @@
# and an is_blank function
assert self.is_blank
+ # XXX maybe do stateful things like this in self.update()?
self.feed = self.adapt()
if self.is_blank():
Modified: opencore/trunk/opencore/listen/feed/discussions.py
===================================================================
--- opencore/trunk/opencore/listen/feed/discussions.py 2008-08-12 23:10:55 UTC
(rev 19795)
+++ opencore/trunk/opencore/listen/feed/discussions.py 2008-08-12 23:17:19 UTC
(rev 19796)
@@ -21,14 +21,16 @@
return clean_project._getOb('lists', None)
def is_blank(self):
+ # XXX Confusing: where does self.feed come from?
+ # It gets bound in the base class' render() method.
if self.feed.items:
return False
if self.feed.mlists:
- self.create = os.path.join(self.context.absolute_url(),
- self.feed.mlists[0],
- 'archive','new_topic')
+ self.create = '/'.join((self.listfolder().absolute_url(),
+ self.feed.mlists[0],
+ 'archive', 'new_topic'))
else:
- self.create = os.path.join(self.context.absolute_url(), 'create')
+ self.create = '/'.join((self.listfolder().absolute_url(),
'create'))
return True
def adapt(self):
--
To unsubscribe send an email with subject "unsubscribe" to [EMAIL PROTECTED]
Please contact [EMAIL PROTECTED] for questions.
