From 13330942d52610da09d9f42ec9a138af4249afa6 Mon Sep 17 00:00:00 2001 From: Karel Picman Date: Tue, 22 Oct 2013 09:58:17 +0200 Subject: [PATCH] #169 I first lock the file then Assign an approval workflow get some error --- app/controllers/dmsf_workflows_controller.rb | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/app/controllers/dmsf_workflows_controller.rb b/app/controllers/dmsf_workflows_controller.rb index 6f6f5ebf..fdc3fe6a 100644 --- a/app/controllers/dmsf_workflows_controller.rb +++ b/app/controllers/dmsf_workflows_controller.rb @@ -52,7 +52,7 @@ class DmsfWorkflowsController < ApplicationController begin file.unlock! rescue DmsfLockError => e - logger.error e.message + logger.warn e.message end end if revision.workflow == DmsfWorkflow::STATE_APPROVED @@ -134,8 +134,14 @@ class DmsfWorkflowsController < ApplicationController if request.post? if revision.save file = DmsfFile.find_by_id revision.dmsf_file_id - file.lock! if file - flash[:notice] = l(:notice_successful_update) + if file + begin + file.lock! + rescue DmsfLockError => e + logger.warn e.message + end + flash[:notice] = l(:notice_successful_update) + end else flash[:error] = l(:error_workflow_assign) end