deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix extension configs meta page to correctly handle multiple instance extensions like blog

Browse source
This commit is contained in:
Ben Hollis 2013-11-24 21:45:06 -08:00
parent 5604fa1a8b
commit fc20a761de
2 changed files with 28 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
middleman-core/lib/middleman-core/meta_pages.rb
View file

@ -60,14 +60,24 @@ module Middleman
# Inspect configuration
def config(env)
global_config = @middleman.inst.config.all_settings.map {|c| ConfigSetting.new(c) }
extension_config = Hash[@middleman.inst.extensions.map do |ext_name, extension|
opts = if extension.is_a?(::Middleman::Extension)
extension.options.all_settings.map {|c| ConfigSetting.new(c) }
extension_config = {}
@middleman.inst.extensions.each do |ext_name, extension|
if extension.is_a?(Hash)
# Multiple instance extension
if extension.size == 1
extension_config[ext_name] = extension_options(extension.values.first)
else
nil
extension.each do |inst, ext|
extension_config["#{ext_name} (#{inst})"] = extension_options(ext)
end
end
elsif extension.is_a?(::Middleman::Extension)
extension_config[ext_name] = extension_options(extension)
else
extension_config[ext_name] = nil
end
end
[ext_name, opts]
end]
template('config.html.erb',
:global_config => global_config,
@ -88,6 +98,10 @@ module Middleman
def response(content)
[ 200, {"Content-Type" => "text/html"}, Array(content) ]
end
def extension_options(extension)
extension.options.all_settings.map {|c| ConfigSetting.new(c) }
end
end
end
end

4
middleman-core/lib/middleman-core/meta_pages/templates/config.html.erb
View file

@ -33,7 +33,7 @@
<li>
<% registered_extensions.delete(ext_name) %>
<span class="extension active"><%= ext_name.inspect %></span>
<span class="extension active">:<%= ext_name %></span>
<% if configs && !configs.empty? %>
@ -55,5 +55,3 @@
</div>
</body>
</html>