summaryrefslogtreecommitdiff
path: root/chimere/main
diff options
context:
space:
mode:
authoretienne <etienne@9215b0d5-fb2c-4bbd-8d3e-bd2e9090e864>2010-03-20 18:53:11 +0000
committeretienne <etienne@9215b0d5-fb2c-4bbd-8d3e-bd2e9090e864>2010-03-20 18:53:11 +0000
commita38f007529bc2c64e1465ee3e2bb0082c0bcd1dc (patch)
tree14ef587251f439bdf08520f8e3d264a65978435c /chimere/main
parent64acbb356f5a177dc5bd80e7ad493ee554ca0e09 (diff)
downloadChimère-a38f007529bc2c64e1465ee3e2bb0082c0bcd1dc.tar.bz2
Chimère-a38f007529bc2c64e1465ee3e2bb0082c0bcd1dc.zip
JS correction for IE #89 - URL path correction when switching between views
git-svn-id: http://www.peacefrogs.net/svn/chimere/trunk@73 9215b0d5-fb2c-4bbd-8d3e-bd2e9090e864
Diffstat (limited to 'chimere/main')
-rw-r--r--chimere/main/actions.py2
-rw-r--r--chimere/main/views.py4
2 files changed, 4 insertions, 2 deletions
diff --git a/chimere/main/actions.py b/chimere/main/actions.py
index 74b622a..4857005 100644
--- a/chimere/main/actions.py
+++ b/chimere/main/actions.py
@@ -27,7 +27,7 @@ from chimere.settings import EXTRA_URL
class Action:
def __init__(self, id, path, label):
- self.id, self.path, self.label = id, EXTRA_URL + path, label
+ self.id, self.path, self.label = id, path, label
actions = ((Action('view', '', _('View')), []),
(Action('contribute', 'edit', _('Contribute')),
diff --git a/chimere/main/views.py b/chimere/main/views.py
index e6e37c2..6cd335d 100644
--- a/chimere/main/views.py
+++ b/chimere/main/views.py
@@ -49,7 +49,9 @@ def get_base_response(area_name=""):
if not base_url.startswith('/'):
base_url = '/' + base_url
if area_name:
- base_url = '/' + area_name + base_url
+ if base_url[-1] != '/':
+ base_url += '/'
+ base_url += area_name + '/'
base_response_dct['extra_url'] = base_url
base_response_dct['area_name'] = area_name
if settings.CSS_AREAS and area_name: