Author: rmarianski
Date: 2007-11-21 22:29:41 -0500 (Wed, 21 Nov 2007)
New Revision: 11224
Modified:
opencore/trunk/opencore/project/browser/home_page.py
opencore/trunk/opencore/project/browser/view.py
Log:
merge project home page relative redirection branch -r10639:10640
Modified: opencore/trunk/opencore/project/browser/home_page.py
===================================================================
--- opencore/trunk/opencore/project/browser/home_page.py 2007-11-22
01:55:51 UTC (rev 11223)
+++ opencore/trunk/opencore/project/browser/home_page.py 2007-11-22
03:29:41 UTC (rev 11224)
@@ -26,9 +26,7 @@
self.annot = homepage_annot
def _get_home_page(self):
- project = self.context
- default_page = '%s/project-home' % project.absolute_url()
- return self.annot.get('home_page', default_page)
+ return self.annot.get('home_page', 'project-home')
def _set_home_page(self, value):
assert self._allowed_home_page_re.match(value)
Modified: opencore/trunk/opencore/project/browser/view.py
===================================================================
--- opencore/trunk/opencore/project/browser/view.py 2007-11-22 01:55:51 UTC
(rev 11223)
+++ opencore/trunk/opencore/project/browser/view.py 2007-11-22 03:29:41 UTC
(rev 11224)
@@ -492,17 +492,17 @@
home_page = self.request.form.get('home-page', None)
hpcontext = IHomePage(self.context)
if home_page is not None:
- home_page = '%s/%s' % (self.context.absolute_url(), home_page)
if hpcontext.home_page != home_page:
- self.add_status_message(_(u'psm_proj_homepage_change',
u'Project home page set to: <a href="${homepage}">${homepage}</a>',
- mapping={u'homepage':home_page}))
+ hp_url = '%s/%s' % (self.context.absolute_url(), home_page)
+ self.add_status_message(_(u'psm_proj_homepage_change',
u'Project home page set to: <a href="${hp_url}">${homepage}</a>',
+ mapping={u'homepage':home_page,
u'hp_url':hp_url}))
hpcontext.home_page = home_page
self.redirect(self.context.absolute_url())
def current_home_page(self):
- return IHomePage(self.context).home_page.split('/')[-1]
+ return IHomePage(self.context).home_page
def featurelets(self, include_wiki=False):
all_flets =
getUtility(IFeatureletRegistry).getFeaturelets(self.context)
@@ -617,7 +617,6 @@
home_page = self.request.form.get('home-page', None)
if home_page is not None:
- home_page = '%s/%s' % (proj.absolute_url(), home_page)
IHomePage(proj).home_page = home_page
s_message_mapping = {'title': title, 'proj_edit_url': proj_edit_url}
@@ -656,7 +655,8 @@
"""redirect to the project home page url"""
def __call__(self):
- url = IHomePage(self.context).home_page
+ hp = IHomePage(self.context).home_page
+ url = '%s/%s' % (self.context.absolute_url(), hp)
self.redirect(url)
class SubProjectAddView(ProjectAddView):
--
Archive:
http://www.openplans.org/projects/opencore/lists/openplans-svn/archive/2007/11/1195702182813
To unsubscribe send an email with subject unsubscribe to [EMAIL PROTECTED]
Please contact [EMAIL PROTECTED] for questions.
