Use "real" series name field when editing alt styles
Just a little improvement to the form, so when there's no series name, the text field is empty—even though in most contexts we *pretend* it's "<New?">
This commit is contained in:
parent
6b7c73870a
commit
23c083ff1d
4 changed files with 15 additions and 7 deletions
|
@ -63,7 +63,7 @@ class AltStylesController < ApplicationController
|
||||||
protected
|
protected
|
||||||
|
|
||||||
def alt_style_params
|
def alt_style_params
|
||||||
params.require(:alt_style).permit(:series_name, :thumbnail_url)
|
params.require(:alt_style).permit(:real_series_name, :thumbnail_url)
|
||||||
end
|
end
|
||||||
|
|
||||||
def find_color
|
def find_color
|
||||||
|
|
|
@ -35,13 +35,21 @@ class AltStyle < ApplicationRecord
|
||||||
# `fits:<New?>-faerie-draik` intentionally will not work, and the canonical
|
# `fits:<New?>-faerie-draik` intentionally will not work, and the canonical
|
||||||
# filter name will be `fits:alt-style-IDNUMBER`, instead.
|
# filter name will be `fits:alt-style-IDNUMBER`, instead.
|
||||||
def series_name
|
def series_name
|
||||||
self[:series_name] || "<New?>"
|
real_series_name || "<New?>"
|
||||||
|
end
|
||||||
|
|
||||||
|
def real_series_name=(new_series_name)
|
||||||
|
self[:series_name] = new_series_name
|
||||||
|
end
|
||||||
|
|
||||||
|
def real_series_name
|
||||||
|
self[:series_name]
|
||||||
end
|
end
|
||||||
|
|
||||||
# You can use this to check whether `series_name` is returning the actual
|
# You can use this to check whether `series_name` is returning the actual
|
||||||
# value or its placeholder value.
|
# value or its placeholder value.
|
||||||
def has_real_series_name?
|
def real_series_name?
|
||||||
self[:series_name].present?
|
real_series_name.present?
|
||||||
end
|
end
|
||||||
|
|
||||||
def adjective_name
|
def adjective_name
|
||||||
|
|
|
@ -367,7 +367,7 @@ class Item
|
||||||
# If the real series name has been set in the database by support
|
# If the real series name has been set in the database by support
|
||||||
# staff, use that for the canonical filter text for this alt style.
|
# staff, use that for the canonical filter text for this alt style.
|
||||||
# Otherwise, represent this alt style by ID.
|
# Otherwise, represent this alt style by ID.
|
||||||
if alt_style.has_real_series_name?
|
if alt_style.real_series_name?
|
||||||
series_name = alt_style.series_name.downcase
|
series_name = alt_style.series_name.downcase
|
||||||
color_name = alt_style.color.name.downcase
|
color_name = alt_style.color.name.downcase
|
||||||
species_name = alt_style.species.name.downcase
|
species_name = alt_style.species.name.downcase
|
||||||
|
|
|
@ -21,8 +21,8 @@
|
||||||
- @alt_style.errors.each do |error|
|
- @alt_style.errors.each do |error|
|
||||||
%li= error.full_message
|
%li= error.full_message
|
||||||
%fieldset
|
%fieldset
|
||||||
= f.label :series_name, "Series"
|
= f.label :real_series_name, "Series"
|
||||||
= f.text_field :series_name
|
= f.text_field :real_series_name
|
||||||
= f.label :thumbnail_url, "Thumbnail"
|
= f.label :thumbnail_url, "Thumbnail"
|
||||||
.thumbnail-field
|
.thumbnail-field
|
||||||
- if @alt_style.thumbnail_url?
|
- if @alt_style.thumbnail_url?
|
||||||
|
|
Loading…
Reference in a new issue