Skip to content

Commit 719f0b1

Browse files
committed
refactor: 应用上传版本详情的 changelog_list 改名 array_changelog; 网络钩子的 changelog 默认输出 markdown 列表格式
1 parent 0dd15fe commit 719f0b1

9 files changed

Lines changed: 15 additions & 13 deletions

File tree

‎app/helpers/application_helper.rb‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,7 @@ def active_class(link_paths, class_name = 'active')
4949
end
5050

5151
def changelog_format(changelog, **options)
52-
raw = changelog.each_with_object([]) do |line, obj|
53-
obj << "- #{line['message']}"
54-
end.join("\n")
55-
56-
simple_format raw, **options
52+
simple_format changelog, **options
5753
end
5854

5955
def device_name(device_type)

‎app/jobs/app_web_hook_job.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def build(body)
4949
release_version: @release.release_version,
5050
build_version: @release.build_version,
5151
bundle_id: @release.bundle_id,
52-
changelog: @release.changelog,
52+
changelog: @release.text_changelog,
5353
file_size: @release.file.size,
5454
release_url: @release.release_url,
5555
install_url: @release.install_url,

‎app/models/release.rb‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,13 +121,19 @@ def short_git_commit
121121
git_commit[0..8]
122122
end
123123

124-
def changelog_list(use_default_changelog = true)
124+
def array_changelog(use_default_changelog = true)
125125
return empty_changelog(use_default_changelog) if changelog.blank?
126126
return [{'message' => changelog.to_s}] unless changelog.is_a?(Array) || changelog.is_a?(Hash)
127127

128128
changelog
129129
end
130130

131+
def text_changelog(use_default_changelog = true)
132+
array_changelog(use_default_changelog).each_with_object([]) do |line, obj|
133+
obj << "- #{line['message']}"
134+
end.join("\n")
135+
end
136+
131137
def file?
132138
return false if file.blank?
133139

‎app/serializers/api/upload_app_serializer.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ class Api::UploadAppSerializer < ApplicationSerializer
44
# release model based
55
attributes :id, :version, :app_name, :bundle_id, :release_version, :build_version,
66
:source, :branch, :git_commit, :ci_url, :size,
7-
:icon_url, :release_url, :install_url, :qrcode_url, :changelog_list,
7+
:icon_url, :release_url, :install_url, :qrcode_url, :array_changelog,
88
:custom_fields, :created_at
99

1010
belongs_to :app

‎app/serializers/release_serializer.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ class ReleaseSerializer < ApplicationSerializer
77
:created_at
88

99
def changelog
10-
object.changelog_list(false)
10+
object.array_changelog(false)
1111
end
1212
end

‎app/views/dashboards/_recently_upload.html.slim‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ section
3131
= t('dashboard.timeline.upload_release', release_version: release.release_version, build_version: release.build_version)
3232
- if release.changelog.present?
3333
.timeline-body.pb-1
34-
= changelog_format release.changelog_list, class: 'mb-0'
34+
= changelog_format release.text_changelog, class: 'mb-0'
3535
- if release.release_type.present? || release.branch.present? || release.short_git_commit.present?
3636
.timeline-footer
3737
- if release.device_type

‎app/views/releases/body/_activity.html.slim‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ ruby:
2424
= t('releases.show.upload_release', release_version: release.release_version, build_version: release.build_version)
2525
- if release.changelog.present?
2626
.timeline-body.pb-0
27-
= changelog_format(release.changelog_list, class: 'mb-0')
27+
= changelog_format(release.text_changelog, class: 'mb-0')
2828
- if release.release_type.present? || release.branch.present? || release.short_git_commit.present?
2929
.timeline-footer
3030
- if release.device_type

‎app/views/releases/body/_changelog.html.slim‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
i.fas.fa-minus
99
.card-body.p-0
1010
ul.products-list.product-list-in-card
11-
- @release.changelog_list.each do |changelog|
11+
- @release.array_changelog.each do |changelog|
1212
li.item.pl-3.pr-3
1313
.product-title
1414
- if date = changelog['date']

‎app/views/udid/show.html.slim‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
= t('udid.show.upload_release', release_version: release.release_version, build_version: release.build_version)
7676
- if release.changelog.present?
7777
.timeline-body.pb-0
78-
= changelog_format release.changelog_list, class: 'mb-0'
78+
= changelog_format release.text_changelog, class: 'mb-0'
7979
- if release.release_type.present? || release.branch.present? || release.short_git_commit.present?
8080
.timeline-footer
8181
- if release.release_type.present?

0 commit comments

Comments
 (0)