From e1061c6a98c5836928bb803d0f7968d9f3df2042 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Pi=C4=8Dman?= Date: Tue, 11 Oct 2022 09:10:08 +0200 Subject: [PATCH] #1124 (x folders / y documents) --- app/views/my/blocks/_locked_documents.html.erb | 3 +-- test/functional/my_controller_test.rb | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/my/blocks/_locked_documents.html.erb b/app/views/my/blocks/_locked_documents.html.erb index 9e923d5d..9f2cf497 100644 --- a/app/views/my/blocks/_locked_documents.html.erb +++ b/app/views/my/blocks/_locked_documents.html.erb @@ -29,8 +29,7 @@ ['dmsf_locks.entity_type = ? AND dmsf_locks.user_id = ? AND (dmsf_locks.expires_at IS NULL OR dmsf_locks.expires_at > ?)', 0, @user&.id, Time.current]) %>

- <%= l(:locked_documents)%> (<%= "#{folders.all.size} #{l(:label_number_of_folders).downcase}" %> / - <%= "#{files.all.size} #{l(:label_number_of_documents).downcase}" %>) + <%= l(:locked_documents)%> (<%= "#{folders.all.size} #{l(:label_number_of_folders).downcase}" %> / <%= "#{files.all.size} #{l(:label_number_of_documents).downcase}" %>)

<% if folders.any? || files.any?%> <%= form_tag({}, data: { cm_url: dmsf_context_menu_path(back_url: my_page_path) }) do %> diff --git a/test/functional/my_controller_test.rb b/test/functional/my_controller_test.rb index ff1bf418..da5195ab 100644 --- a/test/functional/my_controller_test.rb +++ b/test/functional/my_controller_test.rb @@ -66,7 +66,8 @@ class MyControllerTest < RedmineDmsf::Test::TestCase assert_response :success unless defined?(EasyExtensions) assert_select 'div#list-top' do - assert_select 'h3', { text: "#{l(:locked_documents)} (0/1)" } + assert_select 'h3', { text: + "#{l(:locked_documents)} (0 #{l(:label_number_of_folders).downcase} / 1 #{l(:label_number_of_documents).downcase})" } end end end