Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
MOOC packages by hacklab
django-courses
Commits
90a4e285
Commit
90a4e285
authored
Jun 08, 2020
by
Fernando Ribeiro
Browse files
Fix: changed relation in courses models and add serializers
parent
3fbe0cdb
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
31 additions
and
8 deletions
+31
-8
courses/migrations/0008_auto_20200608_1102.py
courses/migrations/0008_auto_20200608_1102.py
+24
-0
courses/models.py
courses/models.py
+4
-6
courses/serializers.py
courses/serializers.py
+3
-2
No files found.
courses/migrations/0008_auto_20200608_1102.py
0 → 100644
View file @
90a4e285
# Generated by Django 2.2.12 on 2020-06-08 14:02
from
django.db
import
migrations
,
models
class
Migration
(
migrations
.
Migration
):
dependencies
=
[
(
'auth'
,
'0011_update_proxy_permissions'
),
(
'courses'
,
'0007_auto_20200512_2349'
),
]
operations
=
[
migrations
.
AddField
(
model_name
=
'professormessage'
,
name
=
'classes'
,
field
=
models
.
ManyToManyField
(
blank
=
True
,
related_name
=
'message_courses'
,
to
=
'courses.Class'
,
verbose_name
=
'Default Class'
),
),
migrations
.
AddField
(
model_name
=
'professormessage'
,
name
=
'groups'
,
field
=
models
.
ManyToManyField
(
blank
=
True
,
help_text
=
'The Groups that will receive this message.'
,
related_name
=
'message_groups'
,
to
=
'auth.Group'
,
verbose_name
=
'groups'
),
),
]
courses/models.py
View file @
90a4e285
...
@@ -652,15 +652,13 @@ class ProfessorMessage(models.Model):
...
@@ -652,15 +652,13 @@ class ProfessorMessage(models.Model):
Group
,
Group
,
verbose_name
=
_
(
'groups'
),
verbose_name
=
_
(
'groups'
),
blank
=
True
,
blank
=
True
,
help_text
=
_
(
'The Groups that
can have access to this forum. If empty, there are no group restrictions
.'
),
help_text
=
_
(
'The Groups that
will receive this message
.'
),
related_name
=
"
course
s"
,
related_name
=
"
message_group
s"
,
)
)
default_
class
=
models
.
ManyToManyField
(
class
es
=
models
.
ManyToManyField
(
'Class'
,
'Class'
,
models
.
SET_NULL
,
verbose_name
=
_
(
'Default Class'
),
verbose_name
=
_
(
'Default Class'
),
related_name
=
'default_course'
,
related_name
=
'message_courses'
,
null
=
True
,
blank
=
True
,
blank
=
True
,
)
)
...
...
courses/serializers.py
View file @
90a4e285
...
@@ -123,12 +123,13 @@ class ProfessorMessageSerializer(serializers.ModelSerializer):
...
@@ -123,12 +123,13 @@ class ProfessorMessageSerializer(serializers.ModelSerializer):
course_slug
=
serializers
.
SerializerMethodField
(
read_only
=
True
)
course_slug
=
serializers
.
SerializerMethodField
(
read_only
=
True
)
course_name
=
serializers
.
SerializerMethodField
(
read_only
=
True
)
course_name
=
serializers
.
SerializerMethodField
(
read_only
=
True
)
is_read
=
serializers
.
SerializerMethodField
(
read_only
=
True
)
is_read
=
serializers
.
SerializerMethodField
(
read_only
=
True
)
groups
=
self
.
context
[
'request'
].
data
.
get
(
'groups'
,
None
)
groups
=
serializers
.
SerializerMethodField
(
read_only
=
True
)
classes
=
serializers
.
SerializerMethodField
(
read_only
=
True
)
class
Meta
:
class
Meta
:
model
=
ProfessorMessage
model
=
ProfessorMessage
fields
=
(
'id'
,
'course'
,
'course_name'
,
'course_slug'
,
'professor'
,
fields
=
(
'id'
,
'course'
,
'course_name'
,
'course_slug'
,
'professor'
,
'users'
,
'subject'
,
'message'
,
'date'
,
'is_read'
)
'users'
,
'subject'
,
'message'
,
'date'
,
'is_read'
,
'groups'
,
'classes'
)
def
get_course_slug
(
self
,
obj
):
def
get_course_slug
(
self
,
obj
):
try
:
try
:
...
...
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