Merge branch 'development' of github.com:Rulingcom/orbit into development

Conflicts:
	app/controllers/default_widget_controller.rb
	lib/tasks/migrate.rake

app/models/ad_image.rb

@@ -23,7 +23,7 @@ class AdImage
   belongs_to :ad_banner
 
   before_validation :add_http
-  validates :out_link, :format => /^(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(([0-9]{1,5})?\/.*)?$/ix, :allow_blank => true
+  validates :out_link, :format => /^(http|https):\/\/(([a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5})|((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))(:[0-9]{1,5})?(\/.*)?/i, :allow_blank => true
 
   def display?
     if (self.post_date <= Date.today && (self.unpost_date.nil? || self.unpost_date>= Date.today) rescue false) 

app/models/item.rb

@@ -12,7 +12,7 @@ class Item
   field :enabled_for, :type => Array, :default => nil
   field :menu_enabled_for, :type => Array, :default => nil
   field :title, localize: true
-  field :sitemap_enabled, :type => Hash
+  field :sitemap_enabled, :type => Hash, :default => {}
 
  
   validates_format_of :name, :with => /^[0-9a-zA-Z\-_]+$/
@@ -23,6 +23,7 @@ class Item
   
   before_destroy :destroy_children
   after_rearrange :rebuild_path, :if => "parent_id_changed? || name_changed?"
+  after_save :rebuild_children_path, :if => "path_changed?"
   
   def enabled_for_lang(lang)
     enabled_for.include?(lang)
@@ -57,7 +58,7 @@ class Item
   end
 
   def show_in_sitemap_for(locale)
-    if sitemap_enabled && !sitemap_enabled[locale].blank?
+    if !sitemap_enabled.blank? && !sitemap_enabled[locale].blank?
       sitemap_enabled[locale].eql?('true') ? true : false
     else
       true
@@ -68,7 +69,6 @@ class Item
   
   def rebuild_path
     self.path = (self.ancestors_and_self - [Item.root]).collect{|x| x.name unless x.root?}.join('/')
-    self.rebuild_children_path
   end
 
   def rebuild_children_path

app/models/link.rb

@@ -2,7 +2,7 @@ class Link < Item
   
   field :url
   
-  validates :url, :presence => true, :format => /^(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(([0-9]{1,5})?\/.*)?$/ix
+  validates :url, :presence => true, :format => /^(http|https):\/\/(([a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5})|((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))(:[0-9]{1,5})?(\/.*)?/i
 
 	before_validation :add_http
 

app/models/page.rb

@@ -27,6 +27,11 @@ class Page < Item
   before_save :create_parts, if: Proc.new { |page| page.new_record? || page.design_id_changed? }
   before_save :delete_empty_frontend_field, :generate_html
 
+  def generate_parts
+    create_parts
+    self.save
+  end
+
   protected
   
   def create_parts