OpenNeo/impress
OpenNeo/impress
1
0
Fork 1
Code Pull requests Activity

Oops, fix sort order for alt styles

Browse source 
Oh huh, when doing Rainbow Pool stuff, I put the ordering in the wrong
place! It's a sensible ordering for the Rainbow Pool page, but not so
much for the JSON view!
This commit is contained in:
Emi Matchu 2024-11-15 20:28:38 -08:00
parent c4a7e7916f
commit b6c21dfe40
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/controllers/alt_styles_controller.rb
View file

@ -15,9 +15,7 @@ class AltStylesController < ApplicationController
@color = find_color @color = find_color
@species = find_species @species = find_species
@alt_styles = @all_alt_styles.includes(:swf_assets). @alt_styles = @all_alt_styles.includes(:swf_assets)
by_creation_date.order(:color_id, :species_id, :series_name).
paginate(page: params[:page], per_page: 30)
@alt_styles.where!(series_name: @series_name) if @series_name.present? @alt_styles.where!(series_name: @series_name) if @series_name.present?
@alt_styles.merge!(@color.alt_styles) if @color @alt_styles.merge!(@color.alt_styles) if @color
@alt_styles.merge!(@species.alt_styles) if @species @alt_styles.merge!(@species.alt_styles) if @species
@ -27,9 +25,16 @@ class AltStylesController < ApplicationController
SwfAsset.preload_manifests @alt_styles.map(&:swf_assets).flatten SwfAsset.preload_manifests @alt_styles.map(&:swf_assets).flatten
respond_to do |format| respond_to do |format|
format.html { render } format.html {
@alt_styles = @alt_styles.
by_creation_date.order(:color_id, :species_id, :series_name).
paginate(page: params[:page], per_page: 30)
render
}
format.json { format.json {
render json: @alt_styles.includes(swf_assets: [:zone]).as_json( @alt_styles = @alt_styles.includes(swf_assets: [:zone]).
sort_by(&:full_name)
render json: @alt_styles.as_json(
only: [:id, :species_id, :color_id, :body_id, :series_name, only: [:id, :species_id, :color_id, :body_id, :series_name,
:adjective_name, :thumbnail_url], :adjective_name, :thumbnail_url],
include: { include: {