summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/controllers/auth_sources_controller.rb4
-rw-r--r--db/migrate/074_add_auth_sources_tls.rb9
2 files changed, 11 insertions, 2 deletions
diff --git a/app/controllers/auth_sources_controller.rb b/app/controllers/auth_sources_controller.rb
index 86b58d365..b830f1970 100644
--- a/app/controllers/auth_sources_controller.rb
+++ b/app/controllers/auth_sources_controller.rb
@@ -65,10 +65,10 @@ class AuthSourcesController < ApplicationController
@auth_method = AuthSource.find(params[:id])
begin
@auth_method.test_connection
+ flash[:notice] = l(:notice_successful_connection)
rescue => text
- flash[:notice] = text
+ flash[:error] = "Unable to connect (#{text})"
end
- flash[:notice] ||= l(:notice_successful_connection)
redirect_to :action => 'list'
end
diff --git a/db/migrate/074_add_auth_sources_tls.rb b/db/migrate/074_add_auth_sources_tls.rb
new file mode 100644
index 000000000..3987f7036
--- /dev/null
+++ b/db/migrate/074_add_auth_sources_tls.rb
@@ -0,0 +1,9 @@
+class AddAuthSourcesTls < ActiveRecord::Migration
+ def self.up
+ add_column :auth_sources, :tls, :boolean, :default => false, :null => false
+ end
+
+ def self.down
+ remove_column :auth_sources, :tls
+ end
+end