Download as
Browse Code »

Commit fbf424a93b428c64e0ae4710e1ad10ee129f716c

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

Fixed imports and reference to form 

[skip ci]
Showing 2 changed files with 5 additions and 2 deletions   Show diff stats
colab/accounts/admin.py
  Diff comments   View file @fbf424a
@@ -3,9 +3,10 @@ from django import forms @@ -3,9 +3,10 @@ from django import forms
3 from django.contrib import admin 3 from django.contrib import admin
4 from django.contrib.auth import get_user_model 4 from django.contrib.auth import get_user_model
5 from django.contrib.auth.admin import UserAdmin 5 from django.contrib.auth.admin import UserAdmin
6 -from django.contrib.auth.forms import UserCreationForm  
7 from django.utils.translation import ugettext_lazy as _ 6 from django.utils.translation import ugettext_lazy as _
8 7
  8 +from .forms import UserCreationForm
  9 +
9 User = get_user_model() 10 User = get_user_model()
10 11
11 12
@@ -39,7 +40,7 @@ class MyUserAdmin(UserAdmin): @@ -39,7 +40,7 @@ class MyUserAdmin(UserAdmin):
39 40
40 fieldsets = ( 41 fieldsets = (
41 (None, {'fields': ('username', 'email', 'password')}), 42 (None, {'fields': ('username', 'email', 'password')}),
42 - (_('Personal info'), {'fields': ('first_name', 'last_name', 'twitter', 43 + (_('Personal info'), {'fields': ('first_name', 'last_name', 'twitter',
43 'facebook', 'google_talk', 'webpage', 44 'facebook', 'google_talk', 'webpage',
44 )}), 45 )}),
45 (_('Permissions'), {'fields': ('is_active', 'is_staff', 'is_superuser', 46 (_('Permissions'), {'fields': ('is_active', 'is_staff', 'is_superuser',
colab/accounts/forms.py
  Diff comments   View file @fbf424a
@@ -2,6 +2,8 @@ @@ -2,6 +2,8 @@
2 2
3 from django import forms 3 from django import forms
4 from django.contrib.auth import get_user_model 4 from django.contrib.auth import get_user_model
  5 +from django.contrib.auth.forms import OrderedDict, ReadOnlyPasswordHashField, \
  6 + default_token_generator
5 from django.utils.translation import ugettext_lazy as _ 7 from django.utils.translation import ugettext_lazy as _
6 8
7 from conversejs.models import XMPPAccount 9 from conversejs.models import XMPPAccount