Suppress the creation of boot logs from the ubuntu image

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

diff --git a/app/controllers/redactions_controller.rb b/app/controllers/redactions_controller.rb
index 6dbe53937a80e1e93a5c07a0b8c3802d72f82af9..b8ecce9e250fca521d3ae346f8b958a30026973e 100644 (file)
--- a/app/controllers/redactions_controller.rb
+++ b/app/controllers/redactions_controller.rb
@@ -1,13 +1,13 @@
 class RedactionsController < ApplicationController
 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)
 
   def index
     @redactions = Redaction.order(:id)


@@ -19,24 +19,22 @@ class RedactionsController < ApplicationController
 
   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]
     # note that the description format will default to 'markdown'
 
     if @redaction.save
     @redaction.title = params[:redaction][:title]
     @redaction.description = params[:redaction][:description]
     # note that the description format will default to 'markdown'
 
     if @redaction.save

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

       redirect_to @redaction
     else
       redirect_to @redaction
     else

-      render :action => 'new'
+      render :action => "new"

     end
   end
 
     end
   end
 

-  def show
-  end
+  def show; end

 
 

-  def edit
-  end
+  def edit; end

 
   def update
     # note - don't update the user ID
 
   def update
     # note - don't update the user ID


@@ -44,27 +42,27 @@ class RedactionsController < ApplicationController
     @redaction.description = params[:redaction][:description]
 
     if @redaction.save
     @redaction.description = params[:redaction][:description]
 
     if @redaction.save

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

       redirect_to @redaction
     else
       redirect_to @redaction
     else

-      render :action => 'edit'
+      render :action => "edit"

     end
   end
 
   def destroy
     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
       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
         redirect_to @redaction
       end

+    else
+      flash[:error] = t(".not_empty")
+      redirect_to @redaction

     end
   end
 
     end
   end