Skip to content

Commit 0e8365d

Browse files
committed
show correct pr icon in ContextPopups
1 parent cd44c27 commit 0e8365d

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

web_src/js/components/ContextPopup.vue

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ export default {
3030
icon() {
3131
if (this.issue.pull_request !== null) {
3232
if (this.issue.state === 'open') {
33+
if (this.issue.pull_request.draft === true) {
34+
return 'octicon-git-pull-request-draft'; // Draft PR
35+
}
3336
return 'octicon-git-pull-request'; // Open PR
3437
} else if (this.issue.pull_request.merged === true) {
3538
return 'octicon-git-merge'; // Merged PR
@@ -42,12 +45,17 @@ export default {
4245
},
4346
4447
color() {
48+
if (this.issue.pull_request !== null) {
49+
if (this.issue.pull_request.draft === true) {
50+
return 'grey'; // Draft PR
51+
} else if (this.issue.pull_request.merged === true) {
52+
return 'purple'; // Merged PR
53+
}
54+
}
4555
if (this.issue.state === 'open') {
46-
return 'green';
47-
} else if (this.issue.pull_request !== null && this.issue.pull_request.merged === true) {
48-
return 'purple';
56+
return 'green'; // Open Issue
4957
}
50-
return 'red';
58+
return 'red'; // Closed Issue
5159
},
5260
5361
labels() {

web_src/js/svg.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import octiconGitBranch from '../../public/assets/img/svg/octicon-git-branch.svg
3333
import octiconGitCommit from '../../public/assets/img/svg/octicon-git-commit.svg';
3434
import octiconGitMerge from '../../public/assets/img/svg/octicon-git-merge.svg';
3535
import octiconGitPullRequest from '../../public/assets/img/svg/octicon-git-pull-request.svg';
36+
import octiconGitPullRequestDraft from '../../public/assets/img/svg/octicon-git-pull-request-draft.svg';
3637
import octiconHeading from '../../public/assets/img/svg/octicon-heading.svg';
3738
import octiconHorizontalRule from '../../public/assets/img/svg/octicon-horizontal-rule.svg';
3839
import octiconImage from '../../public/assets/img/svg/octicon-image.svg';
@@ -104,6 +105,7 @@ const svgs = {
104105
'octicon-git-commit': octiconGitCommit,
105106
'octicon-git-merge': octiconGitMerge,
106107
'octicon-git-pull-request': octiconGitPullRequest,
108+
'octicon-git-pull-request-draft': octiconGitPullRequestDraft,
107109
'octicon-heading': octiconHeading,
108110
'octicon-horizontal-rule': octiconHorizontalRule,
109111
'octicon-image': octiconImage,

0 commit comments

Comments
 (0)