Merge branch 'master' into tooltips-enable-disable

[rails.git] / app / controllers / redactions_controller.rb

diff --git a/app/controllers/redactions_controller.rb b/app/controllers/redactions_controller.rb
index b8ecce9e250fca521d3ae346f8b958a30026973e..30425bd429babe42827509eb30c331e00a4cc3d1 100644 (file)
--- a/app/controllers/redactions_controller.rb
+++ b/app/controllers/redactions_controller.rb
@@ -3,8 +3,9 @@ class RedactionsController < ApplicationController
 
   before_action :authorize_web
   before_action :set_locale
 
   before_action :authorize_web
   before_action :set_locale

-  before_action :require_user, :only => [:new, :create, :edit, :update, :destroy]
-  before_action :require_moderator, :only => [:new, :create, :edit, :update, :destroy]
+
+  authorize_resource
+

   before_action :lookup_redaction, :only => [:show, :edit, :update, :destroy]
   before_action :check_database_readable
   before_action :check_database_writable, :only => [:create, :update, :destroy]
   before_action :lookup_redaction, :only => [:show, :edit, :update, :destroy]
   before_action :check_database_readable
   before_action :check_database_writable, :only => [:create, :update, :destroy]


@@ -22,7 +23,7 @@ class RedactionsController < ApplicationController
     @redaction.user = current_user
     @redaction.title = params[:redaction][:title]
     @redaction.description = params[:redaction][:description]
     @redaction.user = current_user
     @redaction.title = params[:redaction][:title]
     @redaction.description = params[:redaction][:description]

-    # note that the description format will default to 'markdown'
+    # NOTE: the description format will default to 'markdown'

 
     if @redaction.save
       flash[:notice] = t(".flash")
 
     if @redaction.save
       flash[:notice] = t(".flash")


@@ -37,7 +38,7 @@ class RedactionsController < ApplicationController
   def edit; end
 
   def update
   def edit; end
 
   def update

-    # note - don't update the user ID
+    # NOTE: don't update the user ID

     @redaction.title = params[:redaction][:title]
     @redaction.description = params[:redaction][:description]
 
     @redaction.title = params[:redaction][:title]
     @redaction.description = params[:redaction][:description]