Download as
Browse Code »

Commit 323f7cde52442b492a409c45237296d1adfe9fa3

Authored by Hugo Melo
Committed by Braulio Bhavamitra
1 parent 24c90b37
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

Allow toggle of name uniqueness on subtypes

Showing 1 changed file with 8 additions and 1 deletions   Show diff stats
app/models/product.rb
  Diff comments   View file @323f7cd
@@ -32,7 +32,8 @@ class Product < ActiveRecord::Base @@ -32,7 +32,8 @@ class Product < ActiveRecord::Base
32 32
33 acts_as_having_settings :field => :data 33 acts_as_having_settings :field => :data
34 34
35 - validates_uniqueness_of :name, :scope => :profile_id, :allow_nil => true 35 + validates_uniqueness_of :name, :scope => :profile_id, :allow_nil => true, :if => :validate_uniqueness_of_column_name?
  36 +
36 validates_presence_of :product_category_id 37 validates_presence_of :product_category_id
37 validates_associated :product_category 38 validates_associated :product_category
38 39
@@ -235,4 +236,10 @@ class Product < ActiveRecord::Base @@ -235,4 +236,10 @@ class Product < ActiveRecord::Base
235 236
236 delegate :enabled, :region, :region_id, :environment, :environment_id, :to => :enterprise 237 delegate :enabled, :region, :region_id, :environment, :environment_id, :to => :enterprise
237 238
  239 + protected
  240 +
  241 + def validate_uniqueness_of_column_name?
  242 + true
  243 + end
  244 +
238 end 245 end