mod-feedback MDL-16706 Removed inline JS and replaced with new PAGE methods

diff --git a/mod/feedback/analysis_course.php b/mod/feedback/analysis_course.php
index 1d3d90a3ca8d0b4505d9088610a7b804b3e2501c..3f7a5b7c90b95a17dfc15782b69e1028d47aefe6 100644 (file)
--- a/mod/feedback/analysis_course.php
+++ b/mod/feedback/analysis_course.php
@@ -133,17 +133,7 @@
         echo '<input type="hidden" name="courseitemfilter" value="'.$courseitemfilter.'" />';
         echo '<input type="hidden" name="courseitemfiltertyp" value="'.$courseitemfiltertyp.'" />';
         echo '<input type="hidden" name="courseid" value="'.$courseid.'" />';
-        echo '<script language="javascript" type="text/javascript">
-                <!--
-                function setcourseitemfilter(item, item_typ) {
-                    document.report.courseitemfilter.value = item;
-                    document.report.courseitemfiltertyp.value = item_typ;
-                    document.report.submit();
-                }
-                -->
-                </script>';
-
-
+        $PAGE->requires->js('mod/feedback/feedback.js')->asap();
         $sql = 'select c.id, c.shortname from {course} c, '.
                                               '{feedback_value} fv, {feedback_item} fi '.
                                               'where c.id = fv.course_id and fv.item = fi.id '.

diff --git a/mod/feedback/feedback.js b/mod/feedback/feedback.js
index 2bb1b6d3f082f7df3a7c8bcd4fddf18571cb581e..40b348fa8a5f53063e7005bef0d7e792de99f476 100644 (file)
--- a/mod/feedback/feedback.js
+++ b/mod/feedback/feedback.js
@@ -8,4 +8,10 @@ function set_item_focus(itemid) {
 function feedbackGo2delete(form) {
     form.action = moodle_cfg.wwwroot+'/mod/feedback/delete_completed.php';
     form.submit();
+}
+
+function setcourseitemfilter(item, item_typ) {
+    document.report.courseitemfilter.value = item;
+    document.report.courseitemfiltertyp.value = item_typ;
+    document.report.submit();
 }
\ No newline at end of file