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

#1434 duplicited code

Browse Source
This commit is contained in:
Karel Pičman 2023-03-23 12:25:04 +01:00
parent 2b73e59c8f
commit 969e76e0f7
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/rubyonrails.yml vendored
View File

@ -127,7 +127,7 @@ jobs:
cp /opt/redmine/config/additional_environment.rb.example /opt/redmine/config/additional_environment.rb cp /opt/redmine/config/additional_environment.rb.example /opt/redmine/config/additional_environment.rb
echo "config.log_level = :info" >> /opt/redmine/config/additional_environment.rb echo "config.log_level = :info" >> /opt/redmine/config/additional_environment.rb
echo "# Redmine DMSF's WebDAV" >> /opt/redmine/config/additional_environment.rb echo "# Redmine DMSF's WebDAV" >> /opt/redmine/config/additional_environment.rb
echo "require File.dirname(__FILE__) + '/plugins/redmine_dmsf/lib/redmine_dmsf/webdav/custom_middleware'" >> /opt/redmine/config/additional_environment.rb echo "require 'plugins/redmine_dmsf/lib/redmine_dmsf/webdav/custom_middleware'" >> /opt/redmine/config/additional_environment.rb
echo "config.middleware.insert_before ActionDispatch::Cookies, RedmineDmsf::Webdav::CustomMiddleware" >> /opt/redmine/config/additional_environment.rb echo "config.middleware.insert_before ActionDispatch::Cookies, RedmineDmsf::Webdav::CustomMiddleware" >> /opt/redmine/config/additional_environment.rb
- name: Standard tests - name: Standard tests
# Run the tests # Run the tests

3
lib/redmine_dmsf/macros.rb
View File

@ -43,9 +43,6 @@ module RedmineDmsf
raise ActiveRecord::RecordNotFound raise ActiveRecord::RecordNotFound
end end
end end
unless User.current&.allowed_to?(:view_dmsf_files, file.project, { id: file.id })
raise l(:notice_not_authorized)
end
title = args[1].present? ? args[1] : file.title title = args[1].present? ? args[1] : file.title
title.gsub! /\A"|"\z/, '' # Remove apostrophes title.gsub! /\A"|"\z/, '' # Remove apostrophes
title.gsub! /\A'|'\z/, '' title.gsub! /\A'|'\z/, ''

8
test/functional/dmsf_files_controller_test.rb
View File

@ -79,9 +79,11 @@ class DmsfFilesControllerTest < RedmineDmsf::Test::TestCase
def test_view_preview def test_view_preview
get :view, params: { id: @file13.id } get :view, params: { id: @file13.id }
assert_response :success if RedmineDmsf::Preview.office_available?
assert_equal 'application/pdf', @response.media_type assert_response :success
assert @response.body.starts_with?('%PDF') assert_equal 'application/pdf', @response.media_type
assert @response.body.starts_with?('%PDF')
end
end end
def delete_forbidden def delete_forbidden

6
test/functional/my_controller_test.rb
View File

@ -80,8 +80,10 @@ class MyControllerTest < RedmineDmsf::Test::TestCase
@project1.add_watcher @jsmith @project1.add_watcher @jsmith
get :page get :page
assert_response :success assert_response :success
assert_select 'div#list-top' do unless defined?(EasyExtensions)
assert_select 'h3', { text: "#{l(:label_dmsf_watched)} (2/1)" } assert_select 'div#list-top' do
assert_select 'h3', { text: "#{l(:label_dmsf_watched)} (2/1)" }
end
end end
end end