From 49f1761a00354aacf99fa74f313afb8c2791df9d Mon Sep 17 00:00:00 2001 From: Bram Devlaminck Date: Fri, 30 Sep 2022 09:21:39 +0200 Subject: [PATCH 1/8] fix: link is now clickable --- .../javascripts/components/annotations/annotation_form.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/components/annotations/annotation_form.ts b/app/assets/javascripts/components/annotations/annotation_form.ts index be04797781..b100bfde9d 100644 --- a/app/assets/javascripts/components/annotations/annotation_form.ts +++ b/app/assets/javascripts/components/annotations/annotation_form.ts @@ -185,7 +185,7 @@ export class AnnotationForm extends watchMixin(ShadowlessLitElement) {
${unsafeHTML(I18n.t("js.user_annotation.help"))} ${this.questionMode ? html` - ${I18n.t("js.user_annotation.help_student")} + ${unsafeHTML(I18n.t("js.user_annotation.help_student"))} ` : ""} ${I18n.formatNumber(this.annotationText.length)} / ${I18n.formatNumber(maxLength)} From 6266b146bc59b578051795688de6ebbce4abb5d0 Mon Sep 17 00:00:00 2001 From: jorg-vr Date: Fri, 30 Sep 2022 10:24:12 +0200 Subject: [PATCH 2/8] Fix listgroup background color in dark mode --- app/assets/stylesheets/bootstrap_style_overrides.css.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/assets/stylesheets/bootstrap_style_overrides.css.scss b/app/assets/stylesheets/bootstrap_style_overrides.css.scss index 5ae85d89cc..8af4fc8849 100644 --- a/app/assets/stylesheets/bootstrap_style_overrides.css.scss +++ b/app/assets/stylesheets/bootstrap_style_overrides.css.scss @@ -233,3 +233,7 @@ blockquote { display: none; } } + +.list-group .list-group-item { + background-color: $background; +} From 4e4bbff3463e134b5aeb66a292920519f84fada7 Mon Sep 17 00:00:00 2001 From: jorg-vr Date: Fri, 30 Sep 2022 10:30:02 +0200 Subject: [PATCH 3/8] Fix width of questions table actions --- app/assets/stylesheets/models/questions.css.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/models/questions.css.scss b/app/assets/stylesheets/models/questions.css.scss index f296071473..3f476d339b 100644 --- a/app/assets/stylesheets/models/questions.css.scss +++ b/app/assets/stylesheets/models/questions.css.scss @@ -1,6 +1,6 @@ .question-table { col.actions { - width: 80px; + width: 100px; } col.age { @@ -28,7 +28,7 @@ .question-index-table { col.actions { - width: 80px; + width: 100px; } col.age { From 35341c1e66d6449c2559d8830ae1dcb1e0ba7dba Mon Sep 17 00:00:00 2001 From: jorg-vr Date: Mon, 3 Oct 2022 10:37:13 +0200 Subject: [PATCH 4/8] Fix annotations not shown bug for submissions outside a course --- app/helpers/renderers/feedback_code_renderer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/renderers/feedback_code_renderer.rb b/app/helpers/renderers/feedback_code_renderer.rb index 73e01ab6c9..e2b541d502 100644 --- a/app/helpers/renderers/feedback_code_renderer.rb +++ b/app/helpers/renderers/feedback_code_renderer.rb @@ -92,7 +92,7 @@ def add_messages(submission, messages, user) @builder.script(type: 'application/javascript') do @builder << <<~HEREDOC window.MathJax.startup.promise.then(() => { - window.dodona.codeListing = new window.dodona.codeListingClass(#{submission.id}, #{submission.course_id}, #{submission.exercise_id}, #{user.id}, #{@code.to_json}, #{@code.lines.length}, #{user_is_student}); + window.dodona.codeListing = new window.dodona.codeListingClass(#{submission.id}, #{submission.course_id || 'undefined'}, #{submission.exercise_id}, #{user.id}, #{@code.to_json}, #{@code.lines.length}, #{user_is_student}); window.dodona.codeListing.addMachineAnnotations(#{messages.to_json}); #{'window.dodona.codeListing.initAnnotateButtons();' if user_perm} window.dodona.codeListing.loadUserAnnotations(); From 3bec4da598264492dcb5e25a5b888c1363779f37 Mon Sep 17 00:00:00 2001 From: jorg-vr Date: Mon, 3 Oct 2022 10:52:33 +0200 Subject: [PATCH 5/8] Use to_json --- app/helpers/renderers/feedback_code_renderer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/renderers/feedback_code_renderer.rb b/app/helpers/renderers/feedback_code_renderer.rb index e2b541d502..c4d95e975d 100644 --- a/app/helpers/renderers/feedback_code_renderer.rb +++ b/app/helpers/renderers/feedback_code_renderer.rb @@ -92,7 +92,7 @@ def add_messages(submission, messages, user) @builder.script(type: 'application/javascript') do @builder << <<~HEREDOC window.MathJax.startup.promise.then(() => { - window.dodona.codeListing = new window.dodona.codeListingClass(#{submission.id}, #{submission.course_id || 'undefined'}, #{submission.exercise_id}, #{user.id}, #{@code.to_json}, #{@code.lines.length}, #{user_is_student}); + window.dodona.codeListing = new window.dodona.codeListingClass(#{submission.id}, #{submission.course_id.to_json}, #{submission.exercise_id}, #{user.id}, #{@code.to_json}, #{@code.lines.length}, #{user_is_student}); window.dodona.codeListing.addMachineAnnotations(#{messages.to_json}); #{'window.dodona.codeListing.initAnnotateButtons();' if user_perm} window.dodona.codeListing.loadUserAnnotations(); From 2eab3f8c02de1fd36286e93f15cca72a74949d5b Mon Sep 17 00:00:00 2001 From: jorg-vr Date: Mon, 3 Oct 2022 11:30:13 +0200 Subject: [PATCH 6/8] SAML: Allow clock drift to account for clock skew between servers --- lib/SAML/strategy.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/SAML/strategy.rb b/lib/SAML/strategy.rb index c4e3665080..96910ae6d7 100644 --- a/lib/SAML/strategy.rb +++ b/lib/SAML/strategy.rb @@ -68,6 +68,8 @@ def on_callback_path? def handle_response(raw, settings) # Parse the raw response. opts = response_options.merge(settings: settings) + # Allow clock drift to account for clock skew between servers. + opts = opts.merge({:allowed_clock_drift => 2.seconds}) parsed_response = OneLogin::RubySaml::Response.new(raw, opts) parsed_response.soft = false From 1afdc198ec83be7daab92b7ed15c99a46193d09d Mon Sep 17 00:00:00 2001 From: jorg-vr Date: Mon, 3 Oct 2022 11:49:17 +0200 Subject: [PATCH 7/8] Allow courseid to be null --- app/assets/javascripts/code_listing/code_listing.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/code_listing/code_listing.ts b/app/assets/javascripts/code_listing/code_listing.ts index 2389c1fc0e..d69649b2f8 100644 --- a/app/assets/javascripts/code_listing/code_listing.ts +++ b/app/assets/javascripts/code_listing/code_listing.ts @@ -40,7 +40,7 @@ export class CodeListing { public readonly code: string; public readonly codeLines: number; public readonly submissionId: number; - public readonly courseId: number; + public readonly courseId: number | null; public readonly exerciseId: number; public readonly userId: number; From 038d0f4713963d6993aa8a1fe35f8fdd04790b7c Mon Sep 17 00:00:00 2001 From: jorg-vr Date: Mon, 3 Oct 2022 11:59:27 +0200 Subject: [PATCH 8/8] Bump version --- config/initializers/00_version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/initializers/00_version.rb b/config/initializers/00_version.rb index 53401ca268..d2f4f0e0a7 100644 --- a/config/initializers/00_version.rb +++ b/config/initializers/00_version.rb @@ -3,7 +3,7 @@ class Application module Version MAJOR = 6 MINOR = 1 - PATCH = 1 + PATCH = 2 STRING = [MAJOR, MINOR, PATCH].compact.join('.') end