@@ -1,8 +1 @@ -puts "Agile Mantis Navigation in use." -begin - primary_sort_order = AGILE_MANTIS_NAVIGATION_PRIMARY_SORT_ORDER -rescue - primary_sort_order = nil -end -$navlinks = AgileMantisNavigation.new(RAILS_ROOT,primary_sort_order) require 'agile_mantis_navigation_links.rb' \ No newline at end of file plugins/agile_mantis_navigation/init.rb @@ -7,7 +7,11 @@ class AgileMantisNavigation if sort_order self.primary_sort_order = sort_order else - self.primary_sort_order = :name + begin + self.primary_sort_order = AGILE_MANTIS_NAVIGATION_PRIMARY_SORT_ORDER + rescue + self.primary_sort_order = :name + end end @primary_links = [] Dir["#{RAILS_ROOT}/app/controllers/**/*_controller.rb"].entries.each do |controller| plugins/agile_mantis_navigation/lib/agile_mantis_navigation.rb @@ -3,7 +3,6 @@ include ActionView::Helpers::UrlHelper def self.included(base) base.send :helper_method, :agile_mantis_navigation_links - #base.send :helper_method, :display_link end def agile_mantis_navigation_links(separator =nil) @@ -12,6 +11,9 @@ def agile_mantis_navigation_links(separator =nil) current_route = ActionController::Routing::Routes.recognize_path(uri) current_route[:controller] = "/" + current_route[:controller] out = "<ul>" + + $navlinks ||= AgileMantisNavigation.new(RAILS_ROOT) + $navlinks.primary.each do |am_link| if display_link(am_link[:controller],am_link[:permission]) out << "<li>" plugins/agile_mantis_navigation/lib/agile_mantis_navigation_links.rb 8a428442453a5ef7f75e2eafb9793c02b6ce5590 Brian Ledworth brian@ledsworth.com http://github.com/AgileMantis/agile-mantis-navigation/commit/baeef83a05d998d3ea83123da366c1b61888d70c baeef83a05d998d3ea83123da366c1b61888d70c 2009-08-01T05:52:54-07:00 2009-08-01T05:52:54-07:00 Bug fix. Moved init of to first fire. Issues when other controller plugins were not initialized during agm init. 95292848854cca09a7bc3a6ffcc4c5f01de94ed1 Brian Ledworth brian@ledsworth.com