redmine_plugins/redmine_dmsf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

A file unlock exception handling

Browse Source
This commit is contained in:
Karel Picman 2013-10-04 15:52:37 +02:00
parent 7396ed34f9
commit 34123392f2
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/controllers/dmsf_workflows_controller.rb
View File

@ -48,7 +48,13 @@ class DmsfWorkflowsController < ApplicationController
if revision
if @workflow.try_finish revision, action, (params[:step_action].to_i / 10)
file = DmsfFile.joins(:revisions).where(:dmsf_file_revisions => {:id => revision.id}).first
file.unlock! if file
if file
begin
file.unlock!
rescue DmsfLockError => e
logger.error e.message
end
end
if revision.workflow == DmsfWorkflow::STATE_APPROVED
# Just approved
DmsfMailer.workflow_notification(
@ -107,8 +113,8 @@ class DmsfWorkflowsController < ApplicationController
end
end
flash[:notice] = l(:notice_successful_update)
else
flash[:error] = l(:error_empty_note)
elsif action.action != DmsfWorkflowStepAction::ACTION_APPROVE && action.note.blank?
flash[:error] = l(:error_empty_note)
end
end
end