From 124cca3af0300c1071ecd0576f138a42fcd8aa4d Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang
Date: Tue, 1 May 2007 08:37:07 +0000
Subject: [PATCH] Text formatting drop down disabled if RedCloth is not
available (system settings).
git-svn-id: http://redmine.rubyforge.org/svn/trunk@497 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
app/controllers/settings_controller.rb | 1 +
app/views/settings/edit.rhtml | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb
index 229a4ab3c..fd094adb3 100644
--- a/app/controllers/settings_controller.rb
+++ b/app/controllers/settings_controller.rb
@@ -29,5 +29,6 @@ class SettingsController < ApplicationController
params[:settings].each { |name, value| Setting[name] = value }
redirect_to :action => 'edit' and return
end
+ @textile_available = ActionView::Helpers::TextHelper.method_defined?("textilize")
end
end
diff --git a/app/views/settings/edit.rhtml b/app/views/settings/edit.rhtml
index 4c9b55029..057a988de 100644
--- a/app/views/settings/edit.rhtml
+++ b/app/views/settings/edit.rhtml
@@ -37,7 +37,7 @@
<%= text_field_tag 'settings[host_name]', Setting.host_name, :size => 60 %>
-<%= select_tag 'settings[text_formatting]', options_for_select( [[l(:label_none), 0], ["textile", "textile"]], Setting.text_formatting) %>
+<%= select_tag 'settings[text_formatting]', options_for_select([[l(:label_none), 0], ["textile", "textile"]], (@textile_available ? Setting.text_formatting : 0)), :disabled => !@textile_available %>
<%= select_tag 'settings[wiki_compression]', options_for_select( [[l(:label_none), 0], ["gzip", "gzip"]], Setting.wiki_compression) %>
--
2.39.5