X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/34e3e51456774127d43408b7ab65c24f41373f62..899891fe8a16934ab98b16456ea95d9f9c81587d:/app/controllers/redactions_controller.rb?ds=inline

diff --git a/app/controllers/redactions_controller.rb b/app/controllers/redactions_controller.rb
index 6dbe53937..31dd7273f 100644
--- a/app/controllers/redactions_controller.rb
+++ b/app/controllers/redactions_controller.rb
@@ -1,13 +1,13 @@
 class RedactionsController < ApplicationController
-  layout 'site'
+  layout "site"
 
-  before_filter :authorize_web
-  before_filter :set_locale
-  before_filter :require_user, :only => [:new, :create, :edit, :update, :destroy]
-  before_filter :require_moderator, :only => [:new, :create, :edit, :update, :destroy]
-  before_filter :lookup_redaction, :only => [:show, :edit, :update, :destroy]
-  before_filter :check_database_readable
-  before_filter :check_database_writable, :only => [:create, :update, :destroy]
+  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]
+  before_action :lookup_redaction, :only => [:show, :edit, :update, :destroy]
+  before_action :check_database_readable
+  before_action :check_database_writable, :only => [:create, :update, :destroy]
 
   def index
     @redactions = Redaction.order(:id)
@@ -25,10 +25,10 @@ class RedactionsController < ApplicationController
     # note that the description format will default to 'markdown'
 
     if @redaction.save
-      flash[:notice] = t('redaction.create.flash')
+      flash[:notice] = t("redaction.create.flash")
       redirect_to @redaction
     else
-      render :action => 'new'
+      render :action => "new"
     end
   end
 
@@ -44,27 +44,27 @@ class RedactionsController < ApplicationController
     @redaction.description = params[:redaction][:description]
 
     if @redaction.save
-      flash[:notice] = t('redaction.update.flash')
+      flash[:notice] = t("redaction.update.flash")
       redirect_to @redaction
     else
-      render :action => 'edit'
+      render :action => "edit"
     end
   end
 
   def destroy
-    unless @redaction.old_nodes.empty? and
-        @redaction.old_ways.empty? and
-        @redaction.old_relations.empty?
-      flash[:error] = t('redaction.destroy.not_empty')
-      redirect_to @redaction
-    else
+    if @redaction.old_nodes.empty? &&
+       @redaction.old_ways.empty? &&
+       @redaction.old_relations.empty?
       if @redaction.destroy
-        flash[:notice] = t('redaction.destroy.flash')
+        flash[:notice] = t("redaction.destroy.flash")
         redirect_to :redactions
       else
-        flash[:error] = t('redaction.destroy.error')
+        flash[:error] = t("redaction.destroy.error")
         redirect_to @redaction
       end
+    else
+      flash[:error] = t("redaction.destroy.not_empty")
+      redirect_to @redaction
     end
   end