jro_apps/redmine Commit - r4479:44ffc5a3365f

Remove the limitation on characters that can be used in custom_field, issue_status, role, tracker, user names (#5152)....

Jean-Philippe Lang -

r4479:44ffc5a3365f

parent child

Context file:

r4479:44ffc5a3365f

app/models/custom_field.rb 0 -1

               validates_presence_of :name, :field_format
               validates_uniqueness_of :name, :scope => :type
               validates_length_of :name, :maximum => 30
-              validates_format_of :name, :with => /^[\w\s\.\'\-]*$/i
               validates_inclusion_of :field_format, :in => Redmine::CustomFieldFormat.available_formats
               def initialize(attributes = nil)

app/models/issue_status.rb 0 -1

               validates_presence_of :name
               validates_uniqueness_of :name
               validates_length_of :name, :maximum => 30
-              validates_format_of :name, :with => /^[\w\s\'\-]*$/i
               validates_inclusion_of :default_done_ratio, :in => 0..100, :allow_nil => true
               def after_save

app/models/role.rb 0 -1

               validates_presence_of :name
               validates_uniqueness_of :name
               validates_length_of :name, :maximum => 30
-              validates_format_of :name, :with => /^[\w\s\'\-]*$/i
               def permissions
                 read_attribute(:permissions) || []

app/models/tracker.rb 0 -1

               validates_presence_of :name
               validates_uniqueness_of :name
               validates_length_of :name, :maximum => 30
-              validates_format_of :name, :with => /^[\w\s\'\-]*$/i
               def to_s; name end

app/models/user.rb 0 -1

               # Login must contain lettres, numbers, underscores only
               validates_format_of :login, :with => /^[a-z0-9_\-@\.]*$/i
               validates_length_of :login, :maximum => 30
-              validates_format_of :firstname, :lastname, :with => /^[\w\s\'\-\.]*$/i
               validates_length_of :firstname, :lastname, :maximum => 30
               validates_format_of :mail, :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i, :allow_nil => true
               validates_length_of :mail, :maximum => 60, :allow_nil => true

lib/tasks/migrate_from_mantis.rake +1 -3

                   def firstname
                     @firstname = realname.blank? ? username : realname.split.first[0..29]
-                    @firstname.gsub!(/[^\w\s\'\-]/i, '')
                     @firstname
                   end
                   def lastname
                     @lastname = realname.blank? ? '-' : realname.split[1..-1].join(' ')[0..29]
-                    @lastname.gsub!(/[^\w\s\'\-]/i, '')
                     @lastname = '-' if @lastname.blank?
                     @lastname
                   end
                   end
                   def name
-                    read_attribute(:name)[0..29].gsub(/[^\w\s\'\-]/, '-')
+                    read_attribute(:name)[0..29]
                   end
                 end

lib/tasks/migrate_from_trac.rake +2 -2

                       ln = ($2 || '-').strip
                       u = User.new :mail => mail.gsub(/[^-@a-z0-9\.]/i, '-'),
-                                   :firstname => fn[0, limit_for(User, 'firstname')].gsub(/[^\w\s\'\-]/i, '-'),
+                                   :firstname => fn[0, limit_for(User, 'firstname')],
-                                   :lastname => ln[0, limit_for(User, 'lastname')].gsub(/[^\w\s\'\-]/i, '-')
+                                   :lastname => ln[0, limit_for(User, 'lastname')]
                       u.login = username[0,limit_for(User, 'login')].gsub(/[^a-z0-9_\-@\.]/i, '-')
                       u.password = 'trac'

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages