fix odd timezone bug when saving articles

git-svn-id: http://svn.techno-weenie.net/projects/mephisto/trunk@1978 567b1171-46fb-0310-a4c9-b4bef9110e78

CHANGELOG

@@ -1,5 +1,7 @@
 * SVN *
 
+* fix odd timezone bug when saving articles
+
 * fix bug with <typo:code> macro
 
 * bad feed urls raise ActiveRecord::RecordNotFound, and return 404 in production

app/controllers/admin/articles_controller.rb

@@ -137,7 +137,7 @@ def convert_times_to_utc
         date = Time.parse_from_attributes(params[:article], :published_at, :local)
         next unless date
         params[:article].delete_if { |k, v| k.to_s =~ /^#{:published_at}/ }
-        params[:article][:published_at] = date.utc
+        params[:article][:published_at] = utc_to_local(date)
       end
     end
 

test/functional/admin/articles_controller_test.rb

@@ -90,7 +90,7 @@ def test_should_create_article
           'published_at(1i)' => '2005', 'published_at(2i)' => '1', 'published_at(3i)' => '1', 'published_at(4i)' => '10' }, :submit => :save
         assert_redirected_to :action => 'index'
         assert  assigns(:article).published?
-        assert_equal Time.local(2005, 1, 1, 9, 0, 0).utc, assigns(:article).published_at
+        assert_equal Time.utc(2005, 1, 1, 5, 0, 0), assigns(:article).published_at
         assert !assigns(:article).new_record?
         assert_equal users(:quentin), assigns(:article).updater
       end
@@ -181,7 +181,7 @@ def test_should_update_article_with_correct_time
       post :update, :id => contents(:welcome).id, :article => { 'published_at(1i)' => '2005', 'published_at(2i)' => '1', 'published_at(3i)' => '1', 'published_at(4i)' => '10' }
       assert_redirected_to :action => 'index'
       assert  assigns(:article).published?
-      assert_equal Time.local(2005, 1, 1, 9, 0, 0).utc, assigns(:article).published_at
+      assert_equal Time.utc(2005, 1, 1, 5, 0, 0), assigns(:article).published_at
     end
   end
 
@@ -330,7 +330,7 @@ def test_should_not_create_article_when_uploading_asset
         assert_template 'new'
         assert_valid assigns(:article)
         assert assigns(:article).new_record?
-        assert_equal Time.local(2005, 1, 1, 9, 0, 0).utc, assigns(:article).published_at
+        assert_equal Time.utc(2005, 1, 1, 5, 0, 0), assigns(:article).published_at
         assert_equal users(:quentin), assigns(:article).updater
       end
     end