From a3ef8bb4abc862a15078a8ecce9dd5116f58b6f9 Mon Sep 17 00:00:00 2001 From: Roman Pedchenko Date: Sun, 22 Jul 2018 17:59:29 +0300 Subject: [PATCH] - fixed an issue reading bug - forced projects reload after clicking the 'test connection' button --- src/biz/elfuego/idea/issues/gitea/GiteaRepositoryEditor.java | 2 ++ src/biz/elfuego/idea/issues/gitea/model/GiteaTask.java | 4 ++-- src/biz/elfuego/idea/issues/gitea/util/Consts.java | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/biz/elfuego/idea/issues/gitea/GiteaRepositoryEditor.java b/src/biz/elfuego/idea/issues/gitea/GiteaRepositoryEditor.java index dfcbd35..4523c15 100644 --- a/src/biz/elfuego/idea/issues/gitea/GiteaRepositoryEditor.java +++ b/src/biz/elfuego/idea/issues/gitea/GiteaRepositoryEditor.java @@ -98,6 +98,8 @@ public class GiteaRepositoryEditor extends BaseRepositoryEditor @NotNull @Override protected List fetch(@NotNull ProgressIndicator indicator) throws Exception { + myRepository.setSelectedProject(null); + myRepository.setProjects(null); return myRepository.getProjectList(); } } diff --git a/src/biz/elfuego/idea/issues/gitea/model/GiteaTask.java b/src/biz/elfuego/idea/issues/gitea/model/GiteaTask.java index 1de86d1..42619d0 100644 --- a/src/biz/elfuego/idea/issues/gitea/model/GiteaTask.java +++ b/src/biz/elfuego/idea/issues/gitea/model/GiteaTask.java @@ -111,8 +111,8 @@ public class GiteaTask { } private void fromJson(JsonObject current) { - if (current.has(TaskFields.ID)) { - this.setId(getString(current, TaskFields.ID, "")); + if (current.has(TaskFields.NUMBER)) { + this.setId(getString(current, TaskFields.NUMBER, "")); } if (current.has(TaskFields.TITLE)) { this.setTitle(getString(current, TaskFields.TITLE, "")); diff --git a/src/biz/elfuego/idea/issues/gitea/util/Consts.java b/src/biz/elfuego/idea/issues/gitea/util/Consts.java index e52d9dc..b7b7634 100644 --- a/src/biz/elfuego/idea/issues/gitea/util/Consts.java +++ b/src/biz/elfuego/idea/issues/gitea/util/Consts.java @@ -29,7 +29,7 @@ public class Consts { } public interface TaskFields { - String ID = "id"; + String NUMBER = "number"; String TITLE = "title"; String DESCRIPTION = "body"; String CREATEDAT = "created_at";