Merge branch '_shimbaco/production'

# Conflicts: # app/components/footer_component.html.erb # app/components/sidebar_component.html.erb # docker-compose.yml
annict · May 10, 2021 · e01c805 · e01c805
2 parents b6b69c5 + ab4fe2c
commit e01c805
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/app/views/api/v1/works/_work.jb b/app/views/api/v1/works/_work.jb
@@ -5,6 +5,7 @@ json = {}
 json[:id] = work.id if params.fields_contain?("#{field_prefix}id")
 json[:title] = work.title if params.fields_contain?("#{field_prefix}title")
 json[:title_kana] = work.title_kana if params.fields_contain?("#{field_prefix}title_kana")
+json[:title_en] = work.title_en if params.fields_contain?("#{field_prefix}title_en")
 json[:media] = work.media if params.fields_contain?("#{field_prefix}media")
 json[:media_text] = work.media_text if params.fields_contain?("#{field_prefix}media_text")
 json[:released_on] = work.released_at&.strftime("%Y-%m-%d").presence || "" if params.fields_contain?("#{field_prefix}released_on")

diff --git a/spec/requests/api/v1/works_spec.rb b/spec/requests/api/v1/works_spec.rb
@@ -19,6 +19,7 @@
           "id" => work.id,
           "title" => work.title,
           "title_kana" => work.title_kana,
+          "title_en" => work.title_en,
           "media" => "tv",
           "media_text" => "TV",
           "season_name" => "2017-winter",