jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

This commit is contained in:
z9hang 2014-06-26 17:55:21 +08:00
parent 74603e1256 33baf88886
commit d57688413e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/attachments_controller.rb
View File

@ -120,7 +120,7 @@ class AttachmentsController < ApplicationController
end end
if @attachment.container if @attachment.container
# Make sure association callbacks are called # Make sure association callbacks are called
@attachment.container.def attachments.delete(@attachment) @attachment.container.attachments.delete(@attachment)
else else
@attachment.destroy @attachment.destroy
end end