- <%= f.input :spotlighted_facilitator_id,
- collection: @people.map { |p| [ p.full_name_with_email, p.id ] },
- prompt: "Select a facilitator",
- label: (f.object.spotlighted_facilitator_id ? (link_to "Story spotlighted facilitator",
- person_path(f.object.spotlighted_facilitator_id),
- class: "hover:underline") : "Story spotlighted facilitator").html_safe,
+ <%= f.input :author_id,
+ collection: person_select_options(@people),
+ prompt: "Select an author",
+ label: (f.object.author ? (
+ link_to "Story author",
+ person_path(f.object.author),
+ class: "hover:underline") : "Story author").html_safe,
label_html: { class: "block font-medium mb-1 text-gray-700" },
input_html: {
- class: select_caret_class(blank: f.object.spotlighted_facilitator_id.blank?),
+ class: select_caret_class(blank: f.object.author_id.blank?),
style: custom_caret_style,
onchange: select_caret_onchange
} %>
- <% story_idea_label = if f.object.story_idea
- (link_to "Source story idea",
- story_idea_path(f.object.story_idea), class: "hover:underline")
- else
- "Source story idea"
- end %>
- <%= f.input :story_idea_id,
- collection: @story_ideas, label_method: :full_name,
- value_method: :id,
- selected: f.object.story_idea_id || @story_idea&.id,
- label: story_idea_label.html_safe,
- prompt: "Select idea",
+ <%= f.input :author_credit_preference,
+ as: :select,
+ collection: AuthorCreditable::ADMIN_FORM_OPTIONS,
+ prompt: "Select a preference",
+ selected: f.object.author_credit_preference || story_idea&.author_credit_preference || f.object.author&.display_name_preference,
+ label: "Author credit preference",
+ hint: "Defaults to the author's name display preference; controls how their name is shown",
input_html: {
- class: select_caret_class(blank: f.object.story_idea_id.blank?),
+ class: select_caret_class(blank: f.object.author_credit_preference.blank?),
style: custom_caret_style,
onchange: select_caret_onchange
} %>
+ <% if story_idea %>
+
+ From
+ <%= link_to "Story Idea # #{story_idea.id}", story_idea_path(story_idea), class: "font-medium text-gray-700 underline" %>
+ by
+ <% if story_idea.author %>
+ <%= link_to story_idea.author_credit, person_path(story_idea.author), class: "font-medium text-gray-800 underline" %>
+ <% else %>
+ <%= story_idea.author_credit %>
+ <% end %>
+ (preference "<%= link_to AuthorCreditable::ADMIN_FORM_OPTIONS.key(story_idea.author_credit_preference) || story_idea.author_credit_preference&.humanize,
+ edit_story_idea_path(story_idea, anchor: "publish-preferences"),
+ class: "italic underline hover:text-blue-600" %>")
+
+ <% end %>
+
+ <%= f.hidden_field :story_idea_id, value: f.object.story_idea_id || @story_idea&.id %>
+
<% if remaining_categories.any? %>
diff --git a/app/views/stories/_story_results.html.erb b/app/views/stories/_story_results.html.erb
index 0a72f05b4..85419b665 100644
--- a/app/views/stories/_story_results.html.erb
+++ b/app/views/stories/_story_results.html.erb
@@ -62,7 +62,7 @@
<%= story.workshop&.title&.truncate(30) %>
-
<%= story.created_by.name %> |
+
<%= story.author&.full_name || "—" %> |
<%= story.organization&.name&.truncate(30) %>
diff --git a/app/views/stories/show.html.erb b/app/views/stories/show.html.erb
index c2f3f28ee..460fb6da1 100644
--- a/app/views/stories/show.html.erb
+++ b/app/views/stories/show.html.erb
@@ -28,8 +28,8 @@
Story by:
- <% if @story.created_by.person&.profile_is_searchable %>
- <%= link_to @story.author_credit, person_path(@story.created_by) %>
+ <% if @story.author&.profile_is_searchable %>
+ <%= link_to @story.author_credit, person_path(@story.author) %>
<% else %>
<%= @story.author_credit %>
<% end %>
diff --git a/app/views/story_ideas/show.html.erb b/app/views/story_ideas/show.html.erb
index c54ef8a99..fc5701c37 100644
--- a/app/views/story_ideas/show.html.erb
+++ b/app/views/story_ideas/show.html.erb
@@ -31,13 +31,13 @@
Story by:
- <% if @story_idea.created_by&.person && allowed_to?(:show?, @story_idea.created_by.person) %>
- <%= link_to @story_idea.created_by.name,
- person_path(@story_idea.created_by.person),
+ <% if @story_idea.author && allowed_to?(:show?, @story_idea.author) %>
+ <%= link_to @story_idea.author.full_name,
+ person_path(@story_idea.author),
data: { turbo_frame: "_top" },
class: "inline-block px-3 py-1 rounded-md text-sm font-medium #{DomainTheme.bg_class_for(:people, intensity: 100)} #{DomainTheme.text_class_for(:people)} #{DomainTheme.bg_class_for(:people, intensity: 100, hover: true)}" %>
<% else %>
- <%= @story_idea.created_by&.name || "—" %>
+ <%= @story_idea.author&.full_name || "—" %>
<% end %>
diff --git a/db/migrate/20260605120000_add_author_to_stories_and_story_ideas.rb b/db/migrate/20260605120000_add_author_to_stories_and_story_ideas.rb
new file mode 100644
index 000000000..33d5a67b9
--- /dev/null
+++ b/db/migrate/20260605120000_add_author_to_stories_and_story_ideas.rb
@@ -0,0 +1,32 @@
+class AddAuthorToStoriesAndStoryIdeas < ActiveRecord::Migration[7.2]
+ def up
+ add_reference :stories, :author, type: :bigint, null: true, index: true
+ add_reference :story_ideas, :author, type: :bigint, null: true, index: true
+
+ add_foreign_key :stories, :people, column: "author_id"
+ add_foreign_key :story_ideas, :people, column: "author_id"
+
+ # Backfill author from the creating user's linked person, preserving existing
+ # author credits. Rows whose creator has no linked person stay null (Anonymous).
+ execute <<~SQL.squish
+ UPDATE stories
+ JOIN users ON users.id = stories.created_by_id
+ SET stories.author_id = users.person_id
+ WHERE users.person_id IS NOT NULL
+ SQL
+
+ execute <<~SQL.squish
+ UPDATE story_ideas
+ JOIN users ON users.id = story_ideas.created_by_id
+ SET story_ideas.author_id = users.person_id
+ WHERE users.person_id IS NOT NULL
+ SQL
+ end
+
+ def down
+ remove_foreign_key :stories, column: "author_id" if foreign_key_exists?(:stories, column: "author_id")
+ remove_foreign_key :story_ideas, column: "author_id" if foreign_key_exists?(:story_ideas, column: "author_id")
+ remove_reference :stories, :author, if_exists: true
+ remove_reference :story_ideas, :author, if_exists: true
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index e0f387ba6..2c5765eab 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema[8.1].define(version: 2026_05_29_155200) do
+ActiveRecord::Schema[8.1].define(version: 2026_06_05_120000) do
create_table "action_text_mentions", charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
t.bigint "action_text_rich_text_id", null: false
t.datetime "created_at", null: false
@@ -18,7 +18,6 @@
t.string "mentionable_type", null: false
t.datetime "updated_at", null: false
t.index ["action_text_rich_text_id", "mentionable_type", "mentionable_id"], name: "index_at_mentions_on_rich_text_and_mentionable", unique: true
- t.index ["action_text_rich_text_id"], name: "index_action_text_mentions_on_action_text_rich_text_id"
t.index ["mentionable_type", "mentionable_id"], name: "index_action_text_mentions_on_mentionable"
end
@@ -899,6 +898,7 @@
create_table "stories", charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
t.string "author_credit_preference"
+ t.bigint "author_id"
t.text "body"
t.datetime "created_at", null: false
t.integer "created_by_id", null: false
@@ -918,6 +918,7 @@
t.integer "windows_type_id", null: false
t.integer "workshop_id"
t.string "youtube_url"
+ t.index ["author_id"], name: "index_stories_on_author_id"
t.index ["created_by_id"], name: "index_stories_on_created_by_id"
t.index ["organization_id"], name: "index_stories_on_organization_id"
t.index ["published"], name: "index_stories_on_published"
@@ -930,6 +931,7 @@
create_table "story_ideas", charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
t.string "author_credit_preference"
+ t.bigint "author_id"
t.text "body"
t.datetime "created_at", null: false
t.integer "created_by_id", null: false
@@ -942,6 +944,7 @@
t.integer "windows_type_id", null: false
t.integer "workshop_id"
t.string "youtube_url"
+ t.index ["author_id"], name: "index_story_ideas_on_author_id"
t.index ["created_by_id"], name: "index_story_ideas_on_created_by_id"
t.index ["organization_id"], name: "index_story_ideas_on_organization_id"
t.index ["updated_by_id"], name: "index_story_ideas_on_updated_by_id"
@@ -1333,8 +1336,6 @@
t.index ["year", "month"], name: "index_workshops_on_year_and_month"
end
- add_foreign_key "action_text_mentions", "action_text_rich_texts"
- add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id"
add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id"
add_foreign_key "affiliations", "organizations"
add_foreign_key "affiliations", "organizations", column: "organization_agency_id"
@@ -1403,6 +1404,7 @@
add_foreign_key "resources", "workshops"
add_foreign_key "sectorable_items", "sectors"
add_foreign_key "stories", "organizations"
+ add_foreign_key "stories", "people", column: "author_id"
add_foreign_key "stories", "people", column: "spotlighted_facilitator_id"
add_foreign_key "stories", "story_ideas"
add_foreign_key "stories", "users", column: "created_by_id"
@@ -1410,6 +1412,7 @@
add_foreign_key "stories", "windows_types"
add_foreign_key "stories", "workshops"
add_foreign_key "story_ideas", "organizations"
+ add_foreign_key "story_ideas", "people", column: "author_id"
add_foreign_key "story_ideas", "users", column: "created_by_id"
add_foreign_key "story_ideas", "users", column: "updated_by_id"
add_foreign_key "story_ideas", "windows_types"
diff --git a/spec/factories/stories.rb b/spec/factories/stories.rb
index c2e0848bf..af1755af0 100644
--- a/spec/factories/stories.rb
+++ b/spec/factories/stories.rb
@@ -3,6 +3,7 @@
association :windows_type
association :organization
association :workshop
+ association :author, factory: :person
association :created_by, factory: :user
association :updated_by, factory: :user
sequence(:title) { |n| "Story #{n}" }
diff --git a/spec/factories/story_ideas.rb b/spec/factories/story_ideas.rb
index 4d411b6c3..9adbc0cd2 100644
--- a/spec/factories/story_ideas.rb
+++ b/spec/factories/story_ideas.rb
@@ -7,6 +7,7 @@
rhino_body { " My Body " }
permission_given { true }
author_credit_preference { "full_name" }
+ association :author, factory: :person
association :created_by, factory: :user
association :updated_by, factory: :user
diff --git a/spec/helpers/person_helper_spec.rb b/spec/helpers/person_helper_spec.rb
new file mode 100644
index 000000000..dfc585144
--- /dev/null
+++ b/spec/helpers/person_helper_spec.rb
@@ -0,0 +1,29 @@
+require "rails_helper"
+
+RSpec.describe PersonHelper, type: :helper do
+ describe "#person_select_options" do
+ it "shows only the name when the full name is unique" do
+ amy = create(:person, first_name: "Amy", last_name: "User", email: "amy@example.com")
+ ben = create(:person, first_name: "Ben", last_name: "Smith", email: "ben@example.com")
+
+ options = helper.person_select_options([ amy, ben ])
+
+ expect(options).to contain_exactly([ "Amy User", amy.id ], [ "Ben Smith", ben.id ])
+ end
+
+ it "appends the email only for people who share a full name" do
+ amy_one = create(:person, first_name: "Amy", last_name: "User", email: "amy.one@example.com")
+ amy_two = create(:person, first_name: "Amy", last_name: "User", email: "amy.two@example.com")
+ ben = create(:person, first_name: "Ben", last_name: "Smith", email: "ben@example.com")
+
+ options = helper.person_select_options([ amy_one, amy_two, ben ])
+
+ expect(options).to contain_exactly(
+ [ amy_one.full_name_with_email, amy_one.id ],
+ [ amy_two.full_name_with_email, amy_two.id ],
+ [ "Ben Smith", ben.id ]
+ )
+ expect(amy_one.full_name_with_email).to include("(")
+ end
+ end
+end
diff --git a/spec/models/story_spec.rb b/spec/models/story_spec.rb
index 36e94234e..a4b4453a1 100644
--- a/spec/models/story_spec.rb
+++ b/spec/models/story_spec.rb
@@ -3,6 +3,25 @@
RSpec.describe Story, type: :model do
it_behaves_like "author_creditable", factory: :story
+ describe "author credit preference default" do
+ it "defaults a blank preference from the author's display name preference" do
+ author = create(:person, display_name_preference: "first_name_only")
+ story = create(:story, author: author, author_credit_preference: nil)
+ expect(story.author_credit_preference).to eq("first_name_only")
+ end
+
+ it "does not override an explicitly set preference" do
+ author = create(:person, display_name_preference: "first_name_only")
+ story = create(:story, author: author, author_credit_preference: "anonymous")
+ expect(story.author_credit_preference).to eq("anonymous")
+ end
+
+ it "leaves the preference blank when there is no author" do
+ story = create(:story, author: nil, author_credit_preference: nil)
+ expect(story.author_credit_preference).to be_nil
+ end
+ end
+
describe "#attach_assets_from_idea!" do
let(:idea) { create(:story_idea) }
let(:story) { create(:story, story_idea: idea) }
diff --git a/spec/requests/stories_spec.rb b/spec/requests/stories_spec.rb
index 2fbc28c11..e6c2e6251 100644
--- a/spec/requests/stories_spec.rb
+++ b/spec/requests/stories_spec.rb
@@ -124,6 +124,7 @@
windows_type: wt_adult,
workshop: ws_art,
organization: org_alpha,
+ author: author_alice.person,
created_by: author_alice).tap do |s|
s.update_columns(created_at: 3.days.ago, updated_at: 1.day.ago)
end
@@ -135,6 +136,7 @@
windows_type: wt_children,
workshop: ws_music,
organization: org_zulu,
+ author: author_zara.person,
created_by: author_zara).tap do |s|
s.update_columns(created_at: 1.day.ago, updated_at: 3.days.ago)
end
diff --git a/spec/support/shared_examples/author_creditable.rb b/spec/support/shared_examples/author_creditable.rb
index 3ac1b03f8..7bcb0966a 100644
--- a/spec/support/shared_examples/author_creditable.rb
+++ b/spec/support/shared_examples/author_creditable.rb
@@ -1,8 +1,16 @@
RSpec.shared_examples "author_creditable" do |factory:|
describe "#author_credit" do
- let(:author_user) { create(:user, :with_person) }
- let(:person) { author_user.person }
- let(:record) { create(factory, created_by: author_user) }
+ let(:person) { create(:person) }
+ # Story/StoryIdea credit a direct author association; other includers derive
+ # the credited person from the creating user.
+ let(:has_author_association) { described_class.reflect_on_association(:author).present? }
+ let(:record) do
+ if has_author_association
+ create(factory, author: person)
+ else
+ create(factory, created_by: create(:user, person: person))
+ end
+ end
context "when author_credit_preference is full_name" do
it "returns the person's full name" do
@@ -46,10 +54,13 @@
end
end
- context "when user has no person" do
+ context "when there is no credited person" do
it "returns Anonymous" do
- user_without_person = create(:user, person: nil)
- record.update!(created_by: user_without_person)
+ if has_author_association
+ record.update!(author: nil)
+ else
+ record.update!(created_by: create(:user, person: nil))
+ end
expect(record.author_credit).to eq("Anonymous")
end
end
|