Skip to content

Commit

Permalink
Moved routes helper methods to an helper.
Browse files Browse the repository at this point in the history
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11075 e93f8b46-1217-0410-a6f0-8f06a7374b81
  • Loading branch information
jplang committed Dec 23, 2012
1 parent 1528c71 commit e921d70
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 10 deletions.
12 changes: 2 additions & 10 deletions app/controllers/application_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -335,16 +337,6 @@ def back_url
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?
Expand Down
31 changes: 31 additions & 0 deletions app/helpers/routes_helper.rb
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit e921d70

Please sign in to comment.