Serialization of attached documents is wrong #1601
This commit is contained in:
parent
9d76eedfa3
commit
44b21d06d1
@ -24,7 +24,7 @@ class DmsfWorkflowsController < ApplicationController
|
|||||||
self.main_menu = false
|
self.main_menu = false
|
||||||
|
|
||||||
before_action :find_model_object, except: %i[create new index assign assignment]
|
before_action :find_model_object, except: %i[create new index assign assignment]
|
||||||
before_action :find_project, except: %i[assignment]
|
before_action :find_project
|
||||||
before_action :authorize_custom
|
before_action :authorize_custom
|
||||||
before_action :permissions?, only: %i[new_action assignment start]
|
before_action :permissions?, only: %i[new_action assignment start]
|
||||||
before_action :approver_candidates, only: %i[remove_step show reorder_steps add_step]
|
before_action :approver_candidates, only: %i[remove_step show reorder_steps add_step]
|
||||||
@ -216,7 +216,7 @@ class DmsfWorkflowsController < ApplicationController
|
|||||||
revision = DmsfFileRevision.find_by(id: params[:dmsf_file_revision_id])
|
revision = DmsfFileRevision.find_by(id: params[:dmsf_file_revision_id])
|
||||||
begin
|
begin
|
||||||
if revision
|
if revision
|
||||||
@project = revision.dmsf_file.project
|
@project = revision.dmsf_file.project unless @project
|
||||||
revision.set_workflow(params[:dmsf_workflow_id], params[:action])
|
revision.set_workflow(params[:dmsf_workflow_id], params[:action])
|
||||||
revision.assign_workflow(params[:dmsf_workflow_id])
|
revision.assign_workflow(params[:dmsf_workflow_id])
|
||||||
if request.post?
|
if request.post?
|
||||||
|
|||||||
@ -359,8 +359,7 @@ class DmsfWorkflowsControllerTest < RedmineDmsf::Test::TestCase
|
|||||||
id: @wf1.id,
|
id: @wf1.id,
|
||||||
dmsf_workflow_id: @wf1.id,
|
dmsf_workflow_id: @wf1.id,
|
||||||
dmsf_file_revision_id: @revision2.id,
|
dmsf_file_revision_id: @revision2.id,
|
||||||
action: 'assignment',
|
action: 'assignment'
|
||||||
project_id: @project1.id,
|
|
||||||
}
|
}
|
||||||
assert_response :redirect
|
assert_response :redirect
|
||||||
end
|
end
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user