2 files changed, 28 insertions, 21 deletions

diff --git a/app/models/node.rb b/app/models/node.rb
index 0f34b73..04d98b5 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -11,7 +11,8 @@ class Node < ActiveRecord::Base
   belongs_to  :user,                          :foreign_key => :locking_user_id
   
   # Callbacks
-  after_create :initialize_empty_page
+  after_create  :initialize_empty_page
+  before_save   :check_for_changed_slug
   
   # Validations
   # validates_length_of :slug, :within => 3..40
@@ -59,7 +60,7 @@ class Node < ActiveRecord::Base
   end
   
   def create_new_draft user
-    empty_page = self.pages.new
+    empty_page = self.pages.create
     empty_page.user = user
     empty_page.clone_attributes_from self.head
     
@@ -96,17 +97,17 @@ class Node < ActiveRecord::Base
     self.save
   end
   
+  def unlock!
+    self.user = nil
+    self.save
+  end
+  
   protected
     def lock_for! current_user
       self.user = current_user
       self.save
     end
   
-    def unlock!
-      self.user = nil
-      self.save
-    end
-  
     # Creates an empty page and associates it to the given node. This means
     # freshly created node has an empty draft. A user can create nodes as he
     # wants to which will not appear on the public page until the author edits
@@ -117,6 +118,16 @@ class Node < ActiveRecord::Base
         self.save
       end
     end
+    
+    def check_for_changed_slug
+      if parent and changed.include? "slug"
+        self.update_unique_name
+        
+        if tmp_descendants = descendants
+          tmp_descendants.each { |descendant| descendant.update_unique_name }
+        end
+      end
+    end
 end
 
 
diff --git a/app/models/page.rb b/app/models/page.rb
index 4c4536e..58f9682 100644
--- a/app/models/page.rb
+++ b/app/models/page.rb
@@ -87,27 +87,23 @@ class Page < ActiveRecord::Base
   
   def clone_attributes_from page
     return nil unless page
-  
+    
+    self.reload
+    
     # Clone untranslated attributes
-  
     self.tag_list = page.tag_list.join(", ")
     self.template_name = page.template_name
     self.published_at = page.published_at
     
-    # Clone translated attributes
+    # Getting rid of the auto-generated empty translations
+    self.globalize_translations.delete_all
     
-    locale_before = I18n.locale
-    
-    I18n.available_locales.each do |l|
-      next if l == :root
-      I18n.locale = l
-      page.reload
-      self.title    = page.title    unless page.title.try(:fallback?)
-      self.abstract = page.abstract unless page.abstract.try(:fallback?)
-      self.body     = page.body     unless page.body.try(:fallback?)
+    # Clone translated attributes
+    page.globalize_translations.each do |translation|
+      self.globalize_translations.create!(translation.attributes)
     end
-  
-    I18n.locale = locale_before
+    
+    self.save
   end
   
   def public?