fergalmoran/dss
1
0
Fork 0
mirror of https://github.com/fergalmoran/dss.git synced 2026-01-03 15:34:00 +00:00
Code Issues 13 Packages Projects Releases Wiki Activity

Fixed shortcut button triggering full refresh

Browse Source
This commit is contained in:
Fergal Moran
2014-08-28 18:18:40 +01:00
parent 549d715ab1
commit 78332a5ced
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/serialisers.py
View File

@@ -4,7 +4,8 @@ from spa.models.comment import Comment
class CommentSerialiser(serializers.HyperlinkedModelSerializer):
user = serializers.RelatedField(many=False)
avatar_image = serializers.Field(source='avatar_image')
class Meta:
model = Comment
fields = ('comment', 'date_created', 'user')
fields = ('comment', 'date_created', 'user', 'avatar_image')

7
spa/models/comment.py
View File

@@ -21,3 +21,10 @@ class Comment(BaseModel):
def create_activity(self):
pass
@property
def avatar_image(self):
if self.user is None:
return UserProfile.get_default_avatar_image()
else:
return self.user.get_profile().get_avatar_image()

8
static/js/dss/templates/sidebarleftnav.jst
View File

@@ -2,19 +2,19 @@
<div class="sidebar-shortcuts" id="sidebar-shortcuts">
<div class="sidebar-shortcuts-large" id="sidebar-shortcuts-large">
<a class="btn btn-success" data-bypass="true" title="Mute" id="button-mute">
<a class="btn btn-success" title="Mute" id="button-mute">
<i class="menu-icon fa fa-volume-up" id="button-mute-icon"></i>
</a>
<a href="/user/<%= com.podnoms.settings.userSlug %>/mixes" class="btn btn-info" data-bypass="true">
<a href="/user/<%= com.podnoms.settings.userSlug %>/mixes" class="btn btn-info">
<i class="menu-icon fa fa-pencil"></i>
</a>
<a href="<%= com.podnoms.settings.userUrl %>" data-bypass="true" class="btn btn-warning" title="Profile">
<a href="<%= com.podnoms.settings.userUrl %>" class="btn btn-warning" title="Profile">
<i class="menu-icon fa fa-users"></i>
</a>
<a href="/me" class="btn btn-purple" data-bypass="true" title="Settings">
<a href="/me" class="btn btn-purple" title="Settings">
<i class="menu-icon fa fa-cogs"></i>
</a>
</div>