jro_apps/redmine Commit - r5985:102c9afadfd6

Revert r6104 "Merged r6098 from trunk."...

Jean-Baptiste Barth -

r5985:102c9afadfd6

parent child

Context file:

r5985:102c9afadfd6

Collapse all files

app/models/attachment.rb +1 -1

                                                                     "LEFT JOIN #{Project.table_name} ON #{Document.table_name}.project_id = #{Project.table_name}.id"}
               cattr_accessor :storage_path
-              @@storage_path = Redmine::Configuration['attachments_storage_path'] || "#{Rails.root}/files"
+              @@storage_path = Redmine::Configuration['attachments_storage_path'] || "#{RAILS_ROOT}/files"
               def validate
                 if self.filesize > Setting.attachment_max_size.to_i.kilobytes

app/models/project.rb +1 -21

@@ -544,27 +544,7 class Project < ActiveRecord::Base
544	def enabled_module_names	544	def enabled_module_names
545	enabled_modules.collect(&:name)	545	enabled_modules.collect(&:name)
546	end	546	end
547		547
548	# Enable a specific module
549	#
550	# Examples:
551	# project.enable_module!(:issue_tracking)
552	# project.enable_module!("issue_tracking")
553	def enable_module!(name)
554	enabled_modules << EnabledModule.new(:name => name.to_s) unless module_enabled?(name)
555	end
556
557	# Disable a module if it exists
558	#
559	# Examples:
560	# project.disable_module!(:issue_tracking)
561	# project.disable_module!("issue_tracking")
562	# project.disable_module!(project.enabled_modules.first)
563	def disable_module!(target)
564	target = enabled_modules.detect{\|mod\| target.to_s == mod.name} unless enabled_modules.include?(target)
565	target.destroy unless target.blank?
566	end
567
568	safe_attributes 'name',	548	safe_attributes 'name',
569	'description',	549	'description',
570	'homepage',	550	'homepage',

app/models/setting.rb +1 -1

                               TIS-620)
               cattr_accessor :available_settings
-              @@available_settings = YAML::load(File.open("#{Rails.root}/config/settings.yml"))
+              @@available_settings = YAML::load(File.open("#{RAILS_ROOT}/config/settings.yml"))
               Redmine::Plugin.all.each do |plugin|
                 next unless plugin.settings
                 @@available_settings["plugin_#{plugin.id}"] = {'default' => plugin.settings[:default], 'serialized' => true}

lib/generators/redmine_plugin_controller/redmine_plugin_controller_generator.rb +1 -1

               end
               def destination_root
-                File.join(Rails.root, plugin_path)
+                File.join(RAILS_ROOT, plugin_path)
               end
               def manifest

lib/generators/redmine_plugin_model/redmine_plugin_model_generator.rb +1 -1

               end
               def destination_root
-                File.join(Rails.root, plugin_path)
+                File.join(RAILS_ROOT, plugin_path)
               end
               def manifest

lib/redmine/i18n.rb +3 -3

                 def month_name(month)
                   ::I18n.t('date.month_names')[month]
                 end
                 def valid_languages
-                  @@valid_languages ||= Dir.glob(File.join(Rails.root, 'config', 'locales', '*.yml')).collect {|f| File.basename(f).split('.').first}.collect(&:to_sym)
+                  @@valid_languages ||= Dir.glob(File.join(RAILS_ROOT, 'config', 'locales', '*.yml')).collect {|f| File.basename(f).split('.').first}.collect(&:to_sym)
                 end
                 def find_language(lang)
                   @@languages_lookup = valid_languages.inject({}) {|k, v| k[v.to_s.downcase] = v; k }
                   @@languages_lookup[lang.to_s.downcase]

lib/redmine/plugin.rb +5 -5

-            # Redmine - project management software
+            # redMine - project management software
-            # Copyright (C) 2006-2011  Jean-Philippe Lang
+            # Copyright (C) 2006-2007  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.
                   p.name(id.to_s.humanize) if p.name.nil?
                   # Adds plugin locales if any
                   # YAML translation files should be found under <plugin>/config/locales/
