diff --git a/app/models/dmsf_workflow.rb b/app/models/dmsf_workflow.rb index 12b66748..8195ea7a 100644 --- a/app/models/dmsf_workflow.rb +++ b/app/models/dmsf_workflow.rb @@ -127,7 +127,7 @@ class DmsfWorkflow < ActiveRecord::Base end unless step_is_finished steps.each do |step| - step.dmsf_workflow_step_assignments.find_each do |assignment| + step.dmsf_workflow_step_assignments.where(dmsf_file_revision_id: dmsf_file_revision_id).find_each do |assignment| results << assignment if assignment.add?(dmsf_file_revision_id) end end diff --git a/test/fixtures/dmsf_workflow_step_assignments.yml b/test/fixtures/dmsf_workflow_step_assignments.yml index 85d1c1fe..c8e0760b 100644 --- a/test/fixtures/dmsf_workflow_step_assignments.yml +++ b/test/fixtures/dmsf_workflow_step_assignments.yml @@ -51,4 +51,4 @@ wfsa9: id: 9 dmsf_workflow_step_id: 5 user_id: 2 - dmsf_file_revision_id: 5 \ No newline at end of file + dmsf_file_revision_id: 1 \ No newline at end of file diff --git a/test/functional/my_controller_test.rb b/test/functional/my_controller_test.rb index 45dd6b71..a627e191 100644 --- a/test/functional/my_controller_test.rb +++ b/test/functional/my_controller_test.rb @@ -36,10 +36,11 @@ class MyControllerTest < RedmineDmsf::Test::TestCase def test_truth assert_kind_of User, @user_member end - - def test_page_with_open_approvals_block + + def test_page_with_open_approvals_one_approval + DmsfFileRevision.delete_all(id: 5) @user_member.pref[:my_page_layout] = { 'top' => ['open_approvals'] } - @user_member.pref.save! + @user_member.pref.save! get :page assert_response :success unless defined?(EasyExtensions) @@ -48,6 +49,18 @@ class MyControllerTest < RedmineDmsf::Test::TestCase end end end + + def test_page_with_open_approvals_no_approval + @user_member.pref[:my_page_layout] = { 'top' => ['open_approvals'] } + @user_member.pref.save! + get :page + assert_response :success + unless defined?(EasyExtensions) + assert_select 'div#list-top' do + assert_select 'h3', { :text => "#{l(:open_approvals)} (0)" } + end + end + end def test_page_with_open_locked_documents @user_member.pref[:my_page_layout] = { 'top' => ['locked_documents'] }