From 5f108dfb0f55c84018d30fe963ef1e79d8cec572 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Tue, 27 May 2008 18:35:04 +0000 Subject: [PATCH] Few fixes. git-svn-id: http://redmine.rubyforge.org/svn/branches/work@1470 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- rails-2.1/app/controllers/projects_controller.rb | 2 +- rails-2.1/db/migrate/072_add_enumerations_position.rb | 2 +- rails-2.1/db/migrate/078_add_custom_fields_position.rb | 2 +- rails-2.1/lib/tabular_form_builder.rb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rails-2.1/app/controllers/projects_controller.rb b/rails-2.1/app/controllers/projects_controller.rb index d15c6bc2a..5e1bdc593 100644 --- a/rails-2.1/app/controllers/projects_controller.rb +++ b/rails-2.1/app/controllers/projects_controller.rb @@ -52,7 +52,7 @@ class ProjectsController < ApplicationController respond_to do |format| format.html { @project_tree = projects.group_by {|p| p.parent || p} - @project_tree.each_key {|p| @project_tree[p] -= [p]} + @project_tree.keys.each {|p| @project_tree[p] -= [p]} } format.atom { render_feed(projects.sort_by(&:created_on).reverse.slice(0, Setting.feeds_limit.to_i), diff --git a/rails-2.1/db/migrate/072_add_enumerations_position.rb b/rails-2.1/db/migrate/072_add_enumerations_position.rb index e0beaf395..22558a6e9 100644 --- a/rails-2.1/db/migrate/072_add_enumerations_position.rb +++ b/rails-2.1/db/migrate/072_add_enumerations_position.rb @@ -1,7 +1,7 @@ class AddEnumerationsPosition < ActiveRecord::Migration def self.up add_column(:enumerations, :position, :integer, :default => 1) unless Enumeration.column_names.include?('position') - Enumeration.find(:all).group_by(&:opt).each_value do |enums| + Enumeration.find(:all).group_by(&:opt).each do |opt, enums| enums.each_with_index do |enum, i| # do not call model callbacks Enumeration.update_all "position = #{i+1}", {:id => enum.id} diff --git a/rails-2.1/db/migrate/078_add_custom_fields_position.rb b/rails-2.1/db/migrate/078_add_custom_fields_position.rb index 7ee8abb58..1c42ae732 100644 --- a/rails-2.1/db/migrate/078_add_custom_fields_position.rb +++ b/rails-2.1/db/migrate/078_add_custom_fields_position.rb @@ -1,7 +1,7 @@ class AddCustomFieldsPosition < ActiveRecord::Migration def self.up add_column(:custom_fields, :position, :integer, :default => 1) - CustomField.find(:all).group_by(&:type).each_value do |fields| + CustomField.find(:all).group_by(&:type).each do |t, fields| fields.each_with_index do |field, i| # do not call model callbacks CustomField.update_all "position = #{i+1}", {:id => field.id} diff --git a/rails-2.1/lib/tabular_form_builder.rb b/rails-2.1/lib/tabular_form_builder.rb index 5b331fe3f..88e35a6d2 100644 --- a/rails-2.1/lib/tabular_form_builder.rb +++ b/rails-2.1/lib/tabular_form_builder.rb @@ -22,7 +22,7 @@ class TabularFormBuilder < ActionView::Helpers::FormBuilder def initialize(object_name, object, template, options, proc) set_language_if_valid options.delete(:lang) - @object_name, @object, @template, @options, @proc = object_name, object, template, options, proc + super end (field_helpers - %w(radio_button hidden_field) + %w(date_select)).each do |selector|