technoweenie / mephisto fork watch download tarball
public
Fork of halorgium/mephisto
Description: A mirror of the mephisto code-base
Homepage: http://mephistoblog.com/
Clone URL: git://github.com/technoweenie/mephisto.git
Click here to lend your support to: mephisto and make a donation at www.pledgie.com ! 
use the search template, but keep using the section's layout in a 
section-specific search

git-svn-id: http://svn.techno-weenie.net/projects/mephisto/trunk@2678 
567b1171-46fb-0310-a4c9-b4bef9110e78
technoweenie (author)
Sun Jan 14 16:55:36 -0800 2007
commit  95f7712ee2e547e5b4e1d20c210e983ec45a364d
tree    6df80db561e3ab40c840fa7e63639e18a685fd4e
parent  6ec3fbe16de53a2dcb341bf99d4d19e64f9f00d6
0
app/models/site.rb 
...
250
251
252
253
254
255
256
257
 
...
250
251
252
 
 
253
254
255
 
0
@@ -250,8 +250,6 @@ class Site < ActiveRecord::Base
0
             section.template
0
           when :archive
0
             section.archive_template
0
-          else
0
-            section.template if section
0
         end
0
       find_preferred_template(template_type, preferred_template)
0
     end
0
test/functional/mephisto_controller_test.rb 
...
225
226
227
228
 
229
230
231
...
238
239
240
241
 
242
243
244
 
...
225
226
227
 
228
229
230
231
...
238
239
240
 
241
242
243
244
 
0
@@ -225,7 +225,7 @@ class MephistoControllerTest < Test::Unit::TestCase
0
     assert_equal 'welcome', liquid(:search_string)
0
     assert_equal 1, liquid(:search_count)
0
     assert_equal sections(:about).to_liquid, liquid(:section)
0
-    assert_preferred_template :page
0
+    assert_preferred_template :search
0
     assert_layout_template    :alt_layout
0
     assert_template_type      :search
0
   end
0
@@ -238,7 +238,7 @@ class MephistoControllerTest < Test::Unit::TestCase
0
     assert_equal 'about', liquid(:search_string)
0
     assert_equal sections(:home).to_liquid, liquid(:section)
0
     assert_equal 0, liquid(:search_count)
0
-    assert_preferred_template :home
0
+    assert_preferred_template :search
0
     assert_layout_template    :alt_layout
0
     assert_template_type      :search
0
   end

Comments

    No one has commented yet.