Download as
Browse Code »

Commit c9fb4c5972e074a48afc718ae637a5eff69c5a1b

Authored by Sergio Oliveira
1 parent 184f587b
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

Removed old logout view

Showing 3 changed files with 1 additions and 11 deletions   Show diff stats
colab/accounts/urls.py
  Diff comments   View file @c9fb4c5
... ... @@ -12,8 +12,6 @@ urlpatterns = patterns('',
12 12 url(r'^change-password/$',
13 13 ChangeXMPPPasswordView.as_view(), name='change_password'),
14 14  
15   - url(r'^logout/?$', 'colab.accounts.views.logoutColab', name='logout'),
16   -
17 15 url(r'^(?P<username>[\w@+.-]+)/?$',
18 16 UserProfileDetailView.as_view(), name='user_profile'),
19 17  
... ...
colab/accounts/views.py
  Diff comments   View file @c9fb4c5
... ... @@ -5,7 +5,6 @@ import datetime
5 5  
6 6 from collections import OrderedDict
7 7  
8   -from django.contrib.auth.views import logout
9 8 from django.contrib import messages
10 9 from django.db import transaction
11 10 from django.db.models import Count
... ... @@ -116,13 +115,6 @@ class UserProfileDetailView(UserProfileBaseMixin, DetailView):
116 115 return super(UserProfileDetailView, self).get_context_data(**context)
117 116  
118 117  
119   -def logoutColab(request):
120   - response = logout(request, next_page='/')
121   - response.delete_cookie('_redmine_session')
122   - response.delete_cookie('_gitlab_session')
123   - return response
124   -
125   -
126 118 def signup(request):
127 119 # If the request method is GET just return the form
128 120 if request.method == 'GET':
... ...
colab/settings.py
  Diff comments   View file @c9fb4c5
... ... @@ -260,7 +260,7 @@ BROWSERID_AUDIENCES = [SITE_URL, SITE_URL.replace(&#39;https&#39;, &#39;http&#39;)]
260 260 LOGIN_URL = '/'
261 261 LOGIN_REDIRECT_URL = '/'
262 262 LOGIN_REDIRECT_URL_FAILURE = '/'
263   -LOGOUT_REDIRECT_URL = '/user/logout'
  263 +LOGOUT_REDIRECT_URL = '/'
264 264 BROWSERID_CREATE_USER = False
265 265  
266 266 REVPROXY_ADD_REMOTE_USER = True
... ...