Author: rmarianski
Date: 2007-11-06 16:26:05 -0500 (Tue, 06 Nov 2007)
New Revision: 10599
Modified:
opencore/trunk/opencore/nui/project/manageteam.py
opencore/trunk/opencore/wordpress/events.py
Log:
merge all remaining changes from release branch 0.9.7.2 to trunk
r10567:10583
r10587:10588
other revisions were merged manually due to conflicts (team and manageteam
filename discrepancy)
Modified: opencore/trunk/opencore/nui/project/manageteam.py
===================================================================
--- opencore/trunk/opencore/nui/project/manageteam.py 2007-11-06 21:17:24 UTC
(rev 10598)
+++ opencore/trunk/opencore/nui/project/manageteam.py 2007-11-06 21:26:05 UTC
(rev 10599)
@@ -584,9 +584,13 @@
acct_url = self._getAccountURLForMember(mem_id)
logged_in_mem = self.loggedinmember
logged_in_mem_name = logged_in_mem.getFullname() or logged_in_mem.id
- mem_path = '%s/%s' %
(self.portal.portal_memberdata.absolute_url_path(), mem_id)
- mem_metadata = self.catalogtool.getMetadataForUID(mem_path)
+
+ mdtool = getToolByName(self.context, 'portal_memberdata')
+ mdtoolpath = '/'.join(mdtool.getPhysicalPath())
+ mem_path = '%s/%s' % (mdtoolpath, mem_id)
+ mem_metadata = self.catalogtool.getMetadataForUID(mem_path)
mem_user_name = mem_metadata['getFullname'] or mem_metadata['id']
+
# XXX if member hasn't logged in yet, acct_url will be whack
msg_subs = {
'project_title': self.context.title,
Modified: opencore/trunk/opencore/wordpress/events.py
===================================================================
--- opencore/trunk/opencore/wordpress/events.py 2007-11-06 21:17:24 UTC (rev
10598)
+++ opencore/trunk/opencore/wordpress/events.py 2007-11-06 21:26:05 UTC (rev
10599)
@@ -57,8 +57,8 @@
# mship_tool.getHomeFolder because it hasn't been created yet
username = mem.getId()
portal_url = getToolByName(mem,
'portal_url').getPortalObject().absolute_url()
- default_page = '%s-home' % username
- home_page = '%s/people/%s/%s' % (portal_url, username, default_page)
+ profile_page = 'profile'
+ home_page = '%s/people/%s/%s' % (portal_url, username, profile_page)
params = dict(
username=username,
email=mem.getEmail(),
--
Archive:
http://www.openplans.org/projects/opencore/lists/openplans-svn/archive/2007/11/1194384365856
To unsubscribe send an email with subject unsubscribe to [EMAIL PROTECTED]
Please contact [EMAIL PROTECTED] for questions.
