Răsfoiți Sursa

Include names in view

James Allen 12 ani în urmă
părinte
comite
be8035faa8

+ 1 - 1
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}} 
 

+ 2 - 2
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, """

+ 1 - 1
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
 			}