From 4a7bdeab3c34d0d839a45a2fa680f06741f57899 Mon Sep 17 00:00:00 2001 From: Gerome Chardon Date: Mon, 18 May 2020 10:57:15 +0200 Subject: [PATCH] Fix gitlabtodo usage of domain Use domain in gitlabtodo Handle error in gitlabtodo --- modules/gitlabtodo/settings.go | 2 +- modules/gitlabtodo/widget.go | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/gitlabtodo/settings.go b/modules/gitlabtodo/settings.go index 1d8af5c2..33cb1eaf 100644 --- a/modules/gitlabtodo/settings.go +++ b/modules/gitlabtodo/settings.go @@ -28,7 +28,7 @@ func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *co numberOfTodos: ymlConfig.UInt("numberOfTodos", 10), apiKey: ymlConfig.UString("apiKey", os.Getenv("WTF_GITLAB_TOKEN")), - domain: ymlConfig.UString("domain"), + domain: ymlConfig.UString("domain", "https://gitlab.com"), showProject: ymlConfig.UBool("showProject", true), } diff --git a/modules/gitlabtodo/widget.go b/modules/gitlabtodo/widget.go index 54102c98..677a3bd7 100644 --- a/modules/gitlabtodo/widget.go +++ b/modules/gitlabtodo/widget.go @@ -27,7 +27,7 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) * settings: settings, } - widget.gitlabClient, _ = gitlab.NewClient(settings.apiKey) + widget.gitlabClient, _ = gitlab.NewClient(settings.apiKey, gitlab.WithBaseURL(settings.domain)) widget.SetRenderFunction(widget.Render) widget.initializeKeyboardControls() @@ -45,8 +45,9 @@ func (widget *Widget) Refresh() { return } - todos, _ := widget.getTodos(widget.settings.apiKey) + todos, err := widget.getTodos(widget.settings.apiKey) widget.todos = todos + widget.err = err widget.SetItemCount(len(todos)) widget.Render()