From 5c7f1aa1648ef55800faf16ca2e30ef59315f755 Mon Sep 17 00:00:00 2001
From: chris <chris.vilayphiou@gmail.com>
Date: Mon, 3 Dec 2012 18:42:50 +0800
Subject: [PATCH] Fix saving of page_part after layout change

---
 app/models/page.rb | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/app/models/page.rb b/app/models/page.rb
index 09f7899d1..7797b2370 100644
--- a/app/models/page.rb
+++ b/app/models/page.rb
@@ -28,20 +28,10 @@ class Page < Item
   
   def generate_parts
     page_design = self.design
-    parent = self.parent
-    menu_part = parent.page_parts.detect{|page_part| page_part.kind.eql?('public_r_tag') && page_part.public_r_tag.eql?('sub_menu') && page_part.public_r_tag_object_id.eql?(parent.id.to_s)} if parent
     page_design.layout.layout_parts.each do |layout_part|
       current_part = self.page_parts.detect{|page_part| page_part.name.eql?(layout_part.name)}
       current_part = self.page_parts.build(:name => layout_part.name) unless current_part
-      if menu_part && current_part.name.eql?(menu_part.name)
-        if current_part.new_record?
-          current_part.kind = menu_part.kind
-          current_part.public_r_tag = menu_part.public_r_tag
-          current_part.public_r_tag_object_id = menu_part.public_r_tag_object_id
-          current_part.save
-        else
-          current_part.update_attributes(:kind => menu_part.kind, :public_r_tag => menu_part.public_r_tag, :public_r_tag_object_id => menu_part.public_r_tag_object_id)
-        end
+        current_part.save if current_part.new_record?
       end
     end
   end
@@ -50,7 +40,22 @@ class Page < Item
   
   def create_parts
     if self.new_record? || self.design_id_changed?
-      generate_parts
+      page_design = self.design
+      parent = self.parent
+      menu_part = parent.page_parts.detect{|page_part| page_part.kind.eql?('public_r_tag') && page_part.public_r_tag.eql?('sub_menu') && page_part.public_r_tag_object_id.eql?(parent.id.to_s)} if parent
+      page_design.layout.layout_parts.each do |layout_part|
+        current_part = self.page_parts.detect{|page_part| page_part.name.eql?(layout_part.name)}
+        current_part = self.page_parts.build(:name => layout_part.name) unless current_part
+        if menu_part && current_part.name.eql?(menu_part.name)
+          if current_part.new_record?
+            current_part.kind = menu_part.kind
+            current_part.public_r_tag = menu_part.public_r_tag
+            current_part.public_r_tag_object_id = menu_part.public_r_tag_object_id
+          else
+            current_part.update_attributes(:kind => menu_part.kind, :public_r_tag => menu_part.public_r_tag, :public_r_tag_object_id => menu_part.public_r_tag_object_id)
+          end
+        end
+      end
     end
   end