Email delivery configuration moved to an unversioned YAML file (config/email.yml, see the sample file) (#1412).
Email delivery is disabled. It's automatically turned on when configuration is found. git-svn-id: http://redmine.rubyforge.org/svn/trunk@1625 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
@@ -39,6 +39,7 @@ class SettingsController < ApplicationController
|
||||
end
|
||||
@options = {}
|
||||
@options[:user_format] = User::USER_FORMATS.keys.collect {|f| [User.current.name(f), f.to_s] }
|
||||
@deliveries = ActionMailer::Base.perform_deliveries
|
||||
end
|
||||
|
||||
def plugin
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
<% if @deliveries %>
|
||||
<% form_tag({:action => 'edit', :tab => 'notifications'}) do %>
|
||||
|
||||
<div class="box tabular settings">
|
||||
@@ -28,3 +29,8 @@
|
||||
|
||||
<%= submit_tag l(:button_save) %>
|
||||
<% end %>
|
||||
<% else %>
|
||||
<div class="nodata">
|
||||
<%= simple_format(l(:text_email_delivery_not_configured)) %>
|
||||
</div>
|
||||
<% end %>
|
||||
|
||||
Reference in New Issue
Block a user