Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Rex Dri
Rex Dri
Commits
d08b29b3
Commit
d08b29b3
authored
Aug 24, 2018
by
Florent Chehab
Browse files
univCampus => univ_campus for coherence
parent
a6becde5
Changes
4
Hide whitespace changes
Inline
Side-by-side
backend/migrations/0002_auto_20180824_0910.py
0 → 100644
View file @
d08b29b3
# Generated by Django 2.0.3 on 2018-08-24 07:10
from
django.db
import
migrations
,
models
import
django.db.models.deletion
class
Migration
(
migrations
.
Migration
):
dependencies
=
[
(
'backend'
,
'0001_initial'
),
]
operations
=
[
migrations
.
AlterField
(
model_name
=
'campus'
,
name
=
'university'
,
field
=
models
.
ForeignKey
(
on_delete
=
django
.
db
.
models
.
deletion
.
PROTECT
,
related_name
=
'univ_campus'
,
to
=
'backend.University'
),
),
]
backend/models/university/campus.py
View file @
d08b29b3
...
...
@@ -16,7 +16,7 @@ class Campus(BasicModule):
comment
=
models
.
TextField
(
null
=
True
,
blank
=
True
)
city
=
models
.
ForeignKey
(
City
,
on_delete
=
models
.
PROTECT
,
null
=
False
)
university
=
models
.
ForeignKey
(
University
,
on_delete
=
models
.
PROTECT
,
null
=
False
,
related_name
=
"univ
C
ampus"
)
University
,
on_delete
=
models
.
PROTECT
,
null
=
False
,
related_name
=
"univ
_c
ampus"
)
lat
=
models
.
DecimalField
(
max_digits
=
10
,
...
...
backend/models/university/universityAPI.py
View file @
d08b29b3
...
...
@@ -4,11 +4,11 @@ from backend.models.university.campus import CampusSerializer
class
UniversitySerializer
(
serializers
.
ModelSerializer
):
univ
C
ampus
=
CampusSerializer
(
many
=
True
,
read_only
=
True
)
univ
_c
ampus
=
CampusSerializer
(
many
=
True
,
read_only
=
True
)
class
Meta
:
model
=
University
fields
=
(
'name'
,
'acronym'
,
'logo'
,
'id'
,
'univ
C
ampus'
)
fields
=
(
'name'
,
'acronym'
,
'logo'
,
'id'
,
'univ
_c
ampus'
)
class
UniversityViewSet
(
viewsets
.
ModelViewSet
):
# TODO switch to dict
...
...
frontend/src/components/map/UnivMap.js
View file @
d08b29b3
...
...
@@ -80,7 +80,7 @@ class UnivMap extends Component {
<
/LayersControl
>
{
this
.
props
.
universities
.
map
((
el
)
=>
(
<
Marker
position
=
{[
el
.
univ
C
ampus
[
0
].
lat
,
el
.
univ
C
ampus
[
0
].
lon
]}
>
<
Marker
position
=
{[
el
.
univ
_c
ampus
[
0
].
lat
,
el
.
univ
_c
ampus
[
0
].
lon
]}
>
<
Popup
>
{
el
.
name
}
<
/Popup
>
...
...
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