added inheritable? to the parent check on editable_contents

2011-03-02 08:12:42 +08:00 · 2011-03-02 08:12:42 +08:00 · ed88eb82b0
parent e059ce2023
commit ed88eb82b0
1 changed files with 1 additions and 1 deletions
--- a/app/models/extensions/page/editable_elements.rb
+++ b/app/models/extensions/page/editable_elements.rb
@ -62,7 +62,7 @@ module Models

          def merge_editable_elements_from_page(source)
            source.editable_elements.each do |el|
-              next if el.disabled?
+              next if el.disabled? or !el.inheritable?

              existing_el = self.find_editable_element(el.block, el.slug)