Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
django-basetheme-bootstrap
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Analyze
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
Bryan BRANCOTTE
django-basetheme-bootstrap
Commits
33188c4a
Commit
33188c4a
authored
4 years ago
by
Bryan BRANCOTTE
Browse files
Options
Downloads
Patches
Plain Diff
have access to group PendingAccountUser's name
parent
4427bd3e
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Pipeline
#45826
passed
4 years ago
Stage: test
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
basetheme_bootstrap/views.py
+9
-5
9 additions, 5 deletions
basetheme_bootstrap/views.py
setup.py
+1
-1
1 addition, 1 deletion
setup.py
with
10 additions
and
6 deletions
basetheme_bootstrap/views.py
+
9
−
5
View file @
33188c4a
...
@@ -28,6 +28,10 @@ from basetheme_bootstrap.forms import UserCreationFormWithMore, \
...
@@ -28,6 +28,10 @@ from basetheme_bootstrap.forms import UserCreationFormWithMore, \
logger
=
logging
.
getLogger
(
__name__
)
logger
=
logging
.
getLogger
(
__name__
)
__PENDING_ACCOUNT_USER
=
"
PendingAccountUser
"
def
get_pending_account_user_group_name
():
return
__PENDING_ACCOUNT_USER
def
about_page
(
request
):
def
about_page
(
request
):
context
=
{}
context
=
{}
...
@@ -67,10 +71,10 @@ def signup(request):
...
@@ -67,10 +71,10 @@ def signup(request):
user
.
is_superuser
=
True
user
.
is_superuser
=
True
user
.
is_staff
=
True
user
.
is_staff
=
True
user
.
is_active
=
True
user
.
is_active
=
True
Group
.
objects
.
get_or_create
(
name
=
"
PendingAccountUser
"
)
Group
.
objects
.
get_or_create
(
name
=
__PENDING_ACCOUNT_USER
)
else
:
else
:
if
not
auto_active
:
if
not
auto_active
:
g
,
created
=
Group
.
objects
.
get_or_create
(
name
=
"
PendingAccountUser
"
)
g
,
created
=
Group
.
objects
.
get_or_create
(
name
=
__PENDING_ACCOUNT_USER
)
user
.
groups
.
add
(
g
)
user
.
groups
.
add
(
g
)
user
.
is_active
=
auto_active
user
.
is_active
=
auto_active
user
.
save
()
user
.
save
()
...
@@ -88,7 +92,7 @@ def signup(request):
...
@@ -88,7 +92,7 @@ def signup(request):
login
(
request
,
user
)
login
(
request
,
user
)
return
redirect
(
'
home
'
)
return
redirect
(
'
home
'
)
else
:
else
:
user
=
get_user_model
().
objects
.
filter
(
groups__name
=
"
PendingAccountUser
"
,
user
=
get_user_model
().
objects
.
filter
(
groups__name
=
__PENDING_ACCOUNT_USER
,
email
=
request
.
POST
[
'
email
'
]).
first
()
email
=
request
.
POST
[
'
email
'
]).
first
()
if
user
is
not
None
:
if
user
is
not
None
:
send_account_created
(
request
,
user
,
auto_active
=
not
is_validating_email
())
send_account_created
(
request
,
user
,
auto_active
=
not
is_validating_email
())
...
@@ -240,10 +244,10 @@ def activate(request, uidb64, token):
...
@@ -240,10 +244,10 @@ def activate(request, uidb64, token):
user
=
get_user_model
().
objects
.
get
(
pk
=
uid
)
user
=
get_user_model
().
objects
.
get
(
pk
=
uid
)
except
(
TypeError
,
ValueError
,
OverflowError
,
get_user_model
().
DoesNotExist
):
except
(
TypeError
,
ValueError
,
OverflowError
,
get_user_model
().
DoesNotExist
):
user
=
None
user
=
None
if
user
is
not
None
and
user
.
groups
.
filter
(
name
=
"
PendingAccountUser
"
).
exists
():
if
user
is
not
None
and
user
.
groups
.
filter
(
name
=
__PENDING_ACCOUNT_USER
).
exists
():
if
tokens
.
account_activation_token
.
check_token
(
user
,
token
):
if
tokens
.
account_activation_token
.
check_token
(
user
,
token
):
user
.
is_active
=
True
user
.
is_active
=
True
user
.
groups
.
remove
(
user
.
groups
.
get
(
name
=
"
PendingAccountUser
"
))
user
.
groups
.
remove
(
user
.
groups
.
get
(
name
=
__PENDING_ACCOUNT_USER
))
user
.
save
()
user
.
save
()
login
(
request
,
user
)
login
(
request
,
user
)
# return redirect('home')
# return redirect('home')
...
...
This diff is collapsed.
Click to expand it.
setup.py
+
1
−
1
View file @
33188c4a
...
@@ -7,7 +7,7 @@ readme = open('README.rst').read()
...
@@ -7,7 +7,7 @@ readme = open('README.rst').read()
setup
(
setup
(
name
=
'
django-basetheme-bootstrap
'
,
name
=
'
django-basetheme-bootstrap
'
,
version
=
'
0.2.5
2
'
,
version
=
'
0.2.5
3
'
,
description
=
'
Django Basetheme Bootstrap
'
,
description
=
'
Django Basetheme Bootstrap
'
,
long_description
=
readme
,
long_description
=
readme
,
author
=
'
Bryan Brancotte
'
,
author
=
'
Bryan Brancotte
'
,
...
...
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