jro_apps/redmine Commit - r8953:64d843a4d715

Rails 3.1 compatibility....

Jean-Philippe Lang -

r8953:64d843a4d715

parent child

Context file:

r8953:64d843a4d715

app/controllers/attachments_controller.rb +3 0

               end
               def destroy
+                if @attachment.container.respond_to?(:init_journal)
+                  @attachment.container.init_journal(User.current)
+                end
                 # Make sure association callbacks are called
                 @attachment.container.attachments.delete(@attachment)
                 redirect_to :back

app/models/issue.rb +4 -5

               # Callback on attachment deletion
               def attachment_removed(obj)
-                journal = init_journal(User.current)
+                if @current_journal && !obj.new_record?
-                journal.details << JournalDetail.new(:property => 'attachment',
+                  @current_journal.details << JournalDetail.new(:property => 'attachment', :prop_key => obj.id, :old_value => obj.filename)
-                                                     :prop_key => obj.id,
+                  @current_journal.save
-                                                     :old_value => obj.filename)
+                end
-                journal.save
               end
               # Default assignment based on category

test/functional/attachments_controller_test.rb +7 -4

                 @request.session[:user_id] = 2
                 assert_difference 'issue.attachments.count', -1 do
-                  delete :destroy, :id => 1
+                  assert_difference 'Journal.count' do
+                    delete :destroy, :id => 1
+                    assert_redirected_to '/projects/ecookbook'
+                  end
                 end
-                # no referrer
-                assert_redirected_to '/projects/ecookbook'
                 assert_nil Attachment.find_by_id(1)
-                j = issue.journals.find(:first, :order => 'created_on DESC')
+                j = Journal.first(:order => 'id DESC')
+                assert_equal issue, j.journalized
                 assert_equal 'attachment', j.details.first.property
                 assert_equal '1', j.details.first.prop_key
                 assert_equal 'error281.txt', j.details.first.old_value
+                assert_equal User.find(2), j.user
               end
               def test_destroy_wiki_page_attachment

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages