Bug 1322023

Alberto, I re-assigned this to you because https://bugzilla.redhat.com/show_bug.cgi?id=1321352 was fixed by a commit that you made. I think all that needs to be done is to cherry-pick this commit to 5.5.z, but I wanted to assign to you in case you think that there is anything else that may need to be done, or if there's some crazy conflict that arises on the cherry-pick.

Thanks!

New commit detected on cfme/5.5.z:
https://code.engineering.redhat.com/gerrit/gitweb?p=cfme.git;a=commitdiff;h=2e38c82df02a7baf9179eb65f1285e7dc59a19b8

commit 2e38c82df02a7baf9179eb65f1285e7dc59a19b8
Merge: a0c3c1e 6811105
Author:     Gregg Tanzillo <gtanzill>
AuthorDate: Tue Jun 21 17:30:11 2016 -0400
Commit:     Gregg Tanzillo <gtanzill>
CommitDate: Tue Jun 21 17:30:11 2016 -0400

    Merge branch '55z_api_ssui_dynamic_drop_down' into '5.5.z'
    
    [api] Service Dialog content query update
    
    Update to make sure service dialogs "content" queries are refreshed
    by automate via a workflow when queried for a specific service_template
    or indirectly for a service.
    
    i.e. GET /api/service_templates/:id/service_dialogs/:dialog_id?attributes=content
         GET /api/service_templates/:id/service_dialogs
             ?expand=resources
             &attributes=content
         GET /api/services/:id/service_dialogs/:dialog_id?attributes=content
         GET /api/services/:id/service_dialogs
             ?expand=resources
             &attributes=content
    
    Cherry-Pick from: https://github.com/ManageIQ/manageiq/pull/7671
    
    Cherry-pick not clean, there was a conflict in: app/controllers/api_controller/service_dialogs.rb
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1322023
    
    See merge request !978

 app/controllers/api_controller/renderer.rb        | 13 ++++++++++--
 app/controllers/api_controller/service_dialogs.rb | 25 +++++++++++++++++++++++
 app/models/dialog.rb                              | 12 +++++++++--
 3 files changed, 46 insertions(+), 4 deletions(-)

New commit detected on cfme/5.5.z:
https://code.engineering.redhat.com/gerrit/gitweb?p=cfme.git;a=commitdiff;h=681110563f4af6b35255f0e3dc2b06a1e6d87a90

commit 681110563f4af6b35255f0e3dc2b06a1e6d87a90
Author:     Alberto Bellotti <abellott>
AuthorDate: Fri Apr 1 17:32:55 2016 -0400
Commit:     Alberto Bellotti <abellott>
CommitDate: Tue Jun 21 10:56:12 2016 -0400

    [api] Service Dialog content query update
    
    Update to make sure service dialogs "content" queries are refreshed
    by automate via a workflow when queried for a specific service_template
    or indirectly for a service.
    
    i.e. GET /api/service_templates/:id/service_dialogs/:dialog_id?attributes=content
         GET /api/service_templates/:id/service_dialogs
             ?expand=resources
             &attributes=content
         GET /api/services/:id/service_dialogs/:dialog_id?attributes=content
         GET /api/services/:id/service_dialogs
             ?expand=resources
             &attributes=content
    
    Cherry-Pick from: https://github.com/ManageIQ/manageiq/pull/7671
    
    Cherry-pick not clean, there was a conflict in: app/controllers/api_controller/service_dialogs.rb
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1322023

 app/controllers/api_controller/renderer.rb        | 13 ++++++++++--
 app/controllers/api_controller/service_dialogs.rb | 25 +++++++++++++++++++++++
 app/models/dialog.rb                              | 12 +++++++++--
 3 files changed, 46 insertions(+), 4 deletions(-)

Fixed.
Verified in 5.5.5.0.20160628144838_629f93b

Since the problem described in this bug report should be
resolved in a recent advisory, it has been closed with a
resolution of ERRATA.

For information on the advisory, and where to find the updated
files, follow the link below.

If the solution does not work for you, open a new bug report.

https://rhn.redhat.com/errata/RHBA-2016-1488.html