Download as
Browse Code »

Commit 6056cc27e88e7b5a62af824dfe8f1bffe64b1db7

Authored by Carlos Coêlho
Committed by Sergio Oliveira
1 parent 58bce9e0
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

Changed logout url if browserid is disabled 

Logout was set to use only browserid, so we added the option to use
django default logout url instead of browserid if the latter is
disabled.

Signed-off-by: Carlos Oliveira <carlospecter@gmail.com>
Signed-off-by: Alexandre Almeida <alexandreab@live.com>
Showing 2 changed files with 6 additions and 2 deletions   Show diff stats
colab/accounts/urls.py
  Diff comments   View file @6056cc2
... ... @@ -39,7 +39,7 @@ if not BROWSERID_ENABLED:
39 39 )
40 40 else:
41 41 urlpatterns = patterns('',
42   - url(r'^login/?$', LoginView.as_view(), name='colab.login'),
  42 + url(r'^login/?$', LoginView.as_view(), name='login'),
43 43 )
44 44  
45 45 urlpatterns += patterns('',
... ...
colab/templates/base.html
  Diff comments   View file @6056cc2
... ... @@ -141,7 +141,11 @@
141 141 <div>
142 142 <a class="btn btn-info pull-left" href="{% url 'user_profile' user.username %}">{% trans "My Profile" %}</a>
143 143 {% trans 'Logout' as logout_text %}
144   - {% browserid_logout text=logout_text link_class='btn btn-default pull-right' %}
  144 + {% if BROWSERID_ENABLED %}
  145 + {% browserid_logout text=logout_text link_class='btn btn-default pull-right' %}
  146 + {% else %}
  147 + <a class="btn btn-default pull-right" href="{% url 'logout' %}"> {% trans "Logout" %}</a>
  148 + {% endif %}
145 149 </div>
146 150 </div>
147 151 </li>
... ...