diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-03-24 14:07:42 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-03-24 14:07:42 +0000 |
| commit | 5663ca89facc10db2b9c665ecda6101ece14ce3e (patch) | |
| tree | 5c88c8743080e7dd19b14ff6ed3e59feefab788a | |
| parent | ee8002b0c9342ccd8db85a2eaa9aa38683cdf0e8 (diff) | |
| download | redmine-5663ca89facc10db2b9c665ecda6101ece14ce3e.tar.gz redmine-5663ca89facc10db2b9c665ecda6101ece14ce3e.zip | |
Fixes error message for LDAP filter (#1060).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9258 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/models/auth_source_ldap.rb | 8 | ||||
| -rw-r--r-- | test/unit/auth_source_ldap_test.rb | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/app/models/auth_source_ldap.rb b/app/models/auth_source_ldap.rb index 91942b282..92bcd4d65 100644 --- a/app/models/auth_source_ldap.rb +++ b/app/models/auth_source_ldap.rb @@ -29,6 +29,14 @@ class AuthSourceLdap < AuthSource before_validation :strip_ldap_attributes + def self.human_attribute_name(attribute_key_name, *args) + attr_name = attribute_key_name.to_s + if attr_name == "filter" + attr_name = "ldap_filter" + end + super(attr_name, *args) + end + def initialize(attributes=nil, *args) super self.port = 389 if self.port == 0 diff --git a/test/unit/auth_source_ldap_test.rb b/test/unit/auth_source_ldap_test.rb index 4955a4dc8..1662042b2 100644 --- a/test/unit/auth_source_ldap_test.rb +++ b/test/unit/auth_source_ldap_test.rb @@ -51,7 +51,7 @@ class AuthSourceLdapTest < ActiveSupport::TestCase a = AuthSourceLdap.new(:name => 'My LDAP', :host => 'ldap.example.net', :port => 389, :attr_login => 'sn') a.filter = "(mail=*@redmine.org" assert !a.valid? - assert_include "is invalid", a.errors[:filter] + assert_include "LDAP filter is invalid", a.errors.full_messages a.filter = "(mail=*@redmine.org)" assert a.valid? |