jro_apps/redmine Commit - r2232:260373aed71e

Slight changes to ease Rails 2.2 support....

Jean-Philippe Lang -

r2232:260373aed71e

parent child

Context file:

r2232:260373aed71e

Collapse all files

lib/redmine/utils.rb created 644 +38 0

@@ -0,0 +1,38
	1	# Redmine - project management software
	2	# Copyright (C) 2006-2009 Jean-Philippe Lang
	3	#
	4	# This program is free software; you can redistribute it and/or
	5	# modify it under the terms of the GNU General Public License
	6	# as published by the Free Software Foundation; either version 2
	7	# of the License, or (at your option) any later version.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License
	15	# along with this program; if not, write to the Free Software
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17
	18	module Redmine
	19	module Utils
	20	class << self
	21	# Returns the relative root url of the application
	22	def relative_url_root
	23	ActionController::Base.respond_to?('relative_url_root') ?
	24	ActionController::Base.relative_url_root.to_s :
	25	ActionController::AbstractRequest.relative_url_root.to_s
	26	end
	27
	28	# Sets the relative root url of the application
	29	def relative_url_root=(arg)
	30	if ActionController::Base.respond_to?('relative_url_root=')
	31	ActionController::Base.relative_url_root=arg
	32	else
	33	ActionController::AbstractRequest.relative_url_root=arg
	34	end
	35	end
	36	end
	37	end
	38	end

app/controllers/settings_controller.rb +1 -1

                 @deliveries = ActionMailer::Base.perform_deliveries
                 @guessed_host_and_path = request.host_with_port
-                @guessed_host_and_path << ('/'+ request.relative_url_root.gsub(%r{^\/}, '')) unless request.relative_url_root.blank?
+                @guessed_host_and_path << ('/'+ Redmine::Utils.relative_url_root.gsub(%r{^\/}, '')) unless Redmine::Utils.relative_url_root.blank?
               end
               def plugin

app/models/mailer.rb +2 -2

                 # URL options
                 h = Setting.host_name
-                h = h.to_s.gsub(%r{\/.*$}, '') unless ActionController::AbstractRequest.relative_url_root.blank?
+                h = h.to_s.gsub(%r{\/.*$}, '') unless Redmine::Utils.relative_url_root.blank?
                 default_url_options[:host] = h
                 default_url_options[:protocol] = Setting.protocol
               # Renders a message with the corresponding layout
               def render_message(method_name, body)
-                layout = method_name.match(%r{text\.html\.(rhtml|rxml)}) ? 'layout.text.html.rhtml' : 'layout.text.plain.rhtml'
+                layout = method_name.to_s.match(%r{text\.html\.(rhtml|rxml)}) ? 'layout.text.html.rhtml' : 'layout.text.plain.rhtml'
                 body[:content_for_layout] = render(:file => method_name, :body => body)
                 ActionView::Base.new(template_root, body, self).render(:file => "mailer/#{layout}", :use_full_path => true)
               end

lib/redmine/wiki_formatting/textile/helper.rb +1 -2

                   module Helper
                     def wikitoolbar_for(field_id)
                       # Is there a simple way to link to a public resource?
-                      prefix = (ActionController::Base.respond_to?(:relative_url_root) ? ActionController::Base.relative_url_root : ActionController::AbstractRequest.relative_url_root)
+                      url = "#{Redmine::Utils.relative_url_root}/help/wiki_syntax.html"
-                      url = "#{prefix}/help/wiki_syntax.html"
                       help_link = l(:setting_text_formatting) + ': ' +
                         link_to(l(:label_help), url,

test/unit/mailer_test.rb +6 -6

               end
               def test_generated_links_with_prefix
-                relative_url_root = ActionController::AbstractRequest.relative_url_root
+                relative_url_root = Redmine::Utils.relative_url_root
                 ActionMailer::Base.deliveries.clear
                 Setting.host_name = 'mydomain.foo/rdm'
                 Setting.protocol = 'http'
-                ActionController::AbstractRequest.relative_url_root = '/rdm'
+                Redmine::Utils.relative_url_root = '/rdm'
                 journal = Journal.find(2)
                 assert Mailer.deliver_issue_edit(journal)
                 assert mail.body.include?('<a href="http://mydomain.foo/rdm/repositories/revision/ecookbook/2" class="changeset" title="This commit fixes #1, #2 and references #1 &amp; #3">r2</a>')
               ensure
                 # restore it
-                ActionController::AbstractRequest.relative_url_root = relative_url_root
+                Redmine::Utils.relative_url_root = relative_url_root
               end
               def test_generated_links_with_prefix_and_no_relative_url_root
-                relative_url_root = ActionController::AbstractRequest.relative_url_root
+                relative_url_root = Redmine::Utils.relative_url_root
                 ActionMailer::Base.deliveries.clear
                 Setting.host_name = 'mydomain.foo/rdm'
                 Setting.protocol = 'http'
-                ActionController::AbstractRequest.relative_url_root = nil
+                Redmine::Utils.relative_url_root = nil
                 journal = Journal.find(2)
                 assert Mailer.deliver_issue_edit(journal)
                 assert mail.body.include?('<a href="http://mydomain.foo/rdm/repositories/revision/ecookbook/2" class="changeset" title="This commit fixes #1, #2 and references #1 &amp; #3">r2</a>')
               ensure
                 # restore it
-                ActionController::AbstractRequest.relative_url_root = relative_url_root
+                Redmine::Utils.relative_url_root = relative_url_root
               end
               def test_plain_text_mail

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages