| @@ -95,9 +95,9 @@ socket.onmessage = function (e) { | |||||
| for(var i = 0; i < messageQueue.length; i++){ | for(var i = 0; i < messageQueue.length; i++){ | ||||
| var record = messageQueue[i]; | var record = messageQueue[i]; | ||||
| var recordPrefix = getMsg(record); | |||||
| var actionName = getAction(record.OpType,isZh); | var actionName = getAction(record.OpType,isZh); | ||||
| console.log("receive action type=" + record.OpType + " name=" + actionName); | |||||
| var recordPrefix = getMsg(record); | |||||
| if(record.OpType == "6" || record.OpType == "10" || record.OpType == "12" || record.OpType == "13"){ | if(record.OpType == "6" || record.OpType == "10" || record.OpType == "12" || record.OpType == "13"){ | ||||
| html += recordPrefix + actionName; | html += recordPrefix + actionName; | ||||
| html += " <a href=\"" + getIssueLink(record) + "\" rel=\"nofollow\">" + getIssueText(record) + "</a>" | html += " <a href=\"" + getIssueLink(record) + "\" rel=\"nofollow\">" + getIssueText(record) + "</a>" | ||||
| @@ -170,9 +170,15 @@ function getTaskLink(record){ | |||||
| function getMsg(record){ | function getMsg(record){ | ||||
| var html =""; | var html =""; | ||||
| html += "<div class=\"swiper-slide item\">"; | html += "<div class=\"swiper-slide item\">"; | ||||
| html += " <img class=\"ui avatar image\" src=\"/user/avatar/" + record.ActUser.Name + "/-1\" alt=\"\">" | |||||
| var name = ""; | |||||
| if(record.ActUser != null){ | |||||
| name = record.ActUser.Name; | |||||
| }else{ | |||||
| console.log("act user is null."); | |||||
| } | |||||
| html += " <img class=\"ui avatar image\" src=\"/user/avatar/" + name + "/-1\" alt=\"\">" | |||||
| html += " <div class=\"middle aligned content nowrap\">" | html += " <div class=\"middle aligned content nowrap\">" | ||||
| html += " <a href=\"/" + record.ActUser.Name + "\" title=\"\">" + record.ActUser.Name + "</a>" | |||||
| html += " <a href=\"/" + name + "\" title=\"\">" + name + "</a>" | |||||
| return html; | return html; | ||||
| } | } | ||||