aboutsummaryrefslogtreecommitdiffstats
path: root/server/sonar-web/src/main/js/components/issue
diff options
context:
space:
mode:
authorGrégoire Aubert <gregoire.aubert@sonarsource.com>2018-05-22 14:23:43 +0200
committerSonarTech <sonartech@sonarsource.com>2018-05-24 20:20:47 +0200
commit4feaaa420f34c2ae4e6d4c9bc09da49d5dd8edbb (patch)
tree1b70a40338767cb6efb76093153aca05c05a1115 /server/sonar-web/src/main/js/components/issue
parent48e045181a8cf4aaeb237734390cf23962350222 (diff)
downloadsonarqube-4feaaa420f34c2ae4e6d4c9bc09da49d5dd8edbb.tar.gz
sonarqube-4feaaa420f34c2ae4e6d4c9bc09da49d5dd8edbb.zip
SONAR-10692 Don't break the issues page if a user is missing
Diffstat (limited to 'server/sonar-web/src/main/js/components/issue')
-rw-r--r--server/sonar-web/src/main/js/components/issue/components/IssueAssign.js4
-rw-r--r--server/sonar-web/src/main/js/components/issue/components/IssueCommentLine.js4
-rw-r--r--server/sonar-web/src/main/js/components/issue/popups/SimilarIssuesPopup.js4
3 files changed, 6 insertions, 6 deletions
diff --git a/server/sonar-web/src/main/js/components/issue/components/IssueAssign.js b/server/sonar-web/src/main/js/components/issue/components/IssueAssign.js
index 783fdec65b0..ffb8dd35c17 100644
--- a/server/sonar-web/src/main/js/components/issue/components/IssueAssign.js
+++ b/server/sonar-web/src/main/js/components/issue/components/IssueAssign.js
@@ -58,13 +58,13 @@ export default class IssueAssign extends React.PureComponent {
<Avatar
className="little-spacer-right"
hash={issue.assigneeAvatar}
- name={issue.assigneeName}
+ name={issue.assigneeName || issue.assignee}
size={16}
/>
</span>
)}
<span className="issue-meta-label">
- {issue.assignee ? issue.assigneeName : translate('unassigned')}
+ {issue.assignee ? issue.assigneeName || issue.assignee : translate('unassigned')}
</span>
</span>
);
diff --git a/server/sonar-web/src/main/js/components/issue/components/IssueCommentLine.js b/server/sonar-web/src/main/js/components/issue/components/IssueCommentLine.js
index 3a0910f6552..cce84863a06 100644
--- a/server/sonar-web/src/main/js/components/issue/components/IssueCommentLine.js
+++ b/server/sonar-web/src/main/js/components/issue/components/IssueCommentLine.js
@@ -89,10 +89,10 @@ export default class IssueCommentLine extends React.PureComponent {
<Avatar
className="little-spacer-right"
hash={comment.authorAvatar}
- name={comment.authorName}
+ name={comment.authorName || comment.author}
size={16}
/>
- {comment.authorName}
+ {comment.authorName || comment.author}
</div>
<div
className="issue-comment-text markdown"
diff --git a/server/sonar-web/src/main/js/components/issue/popups/SimilarIssuesPopup.js b/server/sonar-web/src/main/js/components/issue/popups/SimilarIssuesPopup.js
index 77273cd9f39..e1b7315c266 100644
--- a/server/sonar-web/src/main/js/components/issue/popups/SimilarIssuesPopup.js
+++ b/server/sonar-web/src/main/js/components/issue/popups/SimilarIssuesPopup.js
@@ -100,10 +100,10 @@ export default class SimilarIssuesPopup extends React.PureComponent {
<Avatar
className="little-spacer-left little-spacer-right"
hash={issue.assigneeAvatar}
- name={issue.assigneeName}
+ name={issue.assigneeName || issue.assignee}
size={16}
/>
- {issue.assigneeName}
+ {issue.assigneeName || issue.assignee}
</span>
) : (
translate('unassigned')