Merge pull request #27391 from edx/private_to_public_025fb5e

Mergeback PR from private to public.
openedx · Apr 21, 2021 · 15f3900 · 15f3900
2 parents efa13ff + 025fb5e
commit 15f3900
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/cms/static/js/models/settings/course_grader.js b/cms/static/js/models/settings/course_grader.js
@@ -63,7 +63,7 @@ define(['backbone', 'underscore', 'gettext'], function(Backbone, _, gettext) {
             }
             if (_.has(attrs, 'min_count') && _.has(attrs, 'drop_count') && !_.has(errors, 'min_count') && !_.has(errors, 'drop_count') && attrs.drop_count > attrs.min_count) {
                 var template = _.template(
-                gettext('Cannot drop more <%= types %> assignments than are assigned.')
+                gettext('Cannot drop more <%- types %> assignments than are assigned.')
             );
                 errors.drop_count = template({types: attrs.type});
             }

diff --git a/cms/static/js/views/active_video_upload.js b/cms/static/js/views/active_video_upload.js
@@ -1,6 +1,7 @@
 define(
-    ['underscore', 'js/models/active_video_upload', 'js/views/baseview', 'common/js/components/views/feedback_prompt'],
-    function(_, ActiveVideoUpload, BaseView, PromptView) {
+    ['underscore', 'js/models/active_video_upload', 'js/views/baseview', 'common/js/components/views/feedback_prompt',
+        'edx-ui-toolkit/js/utils/html-utils'],
+    function(_, ActiveVideoUpload, BaseView, PromptView, HtmlUtils) {
         'use strict';
 
         var STATUS_CLASSES = [
@@ -25,7 +26,7 @@ define(
             render: function() {
                 var $el = this.$el,
                     status;
-                $el.html(this.template(this.model.attributes));
+                $el.html(HtmlUtils.HTML(this.template(this.model.attributes)).toString());
                 status = this.model.get('status');
                 _.each(
                     STATUS_CLASSES,

diff --git a/common/lib/xmodule/xmodule/js/src/video/09_poster.js b/common/lib/xmodule/xmodule/js/src/video/09_poster.js
@@ -23,8 +23,8 @@
         VideoPoster.moduleName = 'Poster';
         VideoPoster.prototype = {
             template: _.template([
-                '<div class="video-pre-roll is-<%= type %> poster" ',
-                'style="background-image: url(<%= url %>)">',
+                '<div class="video-pre-roll is-<%- type %> poster" ',
+                'style="background-image: url(<%- url %>)">',
                 '<button class="btn-play btn-pre-roll">',
                 '<img src="/static/images/play.png" alt="">',
                 '<span class="sr">', gettext('Play video'), '</span>',