Skip to content

Commit a414042

Browse files
committed
Log warning when submission deletion fails.
1 parent d175af3 commit a414042

1 file changed

Lines changed: 13 additions & 8 deletions

File tree

app/controllers/admin/submissions_controller.rb

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -186,25 +186,30 @@ def unmark
186186
def delete
187187
ensure_form_manager(form: @form)
188188

189-
Event.log_event(Event.names[:response_deleted], 'Submission', @submission.id, "Submission #{@submission.id} undeleted at #{DateTime.now}", current_user.id)
190-
@submission.update(deleted: true, deleted_at: Time.now)
189+
if @submission.update(deleted: true, deleted_at: Time.now)
190+
Event.log_event(Event.names[:response_deleted], 'Submission', @submission.id, "Submission #{@submission.id} deleted at #{DateTime.now}", current_user.id)
191+
else
192+
Rails.logger.warn("Failed to delete submission: #{@submission.errors.full_messages.join(', ')}")
193+
end
191194
end
192195

193196
def destroy
194197
ensure_form_manager(form: @form)
195198

196-
Event.log_event(Event.names[:response_deleted], 'Submission', @submission.id, "Submission #{@submission.id} undeleted at #{DateTime.now}", current_user.id)
197-
@submission.update(deleted: true, deleted_at: Time.now)
198-
199-
respond_to do |format|
200-
format.js { render :destroy }
199+
if @submission.update(deleted: true, deleted_at: Time.now)
200+
Event.log_event(Event.names[:response_deleted], 'Submission', @submission.id, "Submission #{@submission.id} deleted at #{DateTime.now}", current_user.id)
201+
respond_to do |format|
202+
format.js { render :destroy }
203+
end
204+
else
205+
Rails.logger.warn("Failed to delete submission: #{@submission.errors.full_messages.join(', ')}")
201206
end
202207
end
203208

204209
def undelete
205210
ensure_form_manager(form: @form)
206211

207-
Event.log_event(Event.names[:response_undeleted], 'Submission', @submission.id, "Submission #{@submission.id} deleted at #{DateTime.now}", current_user.id)
212+
Event.log_event(Event.names[:response_undeleted], 'Submission', @submission.id, "Submission #{@submission.id} undeleted at #{DateTime.now}", current_user.id)
208213
@submission.update(deleted: false, deleted_at: nil)
209214
end
210215

0 commit comments

Comments
 (0)