aboutsummaryrefslogtreecommitdiffstats
path: root/termui
diff options
context:
space:
mode:
authorMichael Muré <batolettre@gmail.com>2018-10-07 18:27:23 +0200
committerMichael Muré <batolettre@gmail.com>2018-10-07 18:27:23 +0200
commit7cb7994cdae848053487d00c1730d1e865fb8623 (patch)
treebc9be185e81479d8d3e5b0fc636daea011a64e4c /termui
parent03202fed493539c8d1fdcad7254687f951d0ca4a (diff)
downloadgit-bug-7cb7994cdae848053487d00c1730d1e865fb8623.tar.gz
github: also pull users email
Diffstat (limited to 'termui')
-rw-r--r--termui/bug_table.go2
-rw-r--r--termui/show_bug.go12
2 files changed, 7 insertions, 7 deletions
diff --git a/termui/bug_table.go b/termui/bug_table.go
index a60e226e..8ad77b41 100644
--- a/termui/bug_table.go
+++ b/termui/bug_table.go
@@ -299,7 +299,7 @@ func (bt *bugTable) render(v *gocui.View, maxX int) {
id := text.LeftPadMaxLine(snap.HumanId(), columnWidths["id"], 2)
status := text.LeftPadMaxLine(snap.Status.String(), columnWidths["status"], 2)
title := text.LeftPadMaxLine(snap.Title, columnWidths["title"], 2)
- author := text.LeftPadMaxLine(person.Name, columnWidths["author"], 2)
+ author := text.LeftPadMaxLine(person.DisplayName(), columnWidths["author"], 2)
summary := text.LeftPadMaxLine(snap.Summary(), columnWidths["summary"], 2)
lastEdit := text.LeftPadMaxLine(humanize.Time(snap.LastEditTime()), columnWidths["lastEdit"], 2)
diff --git a/termui/show_bug.go b/termui/show_bug.go
index 72bcfe2f..395d0cd2 100644
--- a/termui/show_bug.go
+++ b/termui/show_bug.go
@@ -8,8 +8,8 @@ import (
"github.com/MichaelMure/git-bug/bug"
"github.com/MichaelMure/git-bug/cache"
"github.com/MichaelMure/git-bug/util/colors"
- "github.com/MichaelMure/git-bug/util/text"
"github.com/MichaelMure/git-bug/util/git"
+ "github.com/MichaelMure/git-bug/util/text"
"github.com/jroimartin/gocui"
)
@@ -233,7 +233,7 @@ func (sb *showBug) renderMain(g *gocui.Gui, mainView *gocui.View) error {
colors.Cyan(snap.HumanId()),
colors.Bold(snap.Title),
colors.Yellow(snap.Status),
- colors.Magenta(snap.Author.Name),
+ colors.Magenta(snap.Author.DisplayName()),
snap.CreatedAt.Format(timeLayout),
edited,
)
@@ -276,7 +276,7 @@ func (sb *showBug) renderMain(g *gocui.Gui, mainView *gocui.View) error {
message, _ := text.WrapLeftPadded(comment.Message, maxX, 4)
content := fmt.Sprintf("%s commented on %s%s\n\n%s",
- colors.Magenta(comment.Author.Name),
+ colors.Magenta(comment.Author.DisplayName()),
comment.CreatedAt.Time().Format(timeLayout),
edited,
message,
@@ -294,7 +294,7 @@ func (sb *showBug) renderMain(g *gocui.Gui, mainView *gocui.View) error {
setTitle := op.(*bug.SetTitleTimelineItem)
content := fmt.Sprintf("%s changed the title to %s on %s",
- colors.Magenta(setTitle.Author.Name),
+ colors.Magenta(setTitle.Author.DisplayName()),
colors.Bold(setTitle.Title),
setTitle.UnixTime.Time().Format(timeLayout),
)
@@ -311,7 +311,7 @@ func (sb *showBug) renderMain(g *gocui.Gui, mainView *gocui.View) error {
setStatus := op.(*bug.SetStatusTimelineItem)
content := fmt.Sprintf("%s %s the bug on %s",
- colors.Magenta(setStatus.Author.Name),
+ colors.Magenta(setStatus.Author.DisplayName()),
colors.Bold(setStatus.Status.Action()),
setStatus.UnixTime.Time().Format(timeLayout),
)
@@ -360,7 +360,7 @@ func (sb *showBug) renderMain(g *gocui.Gui, mainView *gocui.View) error {
}
content := fmt.Sprintf("%s %s on %s",
- colors.Magenta(labelChange.Author.Name),
+ colors.Magenta(labelChange.Author.DisplayName()),
action.String(),
labelChange.UnixTime.Time().Format(timeLayout),
)