aboutsummaryrefslogtreecommitdiffstats
path: root/webui/src
diff options
context:
space:
mode:
authorMichael Muré <batolettre@gmail.com>2018-10-07 18:27:23 +0200
committerMichael Muré <batolettre@gmail.com>2018-10-07 18:27:23 +0200
commit7cb7994cdae848053487d00c1730d1e865fb8623 (patch)
treebc9be185e81479d8d3e5b0fc636daea011a64e4c /webui/src
parent03202fed493539c8d1fdcad7254687f951d0ca4a (diff)
downloadgit-bug-7cb7994cdae848053487d00c1730d1e865fb8623.tar.gz
github: also pull users email
Diffstat (limited to 'webui/src')
-rw-r--r--webui/src/Author.js6
-rw-r--r--webui/src/bug/Bug.js1
-rw-r--r--webui/src/bug/LabelChange.js1
-rw-r--r--webui/src/bug/Message.js2
-rw-r--r--webui/src/bug/SetStatus.js1
-rw-r--r--webui/src/bug/SetTitle.js1
-rw-r--r--webui/src/list/BugRow.js3
7 files changed, 13 insertions, 2 deletions
diff --git a/webui/src/Author.js b/webui/src/Author.js
index 0ad7e257..e8fe9f94 100644
--- a/webui/src/Author.js
+++ b/webui/src/Author.js
@@ -14,9 +14,13 @@ const styles = theme => ({
const Author = ({ author, bold, classes }) => {
const klass = bold ? [classes.author, classes.bold] : [classes.author];
+ if(!author.email) {
+ return <span className={klass.join(' ')}>{author.displayName}</span>
+ }
+
return (
<Tooltip title={author.email}>
- <span className={klass.join(' ')}>{author.name}</span>
+ <span className={klass.join(' ')}>{author.displayName}</span>
</Tooltip>
);
};
diff --git a/webui/src/bug/Bug.js b/webui/src/bug/Bug.js
index 329fdd72..496d0c4f 100644
--- a/webui/src/bug/Bug.js
+++ b/webui/src/bug/Bug.js
@@ -88,6 +88,7 @@ Bug.fragment = gql`
author {
email
name
+ displayName
}
}
`;
diff --git a/webui/src/bug/LabelChange.js b/webui/src/bug/LabelChange.js
index bb546678..b1bed4a5 100644
--- a/webui/src/bug/LabelChange.js
+++ b/webui/src/bug/LabelChange.js
@@ -42,6 +42,7 @@ LabelChange.fragment = gql`
author {
name
email
+ displayName
}
added
removed
diff --git a/webui/src/bug/Message.js b/webui/src/bug/Message.js
index 2d03e780..a4e3eeb0 100644
--- a/webui/src/bug/Message.js
+++ b/webui/src/bug/Message.js
@@ -47,6 +47,7 @@ Message.createFragment = gql`
author {
name
email
+ displayName
}
message
}
@@ -60,6 +61,7 @@ Message.commentFragment = gql`
author {
name
email
+ displayName
}
message
}
diff --git a/webui/src/bug/SetStatus.js b/webui/src/bug/SetStatus.js
index 7d6bccf3..332c8352 100644
--- a/webui/src/bug/SetStatus.js
+++ b/webui/src/bug/SetStatus.js
@@ -27,6 +27,7 @@ SetStatus.fragment = gql`
author {
name
email
+ displayName
}
status
}
diff --git a/webui/src/bug/SetTitle.js b/webui/src/bug/SetTitle.js
index 838219e2..5b17c431 100644
--- a/webui/src/bug/SetTitle.js
+++ b/webui/src/bug/SetTitle.js
@@ -33,6 +33,7 @@ SetTitle.fragment = gql`
author {
name
email
+ displayName
}
title
was
diff --git a/webui/src/list/BugRow.js b/webui/src/list/BugRow.js
index 9253cc88..a045770b 100644
--- a/webui/src/list/BugRow.js
+++ b/webui/src/list/BugRow.js
@@ -77,7 +77,7 @@ const BugRow = ({ bug, classes }) => (
<Typography color={'textSecondary'}>
{bug.humanId} opened
<Date date={bug.createdAt} />
- by {bug.author.name}
+ by {bug.author.displayName}
</Typography>
</div>
</TableCell>
@@ -94,6 +94,7 @@ BugRow.fragment = gql`
labels
author {
name
+ displayName
}
}
`;