Merge remote-tracking branch 'upstream/pull/5401'

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

diff --git a/app/controllers/redactions_controller.rb b/app/controllers/redactions_controller.rb
index a70ada3ecddf7ba3c5693c4f475957b15571cb0c..6e28f36253f0dd0e80e3cae51ddae793e6bbcbd8 100644 (file)
--- a/app/controllers/redactions_controller.rb
+++ b/app/controllers/redactions_controller.rb
@@ -1,78 +1,69 @@
 class RedactionsController < ApplicationController
 class RedactionsController < ApplicationController

-  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]
+  layout "site"
+
+  before_action :authorize_web
+  before_action :set_locale
+
+  authorize_resource
+
+  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
 
   def index

-    @redactions_pages, @redactions = paginate(:redactions, :order => :id, :per_page => 10)
+    @redactions = Redaction.order(:id)

   end
 
   end
 

+  def show; end
+

   def new
     @redaction = Redaction.new
   end
   def new
     @redaction = Redaction.new
   end

-     
+
+  def edit; end
+

   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]
     @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: the description format will default to 'markdown'

 
     if @redaction.save
 
     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 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
+  def update
+    # NOTE: don't update the user ID
+    @redaction.title = params[:redaction][:title]
+    @redaction.description = params[:redaction][:description]

 
     if @redaction.save
 
     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
     end
   end

-     
+

   def destroy
   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')
-        redirect_to :index
+        flash[:notice] = t(".flash")
+        redirect_to :redactions

       else
       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