Fix most auto-correctable rubocop issues

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

diff --git a/app/controllers/redactions_controller.rb b/app/controllers/redactions_controller.rb
index 6dbe53937a80e1e93a5c07a0b8c3802d72f82af9..b40c83e0dc08548366e3893d2858b887d5d8716e 100644 (file)
--- a/app/controllers/redactions_controller.rb
+++ b/app/controllers/redactions_controller.rb
@@ -52,9 +52,9 @@ class RedactionsController < ApplicationController
   end
 
   def destroy
   end
 
   def destroy

-    unless @redaction.old_nodes.empty? and
-        @redaction.old_ways.empty? and
-        @redaction.old_relations.empty?
+    unless @redaction.old_nodes.empty? &&
+           @redaction.old_ways.empty? &&
+           @redaction.old_relations.empty?

       flash[:error] = t('redaction.destroy.not_empty')
       redirect_to @redaction
     else
       flash[:error] = t('redaction.destroy.not_empty')
       redirect_to @redaction
     else