Corrected with rubocop cop 'Rails/ActionFilter'.

2015-05-07 13:23:55 +02:00 · 2015-05-07 13:23:55 +02:00 · 1e4f47acde
parent 3eaac7009a
commit 1e4f47acde
34 changed files with 37 additions and 41 deletions
--- a/.rubocop.yml
+++ b/.rubocop.yml
@ -173,10 +173,6 @@ Style/Documentation:
  Description: 'Document classes and non-namespace modules.'
  Enabled: false

-Rails/ActionFilter:
-  Description: 'Enforces consistent use of action filter methods.'
-  Enabled: false
-
 Style/SignalException:
  Description: 'Checks for proper usage of fail and raise.'
  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#fail-method'
--- a/app/controllers/activity_stream_controller.rb
+++ b/app/controllers/activity_stream_controller.rb
@ -1,7 +1,7 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/

 class ActivityStreamController < ApplicationController
-  before_filter :authentication_check
+  before_action :authentication_check

  # GET /api/v1/activity_stream
  def show
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@ -14,12 +14,12 @@ class ApplicationController < ActionController::Base
                :mode_show_rendeder,
                :model_index_render

-  skip_before_filter :verify_authenticity_token
-  before_filter :set_user, :session_update
-  before_filter :cors_preflight_check
+  skip_before_action :verify_authenticity_token
+  before_action :set_user, :session_update
+  before_action :cors_preflight_check

-  after_filter  :set_access_control_headers
-  after_filter  :trigger_events
+  after_action  :set_access_control_headers
+  after_action  :trigger_events

  # For all responses in this controller, return the CORS access control headers.
  def set_access_control_headers
--- a/app/controllers/channels_controller.rb
+++ b/app/controllers/channels_controller.rb
@ -1,7 +1,7 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/

 class ChannelsController < ApplicationController
-  before_filter :authentication_check
+  before_action :authentication_check

 =begin

--- a/app/controllers/email_addresses_controller.rb
+++ b/app/controllers/email_addresses_controller.rb
@ -1,7 +1,7 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/

 class EmailAddressesController < ApplicationController
-  before_filter :authentication_check
+  before_action :authentication_check

 =begin

--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@ -1,7 +1,7 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/

 class GroupsController < ApplicationController
-  before_filter :authentication_check
+  before_action :authentication_check

 =begin

--- a/app/controllers/ical_tickets_controller.rb
+++ b/app/controllers/ical_tickets_controller.rb
@ -3,7 +3,7 @@
 require 'icalendar'

 class IcalTicketsController < ApplicationController
-  before_filter  { authentication_check_action_token 'iCal' }
+  before_action  { authentication_check_action_token 'iCal' }

  # @path       [GET] /ical/tickets_all/:action_token
  #
--- a/app/controllers/jobs_controller.rb
+++ b/app/controllers/jobs_controller.rb
@ -1,7 +1,7 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/

 class JobsController < ApplicationController
-  before_filter :authentication_check
+  before_action :authentication_check

  def index
    return if deny_if_not_role(Z_ROLENAME_ADMIN)
--- a/app/controllers/links_controller.rb
+++ b/app/controllers/links_controller.rb
@ -1,7 +1,7 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/

 class LinksController < ApplicationController
-  before_filter :authentication_check
+  before_action :authentication_check

  # GET /api/v1/links
  def index
--- a/app/controllers/network_controller.rb
+++ b/app/controllers/network_controller.rb
@ -1,7 +1,7 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/

 class NetworksController < ApplicationController
-  before_filter :authentication_check
+  before_action :authentication_check

  # GET /networks
  # GET /networks.json
--- a/app/controllers/object_manager_attributes_controller.rb
+++ b/app/controllers/object_manager_attributes_controller.rb
@ -1,7 +1,7 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/

 class ObjectManagerAttributesController < ApplicationController
-  before_filter :authentication_check
+  before_action :authentication_check

  # GET /object_manager_attributes_list
  def list
--- a/app/controllers/online_notifications_controller.rb
+++ b/app/controllers/online_notifications_controller.rb
@ -1,7 +1,7 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/

 class OnlineNotificationsController < ApplicationController
-  before_filter :authentication_check
+  before_action :authentication_check

 =begin

--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@ -1,7 +1,7 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/

 class OrganizationsController < ApplicationController
-  before_filter :authentication_check
+  before_action :authentication_check

 =begin

--- a/app/controllers/overviews_controller.rb
+++ b/app/controllers/overviews_controller.rb
@ -1,7 +1,7 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/

 class OverviewsController < ApplicationController
-  before_filter :authentication_check
+  before_action :authentication_check

 =begin

--- a/app/controllers/packages_controller.rb
+++ b/app/controllers/packages_controller.rb
@ -1,7 +1,7 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/

 class PackagesController < ApplicationController
-  before_filter :authentication_check
+  before_action :authentication_check

  # GET /api/v1/packages
  def index
--- a/app/controllers/postmaster_filters_controller.rb
+++ b/app/controllers/postmaster_filters_controller.rb
@ -1,7 +1,7 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/

 class PostmasterFiltersController < ApplicationController
