Download as
Browse Code »

Commit 175d00f1d792dfb5280cc4e793712e1589533d77

Authored by Alexandre Barbosa
Committed by Sergio Oliveira
1 parent 16a3e99f
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

Update accounts module reference 

Signed-off-by: Alexandre Barbosa <alexandreab@live.com>
Signed-off-by: Lucas Kanashiro <kanashiro.duarte@gmail.com>
Showing 3 changed files with 7 additions and 7 deletions   Show diff stats
colab/accounts/urls.py
  Diff comments   View file @175d00f
... ... @@ -4,7 +4,7 @@ from django.conf.urls import patterns, url
4 4 from .views import (UserProfileDetailView, UserProfileUpdateView, LoginView,
5 5 ManageUserSubscriptionsView, ChangeXMPPPasswordView)
6 6  
7   -from accounts import views
  7 +from colab.accounts import views
8 8 from django.contrib.auth import views as auth_views
9 9  
10 10 from colab.settings import BROWSERID_ENABLED
... ... @@ -30,12 +30,12 @@ if not BROWSERID_ENABLED:
30 30 urlpatterns += patterns('',
31 31 url(r'^login/?$', 'django.contrib.auth.views.login', name='login'),
32 32  
33   - url(r'^logout/?$', 'accounts.views.logoutColab', name='logout'),
  33 + url(r'^logout/?$', 'django.contrib.auth.views.logout', name='logout'),
34 34  
35   - url(r'^password-reset-done/?$', 'accounts.views.password_reset_done_custom',
  35 + url(r'^password-reset-done/?$', 'colab.accounts.views.password_reset_done_custom',
36 36 name="password_reset_done"),
37 37  
38   - url(r'^password-reset-complete/$', 'accounts.views.password_reset_complete_custom',
  38 + url(r'^password-reset-complete/$', 'colab.accounts.views.password_reset_complete_custom',
39 39 name="password_reset_complete"),
40 40  
41 41 url(r'^password-reset-confirm/(?P<uidb64>[0-9A-Za-z]+)-(?P<token>.+)/$',
... ... @@ -52,7 +52,7 @@ if not BROWSERID_ENABLED:
52 52 name='password_change'),
53 53  
54 54 url(r'^change-password-done/?$',
55   - 'accounts.views.password_changed', name='password_change_done'),
  55 + 'colab.accounts.views.password_changed', name='password_change_done'),
56 56 )
57 57 else:
58 58 urlpatterns += patterns('',
... ...
colab/accounts/views.py
  Diff comments   View file @175d00f
... ... @@ -161,7 +161,7 @@ def signup(request):
161 161  
162 162 user = user_form.save(commit=False)
163 163 user.needs_update = False
164   - if not browser_id_enabled:
  164 + if not BROWSERID_ENABLED:
165 165 user.is_active = False
166 166 EmailAddressValidation.create(user.email, user)
167 167  
... ...
colab/urls.py
  Diff comments   View file @175d00f
... ... @@ -4,7 +4,7 @@ from django.views.generic import TemplateView
4 4 from django.contrib import admin
5 5 from django.views.generic import RedirectView
6 6  
7   -from .accounts.models import User
  7 +from colab.accounts.models import User
8 8 from .search.forms import ColabSearchForm
9 9 from .super_archives.models import Message
10 10  
... ...