[DRE-commits] r4459 - in trunk/redmine/debian: . patches

[Jérémy Lal]

Author: kapouer-guest
Date: 2009-12-13 00:10:58 +0000 (Sun, 13 Dec 2009)
New Revision: 4459

Modified:
   trunk/redmine/debian/changelog
   trunk/redmine/debian/patches/revert_rails_2.3.patch
Log:
Converts to Hash where OrderedHash is used, since in rails 2.2 it inherits from Array, not Hash.

Modified: trunk/redmine/debian/changelog
===================================================================
--- trunk/redmine/debian/changelog	2009-12-13 00:10:37 UTC (rev 4458)
+++ trunk/redmine/debian/changelog	2009-12-13 00:10:58 UTC (rev 4459)
@@ -1,4 +1,4 @@
-redmine (0.9.0~svn3136-1) UNRELEASED; urgency=low
+redmine (0.9.0~svn3162-1) UNRELEASED; urgency=low
 
   * Upstream update.
   * Stop using deprecated dbfile param in database.yml.

Modified: trunk/redmine/debian/patches/revert_rails_2.3.patch
===================================================================
--- trunk/redmine/debian/patches/revert_rails_2.3.patch	2009-12-13 00:10:37 UTC (rev 4458)
+++ trunk/redmine/debian/patches/revert_rails_2.3.patch	2009-12-13 00:10:58 UTC (rev 4459)
@@ -22,6 +22,19 @@
  
    def self.default
      # Creates a fake default scope so Enumeration.default will check
+diff --git a/app/models/issue.rb b/app/models/issue.rb
+index a550779..40d58d9 100644
+--- a/app/models/issue.rb
++++ b/app/models/issue.rb
+@@ -157,7 +157,7 @@ class Issue < ActiveRecord::Base
+     if new_tracker_id
+       self.tracker_id = new_tracker_id
+     end
+-    self.attributes_without_tracker_first = new_attributes, *args
++    self.attributes_without_tracker_first = new_attributes.to_hash, *args
+   end
+   alias_method_chain :attributes=, :tracker_first
+   
 diff --git a/app/models/mail_handler.rb b/app/models/mail_handler.rb
 index cda556f..5eeb89c 100644
 --- a/app/models/mail_handler.rb
@@ -219,6 +232,20 @@
    end
  
    # Makes partial rendering work with Rails 1.2 (retro-compatibility)
+diff --git a/app/models/query.rb b/app/models/query.rb
+index 2e1680a..33d9491 100644
+--- a/app/models/query.rb
++++ b/app/models/query.rb
+@@ -429,6 +429,9 @@ class Query < ActiveRecord::Base
+         r = r.keys.inject({}) {|h, k| h[c.custom_field.cast_value(k)] = r[k]; h}
+       end
+     end
++    if !r.nil? && r.is_a?(ActiveSupport::OrderedHash)
++      r = r.to_hash
++    end
+     r
+   rescue ::ActiveRecord::StatementInvalid => e
+     raise StatementInvalid.new(e.message)
 diff --git a/config/environment.rb b/config/environment.rb
 index 1df06f5..1f7d23e 100644
 --- a/config/environment.rb