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
e0dcfc58
Commit
e0dcfc58
authored
Jun 24, 2020
by
Fernando Ribeiro
Browse files
Merge branch 'develop' into 'master'
Develop into master See merge request
!11
parents
d4f0ff56
b74499ee
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
2 deletions
+10
-2
courses/admin.py
courses/admin.py
+5
-0
courses/models.py
courses/models.py
+3
-0
courses/workspaces/serializers.py
courses/workspaces/serializers.py
+2
-2
No files found.
courses/admin.py
View file @
e0dcfc58
...
...
@@ -7,6 +7,7 @@ from .videos.models import Video
from
.models
import
(
Course
,
Lesson
,
Unit
,
CourseProfessor
,
CourseStudent
,
StudentProgress
,
Class
,
ProfessorMessage
,
)
from
.course_material.models
import
CourseMaterial
,
File
...
...
@@ -112,3 +113,7 @@ class WorkspaceAdmin(admin.ModelAdmin):
'groups'
,
'classes'
,
)
@
admin
.
register
(
ProfessorMessage
)
class
ProfessorMessageAdmin
(
admin
.
ModelAdmin
):
pass
courses/models.py
View file @
e0dcfc58
...
...
@@ -663,6 +663,9 @@ class ProfessorMessage(models.Model):
blank
=
True
,
)
def
__str__
(
self
):
return
self
.
professor
.
name
+
" - "
+
self
.
subject
+
" - "
+
str
(
self
.
date
)
def
send
(
self
):
# bcc = list with all destinataries
# batch = bcc.split( constant )
...
...
courses/workspaces/serializers.py
View file @
e0dcfc58
...
...
@@ -2,6 +2,7 @@ from rest_framework import serializers
from
django.contrib.auth.models
import
Group
from
baquara.users.serializers
import
SimpleUserSerializer
from
courses.models
import
Course
,
Class
# from courses.serializers import ClassSerializer as CoreClassSerializer
# from courses_legacy.core.serializers import ClassSerializer as CoreClassSerializer
...
...
@@ -24,12 +25,11 @@ class GroupSerializer(serializers.ModelSerializer):
class
GroupAdminSerializer
(
serializers
.
ModelSerializer
):
#
users =
T
im
tec
UserSerializer(many=True, read_only=True, source="user_set")
users
=
S
im
ple
UserSerializer
(
many
=
True
,
read_only
=
True
,
source
=
"user_set"
)
class
Meta
:
model
=
Group
fields
=
(
'id'
,
'name'
,
'users'
,
)
depth
=
1
class
ClassSerializer
(
serializers
.
ModelSerializer
):
...
...
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