From 97e3ddb6e39c59dc58a2dea707c7d39c2b3cd609 Mon Sep 17 00:00:00 2001 From: Dirk Kelly Date: Wed, 2 Mar 2011 14:38:57 +0800 Subject: [PATCH] reading that default attribute on inheriting editable_elements and calling the method on that page (instead of getting it from the parent) --- app/models/extensions/page/editable_elements.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/models/extensions/page/editable_elements.rb b/app/models/extensions/page/editable_elements.rb index 1246d3af..1e4d85ae 100644 --- a/app/models/extensions/page/editable_elements.rb +++ b/app/models/extensions/page/editable_elements.rb @@ -68,8 +68,12 @@ module Models if existing_el.nil? # new one from parents new_attributes = el.attributes.merge(:from_parent => true) - new_attributes[:default_content] = el.content - + if new_attributes['default_attribute'].present? + new_attributes['default_content'] = self.send(new_attributes['default_attribute']) || el.content + else + new_attributes['default_content'] = el.content + end + self.editable_elements.build(new_attributes, el.class) else existing_el.attributes = { :disabled => false, :default_content => el.content }