Description of problem: From pivotal story: "The deletion of a service_template should be prevented if there is an associated JobTemplate for retirement and if there is at least one active service based on the service template. If there is no retirement JobTemplate the service_template can be deleted. If there is a retirement JobTemplate, check if there are any active (non-retired) services. https://www.pivotaltracker.com/story/show/142646939" That behavior works as expected, but wrong flash message appears "The selected Catalog Item was deleted". Version-Release number of selected component (if applicable): 5.8.0.10-beta1-nightly.20170414034628_b979a0b How reproducible: Always Steps to Reproduce: 1. Enable Embedded Ansible role. 2. Wait until it will be enabled. 3. Navigate to Automation/Ansible. Add some repository and credential. 4. Navigate to Services/Catalogs. Add "Ansible playbook" catalog item. Fill retirement tab. 5. Provision the service. 6. Try to delete the catalog item. Actual results: Catalog item is not deleted as expected, but "The selected Catalog Item was deleted" flash message appears. Expected results: The flash message should show related text, something like: "The selected Catalog Item hasn't been deleted due existing active service based on that catalog item"
https://github.com/ManageIQ/manageiq-ui-classic/pull/1115
New commit detected on ManageIQ/manageiq-ui-classic/master: https://github.com/ManageIQ/manageiq-ui-classic/commit/78451fec0606a53faccb578aa8860f92df69eaf1 commit 78451fec0606a53faccb578aa8860f92df69eaf1 Author: Harpreet Kataria <hkataria> AuthorDate: Thu Apr 20 13:18:06 2017 -0400 Commit: Harpreet Kataria <hkataria> CommitDate: Thu Apr 20 13:18:06 2017 -0400 Display error message correctly that is returned from model. Display correct flash message when there is an error deleting Catalog Item https://bugzilla.redhat.com/show_bug.cgi?id=1443120 app/controllers/catalog_controller.rb | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
New commit detected on ManageIQ/manageiq-ui-classic/master: https://github.com/ManageIQ/manageiq-ui-classic/commit/caccd8015df26de891b57bc979ffd0f45e083fb7 commit caccd8015df26de891b57bc979ffd0f45e083fb7 Author: Harpreet Kataria <hkataria> AuthorDate: Mon Apr 24 17:50:48 2017 -0400 Commit: Harpreet Kataria <hkataria> CommitDate: Mon Apr 24 17:50:48 2017 -0400 Addressed PR feedback https://bugzilla.redhat.com/show_bug.cgi?id=1443120 app/controllers/catalog_controller.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
Verified in 5.9.0.2.20171010190026_0413a06. The flash message is correct.