|
|
@ -203,12 +203,7 @@ class AttachmentsController < ApplicationController
|
|
|
|
if @attachment.container.respond_to?(:init_journal)
|
|
|
|
if @attachment.container.respond_to?(:init_journal)
|
|
|
|
@attachment.container.init_journal(User.current)
|
|
|
|
@attachment.container.init_journal(User.current)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
if @attachment.container
|
|
|
|
@attachment.destroy
|
|
|
|
# Make sure association callbacks are called
|
|
|
|
|
|
|
|
@attachment.container.attachments.delete(@attachment)
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
@attachment.destroy
|
|
|
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
respond_to do |format|
|
|
|
|
respond_to do |format|
|
|
|
|
if !@attachment.container.nil? &&
|
|
|
|
if !@attachment.container.nil? &&
|
|
|
|