diff --git a/app/views/my/blocks/_open_approvals.html.erb b/app/views/my/blocks/_open_approvals.html.erb index e4572878..c6351a61 100644 --- a/app/views/my/blocks/_open_approvals.html.erb +++ b/app/views/my/blocks/_open_approvals.html.erb @@ -26,7 +26,7 @@ '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.id }).where( ['dmsf_workflow_step_actions.id IS NULL OR dmsf_workflow_step_actions.action = ?', DmsfWorkflowStepAction::ACTION_DELEGATE]) %> - <% all_assignments.each do |assignment| %> + <% all_assignments.find_each do |assignment| %> <% 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) && @@ -36,10 +36,10 @@ <% end %> <% end %> <% unless defined?(EasyExtensions) %> -

<%= l(:open_approvals)%> (<%= assignments.count %>)

+

<%= l(:open_approvals)%> (<%= assignments.size %>)

<% end %> <% if assignments.any? %> - <%= form_tag({}) do %> + <%= form_tag do %> diff --git a/test/functional/my_controller_test.rb b/test/functional/my_controller_test.rb index 550b62f9..3b70fff5 100644 --- a/test/functional/my_controller_test.rb +++ b/test/functional/my_controller_test.rb @@ -23,9 +23,9 @@ require File.expand_path('../../test_helper', __FILE__) class MyControllerTest < RedmineDmsf::Test::TestCase include Redmine::I18n - fixtures :users, :email_addresses, :user_preferences, :projects, - :dmsf_workflows, :dmsf_workflow_steps, :dmsf_workflow_step_assignments, - :dmsf_file_revisions, :dmsf_folders, :dmsf_files, :dmsf_locks + fixtures :users, :email_addresses, :user_preferences, :projects, :dmsf_workflows, :dmsf_workflow_steps, + :dmsf_workflow_step_assignments, :dmsf_workflow_step_actions, :dmsf_file_revisions, :dmsf_folders, + :dmsf_files, :dmsf_locks def setup @user_member = User.find 2 @@ -44,7 +44,7 @@ class MyControllerTest < RedmineDmsf::Test::TestCase assert_response :success unless defined?(EasyExtensions) assert_select 'div#list-top' do - assert_select 'h3', { :text => "#{l(:open_approvals)} (3)" } + assert_select 'h3', { :text => "#{l(:open_approvals)} (1)" } end end end