From 1eee7312f60267b0f8e575cc96302812f2dc38a8 Mon Sep 17 00:00:00 2001
From: Eric Davis <edavis@littlestreamsoftware.com>
Date: Wed, 20 Apr 2011 16:08:00 -0700
Subject: [PATCH] [#289] Remove single helpers in favor of :all in
ApplicationController
---
app/controllers/account_controller.rb | 1 -
app/controllers/admin_controller.rb | 1 -
app/controllers/application_controller.rb | 1 +
app/controllers/boards_controller.rb | 3 ---
app/controllers/calendars_controller.rb | 4 ----
app/controllers/context_menus_controller.rb | 1 -
app/controllers/documents_controller.rb | 1 -
app/controllers/enumerations_controller.rb | 1 -
app/controllers/files_controller.rb | 1 -
app/controllers/gantts_controller.rb | 5 -----
app/controllers/groups_controller.rb | 1 -
app/controllers/issues_controller.rb | 11 -----------
app/controllers/journals_controller.rb | 5 -----
app/controllers/messages_controller.rb | 2 --
app/controllers/my_controller.rb | 3 ---
app/controllers/news_controller.rb | 1 -
app/controllers/projects_controller.rb | 5 -----
app/controllers/search_controller.rb | 1 -
app/controllers/time_entry_reports_controller.rb | 4 ----
app/controllers/timelog_controller.rb | 3 ---
app/controllers/users_controller.rb | 2 --
app/controllers/versions_controller.rb | 2 --
app/controllers/wiki_controller.rb | 2 --
23 files changed, 1 insertion(+), 60 deletions(-)
diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index 5d6f890f9..024f75347 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -16,7 +16,6 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
class AccountController < ApplicationController
- helper :custom_fields
include CustomFieldsHelper
# prevents login action to be filtered by check_if_login_required application scope filter
diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index 2dc3ab1ca..7d97a1bd6 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -20,7 +20,6 @@ class AdminController < ApplicationController
before_filter :require_admin
- helper :sort
include SortHelper
def index
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 10c7b6533..139d7cf82 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -19,6 +19,7 @@ require 'uri'
require 'cgi'
class ApplicationController < ActionController::Base
+ helper :all
protected
diff --git a/app/controllers/boards_controller.rb b/app/controllers/boards_controller.rb
index ebad847dc..98497a59d 100644
--- a/app/controllers/boards_controller.rb
+++ b/app/controllers/boards_controller.rb
@@ -20,11 +20,8 @@ class BoardsController < ApplicationController
before_filter :find_project, :find_board_if_available, :authorize
accept_key_auth :index, :show
- helper :messages
include MessagesHelper
- helper :sort
include SortHelper
- helper :watchers
include WatchersHelper
def index
diff --git a/app/controllers/calendars_controller.rb b/app/controllers/calendars_controller.rb
index 4544b3399..c228099cd 100644
--- a/app/controllers/calendars_controller.rb
+++ b/app/controllers/calendars_controller.rb
@@ -4,11 +4,7 @@ class CalendarsController < ApplicationController
rescue_from Query::StatementInvalid, :with => :query_statement_invalid
- helper :issues
- helper :projects
- helper :queries
include QueriesHelper
- helper :sort
include SortHelper
def show
diff --git a/app/controllers/context_menus_controller.rb b/app/controllers/context_menus_controller.rb
index 373938abe..5cdf2b0a1 100644
--- a/app/controllers/context_menus_controller.rb
+++ b/app/controllers/context_menus_controller.rb
@@ -1,5 +1,4 @@
class ContextMenusController < ApplicationController
- helper :watchers
def issues
@issues = Issue.visible.all(:conditions => {:id => params[:ids]}, :include => :project)
diff --git a/app/controllers/documents_controller.rb b/app/controllers/documents_controller.rb
index 118a7d99e..1db5d7568 100644
--- a/app/controllers/documents_controller.rb
+++ b/app/controllers/documents_controller.rb
@@ -23,7 +23,6 @@ class DocumentsController < ApplicationController
before_filter :find_project_from_association, :except => [:index, :new]
before_filter :authorize
- helper :attachments
def index
@sort_by = %w(category date title author).include?(params[:sort_by]) ? params[:sort_by] : 'category'
diff --git a/app/controllers/enumerations_controller.rb b/app/controllers/enumerations_controller.rb
index e5b50c873..2b9be4c45 100644
--- a/app/controllers/enumerations_controller.rb
+++ b/app/controllers/enumerations_controller.rb
@@ -20,7 +20,6 @@ class EnumerationsController < ApplicationController
before_filter :require_admin
- helper :custom_fields
include CustomFieldsHelper
def index
diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index d7234985e..39bc9be5e 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -4,7 +4,6 @@ class FilesController < ApplicationController
before_filter :find_project_by_project_id
before_filter :authorize
- helper :sort
include SortHelper
def index
diff --git a/app/controllers/gantts_controller.rb b/app/controllers/gantts_controller.rb
index 50fd8c13d..c33f89f74 100644
--- a/app/controllers/gantts_controller.rb
+++ b/app/controllers/gantts_controller.rb
@@ -4,12 +4,7 @@ class GanttsController < ApplicationController
rescue_from Query::StatementInvalid, :with => :query_statement_invalid
- helper :gantt
- helper :issues
- helper :projects
- helper :queries
include QueriesHelper
- helper :sort
include SortHelper
include Redmine::Export::PDF
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index db56eff96..4667dc9cb 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -20,7 +20,6 @@ class GroupsController < ApplicationController
before_filter :require_admin
- helper :custom_fields
# GET /groups
# GET /groups.xml
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index fdce296c4..adbf0c367 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -31,26 +31,15 @@ class IssuesController < ApplicationController
rescue_from Query::StatementInvalid, :with => :query_statement_invalid
- helper :journals
- helper :projects
include ProjectsHelper
- helper :custom_fields
include CustomFieldsHelper
- helper :issue_relations
include IssueRelationsHelper
- helper :watchers
include WatchersHelper
- helper :attachments
include AttachmentsHelper
- helper :queries
include QueriesHelper
- helper :repositories
include RepositoriesHelper
- helper :sort
include SortHelper
include IssuesHelper
- helper :timelog
- helper :gantt
include Redmine::Export::PDF
verify :method => [:post, :delete],
diff --git a/app/controllers/journals_controller.rb b/app/controllers/journals_controller.rb
index ac3cbb676..00e5e240d 100644
--- a/app/controllers/journals_controller.rb
+++ b/app/controllers/journals_controller.rb
@@ -23,13 +23,8 @@ class JournalsController < ApplicationController
accept_key_auth :index
menu_item :issues
- helper :issues
- helper :custom_fields
- helper :queries
include QueriesHelper
- helper :sort
include SortHelper
- helper :custom_fields
def index
retrieve_query
diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index 5ad8ea58d..56c99ebf6 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -25,8 +25,6 @@ class MessagesController < ApplicationController
verify :method => :post, :only => [ :reply, :destroy ], :redirect_to => { :action => :show }
verify :xhr => true, :only => :quote
- helper :watchers
- helper :attachments
include AttachmentsHelper
REPLIES_PER_PAGE = 25 unless const_defined?(:REPLIES_PER_PAGE)
diff --git a/app/controllers/my_controller.rb b/app/controllers/my_controller.rb
index b381fbc8a..07570c131 100644
--- a/app/controllers/my_controller.rb
+++ b/app/controllers/my_controller.rb
@@ -18,9 +18,6 @@
class MyController < ApplicationController
before_filter :require_login
- helper :issues
- helper :users
- helper :custom_fields
BLOCKS = { 'issuesassignedtome' => :label_assigned_to_me_issues,
'issuesreportedbyme' => :label_reported_issues,
diff --git a/app/controllers/news_controller.rb b/app/controllers/news_controller.rb
index bc7eabb58..87965a7dc 100644
--- a/app/controllers/news_controller.rb
+++ b/app/controllers/news_controller.rb
@@ -25,7 +25,6 @@ class NewsController < ApplicationController
before_filter :find_optional_project, :only => :index
accept_key_auth :index
- helper :watchers
def index
case params[:format]
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index ea2ddd132..bedb1ac3d 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -32,14 +32,9 @@ class ProjectsController < ApplicationController
end
end
- helper :sort
include SortHelper
- helper :custom_fields
include CustomFieldsHelper
- helper :issues
- helper :queries
include QueriesHelper
- helper :repositories
include RepositoriesHelper
include ProjectsHelper
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index f2e146b2f..409a430d7 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -18,7 +18,6 @@
class SearchController < ApplicationController
before_filter :find_optional_project
- helper :messages
include MessagesHelper
def index
diff --git a/app/controllers/time_entry_reports_controller.rb b/app/controllers/time_entry_reports_controller.rb
index dd02ff8ff..a44254bdc 100644
--- a/app/controllers/time_entry_reports_controller.rb
+++ b/app/controllers/time_entry_reports_controller.rb
@@ -3,12 +3,8 @@ class TimeEntryReportsController < ApplicationController
before_filter :find_optional_project
before_filter :load_available_criterias
- helper :sort
include SortHelper
- helper :issues
- helper :timelog
include TimelogHelper
- helper :custom_fields
include CustomFieldsHelper
def report
diff --git a/app/controllers/timelog_controller.rb b/app/controllers/timelog_controller.rb
index 604a8f244..50c68929d 100644
--- a/app/controllers/timelog_controller.rb
+++ b/app/controllers/timelog_controller.rb
@@ -23,11 +23,8 @@ class TimelogController < ApplicationController
before_filter :find_optional_project, :only => [:index]
accept_key_auth :index, :show, :create, :update, :destroy
- helper :sort
include SortHelper
- helper :issues
include TimelogHelper
- helper :custom_fields
include CustomFieldsHelper
def index
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index c0ab99a37..c39551668 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -22,9 +22,7 @@ class UsersController < ApplicationController
before_filter :find_user, :only => [:show, :edit, :update, :edit_membership, :destroy_membership]
accept_key_auth :index, :show, :create, :update
- helper :sort
include SortHelper
- helper :custom_fields
include CustomFieldsHelper
def index
diff --git a/app/controllers/versions_controller.rb b/app/controllers/versions_controller.rb
index 03af71b99..97e73296d 100644
--- a/app/controllers/versions_controller.rb
+++ b/app/controllers/versions_controller.rb
@@ -23,8 +23,6 @@ class VersionsController < ApplicationController
before_filter :find_project, :only => [:index, :new, :create, :close_completed]
before_filter :authorize
- helper :custom_fields
- helper :projects
def index
@trackers = @project.trackers.find(:all, :order => 'position')
diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb
index 5b87f902a..6ad8639f2 100644
--- a/app/controllers/wiki_controller.rb
+++ b/app/controllers/wiki_controller.rb
@@ -38,9 +38,7 @@ class WikiController < ApplicationController
verify :method => :post, :only => [:protect], :redirect_to => { :action => :show }
- helper :attachments
include AttachmentsHelper
- helper :watchers
# List of pages, sorted alphabetically and by parent (hierarchy)
def index
--
GitLab