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-legacy
Commits
4c877fad
Commit
4c877fad
authored
5 years ago
by
Fernando Ribeiro
Browse files
Options
Download
Email Patches
Plain Diff
Fix: Optimizing activity discussion to use lighter Topic serializer and hide null values
parent
bfb734a3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
18 deletions
+18
-18
courses_legacy/activities/serializers.py
courses_legacy/activities/serializers.py
+2
-2
courses_legacy/static/templates/activity_discussion.html
courses_legacy/static/templates/activity_discussion.html
+16
-16
No files found.
courses_legacy/activities/serializers.py
View file @
4c877fad
from
rest_framework
import
serializers
from
discussion.models
import
Topic
from
discussion.serializers
import
TopicSerializer
from
discussion.serializers
import
Base
TopicSerializer
from
.models
import
Activity
,
Answer
...
...
@@ -24,4 +24,4 @@ class AnswerSerializer(serializers.ModelSerializer):
except
(
Topic
.
DoesNotExist
,
AttributeError
)
as
e
:
return
return
TopicSerializer
(
instance
=
topic
,
**
{
'context'
:
self
.
context
}).
data
return
Base
TopicSerializer
(
instance
=
topic
,
**
{
'context'
:
self
.
context
}).
data
This diff is collapsed.
Click to expand it.
courses_legacy/static/templates/activity_discussion.html
View file @
4c877fad
...
...
@@ -287,23 +287,23 @@
</tr>
</thead>
<tbody
ng-repeat=
"course_class in classes_activities"
>
<tr
class=
"new"
ng-repeat=
"answer in course_class.activity_answers"
>
<td>
<div
class=
"user-icon"
>
<img
ng-src=
"{{ answer.topic.author.image || '/static/img/avatar-default.png'}}"
alt=
"{{answer.topic.author.name}}"
>
<tr
class=
"new"
ng-repeat=
"answer in course_class.activity_answers"
ng-hide=
"answer.topic === null"
>
<td>
<div
class=
"user-icon"
>
<img
ng-src=
"{{ answer.topic.author.image || '/static/img/avatar-default.png'}}"
alt=
"{{answer.topic.author.name}}"
>
</div>
<div
class=
"info"
>
<a
ng-click=
"viewAnswer(answer.topic)"
><span
class=
"user-name"
>
{{answer.topic.author.name}}
</span></a>
</div>
</td>
<td><b>
{{course_class.name}}
</b></td>
<td>
Última atividade
<b>
{{answer.topic.last_activity_at | date : 'dd/MM/yyyy' }}
</b></td>
<td>
<!-- <span class="action liked">{{ activity.count_likes }} curtiram</span> -->
<span
class=
"action replies"
>
{{ answer.topic.count_replies }} comentaram
</span>
</td>
</tr>
</div>
<div
class=
"info"
>
<a
ng-click=
"viewAnswer(answer.topic)"
><span
class=
"user-name"
>
{{answer.topic.author.name}}
</span></a>
</div>
</td>
<td><b>
{{course_class.name}}
</b></td>
<td>
Última
dsadas
atividade
<b>
{{answer.topic.last_activity_at | date : 'dd/MM/yyyy' }}
</b></td>
<td>
<!-- <span class="action liked">{{ activity.count_likes }} curtiram</span> -->
<span
class=
"action replies"
>
{{ answer.topic.count_replies }} comentaram
</span>
</td>
</tr>
</tbody>
</table>
</div>
...
...
This diff is collapsed.
Click to expand it.
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