Commit @b782a77670954f9346444892c566eb8934f8b0f4

doortts 2018-10-25

api: Support ISSUE_LABE_CHANGED event

@b782a77670954f9346444892c566eb8934f8b0f4

a40084e

b782a77

app/controllers/IssueApp.java

--- app/controllers/IssueApp.java

+++ app/controllers/IssueApp.java


                 IssueLabel label = IssueLabel.finder.byId(labelId);
                 issue.labels.add(label);
                 isLabelChanged = true;
-                addedLabels.append(label.category.name).append(" - ").append(label.name);
+                addedLabels.append(label.category.name).append(" - ").append(label.name).append(" ").append(label.color);
             }
         }
 

                 IssueLabel label = IssueLabel.finder.byId(labelId);
                 issue.labels.remove(label);
                 isLabelChanged = true;
-                deletedLabels.append(label.category.name).append(" - ").append(label.name);
+                deletedLabels.append(label.category.name).append(" - ").append(label.name).append(" ").append(label.color);
             }
         }
 

a40084e

b782a77

app/controllers/api/IssueApi.java

--- app/controllers/api/IssueApi.java

+++ app/controllers/api/IssueApi.java


         if (issue.events.size() > 0) {
             for (IssueEvent event: issue.events) {
                 ObjectNode result = Json.newObject();
+                User sender = User.findByLoginId(event.senderLoginId);
                 result.put("id", event.id);
                 result.put("createdDate", JodaDateUtil.getDateString(event.created, JodaDateUtil.ISO_FORMAT));
                 result.put("eventType", event.eventType.toString());
                 result.put("eventDescription", event.eventType.getDescr());
                 result.put("oldValue", event.oldValue);
                 result.put("newValue", event.newValue);
+                result.put("actor", getActorJson(sender));
                 array.add(result);
             }
         }

         return array;
     }
 
+    private static JsonNode getActorJson(User user) {
+        ObjectNode result = Json.newObject();
+        result.put("name", user.getPureNameOnly());
+        result.put("loginId", user.loginId);
+        result.put("englishName", user.englishName);
+        return result;
+    }
+
     @Transactional
     @IsCreatable(ResourceType.ISSUE_POST)
     public static Result newIssues(String owner, String projectName) {

a40084e

b782a77

app/views/issue/partial_event_timeline.scala.html

--- app/views/issue/partial_event_timeline.scala.html

+++ app/views/issue/partial_event_timeline.scala.html


         categoryAndName
     } else {
         var categoryName = splitedCategoryAndName(0).trim
-        var labelName = splitedCategoryAndName(1).trim
+        var labelName = splitedCategoryAndName(1).split(" #")(0).trim
         val issueLabel = IssueLabel.findByName(labelName, categoryName, project)
         if(issueLabel != null) {
             val labelColor = issueLabel.color

Add a comment

Open 0
Closed 0

List

...	...	@@ -432,7 +432,7 @@
432	432	IssueLabel label = IssueLabel.finder.byId(labelId);
433	433	issue.labels.add(label);
434	434	isLabelChanged = true;
435		- addedLabels.append(label.category.name).append(" - ").append(label.name);
	435	+ addedLabels.append(label.category.name).append(" - ").append(label.name).append(" ").append(label.color);
436	436	}
437	437	}
438	438
...	...	@@ -441,7 +441,7 @@
441	441	IssueLabel label = IssueLabel.finder.byId(labelId);
442	442	issue.labels.remove(label);
443	443	isLabelChanged = true;
444		- deletedLabels.append(label.category.name).append(" - ").append(label.name);
	444	+ deletedLabels.append(label.category.name).append(" - ").append(label.name).append(" ").append(label.color);
445	445	}
446	446	}
447	447

...	...	@@ -107,12 +107,14 @@
107	107	if (issue.events.size() > 0) {
108	108	for (IssueEvent event: issue.events) {
109	109	ObjectNode result = Json.newObject();
	110	+ User sender = User.findByLoginId(event.senderLoginId);
110	111	result.put("id", event.id);
111	112	result.put("createdDate", JodaDateUtil.getDateString(event.created, JodaDateUtil.ISO_FORMAT));
112	113	result.put("eventType", event.eventType.toString());
113	114	result.put("eventDescription", event.eventType.getDescr());
114	115	result.put("oldValue", event.oldValue);
115	116	result.put("newValue", event.newValue);
	117	+ result.put("actor", getActorJson(sender));
116	118	array.add(result);
117	119	}
118	120	}
...	...	@@ -120,6 +122,14 @@
120	122	return array;
121	123	}
122	124
	125	+ private static JsonNode getActorJson(User user) {
	126	+ ObjectNode result = Json.newObject();
	127	+ result.put("name", user.getPureNameOnly());
	128	+ result.put("loginId", user.loginId);
	129	+ result.put("englishName", user.englishName);
	130	+ return result;
	131	+ }
	132	+
123	133	@Transactional
124	134	@IsCreatable(ResourceType.ISSUE_POST)
125	135	public static Result newIssues(String owner, String projectName) {

...	...	@@ -58,7 +58,7 @@
58	58	categoryAndName
59	59	} else {
60	60	var categoryName = splitedCategoryAndName(0).trim
61		- var labelName = splitedCategoryAndName(1).trim
	61	+ var labelName = splitedCategoryAndName(1).split(" #")(0).trim
62	62	val issueLabel = IssueLabel.findByName(labelName, categoryName, project)
63	63	if(issueLabel != null) {
64	64	val labelColor = issueLabel.color

Delete comment