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 @@