Merge remote-tracking branch 'upstream/pull/5391'

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

diff --git a/app/controllers/redactions_controller.rb b/app/controllers/redactions_controller.rb
index 31dd7273f114d2ff217961830c7d80c29ecc41cb..6e28f36253f0dd0e80e3cae51ddae793e6bbcbd8 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]


@@ -13,38 +14,36 @@ class RedactionsController < ApplicationController
     @redactions = Redaction.order(:id)
   end
 
     @redactions = Redaction.order(:id)
   end
 

+  def show; end
+

   def new
     @redaction = Redaction.new
   end
 
   def new
     @redaction = Redaction.new
   end
 

+  def edit; end
+

   def create
     @redaction = Redaction.new
   def create
     @redaction = Redaction.new

-    @redaction.user = @user
+    @redaction.user = current_user

     @redaction.title = params[:redaction][:title]
     @redaction.description = params[:redaction][:description]
     @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
 
     if @redaction.save

-      flash[:notice] = t("redaction.create.flash")
+      flash[:notice] = t(".flash")

       redirect_to @redaction
     else
       render :action => "new"
     end
   end
 
       redirect_to @redaction
     else
       render :action => "new"
     end
   end
 

-  def show
-  end
-
-  def edit
-  end
-

   def update
   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]
 
     if @redaction.save
     @redaction.title = params[:redaction][:title]
     @redaction.description = params[:redaction][:description]
 
     if @redaction.save

-      flash[:notice] = t("redaction.update.flash")
+      flash[:notice] = t(".flash")

       redirect_to @redaction
     else
       render :action => "edit"
       redirect_to @redaction
     else
       render :action => "edit"


@@ -56,14 +55,14 @@ class RedactionsController < ApplicationController
        @redaction.old_ways.empty? &&
        @redaction.old_relations.empty?
       if @redaction.destroy
        @redaction.old_ways.empty? &&
        @redaction.old_relations.empty?
       if @redaction.destroy

-        flash[:notice] = t("redaction.destroy.flash")
+        flash[:notice] = t(".flash")

         redirect_to :redactions
       else
         redirect_to :redactions
       else

-        flash[:error] = t("redaction.destroy.error")
+        flash[:error] = t(".error")

         redirect_to @redaction
       end
     else
         redirect_to @redaction
       end
     else

-      flash[:error] = t("redaction.destroy.not_empty")
+      flash[:error] = t(".not_empty")

       redirect_to @redaction
     end
   end
       redirect_to @redaction
     end
   end