Merge branch 'develop'5.1-beta1

1 files changed, 21 insertions, 0 deletions

diff --git a/app/models/gemeinschaft_setup.rb b/app/models/gemeinschaft_setup.rb
index b445b21..6056236 100644
--- a/app/models/gemeinschaft_setup.rb
+++ b/app/models/gemeinschaft_setup.rb
@@ -5,4 +5,25 @@ class GemeinschaftSetup < ActiveRecord::Base
   accepts_nested_attributes_for :sip_domain
   belongs_to :country
   belongs_to :language
+
+  # Remove the cache which was created by the heater rake task.
+  #
+  after_create :expire_cache
+
+  before_validation :format_default_area_code
+
+  private
+  def expire_cache
+    ActionController::Base.expire_page(Rails.application.routes.url_helpers.new_gemeinschaft_setup_path)
+  end
+
+  def format_default_area_code
+    if self.default_area_code.blank?
+      self.default_area_code = nil
+    else
+      if self.country != nil && !self.country.trunk_prefix.blank?
+        self.default_area_code.gsub(/^#{self.country.trunk_prefix}/,'')
+      end
+    end
+  end
 end