From be318730a867ca19f29e3a9095f678e0c63a31fa Mon Sep 17 00:00:00 2001 From: Rachel Fox Date: Fri, 13 Sep 2019 21:18:46 +0000 Subject: [PATCH 1/2] Update app/assets/javascripts/boards/components/issue_card_inner.vue, app/assets/javascripts/boards/components/issue_due_date.vue, app/assets/javascripts/boards/models/issue.js, app/serializers/issue_board_entity.rb, changelogs/unreleased/closed-issue-weight-grey files --- .../javascripts/boards/components/issue_card_inner.vue | 2 +- app/assets/javascripts/boards/components/issue_due_date.vue | 1 + app/assets/javascripts/boards/models/issue.js | 1 + app/serializers/issue_board_entity.rb | 3 +++ changelogs/unreleased/closed-issue-weight-grey | 5 +++++ 5 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 changelogs/unreleased/closed-issue-weight-grey diff --git a/app/assets/javascripts/boards/components/issue_card_inner.vue b/app/assets/javascripts/boards/components/issue_card_inner.vue index 7f554c99669e62..52919ea2af43ed 100644 --- a/app/assets/javascripts/boards/components/issue_card_inner.vue +++ b/app/assets/javascripts/boards/components/issue_card_inner.vue @@ -209,7 +209,7 @@ export default { #{{ issue.iid }} - + = 0) return false; + if (this.closed) return false; return true; }, standardDateFormat() { diff --git a/app/assets/javascripts/boards/models/issue.js b/app/assets/javascripts/boards/models/issue.js index 086340105b7b3a..92ab7a3e143076 100644 --- a/app/assets/javascripts/boards/models/issue.js +++ b/app/assets/javascripts/boards/models/issue.js @@ -24,6 +24,7 @@ class ListIssue { this.isFetching = { subscriptions: true, }; + this.closed = obj.closed; this.isLoading = {}; this.sidebarInfoEndpoint = obj.issue_sidebar_endpoint; this.referencePath = obj.reference_path; diff --git a/app/serializers/issue_board_entity.rb b/app/serializers/issue_board_entity.rb index b8f799a7456a84..cf36b89841ce0b 100644 --- a/app/serializers/issue_board_entity.rb +++ b/app/serializers/issue_board_entity.rb @@ -13,6 +13,9 @@ class IssueBoardEntity < Grape::Entity expose :project_id expose :relative_position expose :time_estimate + expose :closed do |issue| + issue.closed? + end expose :project do |issue| API::Entities::Project.represent issue.project, only: [:id, :path] diff --git a/changelogs/unreleased/closed-issue-weight-grey b/changelogs/unreleased/closed-issue-weight-grey new file mode 100644 index 00000000000000..5bcc1ef76a09b9 --- /dev/null +++ b/changelogs/unreleased/closed-issue-weight-grey @@ -0,0 +1,5 @@ +--- +title: Board issue due dates appear grey for closed past-due issues +merge_request: +author: rachelfox +type: fixed -- GitLab From 963d4647a83b7b6a7eb358c9c8809b4ec83c9f67 Mon Sep 17 00:00:00 2001 From: Rachel Fox Date: Fri, 13 Sep 2019 21:25:29 +0000 Subject: [PATCH 2/2] Update the changelog --- changelogs/unreleased/closed-issue-weight-grey | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelogs/unreleased/closed-issue-weight-grey b/changelogs/unreleased/closed-issue-weight-grey index 5bcc1ef76a09b9..66d25908dfdba6 100644 --- a/changelogs/unreleased/closed-issue-weight-grey +++ b/changelogs/unreleased/closed-issue-weight-grey @@ -1,5 +1,5 @@ --- title: Board issue due dates appear grey for closed past-due issues -merge_request: +merge_request: 16695 author: rachelfox type: fixed -- GitLab