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

2014-06-26 17:55:21 +08:00 · 2014-06-26 17:55:21 +08:00 · d57688413e
parent 74603e1256 33baf88886
commit d57688413e
1 changed files with 1 additions and 1 deletions
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@ -120,7 +120,7 @@ class AttachmentsController < ApplicationController
    end
    if @attachment.container
      # Make sure association callbacks are called
-      @attachment.container.def attachments.delete(@attachment)
+      @attachment.container.attachments.delete(@attachment)
    else
      @attachment.destroy
    end