@@ -85,7 +85,7 @@ class Asset < ActiveRecord::Base protected def rename_unique_filename - if (@old_filename || new_record?) && errors.empty? && site_id && filename + if ((@old_filename && !@old_filename.eql?(full_filename)) || new_record?) && errors.empty? && site_id && filename i = 1 pieces = filename.split('.') ext = pieces.size == 1 ? nil : pieces.pop app/models/asset.rb @@ -44,6 +44,13 @@ class AssetTest < Test::Unit::TestCase assert_file_exists File.join(ASSET_PATH, now.year.to_s, now.month.to_s, now.day.to_s, "logo_1.png") end + def test_should_not_rename_file_on_update + asset = process_upload + old_filename = asset.filename + asset.update_attributes({ :filename => 'logo.png' }) + assert_equal old_filename, asset.filename + end + def test_should_upload_file_in_multi_sites_mode Site.multi_sites_enabled = true process_upload test/unit/asset_test.rb 9c610fccc09a0ea54393685b10d27f93c53baf8c rick technoweenie@gmail.com http://github.com/technoweenie/mephisto/commit/3afcdaeac833515e2378c826fca7b1505aa48bb4 3afcdaeac833515e2378c826fca7b1505aa48bb4 2008-03-04T01:36:46-08:00 2008-03-04T01:36:46-08:00 tweak to Asset so it doesn't lose thumbnails when the asset itself is edited [Aubrey] 73a3a59801344c791a27f7372a62dfbe9f9e718d rick technoweenie@gmail.com