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
39a7349f
Commit
39a7349f
authored
Aug 26, 2016
by
Daniel W Bond
Browse files
removed integer casting for floor and room numbers
parent
c48db0ca
Changes
1
Hide whitespace changes
Inline
Side-by-side
roomlist/housing/views.py
View file @
39a7349f
...
@@ -59,7 +59,7 @@ class DetailFloor(LoginRequiredMixin, DetailView):
...
@@ -59,7 +59,7 @@ class DetailFloor(LoginRequiredMixin, DetailView):
url_parts
=
self
.
request
.
get_full_path
().
split
(
'/'
)
url_parts
=
self
.
request
.
get_full_path
().
split
(
'/'
)
# [u'', u'housing', u'building', u'floor', ]
# [u'', u'housing', u'building', u'floor', ]
building_name
=
url_parts
[
2
].
replace
(
'-'
,
' '
).
title
()
building_name
=
url_parts
[
2
].
replace
(
'-'
,
' '
).
title
()
floor_number
=
int
(
url_parts
[
3
]
)
floor_number
=
url_parts
[
3
]
building
=
Building
.
objects
.
get
(
name
=
building_name
)
building
=
Building
.
objects
.
get
(
name
=
building_name
)
floor
=
Floor
.
objects
.
get
(
number
=
floor_number
,
floor
=
Floor
.
objects
.
get
(
number
=
floor_number
,
building
=
building
)
building
=
building
)
...
@@ -85,8 +85,8 @@ class DetailRoom(LoginRequiredMixin, DetailView):
...
@@ -85,8 +85,8 @@ class DetailRoom(LoginRequiredMixin, DetailView):
url_parts
=
self
.
request
.
get_full_path
().
split
(
'/'
)
url_parts
=
self
.
request
.
get_full_path
().
split
(
'/'
)
# [u'', u'housing', u'building', u'floor', u'room', ]
# [u'', u'housing', u'building', u'floor', u'room', ]
building_name
=
url_parts
[
2
].
replace
(
'-'
,
' '
).
title
()
building_name
=
url_parts
[
2
].
replace
(
'-'
,
' '
).
title
()
floor_number
=
int
(
url_parts
[
3
]
)
floor_number
=
url_parts
[
3
]
room_number
=
int
(
url_parts
[
4
])
room_number
=
url_parts
[
4
]
.
upper
(
)
building
=
Building
.
objects
.
get
(
name
=
building_name
)
building
=
Building
.
objects
.
get
(
name
=
building_name
)
floor
=
Floor
.
objects
.
get
(
number
=
floor_number
,
floor
=
Floor
.
objects
.
get
(
number
=
floor_number
,
building
=
building
)
building
=
building
)
...
...
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