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
7beb2bf2
Commit
7beb2bf2
authored
May 02, 2015
by
Daniel W Bond
Browse files
removed login from urls for accounts app
parent
42fc6d6c
Changes
2
Hide whitespace changes
Inline
Side-by-side
roomlist/accounts/urls.py
View file @
7beb2bf2
...
...
@@ -3,42 +3,25 @@ from django.conf.urls import patterns, include, url
# imports from your apps
from
.views
import
DetailStudent
,
UpdateStudent
,
DetailStudentSettings
,
\
DetailCurrentStudent
,
DetailCurrentStudentSettings
,
UpdateStudentMajor
from
.models
import
Student
urlpatterns
=
patterns
(
''
,
url
(
r
''
,
include
(
'allauth.urls'
)),
url
(
r
'^student/(?P<slug>[\w-]+)/$'
,
DetailStudent
.
as_view
(
model
=
Student
,
context_object_name
=
'student'
,
template_name
=
'detailStudent.html'
),
name
=
'detail_student'
),
DetailStudent
.
as_view
(),
name
=
'detail_student'
),
url
(
r
'^student/$'
,
DetailCurrentStudent
.
as_view
(
model
=
Student
,
context_object_name
=
'student'
,
template_name
=
'detailStudent.html'
),
name
=
'detailCurrentStudent'
),
DetailCurrentStudent
.
as_view
(),
name
=
'detailCurrentStudent'
),
url
(
r
'^student/(?P<slug>[\w-]+)/welcome/$'
,
UpdateStudent
.
as_view
(
model
=
Student
,
template_name
=
"updateStudent.html"
),
name
=
'updateStudent'
),
UpdateStudent
.
as_view
(),
name
=
'updateStudent'
),
url
(
r
'^(?P<slug>[\w-]+)/major/$'
,
UpdateStudentMajor
.
as_view
(
model
=
Student
,
template_name
=
"updateStudentMajor.html"
),
name
=
'updateStudentMajor'
),
UpdateStudentMajor
.
as_view
(),
name
=
'updateStudentMajor'
),
url
(
r
'^settings/$'
,
DetailCurrentStudentSettings
.
as_view
(
model
=
Student
,
context_object_name
=
'student'
,
template_name
=
"studentSettings.html"
),
name
=
'currentStudentSettings'
),
DetailCurrentStudentSettings
.
as_view
(),
name
=
'currentStudentSettings'
),
)
roomlist/accounts/views.py
View file @
7beb2bf2
...
...
@@ -12,6 +12,8 @@ from .models import Student
class
UpdateStudent
(
LoginRequiredMixin
,
UpdateView
):
model
=
Student
fields
=
[
'room'
,
'privacy'
,]
context_object_name
=
'student'
template_name
=
'updateStudent.html'
login_url
=
'login'
...
...
@@ -31,8 +33,9 @@ class UpdateStudent(LoginRequiredMixin, UpdateView):
class
UpdateStudentMajor
(
LoginRequiredMixin
,
UpdateView
):
models
=
Student
fields
=
[
'major'
,]
template_name
=
'updateStudentMajor.html'
login_url
=
'
/
'
login_url
=
'
login
'
# copied from below
# def get_object(self):
...
...
@@ -41,6 +44,10 @@ class UpdateStudentMajor(LoginRequiredMixin, UpdateView):
# details about the student
class
DetailStudent
(
LoginRequiredMixin
,
DetailView
):
model
=
Student
context_object_name
=
'student'
template_name
=
'detailStudent.html'
login_url
=
'login'
def
get_context_data
(
self
,
**
kwargs
):
context
=
super
(
DetailStudent
,
self
).
get_context_data
(
**
kwargs
)
...
...
@@ -77,10 +84,12 @@ class DetailStudent(LoginRequiredMixin, DetailView):
context
[
'shares'
]
=
shares
()
return
context
login_url
=
'/'
class
DetailCurrentStudent
(
LoginRequiredMixin
,
DetailView
):
#model = Student
model
=
Student
context_object_name
=
'student'
template_name
=
'detailStudent.html'
login_url
=
'login'
def
get_object
(
self
):
return
get_object_or_404
(
Student
,
pk
=
self
.
request
.
session
[
'_auth_user_id'
])
...
...
@@ -88,10 +97,17 @@ class DetailCurrentStudent(LoginRequiredMixin, DetailView):
# changeable student settings
class
DetailStudentSettings
(
LoginRequiredMixin
,
DetailView
):
model
=
Student
login_url
=
'/'
context_object_name
=
'student'
template_name
=
'studentSettings.html'
login_url
=
'login'
class
DetailCurrentStudentSettings
(
LoginRequiredMixin
,
DetailView
):
model
=
Student
context_object_name
=
'student'
template_name
=
'studentSettings.html'
login_url
=
'login'
def
get_object
(
self
):
return
get_object_or_404
(
Student
,
pk
=
self
.
request
.
session
[
'_auth_user_id'
])
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