app/controllers/spotlight/versions_controller.rb in blacklight-spotlight-0.4.1 vs app/controllers/spotlight/versions_controller.rb in blacklight-spotlight-0.5.0

- old
+ new

@@ -1,33 +1,36 @@ module Spotlight + ## + # Controller for reverting to historical versions of e.g. pages class VersionsController < Spotlight::ApplicationController - before_filter :authenticate_user! + before_action :authenticate_user! - load_and_authorize_resource class: "PaperTrail::Version" + load_and_authorize_resource class: 'PaperTrail::Version' def revert - if obj = @version.reify - authorize! :manage, obj + obj = @version.reify + if obj && authorize!(:manage, obj) if obj.save redirect_to [obj.exhibit, obj], flash: { html_safe: true }, notice: undo_link else redirect_to [obj.exhibit, obj], flash: { html_safe: true }, notice: view_context.t(:'spotlight.versions.undo_error') end else redirect_to :back, flash: { html_safe: true }, notice: view_context.t(:'spotlight.versions.undo_error') end - end + private + def undo_link return unless can? :manage, @version - link_name = if params[:redo] == "true" - view_context.t(:'spotlight.versions.undo') - else - view_context.t(:'spotlight.versions.redo') - end + link_name = if params[:redo] == 'true' + view_context.t(:'spotlight.versions.undo') + else + view_context.t(:'spotlight.versions.redo') + end - view_context.link_to(link_name, revert_version_path(@version.next, :redo => !params[:redo]), method: :post) + view_context.link_to(link_name, revert_version_path(@version.next, redo: !params[:redo]), method: :post) end end -end \ No newline at end of file +end