Skip to content

Commit

Permalink
changed stdout format to be html
Browse files Browse the repository at this point in the history
Added new JS controller to handle sanitize and render html on the screen.

https://bugzilla.redhat.com/show_bug.cgi?id=1439273
  • Loading branch information
h-kataria committed Apr 7, 2017
1 parent c1d9f9f commit 2f280f9
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 38 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
angular
.module('sanitizeRender', ['ngSanitize'])
.controller('SanitizeAndRenderController', ['$sce', function SanitizeAndRenderCtrl($sce) {
var vm = this;
vm.sanitizeRenderHtml = function(str) {
return $sce.trustAsHtml(decodeURI(str));
};
}]);
81 changes: 43 additions & 38 deletions app/views/service/_svcs_show.html.haml
Original file line number Diff line number Diff line change
@@ -1,40 +1,45 @@
#services_tab
%ul.nav.nav-tabs
= miq_tab_header("details") do
= _("Details")
- if @record.type == "ServiceAnsiblePlaybook"
- job = @record.try(:job, "Retirement")
= miq_tab_header("provisioning") do
= _("Provisioning")
- if job
= miq_tab_header("retirement") do
= _("Retirement")
.tab-content
= miq_tab_content("details", 'default', :class => 'cm-tab') do
= render :partial => "layouts/textual_groups_generic"
.row
.col-md-12.col-lg-6
%h3
= _('VMs')
- if @view
= render :partial => "layouts/gtl", :locals => {:view => @view}
- if @record.type == "ServiceAnsiblePlaybook"
= miq_tab_content("provisioning", 'default', :class => 'cm-tab') do
= render :partial => "layouts/textual_groups_tabs", :locals => {:textual_group_list => textual_provisioning_group_list}
- if @job && @job.try(:raw_stdout)
= render :partial => "layouts/textual_code_mirror",
:locals => {:label => _('Standard Output'),
:value => @job.raw_stdout.force_encoding("UTF-8"),
:mode => "htmlmixed",
:text_area_id => "provision_output"}
- if job
= miq_tab_content("retirement", 'default', :class => 'cm-tab') do
= render :partial => "layouts/textual_groups_tabs", :locals => {:textual_group_list => textual_retirement_group_list}
= render :partial => "layouts/textual_code_mirror",
:locals => {:label => _('Standard Output'),
:value => job.raw_stdout.force_encoding("UTF-8"),
:mode => "htmlmixed",
:text_area_id => "retirement_output"}
#service_details{'ng-controller'=>"SanitizeAndRenderController as vm"}
#services_tab
%ul.nav.nav-tabs
= miq_tab_header("details") do
= _("Details")
- if @record.type == "ServiceAnsiblePlaybook"
- job = @record.try(:job, "Retirement")
= miq_tab_header("provisioning") do
= _("Provisioning")
- if job
= miq_tab_header("retirement") do
= _("Retirement")
.tab-content
= miq_tab_content("details", 'default', :class => 'cm-tab') do
= render :partial => "layouts/textual_groups_generic"
.row
.col-md-12.col-lg-6
%h3
= _('VMs')
- if @view
= render :partial => "layouts/gtl", :locals => {:view => @view}
- if @record.type == "ServiceAnsiblePlaybook"
= miq_tab_content("provisioning", 'default', :class => 'cm-tab') do
= render :partial => "layouts/textual_groups_tabs", :locals => {:textual_group_list => textual_provisioning_group_list}
- if @job && @job.try(:raw_stdout)
%h3
= _('Standard Output')
.form-horizontal.static
.form-group
.col-md-9
- htm = @job.raw_stdout('html').gsub('"', '\"').gsub("'", "\\\\'")
%div{'ng-bind-html'=>"vm.sanitizeRenderHtml('#{htm}')"}
- if job
= miq_tab_content("retirement", 'default', :class => 'cm-tab') do
= render :partial => "layouts/textual_groups_tabs", :locals => {:textual_group_list => textual_retirement_group_list}
%h3
= _('Standard Output')
.form-horizontal.static
.form-group
.col-md-9
- htm = job.raw_stdout('html').gsub('"', '\"').gsub("'", "\\\\'")
%div{'ng-bind-html'=>"vm.sanitizeRenderHtml('#{htm}')"}
:javascript
miq_tabs_init('#services_tab');
miq_refresh_code_mirror();
miq_bootstrap('#service_details', 'sanitizeRender');

0 comments on commit 2f280f9

Please sign in to comment.