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

#1417i tests

Browse Source
This commit is contained in:
Karel Pičman 2023-01-18 17:55:16 +01:00
parent 9e2f71a9fa
commit 61c0aab716
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/dmsf_query.rb
View File

@ -146,7 +146,7 @@ class DmsfQuery < Query
"SELECT ct.id FROM dmsf_folders ct LEFT OUTER JOIN custom_values ON custom_values.customized_type='DmsfFolder' AND custom_values.customized_id=ct.id AND custom_values.custom_field_id=", "SELECT ct.id FROM dmsf_folders ct LEFT OUTER JOIN custom_values ON custom_values.customized_type='DmsfFolder' AND custom_values.customized_id=ct.id AND custom_values.custom_field_id=",
'SELECT custom_values.customized_id FROM custom_values WHERE custom_values.customized_type=dmsf_folders.customized_type AND custom_values.customized_id=dmsf_folders.customized_id AND custom_values.custom_field_id=') 'SELECT custom_values.customized_id FROM custom_values WHERE custom_values.customized_type=dmsf_folders.customized_type AND custom_values.customized_id=dmsf_folders.customized_id AND custom_values.custom_field_id=')
sql_cf.gsub! 'WHERE dmsf_folders.id = ct.id AND (', 'AND ' sql_cf.gsub! 'WHERE dmsf_folders.id = ct.id AND (', 'AND '
sql_cf.gsub!(/\)$/, '') sql_cf.gsub! /\)$/, ''
filters_clauses << sql_cf filters_clauses << sql_cf
else else
filters_clauses << '(' + sql_for_field(field, operator, v, queried_table_name, field) + ')' filters_clauses << '(' + sql_for_field(field, operator, v, queried_table_name, field) + ')'

10
test/functional/dmsf_controller_test.rb
View File

@ -235,6 +235,16 @@ class DmsfControllerTest < RedmineDmsf::Test::TestCase
assert_select 'a', text: @file10.title, count: 0 assert_select 'a', text: @file10.title, count: 0
end end
def test_show_filters_custom_field
get :show, params: { id: @project1.id, set_filter: '1', f: ['cf_21', ''], op: { 'cf_21' => '=' },
v: { 'cf_21' => ['User documentation']} }
assert_response :success
# Folder 1 with Tag=User documentation
assert_select 'a', text: @folder1.title
# Other document/folders are not present
assert_select 'a', text: @file10.title, count: 0
end
def test_show_without_file_manipulation def test_show_without_file_manipulation
@role_manager.remove_permission! :file_manipulation @role_manager.remove_permission! :file_manipulation
get :show, params: { id: @project1.id } get :show, params: { id: @project1.id }