Merge remote-tracking branch 'heroku/master'

alanjcfs · May 29, 2016 · dfbe00b · dfbe00b
2 parents f83c0de + 49299c2
commit dfbe00b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/app/controllers/admin/application_controller.rb b/app/controllers/admin/application_controller.rb
@@ -3,10 +3,6 @@ class Admin::ApplicationController < ApplicationController
   before_action :user_must_be_admin
 
   private
-  def poem_params
-    params.require(:poem).permit(:title, :text, :johnson, :franklin)
-  end
-
   def user_must_be_admin
     if current_user && !current_user.admin?
       redirect_to :root, notice: "You must be an admin"

diff --git a/app/controllers/admin/poems_controller.rb b/app/controllers/admin/poems_controller.rb
@@ -25,4 +25,9 @@ def update
 
     respond_with @poem, location: admin_poem_url(@poem)
   end
+
+  protected
+  def poem_params
+    params.require(:poem).permit(:title, :text, :plain_text, :johnson, :franklin)
+  end
 end
diff --git a/app/views/admin/poems/edit.html.slim b/app/views/admin/poems/edit.html.slim
@@ -6,6 +6,7 @@ h1 Edit Poem
   .form-inputs
     = f.input :title
     = f.input :text
+    = f.input :plain_text
     = f.input :johnson
     = f.input :franklin