-                  ::I18n.load_path += Dir.glob(File.join(Rails.root, 'vendor', 'plugins', id.to_s, 'config', 'locales', '*.yml'))
+                  ::I18n.load_path += Dir.glob(File.join(RAILS_ROOT, 'vendor', 'plugins', id.to_s, 'config', 'locales', '*.yml'))
                   registered_plugins[id] = p
                 end

lib/redmine/scm/adapters/abstract_adapter.rb +1 -1

                       end
                       if Rails.env == 'development'
                         # Capture stderr when running in dev environment
-                        cmd = "#{cmd} 2>>#{Rails.root}/log/scm.stderr.log"
+                        cmd = "#{cmd} 2>>#{RAILS_ROOT}/log/scm.stderr.log"
                       end
                       begin
                         if RUBY_VERSION < '1.9'

lib/redmine/version.rb +1 -1

                 def self.revision
                   revision = nil
-                  entries_path = "#{Rails.root}/.svn/entries"
+                  entries_path = "#{RAILS_ROOT}/.svn/entries"
                   if File.readable?(entries_path)
                     begin
                       f = File.open(entries_path, 'r')

lib/redmine/views/my_page/block.rb +4 -4

             # Redmine - project management software
-            # Copyright (C) 2006-2011  Jean-Philippe Lang
+            # Copyright (C) 2006-2009  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 MyPage
                   module Block
                     def self.additional_blocks
-                      @@additional_blocks ||= Dir.glob("#{Rails.root}/vendor/plugins/*/app/views/my/blocks/_*.{rhtml,erb}").inject({}) do |h,file|
+                      @@additional_blocks ||= Dir.glob("#{RAILS_ROOT}/vendor/plugins/*/app/views/my/blocks/_*.{rhtml,erb}").inject({}) do |h,file|
                         name = File.basename(file).split('.').first.gsub(/^_/, '')
                         h[name] = name.to_sym
                         h

lib/tasks/extract_fixtures.rake +2 -3

               ActiveRecord::Base.establish_connection
               (ActiveRecord::Base.connection.tables - skip_tables).each do |table_name|
                 i = "000"
-                File.open("#{Rails.root}/#{table_name}.yml", 'w' ) do |file|
+                File.open("#{RAILS_ROOT}/#{table_name}.yml", 'w' ) do |file|
                   data = ActiveRecord::Base.connection.select_all(sql % table_name)
                   file.write data.inject({}) { |hash, record|
                     # cast extracted values
                   }.to_yaml
                 end
               end
             end

lib/tasks/initializers.rake +1 -1

             desc 'Generates a configuration file for cookie store sessions.'
             file 'config/initializers/session_store.rb' do
-              path = File.join(Rails.root, 'config', 'initializers', 'session_store.rb')
+              path = File.join(RAILS_ROOT, 'config', 'initializers', 'session_store.rb')
               secret = ActiveSupport::SecureRandom.hex(40)
               File.open(path, 'w') do |f|
                 f.write <<"EOF"

test/fixtures/repositories.yml +2 -2

             ---
             repositories_001:
               project_id: 1
-              url: file:///<%= Rails.root %>/tmp/test/subversion_repository
+              url: file:///<%= RAILS_ROOT.gsub(%r{config\/\.\.}, '') %>/tmp/test/subversion_repository
               id: 10
-              root_url: file:///<%= Rails.root %>/tmp/test/subversion_repository
+              root_url: file:///<%= RAILS_ROOT.gsub(%r{config\/\.\.}, '') %>/tmp/test/subversion_repository
               password: ""
               login: ""
               type: Subversion

test/functional/application_controller_test.rb +1 -1

               # check that all language files are valid
               def test_localization
-                lang_files_count = Dir["#{Rails.root}/config/locales/*.yml"].size
+                lang_files_count = Dir["#{RAILS_ROOT}/config/locales/*.yml"].size
                 assert_equal lang_files_count, valid_languages.size
                 valid_languages.each do |lang|
                   assert set_language_if_valid(lang)

test/functional/attachments_controller_test.rb +1 -1

                 @controller = AttachmentsController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
-                Attachment.storage_path = "#{Rails.root}/test/fixtures/files"
+                Attachment.storage_path = "#{RAILS_ROOT}/test/fixtures/files"
                 User.current = nil
               end

