https://github.com/ManageIQ/manageiq/pull/3529
New commit detected on cfme/5.4.z: https://code.engineering.redhat.com/gerrit/gitweb?p=cfme.git;a=commitdiff;h=8cf7157bdbbe59ae770d11366c8c2a5519c19151 commit 8cf7157bdbbe59ae770d11366c8c2a5519c19151 Author: Brian McLaughlin <bmclaugh> AuthorDate: Fri Jul 17 16:01:08 2015 -0400 Commit: Brian McLaughlin <bmclaugh> CommitDate: Thu Aug 6 11:36:44 2015 -0400 Fix error when viewing timelines in Optimize-Bottlenecks in IE - DRY'd and refactored getTLdata method - added additional routing specs - Fixed double render issue caused by partial _bottlenecks_tl_detail.html.haml being rendered directly as well as indirectly via _bottlenecks_tabs.html.haml https://bugzilla.redhat.com/show_bug.cgi?id=1245669 .../application_controller/timelines.rb | 42 ++++------------------ vmdb/app/controllers/dashboard_controller.rb | 38 -------------------- vmdb/app/controllers/miq_capacity_controller.rb | 1 - vmdb/app/views/dashboard/_tl_detail.html.haml | 2 +- vmdb/app/views/layouts/_tl_detail.html.haml | 2 +- .../miq_capacity/_bottlenecks_tl_detail.html.haml | 3 +- vmdb/config/routes.rb | 5 ++- vmdb/spec/routing/dashboard_routing_spec.rb | 16 +++++---- vmdb/spec/routing/host_routing_spec.rb | 6 ++++ vmdb/spec/routing/miq_capacity_routing_spec.rb | 6 ++++ 10 files changed, 36 insertions(+), 85 deletions(-)
New commit detected on cfme/5.4.z: https://code.engineering.redhat.com/gerrit/gitweb?p=cfme.git;a=commitdiff;h=d5780daa76a83d3128e67aeb89843195ae25f32a commit d5780daa76a83d3128e67aeb89843195ae25f32a Author: Brian McLaughlin <bmclaugh> AuthorDate: Wed Aug 5 10:42:31 2015 -0400 Commit: Brian McLaughlin <bmclaugh> CommitDate: Thu Aug 6 11:37:19 2015 -0400 Refactor timeline_data method https://bugzilla.redhat.com/show_bug.cgi?id=1245669 vmdb/app/controllers/application_controller/timelines.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
New commit detected on cfme/5.4.z: https://code.engineering.redhat.com/gerrit/gitweb?p=cfme.git;a=commitdiff;h=65edfc70c9b2cb5c2ded3420f448a6f665afa812 commit 65edfc70c9b2cb5c2ded3420f448a6f665afa812 Merge: 11d5ec0 d5780da Author: Dan Clarizio <dclarizi> AuthorDate: Thu Aug 6 15:00:11 2015 -0400 Commit: Dan Clarizio <dclarizi> CommitDate: Thu Aug 6 15:00:11 2015 -0400 Merge branch 'bz1245669' into '5.4.z' Fix error when viewing timelines in Optimize-Bottlenecks in IE Upstream PR: https://github.com/ManageIQ/manageiq/pull/3529 Did not merge cleanly, the view files were conflicted: vmdb/app/views/dashboard/_tl_detail.html.haml vmdb/app/views/layouts/_tl_detail.html.haml vmdb/app/views/miq_capacity/_bottlenecks_tl_detail.html.haml Upstream PR: https://github.com/ManageIQ/manageiq/pull/3725 Merged cleanly. https://bugzilla.redhat.com/show_bug.cgi?id=1245669 @dclarizi please review. See merge request !214 .../application_controller/timelines.rb | 40 +++------------------- vmdb/app/controllers/dashboard_controller.rb | 38 -------------------- vmdb/app/controllers/miq_capacity_controller.rb | 1 - vmdb/app/views/dashboard/_tl_detail.html.haml | 2 +- vmdb/app/views/layouts/_tl_detail.html.haml | 2 +- .../miq_capacity/_bottlenecks_tl_detail.html.haml | 3 +- vmdb/config/routes.rb | 5 ++- vmdb/spec/routing/dashboard_routing_spec.rb | 16 +++++---- vmdb/spec/routing/host_routing_spec.rb | 6 ++++ vmdb/spec/routing/miq_capacity_routing_spec.rb | 6 ++++ 10 files changed, 34 insertions(+), 85 deletions(-)
Blocked by https://bugzilla.redhat.com/show_bug.cgi?id=1256505
Reopening this one, now when viewing the pages in IE, instead of blowing up, they are blank. See the following duplicate for a screenshot.
*** Bug 1256505 has been marked as a duplicate of this bug. ***
New commit detected on cfme/5.4.z: https://code.engineering.redhat.com/gerrit/gitweb?p=cfme.git;a=commitdiff;h=781cea00b2d2efa3020d4de12b0d3a0814d36d19 commit 781cea00b2d2efa3020d4de12b0d3a0814d36d19 Author: Brian McLaughlin <bmclaugh> AuthorDate: Wed Sep 2 16:49:09 2015 -0400 Commit: Brian McLaughlin <bmclaugh> CommitDate: Wed Sep 2 16:49:09 2015 -0400 Fix incorrect variable reference https://bugzilla.redhat.com/show_bug.cgi?id=1245669 vmdb/app/views/miq_capacity/_bottlenecks_tl_detail.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commit detected on cfme/5.4.z: https://code.engineering.redhat.com/gerrit/gitweb?p=cfme.git;a=commitdiff;h=d09d377bdcd21eb6b4cfc27bb9b5feb8ff76995f commit d09d377bdcd21eb6b4cfc27bb9b5feb8ff76995f Merge: 3783724 781cea0 Author: Dan Clarizio <dclarizi> AuthorDate: Thu Sep 3 13:49:48 2015 -0400 Commit: Dan Clarizio <dclarizi> CommitDate: Thu Sep 3 13:49:48 2015 -0400 Merge branch 'bz1245669' into '5.4.z' Fix incorrect variable reference Downstream only. https://bugzilla.redhat.com/show_bug.cgi?id=1245669 See merge request !244 vmdb/app/views/miq_capacity/_bottlenecks_tl_detail.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Verified in 5.4.3.0 Used IE10 on Windows 7 to view Optimize->Bottlenecks a 5.4.3.0 appliance https://10.16.5.168
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-2015-1916.html