From 3fd083d9d4f3c266ad9bc8bbf337f44c184d15a2 Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Wed, 28 Nov 2018 15:46:37 +0100 Subject: [PATCH 1/1] Remove the unused require_moderator filter Use of this filter has been refactored to use CanCanCan --- app/controllers/application_controller.rb | 19 ------------------- config/locales/en.yml | 4 ---- 2 files changed, 23 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 8fa279367..6c6a087b7 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -118,20 +118,6 @@ class ApplicationController < ActionController::Base require_capability(:allow_write_gpx) end - ## - # require that the user is a moderator, or fill out a helpful error message - # and return them to the index for the controller this is wrapped from. - def require_moderator - unless current_user.moderator? - if request.get? - flash[:error] = t("application.require_moderator.not_a_moderator") - redirect_to :action => "index" - else - head :forbidden - end - end - end - ## # sets up the current_user for use by other methods. this is mostly called # from the authorize method, but can be called elsewhere if authorisation @@ -189,11 +175,6 @@ class ApplicationController < ActionController::Base ## # to be used as a before_filter *after* authorize. this checks that # the user is a moderator and, if not, returns a forbidden error. - # - # NOTE: this isn't a very good way of doing it - it duplicates logic - # from require_moderator - but what we really need to do is a fairly - # drastic refactoring based on :format and respond_to? but not a - # good idea to do that in this branch. def authorize_moderator(errormessage = "Access restricted to moderators") # check user is a moderator unless current_user.moderator? diff --git a/config/locales/en.yml b/config/locales/en.yml index ad825ef67..2777c1df3 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1811,10 +1811,6 @@ en: cookies_needed: "You appear to have cookies disabled - please enable cookies in your browser before continuing." require_admin: not_an_admin: You need to be an admin to perform that action. - require_moderator: - not_a_moderator: "You need to be a moderator to perform that action." - require_moderator_or_admin: - not_a_moderator_or_admin: You need to be a moderator or an admin to perform that action setup_user_auth: blocked_zero_hour: "You have an urgent message on the OpenStreetMap web site. You need to read the message before you will be able to save your edits." blocked: "Your access to the API has been blocked. Please log-in to the web interface to find out more." -- 2.43.2