test/test_helper.rb +4 -6

               # Use a temporary directory for attachment related tests
               def set_tmp_attachments_directory
-                Dir.mkdir "#{Rails.root}/tmp/test" unless File.directory?("#{Rails.root}/tmp/test")
+                Dir.mkdir "#{RAILS_ROOT}/tmp/test" unless File.directory?("#{RAILS_ROOT}/tmp/test")
-                unless File.directory?("#{Rails.root}/tmp/test/attachments")
+                Dir.mkdir "#{RAILS_ROOT}/tmp/test/attachments" unless File.directory?("#{RAILS_ROOT}/tmp/test/attachments")
-                  Dir.mkdir "#{Rails.root}/tmp/test/attachments"
+                Attachment.storage_path = "#{RAILS_ROOT}/tmp/test/attachments"
-                end
-                Attachment.storage_path = "#{Rails.root}/tmp/test/attachments"
               end
               def with_settings(options, &block)
                 saved_settings = options.keys.inject({}) {|h, k| h[k] = Setting[k].dup; h}
                 options.each {|k, v| Setting[k] = v}

test/unit/lib/redmine/hook_test.rb +30 -30

-            # Redmine - project management software
+            # redMine - project management software
-            # Copyright (C) 2006-2011  Jean-Philippe Lang
+            # Copyright (C) 2006-2008  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.
             class Redmine::Hook::ManagerTest < ActiveSupport::TestCase
               fixtures :issues
               # Some hooks that are manually registered in these tests
               class TestHook < Redmine::Hook::ViewListener; end
               class TestHook1 < TestHook
                 def view_layouts_base_html_head(context)
                   'Test hook 1 listener.'
                   'Test hook 2 listener.'
                 end
               end
               class TestHook3 < TestHook
                 def view_layouts_base_html_head(context)
                   "Context keys: #{context.keys.collect(&:to_s).sort.join(', ')}."
                 end
               end
               class TestLinkToHook < TestHook
                 def view_layouts_base_html_head(context)
                   link_to('Issues', :controller => 'issues')
               class TestHookHelperController < ActionController::Base
                 include Redmine::Hook::Helper
               end
               class TestHookHelperView < ActionView::Base
                 include Redmine::Hook::Helper
               end
               Redmine::Hook.clear_listeners
               def setup
                 @hook_module = Redmine::Hook
               end
               def teardown
                 @hook_module.clear_listeners
               end
               def test_clear_listeners
                 assert_equal 0, @hook_module.hook_listeners(:view_layouts_base_html_head).size
                 @hook_module.add_listener(TestHook1)
                 @hook_module.add_listener(TestHook2)
                 assert_equal 2, @hook_module.hook_listeners(:view_layouts_base_html_head).size
                 @hook_module.clear_listeners
                 assert_equal 0, @hook_module.hook_listeners(:view_layouts_base_html_head).size
               end
               def test_add_listener
                 assert_equal 0, @hook_module.hook_listeners(:view_layouts_base_html_head).size
                 @hook_module.add_listener(TestHook1)
                 assert_equal 1, @hook_module.hook_listeners(:view_layouts_base_html_head).size
               end
               def test_call_hook
                 @hook_module.add_listener(TestHook1)
                 assert_equal ['Test hook 1 listener.'], hook_helper.call_hook(:view_layouts_base_html_head)
               end
               def test_call_hook_with_context
                 @hook_module.add_listener(TestHook3)
                 assert_equal ['Context keys: bar, controller, foo, project, request.'],
                              hook_helper.call_hook(:view_layouts_base_html_head, :foo => 1, :bar => 'a')
               end
               def test_call_hook_with_multiple_listeners
                 @hook_module.add_listener(TestHook1)
                 @hook_module.add_listener(TestHook2)
                 assert_equal ['Test hook 1 listener.', 'Test hook 2 listener.'], hook_helper.call_hook(:view_layouts_base_html_head)
               end
               # Context: Redmine::Hook::Helper.call_hook default_url
               def test_call_hook_default_url_options
                 @hook_module.add_listener(TestLinkToHook)
                 @hook_module.add_listener(TestHook3)
                 assert_match /project/i, hook_helper.call_hook(:view_layouts_base_html_head)[0]
               end
               def test_call_hook_from_controller_with_controller_added_to_context
                 @hook_module.add_listener(TestHook3)
                 assert_match /controller/i, hook_helper.call_hook(:view_layouts_base_html_head)[0]
               end
               def test_call_hook_from_controller_with_request_added_to_context
                 @hook_module.add_listener(TestHook3)
                 assert_match /request/i, hook_helper.call_hook(:view_layouts_base_html_head)[0]
               end
               def test_call_hook_from_view_with_project_added_to_context
                 @hook_module.add_listener(TestHook3)
                 assert_match /project/i, view_hook_helper.call_hook(:view_layouts_base_html_head)
               end
               def test_call_hook_from_view_with_controller_added_to_context
                 @hook_module.add_listener(TestHook3)
                 assert_match /controller/i, view_hook_helper.call_hook(:view_layouts_base_html_head)
               end
               def test_call_hook_from_view_with_request_added_to_context
                 @hook_module.add_listener(TestHook3)
                 assert_match /request/i, view_hook_helper.call_hook(:view_layouts_base_html_head)
               def test_call_hook_should_not_change_the_default_url_for_email_notifications
                 issue = Issue.find(1)
                 ActionMailer::Base.deliveries.clear
                 Mailer.deliver_issue_add(issue)
                 mail = ActionMailer::Base.deliveries.last
                 @hook_module.add_listener(TestLinkToHook)
                 hook_helper.call_hook(:view_layouts_base_html_head)
                 ActionMailer::Base.deliveries.clear
                 Mailer.deliver_issue_add(issue)
                 mail2 = ActionMailer::Base.deliveries.last
                 assert_equal mail.body, mail2.body
               end
               def hook_helper
                 @hook_helper ||= TestHookHelperController.new
               end
               def view_hook_helper
