Merge branch 'MDL-65599-master' of git://github.com/damyon/moodle

gjb2048 · May 15, 2019 · 2b8ffcc · 2b8ffcc
2 parents 802f7c4 + 54d09c4
commit 2b8ffcc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/report/competency/amd/build/grading_popup.min.js b/report/competency/amd/build/grading_popup.min.js
diff --git a/report/competency/amd/src/grading_popup.js b/report/competency/amd/src/grading_popup.js
@@ -73,6 +73,7 @@ define(['jquery', 'core/notification', 'core/str', 'core/ajax', 'core/log', 'cor
      */
     GradingPopup.prototype._contextLoaded = function(context) {
         var self = this;
+
         // We have to display user info in popup.
         context.displayuser = true;
         templates.render('tool_lp/user_competency_summary_in_course', context).done(function(html, js) {
@@ -93,6 +94,11 @@ define(['jquery', 'core/notification', 'core/str', 'core/ajax', 'core/log', 'cor
         var moduleId = region.data('moduleid');
         var userId = region.data('userid');
 
+        // The module id is expected to be an integer, so don't pass empty string.
+        if (moduleId === '') {
+            moduleId = 0;
+        }
+
         ajax.call([{
             methodname: 'report_competency_data_for_report',
             args: {courseid: courseId, userid: userId, moduleid: moduleId},