Skip to content

Commit

Permalink
Move URL /user/dashboard to /dashboard
Browse files Browse the repository at this point in the history
We decided this makes more sense
  • Loading branch information
Sean Hammond committed Nov 26, 2012
1 parent 24b94da commit 7f630a9
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion ckan/config/routing.py
Expand Up @@ -265,7 +265,7 @@ def make_map():
# Note: openid users have slashes in their ids, so need the wildcard
# in the route.
m.connect('/user/activity/{id}', action='activity')
m.connect('/user/dashboard', action='dashboard')
m.connect('/dashboard', action='dashboard')
m.connect('/user/follow/{id}', action='follow')
m.connect('/user/unfollow/{id}', action='unfollow')
m.connect('/user/followers/{id:.*}', action='followers')
Expand Down
1 change: 0 additions & 1 deletion ckan/templates/user/dashboard.html
Expand Up @@ -5,7 +5,6 @@
{% block subtitle %}{{ _('Dashboard') }}{% endblock %}

{% block breadcrumb_content %}
<li>{% link_for _('Users'), controller='user', action='index' %}</li>
<li class="active"><a href="">{{ _('Dashboard') }}</a></li>
{% endblock %}

Expand Down
4 changes: 2 additions & 2 deletions ckan/tests/functional/test_user.py
Expand Up @@ -187,8 +187,8 @@ def test_login(self):
# then get redirected to user's dashboard
res = res.follow()
assert_equal(res.status, 302)
assert res.header('Location').startswith('http://localhost/user/dashboard') or \
res.header('Location').startswith('/user/dashboard')
assert res.header('Location').startswith('http://localhost/dashboard') or \
res.header('Location').startswith('/dashboard')
res = res.follow()
assert_equal(res.status, 200)
assert 'testlogin is now logged in' in res.body
Expand Down

0 comments on commit 7f630a9

Please sign in to comment.