-                @view_hook_helper ||= TestHookHelperView.new(Rails.root.to_s + '/app/views')
+                @view_hook_helper ||= TestHookHelperView.new(RAILS_ROOT + '/app/views')
               end
             end

test/unit/project_test.rb 0 -48

@@ -597,54 +597,6 class ProjectTest < ActiveSupport::TestCase
597	end	597	end
598	end	598	end
599		599
600	context "enabled_modules" do
601	setup do
602	@project = Project.find(1)
603	end
604
605	should "define module by names and preserve ids" do
606	# Remove one module
607	modules = @project.enabled_modules.slice(0..-2)
608	assert modules.any?
609	assert_difference 'EnabledModule.count', -1 do
610	@project.enabled_module_names = modules.collect(&:name)
611	end
612	@project.reload
613	# Ids should be preserved
614	assert_equal @project.enabled_module_ids.sort, modules.collect(&:id).sort
615	end
616
617	should "enable a module" do
618	@project.enabled_module_names = []
619	@project.reload
620	assert_equal [], @project.enabled_module_names
621	#with string
622	@project.enable_module!("issue_tracking")
623	assert_equal ["issue_tracking"], @project.enabled_module_names
624	#with symbol
625	@project.enable_module!(:gantt)
626	assert_equal ["issue_tracking", "gantt"], @project.enabled_module_names
627	#don't add a module twice
628	@project.enable_module!("issue_tracking")
629	assert_equal ["issue_tracking", "gantt"], @project.enabled_module_names
630	end
631
632	should "disable a module" do
633	#with string
634	assert @project.enabled_module_names.include?("issue_tracking")
635	@project.disable_module!("issue_tracking")
636	assert ! @project.reload.enabled_module_names.include?("issue_tracking")
637	#with symbol
638	assert @project.enabled_module_names.include?("gantt")
639	@project.disable_module!(:gantt)
640	assert ! @project.reload.enabled_module_names.include?("gantt")
641	#with EnabledModule object
642	first_module = @project.enabled_modules.first
643	@project.disable_module!(first_module)
644	assert ! @project.reload.enabled_module_names.include?(first_module.name)
645	end
646	end
647
648	def test_enabled_module_names_should_not_recreate_enabled_modules	600	def test_enabled_module_names_should_not_recreate_enabled_modules
649	project = Project.find(1)	601	project = Project.find(1)
650	# Remove one module	602	# Remove one module

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