diff --git a/app/models/page.rb b/app/models/page.rb index 764d2effb..1ea2dc8eb 100644 --- a/app/models/page.rb +++ b/app/models/page.rb @@ -197,7 +197,7 @@ def new_with_defaults(config = Radiant::Config) default_parts = config['defaults.page.parts'].to_s.strip.split(/\s*,\s*/) page = new default_parts.each do |name| - page.parts << PagePart.new(:name => name) + page.parts << PagePart.new(:name => name, :filter_id => config['defaults.page.filter']) end default_status = config['defaults.page.status'] page.status = Status[default_status] if default_status diff --git a/lib/radiant/setup.rb b/lib/radiant/setup.rb index 02e04170e..7fc1a0c93 100644 --- a/lib/radiant/setup.rb +++ b/lib/radiant/setup.rb @@ -49,6 +49,7 @@ def load_default_configuration step { Radiant::Config['admin.subtitle'] = 'Publishing for Small Teams' } step { Radiant::Config['defaults.page.parts' ] = 'body, extended' } step { Radiant::Config['defaults.page.status' ] = 'draft' } + step { Radiant::Config['defaults.page.filter' ] = nil } end end diff --git a/spec/models/page_spec.rb b/spec/models/page_spec.rb index de4951f98..d2968c7c4 100644 --- a/spec/models/page_spec.rb +++ b/spec/models/page_spec.rb @@ -428,7 +428,14 @@ def headers it 'should allow initialization with default page status' do @page = Page.new_with_defaults({ 'defaults.page.status' => 'published' }) @page.status.should == Status[:published] - end + end + + it 'should allow initialization with default filter' do + @page = Page.new_with_defaults({ 'defaults.page.filter' => 'Textile', 'defaults.page.parts' => 'a, b, c' }) + @page.parts.each do |part| + part.filter_id.should == 'Textile' + end + end it 'should allow you to get the class name of a descendant class with a string' do ["", nil, "Page"].each do |value|