Replace trustAsHTML with getTrustedHTML

getTrustedHTML returns value that is safe for HTML context or throws an exception
ManageIQ · Aug 3, 2017 · 0bd24d6 · 0bd24d6
1 parent fa8fe6b
commit 0bd24d6
Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/app/assets/javascripts/components/widget-report.js b/app/assets/javascripts/components/widget-report.js
@@ -8,12 +8,11 @@ ManageIQ.angular.app.component('widgetReport', {
     vm.widgetReportModel = {};
     this.$onInit = function() {
       $http.get('/dashboard/widget_report_data/' + vm.id)
-        .then(function(response) { vm.widgetReportModel.content = $sce.trustAsHtml(response.data.content);})
+        .then(function(response) { vm.widgetReportModel.content = $sce.getTrustedHtml(response.data.content);})
         .catch(miqService.handleFailure);
       vm.div_id = "dd_w" + vm.id + "_box";
     };
     vm.contentPresent = function() {
-      debugger;
       return vm.widgetReportModel.content !== undefined;
     };
   }],

diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb
@@ -129,7 +129,7 @@ def start_url
 
   def widget_report_data
     widget = MiqWidget.find(params[:id])
-    render :json => {:content => widget.contents_for_user(current_user).contents.html_safe}
+    render :json => {:content => widget.contents_for_user(current_user).contents}
   end
 
   def show