Commit b3656e53 authored by Romain Courteaud's avatar Romain Courteaud

Fix url generation, following http://www.erp5.org/GuidelinesForUrlGeneration.

Use absolute_url in order to be compatible with virtual host.
Remove 2 absolute_url lambda expressions which break acquisition (and they
seem useless).


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@19918 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 9b4c8828
...@@ -1638,8 +1638,6 @@ class BasicStructure: ...@@ -1638,8 +1638,6 @@ class BasicStructure:
stat_context = report_group_object.getObject().asContext(**stat_result) stat_context = report_group_object.getObject().asContext(**stat_result)
stat_context.domain_url = \ stat_context.domain_url = \
report_group_object.getObject().getRelativeUrl() report_group_object.getObject().getRelativeUrl()
stat_context.absolute_url = \
lambda x: report_group_object.getObject().absolute_url()
url=getattr(stat_context,'domain_url','') url=getattr(stat_context,'domain_url','')
# updating position_informations # updating position_informations
position +=1 position +=1
...@@ -1853,7 +1851,6 @@ class BasicGroup: ...@@ -1853,7 +1851,6 @@ class BasicGroup:
stat_result = {} stat_result = {}
stat_context = obj.asContext(**stat_result) stat_context = obj.asContext(**stat_result)
stat_context.domain_url = obj.getRelativeUrl() stat_context.domain_url = obj.getRelativeUrl()
stat_context.absolute_url = lambda x: obj.absolute_url()
object = stat_context.getObject() object = stat_context.getObject()
# check if the activity_content has some special method for URL # check if the activity_content has some special method for URL
...@@ -2418,7 +2415,7 @@ class Activity: ...@@ -2418,7 +2415,7 @@ class Activity:
if zone == 1: if zone == 1:
# active # active
block_color = self.color block_color = self.color
block_link = self.link block_link = '%s/view' % self.object.absolute_url()
else: else:
# passive # passive
block_color = '#D1E8FF' block_color = '#D1E8FF'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment