Download as
Browse Code »

Commit 175d00f1d792dfb5280cc4e793712e1589533d77

Authored by Alexandre Barbosa
Committed by Sergio Oliveira
1 parent 16a3e99f
Exists in master and in 13 other branches Validation_colab_sprint_30, check-port, generic-plugins, header_footer, mezuro-integration, move_out_plugins, plugin_extra_configs, proxy_base_template, proxy_hotspot, spb-release/3.0, stable, test, trac_indexing

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,7 +4,7 @@ from django.conf.urls import patterns, url
4 from .views import (UserProfileDetailView, UserProfileUpdateView, LoginView, 4 from .views import (UserProfileDetailView, UserProfileUpdateView, LoginView,
5 ManageUserSubscriptionsView, ChangeXMPPPasswordView) 5 ManageUserSubscriptionsView, ChangeXMPPPasswordView)
6 6
7 -from accounts import views 7 +from colab.accounts import views
8 from django.contrib.auth import views as auth_views 8 from django.contrib.auth import views as auth_views
9 9
10 from colab.settings import BROWSERID_ENABLED 10 from colab.settings import BROWSERID_ENABLED
@@ -30,12 +30,12 @@ if not BROWSERID_ENABLED: @@ -30,12 +30,12 @@ if not BROWSERID_ENABLED:
30 urlpatterns += patterns('', 30 urlpatterns += patterns('',
31 url(r'^login/?$', 'django.contrib.auth.views.login', name='login'), 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 name="password_reset_done"), 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 name="password_reset_complete"), 39 name="password_reset_complete"),
40 40
41 url(r'^password-reset-confirm/(?P<uidb64>[0-9A-Za-z]+)-(?P<token>.+)/$', 41 url(r'^password-reset-confirm/(?P<uidb64>[0-9A-Za-z]+)-(?P<token>.+)/$',
@@ -52,7 +52,7 @@ if not BROWSERID_ENABLED: @@ -52,7 +52,7 @@ if not BROWSERID_ENABLED:
52 name='password_change'), 52 name='password_change'),
53 53
54 url(r'^change-password-done/?$', 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 else: 57 else:
58 urlpatterns += patterns('', 58 urlpatterns += patterns('',
colab/accounts/views.py
  Diff comments   View file @175d00f
@@ -161,7 +161,7 @@ def signup(request): @@ -161,7 +161,7 @@ def signup(request):
161 161
162 user = user_form.save(commit=False) 162 user = user_form.save(commit=False)
163 user.needs_update = False 163 user.needs_update = False
164 - if not browser_id_enabled: 164 + if not BROWSERID_ENABLED:
165 user.is_active = False 165 user.is_active = False
166 EmailAddressValidation.create(user.email, user) 166 EmailAddressValidation.create(user.email, user)
167 167
@@ -4,7 +4,7 @@ from django.views.generic import TemplateView @@ -4,7 +4,7 @@ from django.views.generic import TemplateView
4 from django.contrib import admin 4 from django.contrib import admin
5 from django.views.generic import RedirectView 5 from django.views.generic import RedirectView
6 6
7 -from .accounts.models import User 7 +from colab.accounts.models import User
8 from .search.forms import ColabSearchForm 8 from .search.forms import ColabSearchForm
9 from .super_archives.models import Message 9 from .super_archives.models import Message
10 10