diff --git a/app/controllers/enterprises_controller.rb b/app/controllers/enterprises_controller.rb index 53e52415e5..8f38f4e095 100644 --- a/app/controllers/enterprises_controller.rb +++ b/app/controllers/enterprises_controller.rb @@ -38,8 +38,6 @@ class EnterprisesController < BaseController end end - - private def set_enterprise diff --git a/app/models/enterprise.rb b/app/models/enterprise.rb index edf1fe9a7d..95fb6461cc 100644 --- a/app/models/enterprise.rb +++ b/app/models/enterprise.rb @@ -67,7 +67,6 @@ class Enterprise < ActiveRecord::Base supports_s3 :logo supports_s3 :promo_image - validates :name, presence: true validate :name_is_unique validates :sells, presence: true, inclusion: {in: SELLS} @@ -79,7 +78,6 @@ class Enterprise < ActiveRecord::Base validate :enforce_ownership_limit, if: lambda { owner_id_changed? && !owner_id.nil? } validates_length_of :description, :maximum => 255 - before_save :confirmation_check, if: lambda { email_changed? } before_validation :initialize_permalink, if: lambda { permalink.nil? } @@ -96,7 +94,6 @@ class Enterprise < ActiveRecord::Base after_rollback :restore_permalink - scope :by_name, order('name') scope :visible, where(visible: true) scope :confirmed, where('confirmed_at IS NOT NULL') @@ -366,7 +363,6 @@ class Enterprise < ActiveRecord::Base abn.present? end - protected def devise_mailer