test/functional/sys_api_test.rb vendor/plugins/actionwebservice/CHANGELOG vendor/plugins/actionwebservice/MIT-LICENSE vendor/plugins/actionwebservice/README vendor/plugins/actionwebservice/Rakefile vendor/plugins/actionwebservice/TODO vendor/plugins/actionwebservice/init.rb vendor/plugins/actionwebservice/install.rb vendor/plugins/actionwebservice/lib/action_web_service.rb vendor/plugins/actionwebservice/lib/action_web_service/api.rb vendor/plugins/actionwebservice/lib/action_web_service/base.rb vendor/plugins/actionwebservice/lib/action_web_service/casting.rb vendor/plugins/actionwebservice/lib/action_web_service/client.rb vendor/plugins/actionwebservice/lib/action_web_service/client/base.rb vendor/plugins/actionwebservice/lib/action_web_service/client/soap_client.rb vendor/plugins/actionwebservice/lib/action_web_service/client/xmlrpc_client.rb vendor/plugins/actionwebservice/lib/action_web_service/container.rb vendor/plugins/actionwebservice/lib/action_web_service/container/action_controller_container.rb vendor/plugins/actionwebservice/lib/action_web_service/container/delegated_container.rb vendor/plugins/actionwebservice/lib/action_web_service/container/direct_container.rb vendor/plugins/actionwebservice/lib/action_web_service/dispatcher.rb vendor/plugins/actionwebservice/lib/action_web_service/dispatcher/abstract.rb vendor/plugins/actionwebservice/lib/action_web_service/dispatcher/action_controller_dispatcher.rb vendor/plugins/actionwebservice/lib/action_web_service/invocation.rb vendor/plugins/actionwebservice/lib/action_web_service/protocol.rb vendor/plugins/actionwebservice/lib/action_web_service/protocol/abstract.rb vendor/plugins/actionwebservice/lib/action_web_service/protocol/discovery.rb vendor/plugins/actionwebservice/lib/action_web_service/protocol/soap_protocol.rb vendor/plugins/actionwebservice/lib/action_web_service/protocol/soap_protocol/marshaler.rb vendor/plugins/actionwebservice/lib/action_web_service/protocol/xmlrpc_protocol.rb vendor/plugins/actionwebservice/lib/action_web_service/scaffolding.rb vendor/plugins/actionwebservice/lib/action_web_service/struct.rb vendor/plugins/actionwebservice/lib/action_web_service/support/class_inheritable_options.rb vendor/plugins/actionwebservice/lib/action_web_service/support/signature_types.rb vendor/plugins/actionwebservice/lib/action_web_service/templates/scaffolds/layout.erb vendor/plugins/actionwebservice/lib/action_web_service/templates/scaffolds/layout.rhtml vendor/plugins/actionwebservice/lib/action_web_service/templates/scaffolds/methods.erb vendor/plugins/actionwebservice/lib/action_web_service/templates/scaffolds/methods.rhtml vendor/plugins/actionwebservice/lib/action_web_service/templates/scaffolds/parameters.erb vendor/plugins/actionwebservice/lib/action_web_service/templates/scaffolds/parameters.rhtml vendor/plugins/actionwebservice/lib/action_web_service/templates/scaffolds/result.erb vendor/plugins/actionwebservice/lib/action_web_service/templates/scaffolds/result.rhtml vendor/plugins/actionwebservice/lib/action_web_service/test_invoke.rb vendor/plugins/actionwebservice/lib/action_web_service/version.rb vendor/plugins/actionwebservice/lib/actionwebservice.rb vendor/plugins/actionwebservice/setup.rb vendor/plugins/acts_as_list/README vendor/plugins/acts_as_list/init.rb vendor/plugins/acts_as_list/lib/active_record/acts/list.rb vendor/plugins/acts_as_list/test/list_test.rb vendor/plugins/acts_as_tree/README vendor/plugins/acts_as_tree/Rakefile vendor/plugins/acts_as_tree/init.rb vendor/plugins/acts_as_tree/lib/active_record/acts/tree.rb vendor/plugins/acts_as_tree/test/abstract_unit.rb vendor/plugins/acts_as_tree/test/acts_as_tree_test.rb vendor/plugins/acts_as_tree/test/database.yml vendor/plugins/acts_as_tree/test/fixtures/mixin.rb vendor/plugins/acts_as_tree/test/fixtures/mixins.yml vendor/plugins/acts_as_tree/test/schema.rb vendor/plugins/classic_pagination/CHANGELOG vendor/plugins/classic_pagination/README vendor/plugins/classic_pagination/Rakefile vendor/plugins/classic_pagination/init.rb vendor/plugins/classic_pagination/install.rb vendor/plugins/classic_pagination/lib/pagination.rb vendor/plugins/classic_pagination/lib/pagination_helper.rb vendor/plugins/classic_pagination/test/fixtures/companies.yml vendor/plugins/classic_pagination/test/fixtures/company.rb vendor/plugins/classic_pagination/test/fixtures/developer.rb vendor/plugins/classic_pagination/test/fixtures/developers.yml vendor/plugins/classic_pagination/test/fixtures/developers_projects.yml vendor/plugins/classic_pagination/test/fixtures/project.rb vendor/plugins/classic_pagination/test/fixtures/projects.yml vendor/plugins/classic_pagination/test/fixtures/replies.yml vendor/plugins/classic_pagination/test/fixtures/reply.rb vendor/plugins/classic_pagination/test/fixtures/schema.sql vendor/plugins/classic_pagination/test/fixtures/topic.rb vendor/plugins/classic_pagination/test/fixtures/topics.yml vendor/plugins/classic_pagination/test/helper.rb vendor/plugins/classic_pagination/test/pagination_helper_test.rb vendor/plugins/classic_pagination/test/pagination_test.rb @@ -90,9 +90,10 @@ class SearchController < ApplicationController end else operator = @all_words ? ' AND ' : ' OR ' - Project.with_scope(:find => {:conditions => Project.visible_by(User.current)}) do - @results += Project.find(:all, :limit => limit, :conditions => [ (["(LOWER(name) like ? OR LOWER(description) like ?)"] * like_tokens.size).join(operator), * (like_tokens * 2).sort] ) if @scope.include? 'projects' - end + @results += Project.find(:all, + :limit => limit, + :conditions => [ (["(#{Project.visible_by(User.current)}) AND (LOWER(name) like ? OR LOWER(description) like ?)"] * like_tokens.size).join(operator), * (like_tokens * 2).sort] + ) if @scope.include? 'projects' # if only one project is found, user is redirected to its overview redirect_to :controller => 'projects', :action => 'show', :id => @results.first and return if @results.size == 1 end app/controllers/search_controller.rb @@ -150,6 +150,11 @@ class Mailer < ActionMailer::Base def render_message(method_name, body) layout = method_name.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(File.join(template_root, 'mailer'), body, self).render(:file => layout) + ActionView::Base.new(template_root, body, self).render(:file => "mailer/#{layout}") end + + # Makes partial rendering work with Rails 1.2 (retro-compatibility) + def self.controller_path + '' + end unless respond_to?('controller_path') end app/models/mailer.rb @@ -20,7 +20,7 @@ class Project < ActiveRecord::Base STATUS_ACTIVE = 1 STATUS_ARCHIVED = 9 - has_many :members, :dependent => :delete_all, :include => :user, :conditions => "#{User.table_name}.status=#{User::STATUS_ACTIVE}" + has_many :members, :include => :user, :conditions => "#{User.table_name}.status=#{User::STATUS_ACTIVE}" has_many :users, :through => :members has_many :custom_values, :dependent => :delete_all, :as => :customized has_many :enabled_modules, :dependent => :delete_all @@ -62,6 +62,8 @@ class Project < ActiveRecord::Base validates_length_of :identifier, :in => 3..20 validates_format_of :identifier, :with => /^[a-z0-9\-]*$/ + before_destroy :delete_all_members + def identifier=(identifier) super unless identifier_frozen? end @@ -129,6 +131,11 @@ class Project < ActiveRecord::Base children.select {|child| child.active?} end + # Deletes all project's members + def delete_all_members + Member.delete_all(['project_id = ?', id]) + end + # Users issues can be assigned to def assignable_users members.select {|m| m.role.assignable?}.collect {|m| m.user}.sort app/models/project.rb @@ -1,3 +1,3 @@ <%= l(:text_issue_added, "##{@issue.id}") %> <hr /> -<%= render :file => "_issue_text_html", :use_full_path => true, :locals => { :issue => @issue, :issue_url => @issue_url } %> +<%= render :partial => "issue_text_html", :locals => { :issue => @issue, :issue_url => @issue_url } %> app/views/mailer/issue_add.text.html.rhtml @@ -1,3 +1,3 @@ <%= l(:text_issue_added, "##{@issue.id}") %> ---------------------------------------- -<%= render :file => "_issue_text_plain", :use_full_path => true, :locals => { :issue => @issue, :issue_url => @issue_url } %> +<%= render :partial => "issue_text_plain", :locals => { :issue => @issue, :issue_url => @issue_url } %> app/views/mailer/issue_add.text.plain.rhtml @@ -7,4 +7,4 @@ </ul> <%= textilizable(@journal.notes) %> <hr /> -<%= render :file => "_issue_text_html", :use_full_path => true, :locals => { :issue => @issue, :issue_url => @issue_url } %> +<%= render :partial => "issue_text_html", :locals => { :issue => @issue, :issue_url => @issue_url } %> app/views/mailer/issue_edit.text.html.rhtml @@ -5,4 +5,4 @@ <% end %> <%= @journal.notes if @journal.notes? %> ---------------------------------------- -<%= render :file => "_issue_text_plain", :use_full_path => true, :locals => { :issue => @issue, :issue_url => @issue_url } %> +<%= render :partial => "issue_text_plain", :locals => { :issue => @issue, :issue_url => @issue_url } %> app/views/mailer/issue_edit.text.plain.rhtml @@ -23,6 +23,7 @@ Rails::Initializer.run do |config| # Use the database for sessions instead of the file system # (create the session table with 'rake create_sessions_table') # config.action_controller.session_store = :active_record_store + config.action_controller.session_store = :PStore # Enable page/fragment caching by setting a file-based store # (remember to create the caching directory and make it readable to the application) config/environment.rb @@ -8,9 +8,6 @@ config.cache_classes = false # Log error messages when you accidentally call methods on nil. config.whiny_nils = true -# Enable the breakpoint server that script/breakpointer connects to -config.breakpoint_server = true - # Show full error reports and disable caching config.action_controller.consider_all_requests_local = true config.action_controller.perform_caching = false config/environments/development.rb @@ -17,4 +17,11 @@ members_003: role_id: 2 id: 3 user_id: 2 +members_004: + id: 4 + created_on: 2006-07-19 19:35:36 +02:00 + project_id: 1 + role_id: 2 + # Locked user + user_id: 5 \ No newline at end of file test/fixtures/members.yml @@ -59,3 +59,19 @@ users_003: auth_source_id: mail_notification: true login: dlopper +users_005: + id: 5 + created_on: 2006-07-19 19:33:19 +02:00 + # Locked + status: 3 + last_login_on: + language: en + hashed_password: 7feb7657aa7a7bf5aef3414a5084875f27192415 + updated_on: 2006-07-19 19:33:19 +02:00 + admin: false + mail: dlopper2@somenet.foo + lastname: Lopper2 + firstname: Dave2 + auth_source_id: + mail_notification: true + login: dlopper2 test/fixtures/users.yml @@ -18,7 +18,7 @@ require File.dirname(__FILE__) + '/../test_helper' class ProjectTest < Test::Unit::TestCase - fixtures :projects, :issues, :issue_statuses, :journals, :journal_details + fixtures :projects, :issues, :issue_statuses, :journals, :journal_details, :users, :members, :roles def setup @ecookbook = Project.find(1) @@ -80,8 +80,16 @@ class ProjectTest < Test::Unit::TestCase end def test_destroy + # 2 active members + assert_equal 2, @ecookbook.members.size + # and 1 is locked + assert_equal 3, Member.find(:all, :conditions => ['project_id = ?', @ecookbook.id]).size + @ecookbook.destroy + # make sure that the project non longer exists assert_raise(ActiveRecord::RecordNotFound) { Project.find(@ecookbook.id) } + # make sure all members have been removed + assert_equal 0, Member.find(:all, :conditions => ['project_id = ?', @ecookbook.id]).size end def test_subproject_ok test/unit/project_test.rb f58db70bdecdbfd0a0d81c0c452d58b88391f9f1 Jean-Philippe Lang jp_lang@yahoo.fr http://github.com/edavis10/redmine/commit/6d9490ddcc9c501d31a8b403146cd4ba6d8cc5b5 6d9490ddcc9c501d31a8b403146cd4ba6d8cc5b5 2007-12-10T09:58:07-08:00 2007-12-10T09:58:07-08:00 Merged Rails 2.0 compatibility changes. Compatibility with Rails 1.2 is preserved. git-svn-id: http://redmine.rubyforge.org/svn/trunk@975 e93f8b46-1217-0410-a6f0-8f06a7374b81 ad4a6a8cbc3ec2dadf61886a67c19ffc66ec6710 Jean-Philippe Lang jp_lang@yahoo.fr