From b48aa70c06241999c6450f8d22ccc8e7d79a21e5 Mon Sep 17 00:00:00 2001 From: Bruno Meneguello <1322552+bkmeneguello@users.noreply.github.com> Date: Thu, 7 Nov 2019 18:18:49 -0300 Subject: [PATCH] Fix delete command prompt and flash --- internal/views/resource.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/internal/views/resource.go b/internal/views/resource.go index 4d62664a..494dd939 100644 --- a/internal/views/resource.go +++ b/internal/views/resource.go @@ -197,12 +197,16 @@ func (v *resourceView) deleteCmd(evt *tcell.EventKey) *tcell.EventKey { if len(sel) > 1 { msg = fmt.Sprintf("Delete %d selected %s?", len(sel), v.list.GetName()) } else { - msg = fmt.Sprintf("Delete %s %s?", v.list.GetName(), sel) + msg = fmt.Sprintf("Delete %s %s?", v.list.GetName(), sel[0]) } dialog.ShowDelete(v.Pages, msg, func(cascade, force bool) { v.masterPage().ShowDeleted() + if len(sel) > 1 { + v.app.Flash().Infof("Delete %d selected %s", len(sel), v.list.GetName()) + } else { + v.app.Flash().Infof("Delete resource %s %s", v.list.GetName(), sel[0]) + } for _, res := range sel { - v.app.Flash().Infof("Delete resource %s %s", v.list.GetName(), res) if err := v.list.Resource().Delete(res, cascade, force); err != nil { v.app.Flash().Errf("Delete failed with %s", err) } else {