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
ec04d14f
Verified
Commit
ec04d14f
authored
Jan 13, 2018
by
David Haynes
🙆
Browse files
Follow through on the changing of template names
- landing.html - manage.html
parent
85bfcdf8
Pipeline
#1979
passed with stages
in 2 minutes and 31 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
go/go/views.py
View file @
ec04d14f
...
...
@@ -37,7 +37,7 @@ def index(request):
# If the user is not authenticated, show them a public landing page.
if
not
request
.
user
.
is_authenticated
():
return
render
(
request
,
'
public_
landing.html'
)
return
render
(
request
,
'landing.html'
)
# Do not display this page to unapproved users
if
not
request
.
user
.
registereduser
.
approved
:
return
render
(
request
,
'not_registered.html'
)
...
...
@@ -648,7 +648,7 @@ def useradmin(request):
blocked_users
=
RegisteredUser
.
objects
.
filter
(
blocked
=
True
)
# Pass that list to the template
return
render
(
request
,
'
admin/useradmin
.html'
,
{
return
render
(
request
,
'
manage
.html'
,
{
'need_approval'
:
need_approval
,
'current_users'
:
current_users
,
'blocked_users'
:
blocked_users
...
...
go/settings/test_urls.py
View file @
ec04d14f
...
...
@@ -139,7 +139,7 @@ class UrlsTest(TestCase):
def
test_delete_reverse_chars_ints
(
self
):
"""
/delete/<short> - Delete a link, no content display.
/delete/<short> - Delete a link, no content display.
"""
url
=
reverse
(
'delete'
,
args
=
[
'dhaynes123'
])
...
...
@@ -161,12 +161,12 @@ class UrlsTest(TestCase):
url
=
reverse
(
'registered'
)
self
.
assertEqual
(
url
,
'/registered'
)
# The /admin URL is not tested as it is never resolves in source and
generally
# Django yells at you if the admin page breaks
# The /admin URL is not tested as it is never resolves in source and
#
generally
Django yells at you if the admin page breaks
def
test_useradmin
(
self
):
"""
/
useradmin
- user approval interface
/
manage
- user approval interface
"""
url
=
reverse
(
'useradmin'
)
...
...
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