Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
SRCT
go
Commits
05b6cb0f
Commit
05b6cb0f
authored
Nov 16, 2016
by
Zosman
Browse files
This commit fixes a bug where a user could be in both Waiting to Register and blocked user tables
parent
368a148c
Pipeline
#474
passed with stage
in 7 minutes and 22 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
go/go/templates/banned.html
View file @
05b6cb0f
...
...
@@ -25,7 +25,7 @@ SRCT Go • Account Blocked
<div
class=
"col-md-12"
>
{% block name %}
<p>
You have been banned from
go
{{ request.user.registereduser.full_name }}.
You have been banned from
Go:
<strong>
{{ request.user.registereduser.full_name }}
</strong>
.
</p>
{% endblock %}
<br
/>
...
...
go/go/views.py
View file @
05b6cb0f
...
...
@@ -400,7 +400,7 @@ def useradmin(request):
toremove
.
user
.
delete
()
return
HttpResponseRedirect
(
'useradmin'
)
need_approval
=
RegisteredUser
.
objects
.
filter
(
registered
=
True
).
filter
(
approved
=
False
)
need_approval
=
RegisteredUser
.
objects
.
filter
(
registered
=
True
).
filter
(
approved
=
False
)
.
filter
(
blocked
=
False
)
current_users
=
RegisteredUser
.
objects
.
filter
(
approved
=
True
).
filter
(
registered
=
True
)
blocked_users
=
RegisteredUser
.
objects
.
filter
(
blocked
=
True
)
return
render
(
request
,
'admin/useradmin.html'
,
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment