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

#169 I first lock the file then Assign an approval workflow get some error

Browse Source
This commit is contained in:
Karel Picman 2013-10-22 09:58:17 +02:00
parent 3d0295e424
commit 13330942d5
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

@ -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