jro_apps/redmine Commit - r10733:147e7a8d6172

Use \A and \z in validation regexps....

Jean-Philippe Lang -

r10733:147e7a8d6172

parent child

Context file:

r10733:147e7a8d6172

app/models/project.rb +1 -1

                validates_length_of :homepage, :maximum => 255
                validates_length_of :identifier, :in => 1..IDENTIFIER_MAX_LENGTH
                # donwcase letters, digits, dashes but not digits only
-               validates_format_of :identifier, :with => /^(?!\d+$)[a-z0-9\-_]*$/, :if => Proc.new { |p| p.identifier_changed? }
+               validates_format_of :identifier, :with => /\A(?!\d+$)[a-z0-9\-_]*\z/, :if => Proc.new { |p| p.identifier_changed? }
                # reserved words
                validates_exclusion_of :identifier, :in => %w( new )

app/models/repository.rb +1 -1

                validates_uniqueness_of :identifier, :scope => :project_id, :allow_blank => true
                validates_exclusion_of :identifier, :in => %w(show entry raw changes annotate diff show stats graph)
                # donwcase letters, digits, dashes, underscores but not digits only
-               validates_format_of :identifier, :with => /^(?!\d+$)[a-z0-9\-_]*$/, :allow_blank => true
+               validates_format_of :identifier, :with => /\A(?!\d+$)[a-z0-9\-_]*\z/, :allow_blank => true
                # Checks if the SCM is enabled when creating a repository
                validate :repo_create_validation, :on => :create

app/models/repository/subversion.rb +1 -1

              class Repository::Subversion < Repository
                attr_protected :root_url
                validates_presence_of :url
-               validates_format_of :url, :with => /^(http|https|svn(\+[^\s:\/\\]+)?|file):\/\/.+/i
+               validates_format_of :url, :with => /\A(http|https|svn(\+[^\s:\/\\]+)?|file):\/\/.+/i
                def self.scm_adapter_class
                  Redmine::Scm::Adapters::SubversionAdapter

app/models/user.rb +2 -2

                validates_uniqueness_of :login, :if => Proc.new { |user| user.login_changed? && user.login.present? }, :case_sensitive => false
                validates_uniqueness_of :mail, :if => Proc.new { |user| user.mail_changed? && user.mail.present? }, :case_sensitive => false
                # Login must contain lettres, numbers, underscores only
-               validates_format_of :login, :with => /^[a-z0-9_\-@\.]*$/i
+               validates_format_of :login, :with => /\A[a-z0-9_\-@\.]*\z/i
                validates_length_of :login, :maximum => LOGIN_LENGTH_LIMIT
                validates_length_of :firstname, :lastname, :maximum => 30
-               validates_format_of :mail, :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i, :allow_blank => true
+               validates_format_of :mail, :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i, :allow_blank => true
                validates_length_of :mail, :maximum => MAIL_LENGTH_LIMIT, :allow_nil => true
                validates_confirmation_of :password, :allow_nil => true
                validates_inclusion_of :mail_notification, :in => MAIL_NOTIFICATION_OPTIONS.collect(&:first), :allow_blank => true

app/models/version.rb +1 -1

                validates_presence_of :name
                validates_uniqueness_of :name, :scope => [:project_id]
                validates_length_of :name, :maximum => 60
-               validates_format_of :effective_date, :with => /^\d{4}-\d{2}-\d{2}$/, :message => :not_a_date, :allow_nil => true
+               validates_format_of :effective_date, :with => /\A\d{4}-\d{2}-\d{2}\z/, :message => :not_a_date, :allow_nil => true
                validates_inclusion_of :status, :in => VERSION_STATUSES
                validates_inclusion_of :sharing, :in => VERSION_SHARINGS
                validate :validate_version

app/models/wiki.rb +1 -1

                acts_as_watchable
                validates_presence_of :start_page
-               validates_format_of :start_page, :with => /^[^,\.\/\?\;\|\:]*$/
+               validates_format_of :start_page, :with => /\A[^,\.\/\?\;\|\:]*\z/
                safe_attributes 'start_page'

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