From e921d70e5331ddfbc8c6e95818a4abfa48748e0d Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 23 Dec 2012 15:18:39 +0000 Subject: [PATCH] Moved routes helper methods to an helper. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11075 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/application_controller.rb | 12 ++------- app/helpers/routes_helper.rb | 31 +++++++++++++++++++++++ 2 files changed, 33 insertions(+), 10 deletions(-) create mode 100644 app/helpers/routes_helper.rb diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 019048c4f..d239b734c 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -23,6 +23,8 @@ class Unauthorized < Exception; end class ApplicationController < ActionController::Base include Redmine::I18n include Redmine::Pagination + include RoutesHelper + helper :routes class_attribute :accept_api_auth_actions class_attribute :accept_rss_auth_actions @@ -335,16 +337,6 @@ class ApplicationController < ActionController::Base url end - # Returns the path to project issues or to the cross-project - # issue list if project is nil - def _issues_path(project, *args) - if project - project_issues_path(project, *args) - else - issues_path(*args) - end - end - def redirect_back_or_default(default) back_url = params[:back_url].to_s if back_url.present? diff --git a/app/helpers/routes_helper.rb b/app/helpers/routes_helper.rb new file mode 100644 index 000000000..5a517aae7 --- /dev/null +++ b/app/helpers/routes_helper.rb @@ -0,0 +1,31 @@ +# encoding: utf-8 +# +# Redmine - project management software +# Copyright (C) 2006-2012 Jean-Philippe Lang +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +module RoutesHelper + + # Returns the path to project issues or to the cross-project + # issue list if project is nil + def _issues_path(project, *args) + if project + project_issues_path(project, *args) + else + issues_path(*args) + end + end +end -- 2.39.5