Skip to content
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

Jump to bottom

Change Utils module name to prevent collissions #105

Closed
wants to merge 1 commit into from
Closed

Change Utils module name to prevent collissions #105

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions lib/breadcrumbs_on_rails/action_controller.rb
View file
Open in desktop
Expand Up @@ -31,7 +31,7 @@ def breadcrumbs
@breadcrumbs ||= []
end

module Utils
module ActionControllerUtils

def self.instance_proc(string)
if string.kind_of?(String)
Expand Down Expand Up @@ -66,9 +66,9 @@ module ClassMethods

def add_breadcrumb(name, path = nil, filter_options = {})
# This isn't really nice here
if eval = Utils.convert_to_set_of_strings(filter_options.delete(:eval), %w(name path))
name = Utils.instance_proc(name) if eval.include?("name")
path = Utils.instance_proc(path) if eval.include?("path")
if eval = ActionControllerUtils.convert_to_set_of_strings(filter_options.delete(:eval), %w(name path))
name = ActionControllerUtils.instance_proc(name) if eval.include?("name")
path = ActionControllerUtils.instance_proc(path) if eval.include?("path")
end

element_options = filter_options.delete(:options) || {}
Expand Down