Remove the limitation on characters that can be used in custom_field,…

Remove the limitation on characters that can be used in custom_field, issue_status, role, tracker, user names (#5152). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4599 e93f8b46-1217-0410-a6f0-8f06a7374b81

Remove the limitation on characters that can be used in custom_field,…
Remove the limitation on characters that can be used in custom_field, issue_status, role, tracker, user names (#5152). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4599 e93f8b46-1217-0410-a6f0-8f06a7374b81
44ffc5a3 · Jean-Philippe Lang · 92d34234 · 44ffc5a3 · 44ffc5a3 · 44ffc5a3
Commit 44ffc5a3 authored Dec 31, 2010 by Jean-Philippe Lang
7 changed files
--- a/app/models/custom_field.rb
+++ b/app/models/custom_field.rb
@@ -23,7 +23,6 @@ class CustomField < ActiveRecord::Base
  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)

--- a/app/models/issue_status.rb
+++ b/app/models/issue_status.rb
@@ -25,7 +25,6 @@ class IssueStatus < ActiveRecord::Base
  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

--- a/app/models/role.rb
+++ b/app/models/role.rb
@@ -43,7 +43,6 @@ class Role < ActiveRecord::Base
  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) || []

--- a/app/models/tracker.rb
+++ b/app/models/tracker.rb
@@ -31,7 +31,6 @@ class Tracker < ActiveRecord::Base
  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
  

--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -68,7 +68,6 @@ class User < Principal
  # 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

--- a/lib/tasks/migrate_from_mantis.rake
+++ b/lib/tasks/migrate_from_mantis.rake
@@ -88,13 +88,11 @@ task :migrate_from_mantis => :environment do
      
      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
@@ -224,7 +222,7 @@ task :migrate_from_mantis => :environment do
      end
      
      def name
-        read_attribute(:name)[0..29].gsub(/[^\w\s\'\-]/, '-')
+        read_attribute(:name)[0..29]
      end
    end
    

--- a/lib/tasks/migrate_from_trac.rake
+++ b/lib/tasks/migrate_from_trac.rake
@@ -246,8 +246,8 @@ namespace :redmine do
          ln = ($2 || '-').strip

          u = User.new :mail => mail.gsub(/[^-@a-z0-9\.]/i, '-'),
-                       :firstname => fn[0, limit_for(User, 'firstname')].gsub(/[^\w\s\'\-]/i, '-'),
-                       :lastname => ln[0, limit_for(User, 'lastname')].gsub(/[^\w\s\'\-]/i, '-')
+                       :firstname => fn[0, limit_for(User, 'firstname')],
+                       :lastname => ln[0, limit_for(User, 'lastname')]

          u.login = username[0,limit_for(User, 'login')].gsub(/[^a-z0-9_\-@\.]/i, '-')
          u.password = 'trac'