diff --git a/app/controllers/alt_styles_controller.rb b/app/controllers/alt_styles_controller.rb index 447843d5..9da54fde 100644 --- a/app/controllers/alt_styles_controller.rb +++ b/app/controllers/alt_styles_controller.rb @@ -29,8 +29,7 @@ class AltStylesController < ApplicationController format.json { @alt_styles = @alt_styles.includes(swf_assets: [:zone]).by_name_grouped render json: @alt_styles.as_json( - only: [:id, :species_id, :color_id, :body_id, :series_name, - :adjective_name, :thumbnail_url], + only: [:id, :species_id, :color_id, :body_id, :thumbnail_url], include: { swf_assets: { only: [:id, :body_id], @@ -38,7 +37,7 @@ class AltStylesController < ApplicationController methods: [:urls, :known_glitches], } }, - methods: [:series_name, :adjective_name, :thumbnail_url], + methods: [:series_main_name, :adjective_name], ) } end diff --git a/app/javascript/wardrobe-2020/WardrobePage/PosePicker.js b/app/javascript/wardrobe-2020/WardrobePage/PosePicker.js index 8b5f1a46..96ab16be 100644 --- a/app/javascript/wardrobe-2020/WardrobePage/PosePicker.js +++ b/app/javascript/wardrobe-2020/WardrobePage/PosePicker.js @@ -283,7 +283,7 @@ const PosePickerButton = React.forwardRef( const theme = useTheme(); const icon = altStyle != null ? twemojiSunglasses : getIcon(pose); - const label = altStyle != null ? altStyle.seriesName : getLabel(pose); + const label = altStyle != null ? altStyle.seriesMainName : getLabel(pose); return ( <ClassNames> diff --git a/app/javascript/wardrobe-2020/loaders/alt-styles.js b/app/javascript/wardrobe-2020/loaders/alt-styles.js index 4b761bbe..aaacd3ba 100644 --- a/app/javascript/wardrobe-2020/loaders/alt-styles.js +++ b/app/javascript/wardrobe-2020/loaders/alt-styles.js @@ -49,7 +49,7 @@ function normalizeAltStyle(altStyleData) { speciesId: String(altStyleData.species_id), colorId: String(altStyleData.color_id), bodyId: String(altStyleData.body_id), - seriesName: altStyleData.series_name, + seriesMainName: altStyleData.series_main_name, adjectiveName: altStyleData.adjective_name, thumbnailUrl: altStyleData.thumbnail_url, diff --git a/app/models/alt_style.rb b/app/models/alt_style.rb index aa6d6873..b343fdc1 100644 --- a/app/models/alt_style.rb +++ b/app/models/alt_style.rb @@ -76,6 +76,14 @@ class AltStyle < ApplicationRecord real_series_name.present? end + def series_main_name + series_name.split(': ').last + end + + def series_variant_name + series_name.split(': ').first + end + def adjective_name "#{series_name} #{color.human_name}" end