X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5cbd4038edb32b0304bd766e70fc680ea447b52b..edd49e85823079d6de19cbc9f89c6abc0568382b:/app/controllers/redactions_controller.rb?ds=inline diff --git a/app/controllers/redactions_controller.rb b/app/controllers/redactions_controller.rb index 8ba5c7d9d..45a41058c 100644 --- a/app/controllers/redactions_controller.rb +++ b/app/controllers/redactions_controller.rb @@ -1,13 +1,14 @@ 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 + + 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 @redactions = Redaction.order(:id) @@ -19,24 +20,22 @@ class RedactionsController < ApplicationController 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 - flash[:notice] = t('redaction.create.flash') + flash[:notice] = t(".flash") redirect_to @redaction else - render :action => 'new' + render :action => "new" end end - def show - end + def show; end - def edit - end + def edit; end def update # note - don't update the user ID @@ -44,10 +43,10 @@ class RedactionsController < ApplicationController @redaction.description = params[:redaction][:description] if @redaction.save - flash[:notice] = t('redaction.update.flash') + flash[:notice] = t(".flash") redirect_to @redaction else - render :action => 'edit' + render :action => "edit" end end @@ -56,14 +55,14 @@ class RedactionsController < ApplicationController @redaction.old_ways.empty? && @redaction.old_relations.empty? if @redaction.destroy - flash[:notice] = t('redaction.destroy.flash') + flash[:notice] = t(".flash") redirect_to :redactions else - flash[:error] = t('redaction.destroy.error') + flash[:error] = t(".error") redirect_to @redaction end else - flash[:error] = t('redaction.destroy.not_empty') + flash[:error] = t(".not_empty") redirect_to @redaction end end