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
roomlist
Commits
efbbeb10
Commit
efbbeb10
authored
Sep 27, 2016
by
Daniel W Bond
Browse files
fixed problem with redirect to settings on url resolution following welcome walkthrough completion
parent
cf380fa2
Changes
1
Hide whitespace changes
Inline
Side-by-side
roomlist/welcome/views.py
View file @
efbbeb10
...
...
@@ -2,7 +2,7 @@
from
__future__
import
absolute_import
,
print_function
from
distutils.util
import
strtobool
# core django imports
from
django.shortcuts
import
re
nder
from
django.shortcuts
import
re
direct
from
django.views.generic
import
FormView
from
django.core.urlresolvers
import
reverse
from
django.contrib
import
messages
...
...
@@ -29,8 +29,8 @@ class WelcomeName(LoginRequiredMixin, FormView):
if
self
.
request
.
user
.
student
.
totally_done
():
messages
.
add_message
(
request
,
messages
.
INFO
,
settings_redirect
)
return
reverse
(
'update_student'
,
kwargs
=
{
'slug'
:
self
.
request
.
user
.
username
})
return
redirect
(
reverse
(
'update_student'
,
kwargs
=
{
'slug'
:
self
.
request
.
user
.
username
})
)
else
:
return
super
(
WelcomeName
,
self
).
get
(
request
,
*
args
,
**
kwargs
)
...
...
@@ -84,8 +84,8 @@ class WelcomePrivacy(LoginRequiredMixin, FormView):
if
self
.
request
.
user
.
student
.
totally_done
():
messages
.
add_message
(
request
,
messages
.
INFO
,
settings_redirect
)
return
reverse
(
'update_student'
,
kwargs
=
{
'slug'
:
self
.
request
.
user
.
username
})
return
redirect
(
reverse
(
'update_student'
,
kwargs
=
{
'slug'
:
self
.
request
.
user
.
username
})
)
else
:
return
super
(
WelcomePrivacy
,
self
).
get
(
request
,
*
args
,
**
kwargs
)
...
...
@@ -157,8 +157,8 @@ class WelcomeMajor(LoginRequiredMixin, FormView):
if
self
.
request
.
user
.
student
.
totally_done
():
messages
.
add_message
(
request
,
messages
.
INFO
,
settings_redirect
)
return
reverse
(
'update_student'
,
kwargs
=
{
'slug'
:
self
.
request
.
user
.
username
})
return
redirect
(
reverse
(
'update_student'
,
kwargs
=
{
'slug'
:
self
.
request
.
user
.
username
})
)
else
:
return
super
(
WelcomeMajor
,
self
).
get
(
request
,
*
args
,
**
kwargs
)
...
...
@@ -208,8 +208,8 @@ class WelcomeSocial(LoginRequiredMixin, FormView):
if
self
.
request
.
user
.
student
.
totally_done
():
messages
.
add_message
(
request
,
messages
.
INFO
,
settings_redirect
)
return
re
verse
(
'update_student'
,
kwargs
=
{
'slug'
:
self
.
request
.
user
.
username
})
return
re
nder_to_string
(
'update_student'
,
context
=
{
'slug'
:
self
.
request
.
user
.
username
})
else
:
return
super
(
WelcomeSocial
,
self
).
get
(
request
,
*
args
,
**
kwargs
)
...
...
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