Download as
Browse Code »

Commit 9620f1b8b5f312c9e08edc93683804966d157a88

Authored by Sergio Oliveira
1 parent c037de8a
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Join using string.join

Showing 2 changed files with 3 additions and 4 deletions   Show diff stats
colab/accounts/views.py
  Diff comments   View file @9620f1b
... ... @@ -279,7 +279,6 @@ def myaccount_redirect(request, route):
279 279 if not request.user.is_authenticated():
280 280 raise Http404()
281 281  
282   - username = request.user.username
283   - url = "/account/" + username + "/" + route
  282 + url = '/'.join(('/account', request.user.username, route))
284 283  
285 284 return redirect(url)
... ...
colab/urls.py
  Diff comments   View file @9620f1b
... ... @@ -28,8 +28,8 @@ urlpatterns = patterns(
28 28 # (same here) TODO: move to nginx
29 29 url(r'^signup/', include('colab.accounts.urls')),
30 30 url(r'^account/', include('colab.accounts.urls')),
31   - url(r'^myaccount/(?P<route>[\w@+.-/?]*)$',
32   - 'colab.accounts.views.myaccount_redirect',name='myaccount' ),
  31 + url(r'^myaccount/(?P<route>.*)$',
  32 + 'colab.accounts.views.myaccount_redirect', name='myaccount'),
33 33  
34 34 url(r'', include('django_browserid.urls')),
35 35  
... ...