@@ -26,7 +26,7 @@ class Admin::SectionsController < Admin::BaseController def order if params[:id].to_i == 0 - Section.order! params[:sorted_ids] + site.sections.order! params[:sorted_ids] else find_section @section.order! params[:sorted_ids] app/controllers/admin/sections_controller.rb @@ -35,15 +35,6 @@ class Section < ActiveRecord::Base def permalink_for(str) str.gsub(/[^\w\/]|[!\(\)\.]+/, ' ').strip.downcase.gsub(/\ +/, '-') end - - # orders sections in a site - def order!(*sorted_ids) - sorted_ids.flatten.each_with_index do |section_id, pos| - section = find(section_id) - section.position = pos - section.save - end - end end def find_comments(options = {}) app/models/section.rb @@ -8,6 +8,15 @@ class Site < ActiveRecord::Base def home find_by_path '' end + + # orders sections in a site + def order!(*sorted_ids) + transaction do + sorted_ids.flatten.each_with_index do |section_id, pos| + Section.update_all ['position = ?', pos], ['id = ? and site_id = ?', section_id, proxy_owner.id] + end + end + end end has_many :articles do app/models/site.rb @@ -113,11 +113,6 @@ class SectionTest < Test::Unit::TestCase [contents(:about), contents(:site_map), contents(:welcome)] end - specify "should order sections in site" do - assert_reorder_sections [sections(:home), sections(:about), sections(:earth), sections(:europe), sections(:africa), sections(:bucharest), sections(:links)], - [sections(:home), sections(:earth), sections(:europe), sections(:africa), sections(:bucharest), sections(:links), sections(:about)] - end - protected def assert_reorder_articles(section, old_order, expected) assert_models_equal old_order, section.articles @@ -125,12 +120,6 @@ class SectionTest < Test::Unit::TestCase assert_models_equal expected, section.articles(true) end - def assert_reorder_sections(old_order, expected) - assert_models_equal old_order, sites(:first).sections - Section.order! expected.collect(&:id) - assert_models_equal expected, sites(:first).sections(true) - end - def test_should_report_section_types assert sections(:home).blog? [:about, :cupcake_home, :cupcake_about].each { |s| assert sections(s).paged? } test/unit/section_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' context "Site" do - fixtures :sites, :contents + fixtures :sites, :contents, :sections specify "should create site without accepting comments" do site = Site.new :host => 'foo.com', :comment_age => -1 @@ -54,6 +54,18 @@ context "Site" do assert_equal '/tags/foo', sites(:first).tag_url('foo') assert_equal '/tags/foo/bar', sites(:first).tag_url('foo', 'bar') end + + specify "should order sections in site" do + assert_reorder_sections [sections(:home), sections(:about), sections(:earth), sections(:europe), sections(:africa), sections(:bucharest), sections(:links)], + [sections(:home), sections(:earth), sections(:europe), sections(:africa), sections(:bucharest), sections(:links), sections(:about)] + end + + protected + def assert_reorder_sections(old_order, expected) + assert_models_equal old_order, sites(:first).sections + sites(:first).sections.order! expected.collect(&:id) + assert_models_equal expected, sites(:first).sections(true) + end end context "Site Membership" do test/unit/site_test.rb 09396e763e1d2b8dad71216c5b6a9b212a2ca72a technoweenie technoweenie@567b1171-46fb-0310-a4c9-b4bef9110e78 http://github.com/francois/mephisto/commit/1da1ea5e583cb806314d4b7438c61d4af161c07e 1da1ea5e583cb806314d4b7438c61d4af161c07e 2006-09-26T23:06:47-07:00 2006-09-26T23:06:47-07:00 scope site section ordering to the current site object, so its called like site.sections.order instead of Section.order git-svn-id: http://svn.techno-weenie.net/projects/mephisto/trunk@2292 567b1171-46fb-0310-a4c9-b4bef9110e78 d4590b6400e8bfc21c4eabc4be78fb817df3f605 technoweenie technoweenie@567b1171-46fb-0310-a4c9-b4bef9110e78