[#289] Remove single helpers in favor of :all in ApplicationController

2011-04-20 16:08:00 -07:00 · 2011-04-20 16:08:00 -07:00 · 1eee7312f6
parent d14417070d
commit 1eee7312f6
23 changed files with 1 additions and 60 deletions
--- 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
--- 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
--- 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
  
--- 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
--- 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
--- 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)
--- 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'
--- 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
--- 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
--- 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
  
--- 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
--- 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],
--- 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
--- 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)
--- 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,
--- 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]
--- 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
  
--- 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
--- 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
--- 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
--- 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
--- 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')
--- 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