Download as
Browse Code »

Commit 762529b49b971baa20356080c24d6d4b261c6465

Authored by Carlos Coêlho
Committed by Sergio Oliveira
1 parent cc3ce07f
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 email from creation form 

Removed e-mail field from form since it's not gonna be updated

Signed-off-by: Carlos Oliveira <carlospecter@gmail.com>
Signed-off-by: Sergio Oliveira <sergio@tracy.com.br>
Showing 2 changed files with 4 additions and 25 deletions   Show diff stats
colab/accounts/forms.py
  Diff comments   View file @762529b
... ... @@ -32,7 +32,7 @@ class UserForm(forms.ModelForm):
32 32 # Forces username to be lowercase always
33 33 widget=forms.TextInput(attrs={'style' : 'text-transform: lowercase;'}),
34 34 )
35   - required = ('first_name', 'last_name', 'email', 'username')
  35 + required = ('first_name', 'last_name', 'username')
36 36  
37 37 class Meta:
38 38 model = User
... ... @@ -49,35 +49,17 @@ class UserForm(forms.ModelForm):
49 49  
50 50  
51 51 class UserCreationForm(UserForm):
52   - email = forms.EmailField(
53   -
54   - # Forces email to be a read-only field
55   - widget=forms.TextInput(attrs={'readonly': 'readonly'})
56   - )
57   -
58   - def __init__(self, *args, **kwargs):
59   - self.original_email = kwargs.pop('email', None)
60   - super(UserCreationForm, self).__init__(*args, **kwargs)
61   -
62   - def clean_email(self):
63   - form_email = self.cleaned_data['email']
64   -
65   - if form_email != self.original_email:
66   - raise forms.ValidationError('This is not the original email.')
67   -
68   - return form_email
69   -
70 52  
71 53 def clean_username(self):
72 54 username = self.cleaned_data['username']
73 55 username = username.strip()
74 56 if not username:
75   - raise forms.ValidationError('This field should not be blank.')
  57 + raise forms.ValidationError(_('This field should not be blank.'))
76 58 return username
77 59  
78 60 class Meta:
79 61 model = User
80   - fields = ('first_name', 'last_name', 'email', 'username')
  62 + fields = ('first_name', 'last_name', 'username')
81 63  
82 64  
83 65 class UserUpdateForm(UserForm):
... ...
colab/accounts/views.py
  Diff comments   View file @762529b
... ... @@ -138,8 +138,6 @@ def signup(request):
138 138 user_form = UserCreationForm()
139 139 lists_form = ListsForm()
140 140  
141   - user_form.fields['email'].initial = user.email
142   -
143 141 return render(request, 'accounts/user_create_form.html',
144 142 {'user_form': user_form, 'lists_form': lists_form})
145 143  
... ... @@ -152,8 +150,7 @@ def signup(request):
152 150  
153 151 user = user_form.save(commit=False)
154 152 user.needs_update = False
155   - update_fields = ['first_name', 'last_name', 'username', 'needs_update']
156   - user.save(update_fields=update_fields)
  153 + user.save()
157 154  
158 155 # Check if the user's email have been used previously
159 156 # in the mainling lists to link the user to old messages
... ...