Skip to content

Commit 800575b

Browse files
committed
Add links to user profile in messages
1 parent 66b0a29 commit 800575b

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

core/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ class ProfessorMessage(models.Model):
582582
course = models.ForeignKey(Course, verbose_name=_('Course'), null=True)
583583
users_that_read = models.ManyToManyField(settings.AUTH_USER_MODEL, related_name='read_messages')
584584
users_that_delete = models.ManyToManyField(settings.AUTH_USER_MODEL, related_name='delete_messages')
585-
receive_answer = models.BooleanField(_('Receive Answer'), default=False)
585+
# answer_to = models.ForeignKey('ProfessorMessage', blank=True, null=True)
586586

587587
def __unicode__(self):
588588
return unicode(self.subject)

core/serializers.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,11 @@
1717
class MessageAnswerSerializer(serializers.ModelSerializer):
1818
user_fullname = serializers.CharField(source="user.get_full_name", required=False, read_only=True)
1919
user_id = serializers.IntegerField(source="user.id", required=False, read_only=True)
20+
user_username = serializers.CharField(source="user.username", required=False, read_only=True)
2021

2122
class Meta:
2223
model = MessageAnswer
23-
fields = ('message', 'user', 'text', 'date', 'user_fullname', 'user_id')
24+
fields = ('message', 'user', 'text', 'date', 'user_fullname', 'user_id', 'user_username')
2425

2526

2627
class ProfessorMessageSerializer(serializers.ModelSerializer):

themes/default/templates/message.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ <h1 class="bottom">{% verbatim %}{{ message.subject }}{% endverbatim %}</h1>
2929
<div class="message-body">
3030
{% if user|is_assistant_or_coordinator:course %}
3131
{% verbatim %}
32-
<a>{{ message.professor.name }}</a>
32+
<a href="/profile/{{ message.professor.username }}">{{ message.professor.name }}</a>
3333
{% endverbatim %}
3434
{% else %}
35-
<a ng-if="message.professor.id == {{ user.id }}">{% verbatim %}{{ message.professor.name }}{% endverbatim %}</a>
35+
<a ng-if="message.professor.id == {{ user.id }}" {% verbatim %} href="/profile/{{ message.professor.username }}">{{ message.professor.name }}{% endverbatim %}</a>
3636
<strong ng-if="message.professor.id != {{ user.id }}">{% trans 'Tutor' %}</strong>
3737
{% endif %}
3838
<span ng-bind-html="message.message"> </span>
@@ -45,9 +45,9 @@ <h1 class="bottom">{% verbatim %}{{ message.subject }}{% endverbatim %}</h1>
4545

4646
<hr />
4747
{% if user|is_assistant_or_coordinator:course %}
48-
<a>{% verbatim %}{{ answer.user_fullname }}{% endverbatim %}: </a>
48+
{% verbatim %}<a href="/profile/{{ answer.user_username }}">{{ answer.user_fullname }}</a>: {% endverbatim %}
4949
{% else %}
50-
<a ng-if="answer.user_id == {{ user.id }}">{% verbatim %}{{ answer.user_fullname }}{% endverbatim %}: </a>
50+
<a ng-if="answer.user_id == {{ user.id }}" {% verbatim %} href="/profile/{{ answer.user_username }}">{{ answer.user_fullname }}{% endverbatim %}: </a>
5151
<strong ng-if="answer.user_id != {{ user.id }}">{% trans 'Tutor' %}: </strong>
5252
{% endif %}
5353
<span ng-bind-html="answer.text"></span>

0 commit comments

Comments
 (0)