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

#1124 (x folders / y documents)

Browse Source
This commit is contained in:
Karel Pičman 2022-10-11 09:10:08 +02:00
parent f22ac80d0d
commit e1061c6a98
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/views/my/blocks/_locked_documents.html.erb
View File

@ -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]) %>
<h3>
<%= 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}" %>)
</h3>
<% if folders.any? || files.any?%>
<%= form_tag({}, data: { cm_url: dmsf_context_menu_path(back_url: my_page_path) }) do %>

3
test/functional/my_controller_test.rb
View File

@ -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