Commit 85dd3e71 authored by Paul Weingardt's avatar Paul Weingardt

fixed edit issue

parent 7fc5dfb8
...@@ -232,11 +232,8 @@ public class GitlabAPI { ...@@ -232,11 +232,8 @@ public class GitlabAPI {
public GitlabIssue createIssue(int projectId, int assigneeId, int milestoneId, String labels, public GitlabIssue createIssue(int projectId, int assigneeId, int milestoneId, String labels,
String description, String title) throws IOException { String description, String title) throws IOException {
String tailUrl = GitlabProject.URL + "/" + projectId + GitlabIssue.URL; String tailUrl = GitlabProject.URL + "/" + projectId + GitlabIssue.URL;
GitlabHTTPRequestor requestor = dispatch().with("title", title) GitlabHTTPRequestor requestor = dispatch();
.with("description", description) applyIssue(requestor, projectId, assigneeId, milestoneId, labels, description, title);
.with("labels", labels)
.with("assignee_id", assigneeId)
.with("milestone_id", milestoneId);
return requestor.to(tailUrl, GitlabIssue.class); return requestor.to(tailUrl, GitlabIssue.class);
} }
...@@ -244,11 +241,8 @@ public class GitlabAPI { ...@@ -244,11 +241,8 @@ public class GitlabAPI {
public GitlabIssue editIssue(int projectId, int issueId, int assigneeId, int milestoneId, String labels, public GitlabIssue editIssue(int projectId, int issueId, int assigneeId, int milestoneId, String labels,
String description, String title, GitlabIssue.Action action) throws IOException { String description, String title, GitlabIssue.Action action) throws IOException {
String tailUrl = GitlabProject.URL + "/" + projectId + GitlabIssue.URL + "/" + issueId; String tailUrl = GitlabProject.URL + "/" + projectId + GitlabIssue.URL + "/" + issueId;
GitlabHTTPRequestor requestor = retrieve().method("PUT").with("title", title) GitlabHTTPRequestor requestor = retrieve().method("PUT");
.with("description", description) applyIssue(requestor, projectId, assigneeId, milestoneId, labels, description, title);
.with("labels", labels)
.with("assignee_id", assigneeId)
.with("milestone_id", milestoneId);
if(action != GitlabIssue.Action.LEAVE) { if(action != GitlabIssue.Action.LEAVE) {
requestor.with("state_event", action.toString().toLowerCase()); requestor.with("state_event", action.toString().toLowerCase());
...@@ -257,6 +251,23 @@ public class GitlabAPI { ...@@ -257,6 +251,23 @@ public class GitlabAPI {
return requestor.to(tailUrl, GitlabIssue.class); return requestor.to(tailUrl, GitlabIssue.class);
} }
private void applyIssue(GitlabHTTPRequestor requestor, int projectId,
int assigneeId, int milestoneId, String labels, String description,
String title) {
requestor.with("title", title)
.with("description", description)
.with("labels", labels);
if (assigneeId != 0) {
requestor.with("assignee_id", assigneeId);
}
if (milestoneId != 0) {
requestor.with("milestone_id", milestoneId);
}
}
public List<GitlabNote> getNotes(GitlabIssue issue) throws IOException { public List<GitlabNote> getNotes(GitlabIssue issue) throws IOException {
String tailUrl = GitlabProject.URL + "/" + issue.getProjectId() + GitlabIssue.URL + "/" String tailUrl = GitlabProject.URL + "/" + issue.getProjectId() + GitlabIssue.URL + "/"
+ issue.getId() + GitlabNote.URL; + issue.getId() + GitlabNote.URL;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment