[PATCH] BZ 799270 perform character replacment in 'name' prior to uniqueness validation

Matt Wagner matt.wagner at redhat.com
Mon Mar 5 21:45:21 UTC 2012


On Mon, Mar 05, 2012 at 02:16:34PM -0500, Tzu-Mainn Chen wrote:
> ---
>  src/app/models/deployment.rb |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/src/app/models/deployment.rb b/src/app/models/deployment.rb
> index 989d60f..02f2b0b 100644
> --- a/src/app/models/deployment.rb
> +++ b/src/app/models/deployment.rb
> @@ -62,6 +62,7 @@ class Deployment < ActiveRecord::Base
>  
>    scope :ascending_by_name, :order => 'deployments.name ASC'
>  
> +  before_validation :replace_special_characters_in_name
>    validates_presence_of :pool_id
>    validates_presence_of :name
>    validates_uniqueness_of :name, :scope => :pool_id
> @@ -71,7 +72,6 @@ class Deployment < ActiveRecord::Base
>    before_destroy :destroyable?
>    before_create :inject_launch_parameters
>    before_create :generate_uuid
> -  before_save :replace_special_characters_in_name
>    before_create :set_pool_family
>  
>    USER_MUTABLE_ATTRS = ['name']
> @@ -603,7 +603,7 @@ class Deployment < ActiveRecord::Base
>    end
>  
>    def replace_special_characters_in_name
> -    name.gsub!(/[^a-zA-Z0-9]+/, '-')
> +    name.gsub!(/[^a-zA-Z0-9]+/, '-') if !name.nil?
>    end
>  
>    def set_pool_family
> -- 
> 1.7.6.5

I haven't run automated tests, but this looks good and works for me.
Assuming tests pass for you, ACK.

-- Matt



More information about the aeolus-devel mailing list