Fix rubocop style issues

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

diff --git a/app/controllers/redactions_controller.rb b/app/controllers/redactions_controller.rb
index d0f90271744661ed8447d88a7a30cc871eeed649..8ba5c7d9d3772a5abfef220d1323aa586161cd6b 100644 (file)
--- a/app/controllers/redactions_controller.rb
+++ b/app/controllers/redactions_controller.rb
@@ -1,6 +1,6 @@
 class RedactionsController < ApplicationController
   layout 'site'
-  
+
   before_filter :authorize_web
   before_filter :set_locale
   before_filter :require_user, :only => [:new, :create, :edit, :update, :destroy]
@@ -16,7 +16,7 @@ class RedactionsController < ApplicationController
   def new
     @redaction = Redaction.new
   end
-     
+
   def create
     @redaction = Redaction.new
     @redaction.user = @user
@@ -31,13 +31,13 @@ class RedactionsController < ApplicationController
       render :action => 'new'
     end
   end
-     
+
   def show
   end
-  
+
   def edit
   end
-     
+
   def update
     # note - don't update the user ID
     @redaction.title = params[:redaction][:title]
@@ -50,14 +50,11 @@ class RedactionsController < ApplicationController
       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')
         redirect_to :redactions
@@ -65,6 +62,9 @@ class RedactionsController < ApplicationController
         flash[:error] = t('redaction.destroy.error')
         redirect_to @redaction
       end
+    else
+      flash[:error] = t('redaction.destroy.not_empty')
+      redirect_to @redaction
     end
   end