Description of problem: Not able to set the default value "<None>" for a service dialog with drop down or radio button. Instead of saving the value as "<None>" the first choice is used instead. Version-Release number of selected component (if applicable): 5.7.0.17 How reproducible: Always Steps to Reproduce: 1. 2. 3. Actual results: Expected results: Additional info:
https://github.com/ManageIQ/manageiq-ui-classic/pull/614
https://github.com/ManageIQ/manageiq/pull/14219
https://github.com/ManageIQ/manageiq/pull/14240
https://github.com/ManageIQ/manageiq-ui-classic/pull/633
New commit detected on ManageIQ/manageiq/master: https://github.com/ManageIQ/manageiq/commit/c1a02a6017e30dfa3bc2d6d67ed8d652fd8a5437 commit c1a02a6017e30dfa3bc2d6d67ed8d652fd8a5437 Author: Erik Clarizio <eclarizi> AuthorDate: Wed Mar 8 15:14:35 2017 -0800 Commit: Erik Clarizio <eclarizi> CommitDate: Thu Mar 9 09:50:34 2017 -0800 Allow nil to be a default value for static sorted item fields https://bugzilla.redhat.com/show_bug.cgi?id=1428133 app/models/dialog_field_sorted_item.rb | 7 +- spec/models/dialog_field_drop_down_list_spec.rb | 42 +++---- spec/models/dialog_field_radio_button_spec.rb | 8 +- spec/models/dialog_field_sorted_item_spec.rb | 153 ++++++++++++++++-------- 4 files changed, 139 insertions(+), 71 deletions(-)
New commit detected on ManageIQ/manageiq/master: https://github.com/ManageIQ/manageiq/commit/d530fb70e14975e31f8f34cd05e3cf4144aa474a commit d530fb70e14975e31f8f34cd05e3cf4144aa474a Author: Erik Clarizio <eclarizi> AuthorDate: Thu Mar 9 12:55:26 2017 -0800 Commit: Erik Clarizio <eclarizi> CommitDate: Thu Mar 9 12:55:26 2017 -0800 Refactor raw_values methods to improve readability https://bugzilla.redhat.com/show_bug.cgi?id=1428133 app/models/dialog_field_radio_button.rb | 3 +-- app/models/dialog_field_sorted_item.rb | 12 +++++++++--- 2 files changed, 10 insertions(+), 5 deletions(-)
New commit detected on ManageIQ/manageiq/master: https://github.com/ManageIQ/manageiq/commit/167d22676aeec7c27753dea66372fd2660e825bd commit 167d22676aeec7c27753dea66372fd2660e825bd Author: Erik Clarizio <eclarizi> AuthorDate: Thu Mar 9 10:33:36 2017 -0800 Commit: Erik Clarizio <eclarizi> CommitDate: Thu Mar 9 12:23:50 2017 -0800 Adjust nil default value logic for DialogFieldRadioButtons https://bugzilla.redhat.com/show_bug.cgi?id=1428133 app/models/dialog_field_radio_button.rb | 16 ++++++++++++++- spec/models/dialog_field_drop_down_list_spec.rb | 26 ++++++++++++------------- spec/models/dialog_field_radio_button_spec.rb | 10 +++++----- spec/models/dialog_field_sorted_item_spec.rb | 2 +- 4 files changed, 34 insertions(+), 20 deletions(-)
New commit detected on ManageIQ/manageiq-ui-classic/master: https://github.com/ManageIQ/manageiq-ui-classic/commit/1962209b5dab67cf9a4a74c52f72de36667eb248 commit 1962209b5dab67cf9a4a74c52f72de36667eb248 Author: Erik Clarizio <eclarizio> AuthorDate: Wed Mar 8 15:15:26 2017 -0800 Commit: Erik Clarizio <eclarizio> CommitDate: Thu Mar 9 10:56:14 2017 -0800 Do not prepend 'none' option to values as it is done in model now https://bugzilla.redhat.com/show_bug.cgi?id=1428133 Continue to prepend 'none' option for radio buttons while editing the field, because it should still be a default value option, but we do not want to actually display a radio button with a "None" option, they can simply leave it un-checked app/helpers/application_helper/dialogs.rb | 13 +++ ...dialog_field_form_non_dynamic_options.html.haml | 7 +- .../miq_ae_customization/_dialog_sample.html.haml | 14 +-- .../miq_ae_customization/_field_values.html.haml | 9 +- .../dialogs/_dialog_field_radio_button.html.haml | 4 +- spec/helpers/application_helper/dialogs_spec.rb | 100 +++++++++++++++++++++ 6 files changed, 125 insertions(+), 22 deletions(-)
https://github.com/ManageIQ/manageiq/pull/14259
https://github.com/ManageIQ/manageiq-ui-classic/pull/645
New commit detected on ManageIQ/manageiq-ui-classic/master: https://github.com/ManageIQ/manageiq-ui-classic/commit/00d3031a7c87f30ff5c0b5338945d7aaf5d89278 commit 00d3031a7c87f30ff5c0b5338945d7aaf5d89278 Author: Erik Clarizio <eclarizio> AuthorDate: Thu Mar 9 23:29:44 2017 -0800 Commit: Erik Clarizio <eclarizio> CommitDate: Thu Mar 9 23:29:44 2017 -0800 Rely on model to provide 'none' values instead of helper trying to do it https://bugzilla.redhat.com/show_bug.cgi?id=1428133 app/helpers/application_helper/dialogs.rb | 7 +------ spec/helpers/application_helper/dialogs_spec.rb | 28 ++++++++++++------------- 2 files changed, 14 insertions(+), 21 deletions(-)
New commit detected on ManageIQ/manageiq/euwe: https://github.com/ManageIQ/manageiq/commit/16674f7e3b9678e6cfde6da6d67c6d370e9cf238 commit 16674f7e3b9678e6cfde6da6d67c6d370e9cf238 Author: Greg McCullough <gmccullo> AuthorDate: Thu Mar 9 17:11:59 2017 -0500 Commit: Erik Clarizio <eclarizi> CommitDate: Thu Mar 9 15:37:37 2017 -0800 Merge pull request #14240 from eclarizio/BZ1428133 Fix for Service Dialog not saving default value <None> for drop down or radio button (cherry-picked from commit a912f50e0ca38ecbb5de52c385f7b531da7fda54) https://bugzilla.redhat.com/show_bug.cgi?id=1428133 app/models/dialog_field_radio_button.rb | 15 ++- app/models/dialog_field_sorted_item.rb | 19 ++- spec/models/dialog_field_drop_down_list_spec.rb | 46 +++---- spec/models/dialog_field_radio_button_spec.rb | 14 ++- spec/models/dialog_field_sorted_item_spec.rb | 155 ++++++++++++++++-------- 5 files changed, 168 insertions(+), 81 deletions(-)
New commit detected on ManageIQ/manageiq/euwe: https://github.com/ManageIQ/manageiq/commit/e0984620a707076735b1d16fd6edb92237880aca commit e0984620a707076735b1d16fd6edb92237880aca Author: Erik Clarizio <eclarizi> AuthorDate: Thu Mar 9 15:53:38 2017 -0800 Commit: Erik Clarizio <eclarizi> CommitDate: Thu Mar 9 15:53:38 2017 -0800 Do not prepend 'none' option to values as it is done in the model now https://bugzilla.redhat.com/show_bug.cgi?id=1428133 Continue to prepend 'none' option for radio buttons while editing the field, because it should still be a default value option, but we do not want to actually display a radio button with a "None" option, they can simply leave it un-checked Manually patched from commit 1962209b5dab67cf9a4a74c52f72de36667eb248 from the classic-UI repo. app/helpers/application_helper/dialogs.rb | 13 +++ ...dialog_field_form_non_dynamic_options.html.haml | 7 +- .../miq_ae_customization/_dialog_sample.html.haml | 11 +-- .../miq_ae_customization/_field_values.html.haml | 9 +- .../dialogs/_dialog_field_radio_button.html.haml | 4 +- spec/helpers/application_helper/dialogs_spec.rb | 100 +++++++++++++++++++++ 6 files changed, 123 insertions(+), 21 deletions(-)
New commit detected on ManageIQ/manageiq/euwe: https://github.com/ManageIQ/manageiq/commit/f16bc1b3e544d18c83bc9ed8019de0b2f3ba32c0 commit f16bc1b3e544d18c83bc9ed8019de0b2f3ba32c0 Author: Erik Clarizio <eclarizi> AuthorDate: Thu Mar 9 23:27:15 2017 -0800 Commit: Erik Clarizio <eclarizi> CommitDate: Fri Mar 10 08:57:09 2017 -0800 Fix for test failures due to 'values' method now adding nil options https://bugzilla.redhat.com/show_bug.cgi?id=1428133 app/helpers/application_helper/dialogs.rb | 7 +----- spec/helpers/application_helper/dialogs_spec.rb | 28 ++++++++++------------ spec/models/dialog_field_drop_down_list_spec.rb | 2 +- ...sible_tower_job_template_dialog_service_spec.rb | 4 ++-- .../orchestration_template_dialog_service_spec.rb | 7 +++--- 5 files changed, 21 insertions(+), 27 deletions(-)
New commit detected on ManageIQ/manageiq/master: https://github.com/ManageIQ/manageiq/commit/58d78dfb339521f8ced9dbfb0f2475299d0cf607 commit 58d78dfb339521f8ced9dbfb0f2475299d0cf607 Author: Erik Clarizio <eclarizi> AuthorDate: Wed Mar 15 10:52:40 2017 -0700 Commit: Erik Clarizio <eclarizi> CommitDate: Wed Mar 15 13:31:43 2017 -0700 Ensure TagControl fields include a nil value https://bugzilla.redhat.com/show_bug.cgi?id=1428133 app/models/dialog_field_tag_control.rb | 11 +-- spec/models/dialog_field_tag_control_spec.rb | 130 ++++++++++++++++++++++++--- 2 files changed, 122 insertions(+), 19 deletions(-)
New commit detected on ManageIQ/manageiq-ui-classic/master: https://github.com/ManageIQ/manageiq-ui-classic/commit/a18a1fabe397062f2dd8dd42a2ece2ee5dfaa024 commit a18a1fabe397062f2dd8dd42a2ece2ee5dfaa024 Author: Erik Clarizio <eclarizio> AuthorDate: Wed Mar 15 10:53:12 2017 -0700 Commit: Erik Clarizio <eclarizio> CommitDate: Wed Mar 15 13:18:40 2017 -0700 Leverage the fact that TagControl#values includes nil values now https://bugzilla.redhat.com/show_bug.cgi?id=1428133 app/helpers/application_helper/dialogs.rb | 18 ++++++++--- .../miq_ae_customization/_dialog_sample.html.haml | 10 ++---- .../_tag_field_values.html.haml | 2 +- app/views/shared/dialogs/_dialog_field.html.haml | 14 +++----- spec/helpers/application_helper/dialogs_spec.rb | 37 +++++++++++++++++++--- 5 files changed, 55 insertions(+), 26 deletions(-)
Fixed . Verified in 5.8.0.12-rc1.20170425180304_4f35996