Merge pull request #5530 from dodona-edu/fix/export-name

Use exercise name for dolos report
dodona-edu · May 16, 2024 · 0889c45 · 0889c45
2 parents 297f6c8 + 6c64aa3
commit 0889c45
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/app/controllers/dolos_reports_controller.rb b/app/controllers/dolos_reports_controller.rb
@@ -11,7 +11,7 @@ def create
         body: {
           dataset: {
             zipfile: file,
-            name: export.archive.filename
+            name: export.archive.filename.base
           }
         }
       )

diff --git a/app/helpers/export_helper.rb b/app/helpers/export_helper.rb
@@ -93,7 +93,9 @@ def all?
     end
 
     def zip_filename
-      @item.is_a?(User) ? "#{@item.full_name.parameterize}.zip" : "#{@item.name.parameterize}.zip"
+      name_source = @list.present? && @list.one? ? @list.first : @item
+      base_name = name_source.is_a?(User) ? name_source.full_name : name_source.name
+      "#{base_name.parameterize}.zip"
     end
 
     def ex_fn(ex)

diff --git a/config/locales/js/nl.yml b/config/locales/js/nl.yml
@@ -333,5 +333,5 @@ nl:
     draft: Concept
     popularity: Populariteit
     dolos:
-      view_report: Plagiaat bekijken
+      view_report: Rapport bekijken