You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@devlake.apache.org by zh...@apache.org on 2023/06/25 09:57:18 UTC
[incubator-devlake] branch release-v0.17 updated: chore: cherry pick #5559 back to release-v0.17 (#5562)
This is an automated email from the ASF dual-hosted git repository.
zhangliang2022 pushed a commit to branch release-v0.17
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
The following commit(s) were added to refs/heads/release-v0.17 by this push:
new eb1c645d3 chore: cherry pick #5559 back to release-v0.17 (#5562)
eb1c645d3 is described below
commit eb1c645d326c53d0470938a373d69a0cf50f7228
Author: Liang Zhang <li...@merico.dev>
AuthorDate: Sun Jun 25 17:57:14 2023 +0800
chore: cherry pick #5559 back to release-v0.17 (#5562)
---
backend/plugins/jira/api/blueprint_v200.go | 2 ++
backend/plugins/zentao/tasks/project_convertor.go | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/backend/plugins/jira/api/blueprint_v200.go b/backend/plugins/jira/api/blueprint_v200.go
index 7ae0af6fb..fa46a7dd4 100644
--- a/backend/plugins/jira/api/blueprint_v200.go
+++ b/backend/plugins/jira/api/blueprint_v200.go
@@ -99,6 +99,8 @@ func makeScopesV200(bpScopes []*plugin.BlueprintScopeV200, connectionId uint64)
Id: didgen.NewDomainIdGenerator(&models.JiraBoard{}).Generate(jiraBoard.ConnectionId, jiraBoard.BoardId),
},
Name: jiraBoard.Name,
+ Type: jiraBoard.Type,
+ Url: jiraBoard.Self,
}
scopes = append(scopes, domainBoard)
}
diff --git a/backend/plugins/zentao/tasks/project_convertor.go b/backend/plugins/zentao/tasks/project_convertor.go
index 8bb555372..ad21ed66f 100644
--- a/backend/plugins/zentao/tasks/project_convertor.go
+++ b/backend/plugins/zentao/tasks/project_convertor.go
@@ -76,7 +76,7 @@ func ConvertProjects(taskCtx plugin.SubTaskContext) errors.Error {
Name: toolProject.Name,
Description: toolProject.Description,
CreatedDate: toolProject.OpenedDate.ToNullableTime(),
- Type: toolProject.Type + "/" + toolProject.ProjectType,
+ Type: "scrum",
}
results := make([]interface{}, 0)
results = append(results, domainBoard)