Commit 1a790537 authored by David Symonds's avatar David Symonds

misc/dashboard/codereview: more abbreviated modification duration.

R=golang-dev, r
CC=golang-dev
https://golang.org/cl/6131044
parent 0175e3f1
...@@ -47,9 +47,9 @@ type CL struct { ...@@ -47,9 +47,9 @@ type CL struct {
Reviewer string Reviewer string
} }
// ShortOwner returns the CL's owner, either as their email address // DisplayOwner returns the CL's owner, either as their email address
// or the person ID if it's a reviewer. It is for display only. // or the person ID if it's a reviewer. It is for display only.
func (cl *CL) ShortOwner() string { func (cl *CL) DisplayOwner() string {
if p, ok := emailToPerson[cl.Owner]; ok { if p, ok := emailToPerson[cl.Owner]; ok {
return p return p
} }
...@@ -79,13 +79,20 @@ func (cl *CL) LGTMHTML() template.HTML { ...@@ -79,13 +79,20 @@ func (cl *CL) LGTMHTML() template.HTML {
} }
func (cl *CL) ModifiedAgo() string { func (cl *CL) ModifiedAgo() string {
// Just the first non-zero unit.
units := map[string]time.Duration{
"d": 24 * time.Hour,
"h": time.Hour,
"m": time.Minute,
"s": time.Second,
}
d := time.Now().Sub(cl.Modified) d := time.Now().Sub(cl.Modified)
d -= d % time.Minute // truncate to minute resolution for suffix, u := range units {
s := d.String() if d > u {
if strings.HasSuffix(s, "0s") { return fmt.Sprintf("%d%s", d/u, suffix)
s = s[:len(s)-2] }
} }
return s return "just now"
} }
func handleAssign(w http.ResponseWriter, r *http.Request) { func handleAssign(w http.ResponseWriter, r *http.Request) {
......
...@@ -192,7 +192,7 @@ var frontPage = template.Must(template.New("front").Funcs(template.FuncMap{ ...@@ -192,7 +192,7 @@ var frontPage = template.Must(template.New("front").Funcs(template.FuncMap{
<table class="cls"> <table class="cls">
{{range $cl := .CLs}} {{range $cl := .CLs}}
<tr id="cl-{{$cl.Number}}"> <tr id="cl-{{$cl.Number}}">
<td class="email">{{$cl.ShortOwner}}</td> <td class="email">{{$cl.DisplayOwner}}</td>
{{if $tbl.Assignable}} {{if $tbl.Assignable}}
<td> <td>
<select id="cl-rev-{{$cl.Number}}" {{if not $.UserIsReviewer}}disabled{{end}}> <select id="cl-rev-{{$cl.Number}}" {{if not $.UserIsReviewer}}disabled{{end}}>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment