Download as
Browse Code »

Commit 49dbde6ab176a68d2dd494f5b91d440c8e511f52

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

Fixing email edition for admins

Showing 2 changed files with 26 additions and 14 deletions   Show diff stats
src/accounts/templates/accounts/user_update_form.html
  Diff comments   View file @49dbde6
... ... @@ -13,7 +13,7 @@ $(function() {
13 13 $.ajax({
14 14 url: "{% url 'archive_email_view' %}",
15 15 type: 'post',
16   - data: { email: $('#new_email').val() },
  16 + data: { email: $('#new_email').val(), user: '{{ user_.pk }}' },
17 17 beforeSend: function(xhr, settings) {
18 18 xhr.setRequestHeader("X-CSRFToken", $.cookie('csrftoken'));
19 19 }
... ... @@ -36,7 +36,10 @@ $(function() {
36 36 $.ajax({
37 37 url: "{% url 'archive_email_view' %}",
38 38 type: 'delete',
39   - data: { email: $('.email-address', $email_block).text() },
  39 + data: {
  40 + email: $('.email-address', $email_block).text(),
  41 + user: '{{ user_.pk }}'
  42 + },
40 43 context: $email_block[0],
41 44 beforeSend: function(xhr, settings) {
42 45 xhr.setRequestHeader("X-CSRFToken", $.cookie('csrftoken'));
... ... @@ -53,7 +56,10 @@ $(function() {
53 56 $.ajax({
54 57 url: "{% url 'archive_email_validation_view' %}",
55 58 type: 'post',
56   - data: { email: $('.email-address', $email_block).text() },
  59 + data: {
  60 + email: $('.email-address', $email_block).text(),
  61 + user: '{{ user_.pk }}'
  62 + },
57 63 context: $email_block[0],
58 64 beforeSend: function(xhr, settings) {
59 65 xhr.setRequestHeader("X-CSRFToken", $.cookie('csrftoken'));
... ... @@ -77,7 +83,10 @@ $(function() {
77 83 $.ajax({
78 84 url: "{% url 'archive_email_view' %}",
79 85 type: 'update',
80   - data: { email: $('.email-address', $email_block).text() },
  86 + data: {
  87 + email: $('.email-address', $email_block).text(),
  88 + user: '{{ user_.pk }}'
  89 + },
81 90 beforeSend: function(xhr, settings) {
82 91 xhr.setRequestHeader("X-CSRFToken", $.cookie('csrftoken'));
83 92 }
... ...
src/super_archives/views.py
  Diff comments   View file @49dbde6
... ... @@ -138,8 +138,7 @@ class EmailView(View):
138 138 """Validate an email with the given key"""
139 139  
140 140 try:
141   - email_val = EmailAddressValidation.objects.get(validation_key=key,
142   - user__pk=request.user.pk)
  141 + email_val = EmailAddressValidation.objects.get(validation_key=key)
143 142 except EmailAddressValidation.DoesNotExist:
144 143 messages.error(request, _('The email address you are trying to '
145 144 'verify either has already been verified '
... ... @@ -171,12 +170,13 @@ class EmailView(View):
171 170 """Create new email address that will wait for validation"""
172 171  
173 172 email = request.POST.get('email')
  173 + user_pk = request.POST.get('user')
174 174 if not email:
175 175 return http.HttpResponseBadRequest()
176 176  
177 177 try:
178 178 EmailAddressValidation.objects.create(address=email,
179   - user=request.user)
  179 + user_pk=user_pk)
180 180 except IntegrityError:
181 181 # 409 Conflict
182 182 # duplicated entries
... ... @@ -191,13 +191,14 @@ class EmailView(View):
191 191  
192 192 request.DELETE = http.QueryDict(request.body)
193 193 email_addr = request.DELETE.get('email')
  194 + user_pk = request.DELETE.get('user')
194 195  
195 196 if not email_addr:
196 197 return http.HttpResponseBadRequest()
197 198  
198 199 try:
199 200 email = EmailAddressValidation.objects.get(address=email_addr,
200   - user=request.user)
  201 + user_pk=user_pk)
201 202 except EmailAddressValidation.DoesNotExist:
202 203 pass
203 204 else:
... ... @@ -206,7 +207,7 @@ class EmailView(View):
206 207  
207 208 try:
208 209 email = EmailAddress.objects.get(address=email_addr,
209   - user=request.user)
  210 + user_pk=user_pk)
210 211 except EmailAddress.DoesNotExist:
211 212 raise http.Http404
212 213  
... ... @@ -221,17 +222,18 @@ class EmailView(View):
221 222 request.UPDATE = http.QueryDict(request.body)
222 223  
223 224 email_addr = request.UPDATE.get('email')
  225 + user_pk = request.UPDATE.get('user')
224 226 if not email_addr:
225 227 return http.HttpResponseBadRequest()
226 228  
227 229 try:
228 230 email = EmailAddress.objects.get(address=email_addr,
229   - user=request.user)
  231 + user_pk=user_pk)
230 232 except EmailAddress.DoesNotExist:
231 233 raise http.Http404
232 234  
233   - request.user.email = email_addr
234   - request.user.save()
  235 + email.user.email = email_addr
  236 + email.user.save()
235 237 return http.HttpResponse(status=204)
236 238  
237 239  
... ... @@ -241,14 +243,15 @@ class EmailValidationView(View):
241 243  
242 244 def post(self, request):
243 245 email_addr = request.POST.get('email')
  246 + user_pk = request.POST.get('user')
244 247 try:
245 248 email = EmailAddressValidation.objects.get(address=email_addr,
246   - user=request.user)
  249 + user_pk=user_pk)
247 250 except http.DoesNotExist:
248 251 raise http.Http404
249 252  
250 253 try:
251   - send_verification_email(email_addr, request.user,
  254 + send_verification_email(email_addr, email.user,
252 255 email.validation_key)
253 256 except smtplib.SMTPException:
254 257 logging.exception('Error sending validation email')
... ...