Karel Pičman 2018-11-09 09:03:33 +01:00
parent 53f8d42ffc
commit 232e59069f
3 changed files with 3 additions and 29 deletions

View File

@ -96,7 +96,7 @@ dmsf_file_revisions_005:
mime_type: text/plain mime_type: text/plain
title: "Test File" title: "Test File"
description: NULL description: NULL
workflow: NULL workflow: 1 # DmsfWorkflow::STATE_WAITING_FOR_APPROVAL
minor_version: 0 minor_version: 0
major_version: 1 major_version: 1
comment: NULL comment: NULL
@ -105,7 +105,7 @@ dmsf_file_revisions_005:
user_id: 1 user_id: 1
dmsf_workflow_assigned_by: NULL dmsf_workflow_assigned_by: NULL
dmsf_workflow_started_by: NULL dmsf_workflow_started_by: NULL
created_at: 2017-04-18 14:52:27 +02:00 created_at: 2017-04-18 14:52:28 +02:00
dmsf_file_revisions_006: dmsf_file_revisions_006:
id: 6 id: 6

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: 1 dmsf_file_revision_id: 5

View File

@ -38,32 +38,6 @@ class MyControllerTest < RedmineDmsf::Test::TestCase
end end
def test_page_with_open_approvals_block def test_page_with_open_approvals_block
### Postgres test
all_assignments = DmsfWorkflowStepAssignment.joins(
'LEFT JOIN dmsf_workflow_step_actions ON dmsf_workflow_step_assignments.id = dmsf_workflow_step_actions.dmsf_workflow_step_assignment_id').where(
:dmsf_workflow_step_assignments => { :user_id => @user_member.id }).where(
['dmsf_workflow_step_actions.id IS NULL OR dmsf_workflow_step_actions.action = ?', DmsfWorkflowStepAction::ACTION_DELEGATE])
puts all_assignments.to_sql
puts "all assignments count: #{all_assignments.all.size}"
assignments = []
all_assignments.find_each do |assignment|
puts assignment.id
puts assignment.dmsf_file_revision.dmsf_file.last_revision.present?
puts assignment.dmsf_file_revision.dmsf_file.last_revision.deleted?
puts assignment.dmsf_file_revision.workflow
puts "#{assignment.dmsf_file_revision.id} == #{assignment.dmsf_file_revision.dmsf_file.last_revision.id}"
if assignment.dmsf_file_revision.dmsf_file.last_revision &&
!assignment.dmsf_file_revision.dmsf_file.last_revision.deleted? &&
(assignment.dmsf_file_revision.workflow == DmsfWorkflow::STATE_WAITING_FOR_APPROVAL) &&
(assignment.dmsf_file_revision.id == assignment.dmsf_file_revision.dmsf_file.last_revision.id)
assignments << assignment
puts 'yes'
else
puts 'no'
end
end
puts "open assignments count: #{assignments.size}"
###
@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