File tree 2 files changed +3
-1
lines changed
javascripts/backbone/views
2 files changed +3
-1
lines changed Original file line number Diff line number Diff line change @@ -6,6 +6,8 @@ class Kandan.Views.ShowActivity extends Backbone.View
6
6
render : ()->
7
7
activity = @options .activity .toJSON ()
8
8
activity .created_at = Kandan .Helpers .Utils .time_to_string (new Date (activity .created_at ))
9
+ console .log (" Rendering activity:" )
10
+ console .log (activity)
9
11
if activity .action != " message"
10
12
@compiled_template = JST[' user_notification' ]({activity : activity})
11
13
else
Original file line number Diff line number Diff line change 5
5
<span class="user">Kandan bot</span>
6
6
7
7
<span class="content">
8
- <%= @activity.user.first_name %> <%= @activity.action %>ed <%- "<a href='#{@activity.content}'>#{@activity.content}</a>" if @activity.action == "upload" %>
8
+ <%= @activity.user.first_name || @activity.user.email %> <%= @activity.action %>ed <%- "<a href='#{@activity.content}'>#{@activity.content}</a>" if @activity.action == "upload" %>
9
9
</span>
10
10
</div>
11
11
You can’t perform that action at this time.
0 commit comments