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

An invalid /th> tag

Browse Source
This commit is contained in:
Karel Pičman 2018-11-13 12:39:17 +01:00
parent 5741261343
commit fcfbd271fe
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/dmsf_workflows_controller.rb
View File

@ -419,14 +419,11 @@ class DmsfWorkflowsController < ApplicationController
step = @dmsf_workflow.dmsf_workflow_steps[index] step = @dmsf_workflow.dmsf_workflow_steps[index]
step.name = params[:dmsf_workflow][:step_name] step.name = params[:dmsf_workflow][:step_name]
if step.save if step.save
s = @dmsf_workflow.dmsf_workflow_steps.find_by(step: step.step) @dmsf_workflow.dmsf_workflow_steps.where(step: step.step).find_each do |s|
if s
s.name = step.name s.name = step.name
unless s.save unless s.save
flash[:error] = s.errors.full_messages.to_sentence flash[:error] = s.errors.full_messages.to_sentence
end end
else
render_404
end end
else else
flash[:error] = step.errors.full_messages.to_sentence flash[:error] = step.errors.full_messages.to_sentence

15
test/fixtures/dmsf_workflow_steps.yml vendored
View File

@ -1,11 +1,4 @@
--- ---
wfs2:
id: 2
dmsf_workflow_id: 1
step: 2
name: '2nd step'
user_id: 2
operator: 1
wfs1: wfs1:
id: 1 id: 1
@ -15,6 +8,14 @@ wfs1:
user_id: 1 user_id: 1
operator: 0 operator: 0
wfs2:
id: 2
dmsf_workflow_id: 1
step: 2
name: '2nd step'
user_id: 2
operator: 1
wfs3: wfs3:
id: 3 id: 3
dmsf_workflow_id: 1 dmsf_workflow_id: 1

8
test/functional/dmsf_workflow_controller_test.rb
View File

@ -353,7 +353,7 @@ class DmsfWorkflowsControllerTest < RedmineDmsf::Test::TestCase
def test_start def test_start
@revision2.dmsf_workflow_id = @wf1.id @revision2.dmsf_workflow_id = @wf1.id
get :start, :id => @revision2.dmsf_workflow_id,:dmsf_file_revision_id => @revision2.id get :start, :id => @revision2.dmsf_workflow_id, :dmsf_file_revision_id => @revision2.id
assert_redirected_to dmsf_folder_path(:id => @project1.id) assert_redirected_to dmsf_folder_path(:id => @project1.id)
end end
@ -372,8 +372,14 @@ class DmsfWorkflowsControllerTest < RedmineDmsf::Test::TestCase
def test_update_step_name def test_update_step_name
put :update_step, id: @wf1.id, step: @wfs2.step, dmsf_workflow: { step_name: 'new_name'} put :update_step, id: @wf1.id, step: @wfs2.step, dmsf_workflow: { step_name: 'new_name'}
assert_response :redirect assert_response :redirect
# All steps in the same step must be renamed
@wfs2.reload @wfs2.reload
assert_equal 'new_name', @wfs2.name assert_equal 'new_name', @wfs2.name
@wfs3.reload
assert_equal 'new_name', @wfs3.name
# But not in others
@wfs1.reload
assert_equal '1st step', @wfs1.name
end end
def test_update_step_operators def test_update_step_operators