From ff87f2c67e820980ec570698bd18bcffa7c1c705 Mon Sep 17 00:00:00 2001 From: Ryan W Date: Thu, 16 Dec 2021 14:32:18 -0800 Subject: [PATCH] Change attribute name to content --- app/controllers/articles_controller.rb | 2 +- app/models/article.rb | 1 + app/views/articles/_article.json.jbuilder | 2 +- app/views/articles/_form.html.erb | 4 ++-- db/migrate/20210926221100_create_articles.rb | 2 +- db/schema.rb | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/controllers/articles_controller.rb b/app/controllers/articles_controller.rb index 587b906..057a093 100644 --- a/app/controllers/articles_controller.rb +++ b/app/controllers/articles_controller.rb @@ -64,6 +64,6 @@ class ArticlesController < ApplicationController # Only allow a list of trusted parameters through. def article_params - params.require(:article).permit(:title, :text) + params.require(:article).permit(:title, :content) end end diff --git a/app/models/article.rb b/app/models/article.rb index 5273dd3..573f062 100644 --- a/app/models/article.rb +++ b/app/models/article.rb @@ -1,4 +1,5 @@ class Article < ApplicationRecord has_rich_text :text + has_rich_text :content validates_presence_of :title end diff --git a/app/views/articles/_article.json.jbuilder b/app/views/articles/_article.json.jbuilder index 8f4e2e8..eaaa557 100644 --- a/app/views/articles/_article.json.jbuilder +++ b/app/views/articles/_article.json.jbuilder @@ -1,2 +1,2 @@ -json.extract! article, :id, :title, :text, :created_at, :updated_at +json.extract! article, :id, :title, :content, :created_at, :updated_at json.url article_url(article, format: :json) diff --git a/app/views/articles/_form.html.erb b/app/views/articles/_form.html.erb index df94d6c..a41168c 100644 --- a/app/views/articles/_form.html.erb +++ b/app/views/articles/_form.html.erb @@ -17,8 +17,8 @@
- <%= form.label :text %> - <%= form.rich_text_area :text %> + <%= form.label :content %> + <%= form.rich_text_area :content %>
diff --git a/db/migrate/20210926221100_create_articles.rb b/db/migrate/20210926221100_create_articles.rb index b3c7ea3..c802e5f 100644 --- a/db/migrate/20210926221100_create_articles.rb +++ b/db/migrate/20210926221100_create_articles.rb @@ -2,7 +2,7 @@ class CreateArticles < ActiveRecord::Migration[7.0] def change create_table :articles do |t| t.string :title - t.text :text + t.text :content t.timestamps end diff --git a/db/schema.rb b/db/schema.rb index bf878fb..b34eced 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -55,7 +55,7 @@ ActiveRecord::Schema.define(version: 2021_12_16_184103) do create_table "articles", force: :cascade do |t| t.string "title" - t.text "text" + t.text "content" t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false end