From be8035faa84edba576e046426354f59e30b04aff Mon Sep 17 00:00:00 2001 From: James Allen Date: Thu, 6 Mar 2014 18:13:07 +0000 Subject: [PATCH] Include names in view --- services/web/app/views/templates.jade | 2 +- services/web/public/coffee/track-changes/DiffView.coffee | 4 ++-- services/web/public/coffee/track-changes/models/Change.coffee | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/services/web/app/views/templates.jade b/services/web/app/views/templates.jade index ee2a4ab165..07be07dc1f 100644 --- a/services/web/app/views/templates.jade +++ b/services/web/app/views/templates.jade @@ -435,7 +435,7 @@ input(type="radio",name="toVersion").change-selector-to div(class='change-description') - div(class='change-message') {{user_id}} + div(class='change-message') {{user.first_name}} {{user.last_name}} div(class='change-date') {{end_ts}} div(class='change-date') {{start_ts}} diff --git a/services/web/public/coffee/track-changes/DiffView.coffee b/services/web/public/coffee/track-changes/DiffView.coffee index 70e6046507..4c67dde80f 100644 --- a/services/web/public/coffee/track-changes/DiffView.coffee +++ b/services/web/public/coffee/track-changes/DiffView.coffee @@ -74,7 +74,7 @@ define [ @_addMarkerWithCustomStyle session, markerBackLayer, range, "deleted-change-background", false, """ background-color : hsl(#{hue}, 70%, 85%); """ - tag = "Added by #{entry.meta.user_id}" + tag = "Added by #{entry.meta.user.email}" if entry.d? @_addMarkerWithCustomStyle session, markerBackLayer, range, "deleted-change-background", false, """ background-color : hsl(#{hue}, 70%, 95%); @@ -83,7 +83,7 @@ define [ height: #{Math.round(lineHeight/2) - 1}px; border-bottom: 2px solid hsl(#{hue}, 70%, 40%); """ - tag = "Deleted by #{entry.meta.user_id}" + tag = "Deleted by #{entry.meta.user.email}" tag += " on #{entry.meta.end_ts}" @_addNameTag session, id, range, tag, """ diff --git a/services/web/public/coffee/track-changes/models/Change.coffee b/services/web/public/coffee/track-changes/models/Change.coffee index 4c1187dd5b..a5ea9a546b 100644 --- a/services/web/public/coffee/track-changes/models/Change.coffee +++ b/services/web/public/coffee/track-changes/models/Change.coffee @@ -6,6 +6,6 @@ define [ return { start_ts: change.meta.start_ts end_ts: change.meta.end_ts - user_id: change.meta.user_id + user: change.meta.user version: change.v } \ No newline at end of file