Fix LTI tool issues (#1405)

Added a confirmation dialog for importing the contents of a whole course via LTI in order to reduce the likelyhood of accidentally importing a whole course's worth of content. Also updated LTI module related views with correct classes when rewriting exercise links with lti-exercise URLs, since currently in production the isinstance calls don't match the module exercises.
apluslms · Oct 11, 2024 · 08ce8c3 · 08ce8c3
1 parent f558f93
commit 08ce8c3
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 10 deletions.
diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
@@ -5546,6 +5546,10 @@ msgstr "Use the whole course"
 msgid "LTI_SELECT_SPECIFIC_CONTENT"
 msgstr "Select specific content"
 
+#: lti_tool/templates/lti_tool/course_list.html
+msgid "LTI_CONFIRM_USE_WHOLE_COURSE"
+msgstr "Are you sure you want to use the whole course?"
+
 #: lti_tool/templates/lti_tool/exercise_list.html
 #: lti_tool/templates/lti_tool/module_list.html
 msgid "LTI_GO_BACK"

diff --git a/locale/fi/LC_MESSAGES/django.po b/locale/fi/LC_MESSAGES/django.po
@@ -5566,6 +5566,10 @@ msgstr "Valitse koko kurssi"
 msgid "LTI_SELECT_SPECIFIC_CONTENT"
 msgstr "Valitse tarkempaa sisältöä"
 
+#: lti_tool/templates/lti_tool/course_list.html
+msgid "LTI_CONFIRM_USE_WHOLE_COURSE"
+msgstr "Haluatko varmasti valita koko kurssin?"
+
 #: lti_tool/templates/lti_tool/exercise_list.html
 #: lti_tool/templates/lti_tool/module_list.html
 msgid "LTI_GO_BACK"

diff --git a/lti_tool/templates/lti_tool/course_list.html b/lti_tool/templates/lti_tool/course_list.html
@@ -31,8 +31,8 @@ <h3 lang="{{ instance.language }}">
 							<form style="display: inline-block" method="POST" action="{{ instance_url }}">
 								{% csrf_token %}
 								<button
-									class="aplus-button--secondary aplus-button--xs"
-									type="submit"
+									class="use-whole-course-button aplus-button--secondary aplus-button--xs"
+									type="button"
 								>
 									{% translate "LTI_USE_WHOLE_COURSE" %}
 								</button>
@@ -52,4 +52,13 @@ <h3 lang="{{ instance.language }}">
 		{% endfor %}
 	</div>
 </section>
+<script>
+	$(document).ready(function() {
+		$(".use-whole-course-button").on("click", function() {
+			if (confirm("{% translate 'LTI_CONFIRM_USE_WHOLE_COURSE' %}")) {
+				$(this).closest("form").submit();
+			}
+		});
+	})
+</script>
 {% endblock %}
diff --git a/lti_tool/views.py b/lti_tool/views.py
@@ -19,7 +19,7 @@
 from course.views import InstanceView, ModuleView
 from course.models import CourseInstance, Enrollment, CourseModule
 from course.viewbase import CourseInstanceBaseView, CourseModuleBaseView
-from exercise.cache.points import LearningObjectPoints
+from exercise.cache.points import LearningObjectEntryBase
 from exercise.viewbase import ExerciseBaseView
 from exercise.models import LearningObject, BaseExercise
 from exercise.views import ExerciseView, SubmissionView
@@ -172,12 +172,11 @@ class LtiModuleView(LtiSessionMixin, ModuleView):
     def get(self, request, *args, **kwargs):
         learningobjects = LearningObject.objects.filter(course_module=self.module)
         learningobjects_dict = { obj.id: obj for obj in learningobjects }
-        # Can't use self.children for iteration, so this instead
-        flat_module = self.content.flat_module(self.module, level_markers=False)
-        exercises = [entry for entry in flat_module if isinstance(entry, LearningObjectPoints)]
-        for exercise in exercises:
-            learningobj = learningobjects_dict[exercise.id]
-            exercise.link = learningobj.get_url('lti-exercise')
+        self.children = list(self.children)
+        for exercise in self.children:
+            if isinstance(exercise, LearningObjectEntryBase):
+                learningobj = learningobjects_dict[exercise.id]
+                exercise.link = learningobj.get_url('lti-exercise')
         return super().get(request, *args, **kwargs)
 
 
@@ -324,7 +323,7 @@ def get(self, request, *args, **kwargs):
         self.learningobjects = LearningObject.objects.filter(course_module=self.module)
         self.learningobjects_dict = { obj.id: obj for obj in self.learningobjects }
         self.flat_module = list(self.content.flat_module(self.module))
-        exercises = [entry for entry in self.flat_module if isinstance(entry, LearningObjectPoints)]
+        exercises = [entry for entry in self.flat_module if isinstance(entry, LearningObjectEntryBase)]
         for exercise in exercises:
             learningobj = self.learningobjects_dict[exercise.id]
             exercise.link = learningobj.get_url('lti-select-exercise')