Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
R
roomlist
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
23
Issues
23
List
Boards
Labels
Service Desk
Milestones
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
SRCT
roomlist
Commits
edc2e08b
Commit
edc2e08b
authored
Mar 26, 2015
by
Daniel W Bond
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
floor now optional field for student
parent
e35b7f8c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
5 deletions
+11
-5
roomlist/accounts/models.py
roomlist/accounts/models.py
+11
-5
No files found.
roomlist/accounts/models.py
View file @
edc2e08b
...
...
@@ -88,7 +88,7 @@ class Student(TimeStampedModel):
privacy
=
models
.
CharField
(
max_length
=
100
,
choices
=
PRIVACY_CHOICES
,
default
=
FLOOR
)
room
=
models
.
ForeignKey
(
Room
)
room
=
models
.
ForeignKey
(
Room
,
null
=
True
,
blank
=
True
)
clas
=
models
.
ForeignKey
(
Class
)
major
=
models
.
ForeignKey
(
'Major'
)
...
...
@@ -99,12 +99,18 @@ class Student(TimeStampedModel):
objects
=
StudentManager
()
def
get_floor
(
self
):
floor
=
self
.
room
.
floor
return
floor
try
:
floor
=
self
.
room
.
floor
return
floor
except
AttributeError
:
return
None
def
get_building
(
self
):
building
=
self
.
room
.
floor
.
building
return
building
try
:
building
=
self
.
room
.
floor
.
building
return
building
except
AttributeError
:
return
None
def
profile_image_url
(
self
):
fb_uid
=
SocialAccount
.
objects
.
filter
(
user
=
self
.
user
.
id
,
provider
=
'facebook'
)
...
...
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