From 8bf3ab24d5700d067d6e85d00e6683c1ba77306c Mon Sep 17 00:00:00 2001 From: Billy Zhou Date: Sun, 16 Sep 2018 00:22:56 +0800 Subject: [PATCH] Fixed issue #2233 - Boolean object set to false is not visible (fixes #2233) --- .../controllers/widget/organization.coffee | 2 +- .../app/views/widget/organization.jst.eco | 2 +- test/browser/admin_object_manager_test.rb | 52 +++++++++++++++++++ test/browser_test_helper.rb | 45 +++++++++++++--- 4 files changed, 93 insertions(+), 8 deletions(-) diff --git a/app/assets/javascripts/app/controllers/widget/organization.coffee b/app/assets/javascripts/app/controllers/widget/organization.coffee index 106a444a3..37befa1f0 100644 --- a/app/assets/javascripts/app/controllers/widget/organization.coffee +++ b/app/assets/javascripts/app/controllers/widget/organization.coffee @@ -29,7 +29,7 @@ class App.WidgetOrganization extends App.Controller name = nameNew # add to show if value exists - if ( organization[name] || attributeConfig.tag is 'richtext' ) && attributeConfig.shown + if ( organization[name]? || attributeConfig.tag is 'richtext' ) && attributeConfig.shown # do not show firstname and lastname / already show via diplayName() if name isnt 'name' diff --git a/app/assets/javascripts/app/views/widget/organization.jst.eco b/app/assets/javascripts/app/views/widget/organization.jst.eco index 5935cfdc6..2b5d2daf9 100644 --- a/app/assets/javascripts/app/views/widget/organization.jst.eco +++ b/app/assets/javascripts/app/views/widget/organization.jst.eco @@ -8,7 +8,7 @@ <% for row in @organizationData: %> - <% if @organization[row.name] || row.name is 'note': %> + <% if @organization[row.name]? || row.name is 'note': %>
<% if row.tag isnt 'richtext': %> diff --git a/test/browser/admin_object_manager_test.rb b/test/browser/admin_object_manager_test.rb index 707aa383c..72a115424 100644 --- a/test/browser/admin_object_manager_test.rb +++ b/test/browser/admin_object_manager_test.rb @@ -774,4 +774,56 @@ class AdminObjectManagerTest < TestCase object_manager_attribute_migrate end + # verify fix for issue #2233 - Boolean object set to false is not visible + def test_false_boolean_attributes_gets_displayed + @browser = browser_instance + login( + username: 'master@example.com', + password: 'test', + url: browser_url, + ) + tasks_close_all() + + object_manager_attribute_create( + data: { + object: 'Organization', + name: 'bool_test', + display: 'bool_test', + data_type: 'Boolean', + data_option: { + options: { + # rubocop:disable Lint/BooleanSymbol + true: 'YES', + false: 'NO', + # rubocop:enable Lint/BooleanSymbol + } + }, + }, + ) + object_manager_attribute_migrate + + ticket_open_by_title(title: 'select') + + click( css: '.content.active .tabsSidebar-tab[data-tab="organization"]' ) + click( css: '.content.active .sidebar[data-tab="organization"] .js-actions .dropdown-toggle' ) + click( css: '.content.active .sidebar[data-tab="organization"] .js-actions [data-type="organization-edit"]' ) + + modal_ready + select(css: '.content.active .modal select[name="bool_test"]', value: 'NO') + click( css: '.content.active .modal .js-submit' ) + modal_disappear + + watch_for( + css: '.content.active .sidebar[data-tab="organization"] .sidebar-content', + value: 'bool_test', + ) + + object_manager_attribute_delete( + data: { + object: 'Organization', + name: 'bool_test', + }, + ) + object_manager_attribute_migrate + end end diff --git a/test/browser_test_helper.rb b/test/browser_test_helper.rb index 86f83c7b6..9c3ad60cb 100644 --- a/test/browser_test_helper.rb +++ b/test/browser_test_helper.rb @@ -3895,6 +3895,7 @@ wait untill text in selector disabppears object_manager_attribute_create( browser: browser2, data: { + object: 'Ticket', # optional, defaults to Ticket name: 'field_name' + random, display: 'Display Name of Field', data_type: 'Select', @@ -3913,6 +3914,7 @@ wait untill text in selector disabppears object_manager_attribute_create( browser: browser2, data: { + object: 'Ticket', # optional, defaults to Ticket name: 'field_name' + random, display: 'Display Name of Field', data_type: 'Text', @@ -3927,6 +3929,7 @@ wait untill text in selector disabppears object_manager_attribute_create( browser: browser2, data: { + object: 'Ticket', # optional, defaults to Ticket name: 'field_name' + random, display: 'Display Name of Field', data_type: 'Integer', @@ -3942,6 +3945,7 @@ wait untill text in selector disabppears object_manager_attribute_create( browser: browser2, data: { + object: 'Ticket', # optional, defaults to Ticket name: 'field_name' + random, display: 'Display Name of Field', data_type: 'Datetime', @@ -3957,6 +3961,7 @@ wait untill text in selector disabppears object_manager_attribute_create( browser: browser2, data: { + object: 'Ticket', # optional, defaults to Ticket name: 'field_name' + random, display: 'Display Name of Field', data_type: 'Date', @@ -3972,6 +3977,7 @@ wait untill text in selector disabppears object_manager_attribute_create( browser: browser2, data: { + object: 'Ticket', # optional, defaults to Ticket name: 'field_name' + random, display: 'Display Name of Field', data_type: 'Boolean', @@ -3995,6 +4001,9 @@ wait untill text in selector disabppears instance = params[:browser] || @browser data = params[:data] + data[:object] = data[:object] || 'Ticket' + raise 'invalid object parameter in object_manager_attribute_create' if %w[Ticket User Organization Group].exclude? data[:object] + # make sure that required params are supplied %i[name display data_type].each do |s| next if data.key? s @@ -4017,7 +4026,12 @@ wait untill text in selector disabppears ) click( browser: instance, - css: '.content.active .js-new', + css: ".content.active a[href='#c-#{data[:object]}']", + mute_log: true, + ) + click( + browser: instance, + css: ".content.active #c-#{data[:object]} .js-new", mute_log: true, ) @@ -4029,6 +4043,7 @@ wait untill text in selector disabppears object_manager_attribute_update( browser: browser2, data: { + object: 'Ticket', # optional, defaults to Ticket name: 'field_name' + random, display: 'Display Name of Field', data_type: 'Select', @@ -4053,6 +4068,9 @@ wait untill text in selector disabppears instance = params[:browser] || @browser data = params[:data] + data[:object] = data[:object] || 'Ticket' + raise 'invalid object parameter in object_manager_attribute_update' if %w[Ticket User Organization Group].exclude? data[:object] + click( browser: instance, css: 'a[href="#manage"]', @@ -4067,7 +4085,12 @@ wait untill text in selector disabppears browser: instance, css: '.content.active .js-new', ) - instance.execute_script("$(\".content.active td:contains('#{data[:name]}')\").first().click()") + click( + browser: instance, + css: ".content.active a[href='#c-#{data[:object]}']", + mute_log: true, + ) + instance.execute_script("$(\".content.active #c-#{data[:object]} td:contains('#{data[:name]}')\").first().click()") object_manager_attribute_perform('update', params) end @@ -4077,6 +4100,7 @@ wait untill text in selector disabppears object_manager_attribute_delete( browser: browser2, data: { + object: 'Ticket', # optional, defaults to Ticket name: 'field_name' + random, }, ) @@ -4090,6 +4114,9 @@ wait untill text in selector disabppears instance = params[:browser] || @browser data = params[:data] + data[:object] = data[:object] || 'Ticket' + raise 'invalid object parameter in object_manager_attribute_delete' if %w[Ticket User Organization Group].exclude? data[:object] + click( browser: instance, css: 'a[href="#manage"]', @@ -4100,12 +4127,18 @@ wait untill text in selector disabppears css: '.content.active a[href="#system/object_manager"]', mute_log: true, ) + watch_for( + browser: instance, + css: '.content.active .js-new', + ) + click( + browser: instance, + css: ".content.active a[href='#c-#{data[:object]}']", + mute_log: true, + ) sleep 4 - instance = params[:browser] || @browser - data = params[:data] - r = instance.execute_script("$(\".content.active td:contains('#{data[:name]}')\").first().closest('tr').find('.js-delete').click()") - #p "rrr #{r.inspect}" + r = instance.execute_script("$(\".content.active #c-#{data[:object]} td:contains('#{data[:name]}')\").first().closest('tr').find('.js-delete').click()") end =begin