-  before_filter :authentication_check
+  before_action :authentication_check

 =begin

--- a/app/controllers/recent_view_controller.rb
+++ b/app/controllers/recent_view_controller.rb
@ -1,7 +1,7 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/

 class RecentViewController < ApplicationController
-  before_filter :authentication_check
+  before_action :authentication_check

 =begin

--- a/app/controllers/roles_controller.rb
+++ b/app/controllers/roles_controller.rb
@ -1,7 +1,7 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/

 class RolesController < ApplicationController
-  before_filter :authentication_check
+  before_action :authentication_check

 =begin

--- a/app/controllers/rss_controller.rb
+++ b/app/controllers/rss_controller.rb
@ -1,7 +1,7 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/

 class RssController < ApplicationController
-  before_filter :authentication_check
+  before_action :authentication_check

 =begin

--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@ -1,7 +1,7 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/

 class SearchController < ApplicationController
-  before_filter :authentication_check
+  before_action :authentication_check

  # GET /api/v1/search_user_org
  def search_user_org
--- a/app/controllers/settings_controller.rb
+++ b/app/controllers/settings_controller.rb
@ -1,7 +1,7 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/

 class SettingsController < ApplicationController
-  before_filter :authentication_check
+  before_action :authentication_check

  # GET /settings
  def index
--- a/app/controllers/signatures_controller.rb
+++ b/app/controllers/signatures_controller.rb
@ -1,7 +1,7 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/

 class SignaturesController < ApplicationController
-  before_filter :authentication_check
+  before_action :authentication_check

 =begin

--- a/app/controllers/slas_controller.rb
+++ b/app/controllers/slas_controller.rb
@ -1,7 +1,7 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/

 class SlasController < ApplicationController
-  before_filter :authentication_check
+  before_action :authentication_check

 =begin

--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@ -1,7 +1,7 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/

 class TagsController < ApplicationController
-  before_filter :authentication_check
+  before_action :authentication_check

  # GET /api/v1/tags
  def index
--- a/app/controllers/taskbar_controller.rb
+++ b/app/controllers/taskbar_controller.rb
@ -1,7 +1,7 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/

 class TaskbarController < ApplicationController
-  before_filter :authentication_check
+  before_action :authentication_check

  def index

--- a/app/controllers/templates_controller.rb
+++ b/app/controllers/templates_controller.rb
@ -1,7 +1,7 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/

 class TemplatesController < ApplicationController
-  before_filter :authentication_check
+  before_action :authentication_check

 =begin

--- a/app/controllers/text_modules_controller.rb
+++ b/app/controllers/text_modules_controller.rb
@ -1,7 +1,7 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/

 class TextModulesController < ApplicationController
-  before_filter :authentication_check
+  before_action :authentication_check

 =begin

--- a/app/controllers/ticket_articles_controller.rb
+++ b/app/controllers/ticket_articles_controller.rb
@ -1,7 +1,7 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/

 class TicketArticlesController < ApplicationController
-  before_filter :authentication_check
+  before_action :authentication_check

  # GET /articles
  def index
--- a/app/controllers/ticket_overviews_controller.rb
+++ b/app/controllers/ticket_overviews_controller.rb
@ -3,7 +3,7 @@
 require 'ticket/overviews'

 class TicketOverviewsController < ApplicationController
-  before_filter :authentication_check
+  before_action :authentication_check

  # GET /api/v1/ticket_overviews
  def show
--- a/app/controllers/ticket_priorities_controller.rb
+++ b/app/controllers/ticket_priorities_controller.rb
@ -1,7 +1,7 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/

 class TicketPrioritiesController < ApplicationController
-  before_filter :authentication_check
+  before_action :authentication_check

  # GET /ticket_priorities
  def index
--- a/app/controllers/ticket_states_controller.rb
+++ b/app/controllers/ticket_states_controller.rb
@ -1,7 +1,7 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/

 class TicketStatesController < ApplicationController
-  before_filter :authentication_check
+  before_action :authentication_check

  # GET /ticket_states
  def index
--- a/app/controllers/tickets_controller.rb
+++ b/app/controllers/tickets_controller.rb
@ -1,7 +1,7 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/

 class TicketsController < ApplicationController
-  before_filter :authentication_check
+  before_action :authentication_check

  # GET /api/v1/tickets
  def index
--- a/app/controllers/translations_controller.rb
+++ b/app/controllers/translations_controller.rb
@ -1,7 +1,7 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/

 class TranslationsController < ApplicationController
-  before_filter :authentication_check, except: [:load]
+  before_action :authentication_check, except: [:load]

  # GET /translations/lang/:locale
  def load
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@ -1,7 +1,7 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/

 class UsersController < ApplicationController
-  before_filter :authentication_check, except: [:create, :password_reset_send, :password_reset_verify]
+  before_action :authentication_check, except: [:create, :password_reset_send, :password_reset_verify]

  # @path       [GET] /users
  #