| @@ -144,7 +144,7 class User < ActiveRecord::Base | |||
|
|
144 | 144 | end |
|
|
145 | 145 | |
|
|
146 | 146 | def time_zone |
|
|
147 | @time_zone ||= (self.pref.time_zone.blank? ? nil : TimeZone[self.pref.time_zone]) | |
|
|
147 | @time_zone ||= (self.pref.time_zone.blank? ? nil : ActiveSupport::TimeZone[self.pref.time_zone]) | |
|
|
148 | 148 | end |
|
|
149 | 149 | |
|
|
150 | 150 | def wants_comments_in_reverse_order? |
| @@ -38,7 +38,7 | |||
|
|
38 | 38 | <div class="box tabular"> |
|
|
39 | 39 | <% fields_for :pref, @user.pref, :builder => TabularFormBuilder, :lang => current_language do |pref_fields| %> |
|
|
40 | 40 | <p><%= pref_fields.check_box :hide_mail %></p> |
|
|
41 | <p><%= pref_fields.select :time_zone, TimeZone.all.collect {|z| [ z.to_s, z.name ]}, :include_blank => true %></p> | |
|
|
41 | <p><%= pref_fields.select :time_zone, ActiveSupport::TimeZone.all.collect {|z| [ z.to_s, z.name ]}, :include_blank => true %></p> | |
|
|
42 | 42 | <p><%= pref_fields.select :comments_sorting, [[l(:label_chronological_order), 'asc'], [l(:label_reverse_chronological_order), 'desc']] %></p> |
|
|
43 | 43 | <% end %> |
|
|
44 | 44 | </div> |
| @@ -1,7 +1,7 | |||
|
|
1 | 1 | require 'action_web_service' |
|
|
2 | 2 | |
|
|
3 | 3 | # These need to be in the load path for action_web_service to work |
|
|
4 | Dependencies.load_paths += ["#{RAILS_ROOT}/app/apis"] | |
|
|
4 | ActiveSupport::Dependencies.load_paths += ["#{RAILS_ROOT}/app/apis"] | |
|
|
5 | 5 | |
|
|
6 | 6 | # AWS Test helpers |
|
|
7 | 7 | require 'action_web_service/test_invoke' if ENV['RAILS_ENV'] && ENV['RAILS_ENV'] =~ /^test/ |
| @@ -97,8 +97,8 module ActionController | |||
|
|
97 | 97 | "Unknown options: #{unknown_option_keys.join(', ')}" unless |
|
|
98 | 98 | unknown_option_keys.empty? |
|
|
99 | 99 | |
|
|
100 | options[:singular_name] ||= Inflector.singularize(collection_id.to_s) | |
|
|
101 | options[:class_name] ||= Inflector.camelize(options[:singular_name]) | |
|
|
100 | options[:singular_name] ||= ActiveSupport::Inflector.singularize(collection_id.to_s) | |
|
|
101 | options[:class_name] ||= ActiveSupport::Inflector.camelize(options[:singular_name]) | |
|
|
102 | 102 | end |
|
|
103 | 103 | |
|
|
104 | 104 | # Returns a paginator and a collection of Active Record model instances |
General Comments 0
You need to be logged in to leave comments.
Login now