Commit 8e28e0af4b1484968b368794c13ec65b9d1d55bd
1 parent
49dbde6a
Exists in
master
and in
13 other branches
Replacing user_pk by user_id
Showing
1 changed file
with
9 additions
and
9 deletions
Show diff stats
src/super_archives/views.py
| @@ -170,13 +170,13 @@ class EmailView(View): | @@ -170,13 +170,13 @@ class EmailView(View): | ||
| 170 | """Create new email address that will wait for validation""" | 170 | """Create new email address that will wait for validation""" |
| 171 | 171 | ||
| 172 | email = request.POST.get('email') | 172 | email = request.POST.get('email') |
| 173 | - user_pk = request.POST.get('user') | 173 | + user_id = request.POST.get('user') |
| 174 | if not email: | 174 | if not email: |
| 175 | return http.HttpResponseBadRequest() | 175 | return http.HttpResponseBadRequest() |
| 176 | 176 | ||
| 177 | try: | 177 | try: |
| 178 | EmailAddressValidation.objects.create(address=email, | 178 | EmailAddressValidation.objects.create(address=email, |
| 179 | - user_pk=user_pk) | 179 | + user_id=user_id) |
| 180 | except IntegrityError: | 180 | except IntegrityError: |
| 181 | # 409 Conflict | 181 | # 409 Conflict |
| 182 | # duplicated entries | 182 | # duplicated entries |
| @@ -191,14 +191,14 @@ class EmailView(View): | @@ -191,14 +191,14 @@ class EmailView(View): | ||
| 191 | 191 | ||
| 192 | request.DELETE = http.QueryDict(request.body) | 192 | request.DELETE = http.QueryDict(request.body) |
| 193 | email_addr = request.DELETE.get('email') | 193 | email_addr = request.DELETE.get('email') |
| 194 | - user_pk = request.DELETE.get('user') | 194 | + user_id = request.DELETE.get('user') |
| 195 | 195 | ||
| 196 | if not email_addr: | 196 | if not email_addr: |
| 197 | return http.HttpResponseBadRequest() | 197 | return http.HttpResponseBadRequest() |
| 198 | 198 | ||
| 199 | try: | 199 | try: |
| 200 | email = EmailAddressValidation.objects.get(address=email_addr, | 200 | email = EmailAddressValidation.objects.get(address=email_addr, |
| 201 | - user_pk=user_pk) | 201 | + user_id=user_id) |
| 202 | except EmailAddressValidation.DoesNotExist: | 202 | except EmailAddressValidation.DoesNotExist: |
| 203 | pass | 203 | pass |
| 204 | else: | 204 | else: |
| @@ -207,7 +207,7 @@ class EmailView(View): | @@ -207,7 +207,7 @@ class EmailView(View): | ||
| 207 | 207 | ||
| 208 | try: | 208 | try: |
| 209 | email = EmailAddress.objects.get(address=email_addr, | 209 | email = EmailAddress.objects.get(address=email_addr, |
| 210 | - user_pk=user_pk) | 210 | + user_id=user_id) |
| 211 | except EmailAddress.DoesNotExist: | 211 | except EmailAddress.DoesNotExist: |
| 212 | raise http.Http404 | 212 | raise http.Http404 |
| 213 | 213 | ||
| @@ -222,13 +222,13 @@ class EmailView(View): | @@ -222,13 +222,13 @@ class EmailView(View): | ||
| 222 | request.UPDATE = http.QueryDict(request.body) | 222 | request.UPDATE = http.QueryDict(request.body) |
| 223 | 223 | ||
| 224 | email_addr = request.UPDATE.get('email') | 224 | email_addr = request.UPDATE.get('email') |
| 225 | - user_pk = request.UPDATE.get('user') | 225 | + user_id = request.UPDATE.get('user') |
| 226 | if not email_addr: | 226 | if not email_addr: |
| 227 | return http.HttpResponseBadRequest() | 227 | return http.HttpResponseBadRequest() |
| 228 | 228 | ||
| 229 | try: | 229 | try: |
| 230 | email = EmailAddress.objects.get(address=email_addr, | 230 | email = EmailAddress.objects.get(address=email_addr, |
| 231 | - user_pk=user_pk) | 231 | + user_id=user_id) |
| 232 | except EmailAddress.DoesNotExist: | 232 | except EmailAddress.DoesNotExist: |
| 233 | raise http.Http404 | 233 | raise http.Http404 |
| 234 | 234 | ||
| @@ -243,10 +243,10 @@ class EmailValidationView(View): | @@ -243,10 +243,10 @@ class EmailValidationView(View): | ||
| 243 | 243 | ||
| 244 | def post(self, request): | 244 | def post(self, request): |
| 245 | email_addr = request.POST.get('email') | 245 | email_addr = request.POST.get('email') |
| 246 | - user_pk = request.POST.get('user') | 246 | + user_id = request.POST.get('user') |
| 247 | try: | 247 | try: |
| 248 | email = EmailAddressValidation.objects.get(address=email_addr, | 248 | email = EmailAddressValidation.objects.get(address=email_addr, |
| 249 | - user_pk=user_pk) | 249 | + user_id=user_id) |
| 250 | except http.DoesNotExist: | 250 | except http.DoesNotExist: |
| 251 | raise http.Http404 | 251 | raise http.Http404 |
| 252 | 252 |