Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
I
internewshid
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
aptivate
client-projects
internewshid
Commits
f2ffb253
Commit
f2ffb253
authored
9 years ago
by
Martin Burchell
Browse files
Options
Downloads
Patches
Plain Diff
Fixed bug where incorrect uids were being formed
Follows change from base36 to base64 for Django 1.8
parent
1319389c
No related branches found
Branches containing commit
No related tags found
1 merge request
!49
Password reset
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
django/website/users/forms.py
+3
-2
3 additions, 2 deletions
django/website/users/forms.py
with
3 additions
and
2 deletions
django/website/users/forms.py
+
3
−
2
View file @
f2ffb253
...
...
@@ -7,7 +7,7 @@ from django.contrib.auth.forms import (
from
django.forms
import
(
ModelForm
,
HiddenInput
,
ValidationError
,
ImageField
)
from
django.utils.http
import
int_to_base36
from
django.utils.http
import
urlsafe_base64_encode
import
mail
import
floppyforms
as
forms
...
...
@@ -184,7 +184,7 @@ class ContactPasswordResetForm(PasswordResetForm):
ctx
=
{
'
email
'
:
user
.
business_email
,
'
site
'
:
settings
.
SITE_HOSTNAME
,
'
uid
'
:
int_to_base36
(
user
.
pk
),
'
uid
'
:
urlsafe_base64_encode
(
str
(
user
.
pk
)
)
,
'
user
'
:
user
,
'
token
'
:
token_generator
.
make_token
(
user
),
'
protocol
'
:
use_https
and
'
https
'
or
'
http
'
,
...
...
@@ -196,4 +196,5 @@ class ContactPasswordResetForm(PasswordResetForm):
'
template_name
'
:
email_template_name
,
'
context
'
:
ctx
}
mail
.
notify
(
options
)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment