From 339558b2dcb98dbf0d0b417d7f94e39314ed7161 Mon Sep 17 00:00:00 2001 From: Frank Sweetser Date: Fri, 16 Apr 2010 11:34:19 -0400 Subject: [PATCH] Generate valid doc URLs for nested classes --- app/controllers/puppetclasses_controller.rb | 1 + app/views/puppetclasses/rdoc.erb | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/controllers/puppetclasses_controller.rb b/app/controllers/puppetclasses_controller.rb index ff2d8a4..2a9d615 100644 --- a/app/controllers/puppetclasses_controller.rb +++ b/app/controllers/puppetclasses_controller.rb @@ -16,6 +16,7 @@ class PuppetclassesController < ApplicationController def rdoc @puppetclass = Puppetclass.find(params[:id]) @name = @puppetclass.name + @name_url = @name.gsub('::', '/') #redirect_to "http://#{Facter.fqdn}/puppet/rdoc/development/classes/#{@name}.html" @environments = Environment.all.map(&:name).sort end diff --git a/app/views/puppetclasses/rdoc.erb b/app/views/puppetclasses/rdoc.erb index 968d853..a176466 100644 --- a/app/views/puppetclasses/rdoc.erb +++ b/app/views/puppetclasses/rdoc.erb @@ -4,8 +4,8 @@ Select an environment <% @environments.in_groups_of(cols) do |group| -%> <% for col in (0..(cols - 1)) -%> - <%= link_to(group[col], "http://#{Facter.fqdn}/puppet/rdoc/#{group[col]}/classes/#{@name}.html") if group[col] -%> + <%= link_to(group[col], "http://#{Facter.fqdn}/puppet/rdoc/#{group[col]}/classes/#{@name_url}.html") if group[col] -%> <% end -%> <% end -%> - \ No newline at end of file + -- 1.6.6.1