diff options
Diffstat (limited to 'termui')
| -rw-r--r-- | termui/bug_table.go | 9 | ||||
| -rw-r--r-- | termui/label_select.go | 2 | ||||
| -rw-r--r-- | termui/show_bug.go | 6 | ||||
| -rw-r--r-- | termui/termui.go | 6 |
4 files changed, 11 insertions, 12 deletions
diff --git a/termui/bug_table.go b/termui/bug_table.go index 13d86aa7..69634151 100644 --- a/termui/bug_table.go +++ b/termui/bug_table.go @@ -289,12 +289,9 @@ func (bt *bugTable) render(v *gocui.View, maxX int) { columnWidths := bt.getColumnWidths(maxX) for _, b := range bt.bugs { - person := bug.Person{} snap := b.Snapshot() - if len(snap.Comments) > 0 { - create := snap.Comments[0] - person = create.Author - } + create := snap.Comments[0] + authorIdentity := create.Author summaryTxt := fmt.Sprintf("C:%-2d L:%-2d", len(snap.Comments)-1, @@ -304,7 +301,7 @@ func (bt *bugTable) render(v *gocui.View, maxX int) { id := text.LeftPadMaxLine(snap.HumanId(), columnWidths["id"], 1) status := text.LeftPadMaxLine(snap.Status.String(), columnWidths["status"], 1) title := text.LeftPadMaxLine(snap.Title, columnWidths["title"], 1) - author := text.LeftPadMaxLine(person.DisplayName(), columnWidths["author"], 1) + author := text.LeftPadMaxLine(authorIdentity.DisplayName(), columnWidths["author"], 1) summary := text.LeftPadMaxLine(summaryTxt, columnWidths["summary"], 1) lastEdit := text.LeftPadMaxLine(humanize.Time(snap.LastEditTime()), columnWidths["lastEdit"], 1) diff --git a/termui/label_select.go b/termui/label_select.go index 026eba04..131703f9 100644 --- a/termui/label_select.go +++ b/termui/label_select.go @@ -296,7 +296,7 @@ func (ls *labelSelect) saveAndReturn(g *gocui.Gui, v *gocui.View) error { } } - if _, err := ls.bug.ChangeLabels(newLabels, rmLabels); err != nil { + if _, _, err := ls.bug.ChangeLabels(newLabels, rmLabels); err != nil { ui.msgPopup.Activate(msgPopupErrorTitle, err.Error()) } diff --git a/termui/show_bug.go b/termui/show_bug.go index 55d86018..733c801e 100644 --- a/termui/show_bug.go +++ b/termui/show_bug.go @@ -622,9 +622,11 @@ func (sb *showBug) setTitle(g *gocui.Gui, v *gocui.View) error { func (sb *showBug) toggleOpenClose(g *gocui.Gui, v *gocui.View) error { switch sb.bug.Snapshot().Status { case bug.OpenStatus: - return sb.bug.Close() + _, err := sb.bug.Close() + return err case bug.ClosedStatus: - return sb.bug.Open() + _, err := sb.bug.Open() + return err default: return nil } diff --git a/termui/termui.go b/termui/termui.go index 78900de8..54d9df69 100644 --- a/termui/termui.go +++ b/termui/termui.go @@ -226,7 +226,7 @@ func addCommentWithEditor(bug *cache.BugCache) error { if err == input.ErrEmptyMessage { ui.msgPopup.Activate(msgPopupErrorTitle, "Empty message, aborting.") } else { - err := bug.AddComment(message) + _, err := bug.AddComment(message) if err != nil { return err } @@ -261,7 +261,7 @@ func editCommentWithEditor(bug *cache.BugCache, target git.Hash, preMessage stri } else if message == preMessage { ui.msgPopup.Activate(msgPopupErrorTitle, "No changes found, aborting.") } else { - err := bug.EditComment(target, message) + _, err := bug.EditComment(target, message) if err != nil { return err } @@ -298,7 +298,7 @@ func setTitleWithEditor(bug *cache.BugCache) error { } else if title == snap.Title { ui.msgPopup.Activate(msgPopupErrorTitle, "No change, aborting.") } else { - err := bug.SetTitle(title) + _, err := bug.SetTitle(title) if err != nil { return err } |