Skip to content

Rails 3.1 Compatibility #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zapnap wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Rails 3.1 Compatibility #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a13b6c5
Rails 3.1 compatibility
zapnap May 19, 2011
d2f51ca
fix deprecation warnings for Rails 3.1
zapnap May 23, 2011
505069d
This doesn't work quite the way I expected it to... :)
zapnap May 23, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/inherited_views/base.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class Base < ::InheritedResources::Base
#
# which would then use app/views/my_default_admin_views
#
class_inheritable_accessor :default_views
class_attribute :default_views
self.default_views = 'inherited_views_default'

# Add our default views to the base path
Expand Down Expand Up @@ -103,7 +103,7 @@ def resources_name
def render_or_default(name, args = {})
render name, args
rescue ActionView::MissingTemplate
render args.merge(:template => "#{self.class.default_views}/#{name}", :prefix => '')
render args.merge(:template => "#{self.class.default_views}/#{name}", :prefixes => '')
end

end
Expand Down
4 changes: 2 additions & 2 deletions lib/inherited_views/table_builder.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ def default_table_columns
# end
#
def table(*columns)
options = columns.extract_options!
options = columns.extract_options!

if options[:except]
options[:except] = options[:except].is_a?(Array) ? options[:except] : [options[:except]]
Expand All @@ -59,4 +59,4 @@ def table(*columns)

end
end
end
end