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 03324ad8f30cb0fdcd0b143929c1ef452b8835a8..b40c83e0dc08548366e3893d2858b887d5d8716e 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]
@@ -10,21 +10,19 @@ class RedactionsController < ApplicationController
   before_filter :check_database_writable, :only => [:create, :update, :destroy]
 
   def index
-    @redactions_pages, @redactions = paginate(:redactions, :order => :id, :per_page => 10)
+    @redactions = Redaction.order(:id)
   end
 
   def new
     @redaction = Redaction.new
   end
-     
+
   def create
     @redaction = Redaction.new
     @redaction.user = @user
     @redaction.title = params[:redaction][:title]
     @redaction.description = params[:redaction][:description]
-    # didn't see this come in from the form - maybe i'm doing something
-    # wrong, or markdown is the only thing supported at the moment?
-    @redaction.description_format = 'markdown'
+    # note that the description format will default to 'markdown'
 
     if @redaction.save
       flash[:notice] = t('redaction.create.flash')
@@ -33,23 +31,17 @@ class RedactionsController < ApplicationController
       render :action => 'new'
     end
   end
-     
+
   def show
   end
-  
+
   def edit
   end
-     
+
   def update
     # note - don't update the user ID
-    
-    if params[:redaction][:title] and params[:redaction][:title] != @redaction.title
-      @redaction.title = params[:redaction][:title]
-    end
-
-    if params[:redaction][:description] and params[:redaction][:description] != @redaction.description
-      @redaction.description = params[:redaction][:description]
-    end
+    @redaction.title = params[:redaction][:title]
+    @redaction.description = params[:redaction][:description]
 
     if @redaction.save
       flash[:notice] = t('redaction.update.flash')
@@ -58,11 +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?
+    unless @redaction.old_nodes.empty? &&
+           @redaction.old_ways.empty? &&
+           @redaction.old_relations.empty?
       flash[:error] = t('redaction.destroy.not_empty')
       redirect_to @redaction
     else