##// END OF EJS Templates
LDAP filter changed to text (#20929)....
Jean-Philippe Lang -
r14343:f053c1a5af4a
parent child
Show More
@@ -0,0 +1,9
1 class ChangeAuthSourcesFilterToText < ActiveRecord::Migration
2 def self.up
3 change_column :auth_sources, :filter, :text
4 end
5
6 def self.down
7 change_column :auth_sources, :filter, :string
8 end
9 end
@@ -22,7 +22,7 require 'timeout'
22 class AuthSourceLdap < AuthSource
22 class AuthSourceLdap < AuthSource
23 validates_presence_of :host, :port, :attr_login
23 validates_presence_of :host, :port, :attr_login
24 validates_length_of :name, :host, :maximum => 60, :allow_nil => true
24 validates_length_of :name, :host, :maximum => 60, :allow_nil => true
25 validates_length_of :account, :account_password, :base_dn, :filter, :maximum => 255, :allow_blank => true
25 validates_length_of :account, :account_password, :base_dn, :maximum => 255, :allow_blank => true
26 validates_length_of :attr_login, :attr_firstname, :attr_lastname, :attr_mail, :maximum => 30, :allow_nil => true
26 validates_length_of :attr_login, :attr_firstname, :attr_lastname, :attr_mail, :maximum => 30, :allow_nil => true
27 validates_numericality_of :port, :only_integer => true
27 validates_numericality_of :port, :only_integer => true
28 validates_numericality_of :timeout, :only_integer => true, :allow_blank => true
28 validates_numericality_of :timeout, :only_integer => true, :allow_blank => true
@@ -11,7 +11,7
11 :onfocus => "this.value=''; this.name='auth_source[account_password]';",
11 :onfocus => "this.value=''; this.name='auth_source[account_password]';",
12 :onchange => "this.name='auth_source[account_password]';" %></p>
12 :onchange => "this.name='auth_source[account_password]';" %></p>
13 <p><%= f.text_field :base_dn, :required => true, :size => 60 %></p>
13 <p><%= f.text_field :base_dn, :required => true, :size => 60 %></p>
14 <p><%= f.text_field :filter, :size => 60, :label => :field_auth_source_ldap_filter %></p>
14 <p><%= f.text_area :filter, :size => 60, :label => :field_auth_source_ldap_filter %></p>
15 <p><%= f.text_field :timeout, :size => 4 %></p>
15 <p><%= f.text_field :timeout, :size => 4 %></p>
16 <p><%= f.check_box :onthefly_register, :label => :field_onthefly %></p>
16 <p><%= f.check_box :onthefly_register, :label => :field_onthefly %></p>
17 </div>
17 </div>
General Comments 0
You need to be logged in to leave comments. Login now