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

Workflow tooltip fix

Browse Source
This commit is contained in:
Karel Pičman 2018-11-13 15:34:42 +01:00
parent fcfbd271fe
commit 28b62d5744
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/dmsf_workflow.rb
View File

@ -127,7 +127,7 @@ class DmsfWorkflow < ActiveRecord::Base
end end
unless step_is_finished unless step_is_finished
steps.each do |step| 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) results << assignment if assignment.add?(dmsf_file_revision_id)
end end
end end

2
test/fixtures/dmsf_workflow_step_assignments.yml vendored
View File

@ -51,4 +51,4 @@ wfsa9:
id: 9 id: 9
dmsf_workflow_step_id: 5 dmsf_workflow_step_id: 5
user_id: 2 user_id: 2
dmsf_file_revision_id: 5 dmsf_file_revision_id: 1

19
test/functional/my_controller_test.rb
View File

@ -36,10 +36,11 @@ class MyControllerTest < RedmineDmsf::Test::TestCase
def test_truth def test_truth
assert_kind_of User, @user_member assert_kind_of User, @user_member
end 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[:my_page_layout] = { 'top' => ['open_approvals'] }
@user_member.pref.save! @user_member.pref.save!
get :page get :page
assert_response :success assert_response :success
unless defined?(EasyExtensions) unless defined?(EasyExtensions)
@ -48,6 +49,18 @@ class MyControllerTest < RedmineDmsf::Test::TestCase
end end
end 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 def test_page_with_open_locked_documents
@user_member.pref[:my_page_layout] = { 'top' => ['locked_documents'] } @user_member.pref[:my_page_layout] = { 'top' => ['locked_documents'] }