Added a defaults.page.filter config setting for setting a default pag…

…e filter.
radiant · Jun 22, 2008 · 318687e · 318687e
1 parent 80781ac
commit 318687e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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|