From 2abf5586f898328c02498e90db24a9e2e7cdb6c0 Mon Sep 17 00:00:00 2001 From: Victor Costa Date: Tue, 28 Oct 2014 14:15:48 -0300 Subject: [PATCH] Refactoring extra fields validation for organizations --- app/models/community.rb | 10 ---------- app/models/enterprise.rb | 10 ---------- app/models/organization.rb | 10 ++++++++++ 3 files changed, 10 insertions(+), 20 deletions(-) diff --git a/app/models/community.rb b/app/models/community.rb index 82bbd3b..7d246b2 100644 --- a/app/models/community.rb +++ b/app/models/community.rb @@ -50,16 +50,6 @@ class Community < Organization super + FIELDS end - validate :presence_of_required_fieds, :unless => :is_template - - def presence_of_required_fieds - self.required_fields.each do |field| - if self.send(field).blank? - self.errors.add_on_blank(field) - end - end - end - def active_fields environment ? environment.active_community_fields : [] end diff --git a/app/models/enterprise.rb b/app/models/enterprise.rb index 8b28ffe..a20b1b7 100644 --- a/app/models/enterprise.rb +++ b/app/models/enterprise.rb @@ -59,16 +59,6 @@ class Enterprise < Organization super + FIELDS end - validate :presence_of_required_fieds, :unless => :is_template - - def presence_of_required_fieds - self.required_fields.each do |field| - if self.send(field).blank? - self.errors.add_on_blank(field) - end - end - end - def active_fields environment ? environment.active_enterprise_fields : [] end diff --git a/app/models/organization.rb b/app/models/organization.rb index 1eb6d2f..b4e7c71 100644 --- a/app/models/organization.rb +++ b/app/models/organization.rb @@ -30,6 +30,16 @@ class Organization < Profile scope :more_popular, :order => 'members_count DESC' + validate :presence_of_required_fieds, :unless => :is_template + + def presence_of_required_fieds + self.required_fields.each do |field| + if self.send(field).blank? + self.errors.add_on_blank(field) + end + end + end + def validation_methodology self.validation_info ? self.validation_info.validation_methodology : nil end -- libgit2 0.21.2