Merge pull request #7115 from donny-wong/v2.4.11

V2.4.11
MarkUsProject · Jun 10, 2024 · c93c813 · c93c813
2 parents 9989898 + 6e489a0
commit c93c813
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 16 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## [v2.4.11]
+
+### 🚨 Breaking changes
+
+- Disallow peer reviewers from printing results (#7114)
+
 ## [v2.4.10]
 
 ### ✨ New features and improvements

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -244,7 +244,7 @@ GEM
     matrix (0.4.2)
     method_source (1.0.0)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.5)
+    mini_portile2 (2.8.6)
     minitest (5.20.0)
     mono_logger (1.1.2)
     msgpack (1.7.2)
@@ -261,7 +261,7 @@ GEM
     net-smtp (0.4.0)
       net-protocol
     nio4r (2.7.0)
-    nokogiri (1.16.2)
+    nokogiri (1.16.5)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     parser (3.2.2.4)

diff --git a/app/MARKUS_VERSION b/app/MARKUS_VERSION
@@ -1 +1 @@
-VERSION=v2.4.10,PATCH_LEVEL=DEV
+VERSION=v2.4.11,PATCH_LEVEL=DEV
diff --git a/app/assets/javascripts/Components/Result/submission_selector.jsx b/app/assets/javascripts/Components/Result/submission_selector.jsx
@@ -102,17 +102,19 @@ export class SubmissionSelector extends React.Component {
   }
 
   renderPrintButton() {
-    return (
-      <a
-        className={"button"}
-        href={Routes.print_course_result_path(this.props.course_id, this.props.result_id)}
-        style={{alignSelf: "flex-end"}}
-        title={I18n.t("results.print")}
-      >
-        <FontAwesomeIcon icon={"fa-solid fa-print"} />
-        <span className="button-text">{I18n.t("results.print")}</span>
-      </a>
-    );
+    if (!this.props.is_reviewer) {
+      return (
+        <a
+          className={"button"}
+          href={Routes.print_course_result_path(this.props.course_id, this.props.result_id)}
+          style={{alignSelf: "flex-end"}}
+          title={I18n.t("results.print")}
+        >
+          <FontAwesomeIcon icon={"fa-solid fa-print"} />
+          <span className="button-text">{I18n.t("results.print")}</span>
+        </a>
+      );
+    }
   }
 
   onOpenFilterModal = () => {

diff --git a/app/policies/result_policy.rb b/app/policies/result_policy.rb
@@ -2,9 +2,9 @@
 class ResultPolicy < ApplicationPolicy
   default_rule :manage?
   alias_rule :get_test_runs_instructors_released?, to: :view_marks?
-  alias_rule :create?, :add_extra_mark?, :remove_extra_mark?, :get_test_runs_instructors?,
+  alias_rule :create?, :add_extra_mark?, :remove_extra_mark?, :get_test_runs_instructors?, :print?,
              :add_tag?, :remove_tag?, :revert_to_automatic_deductions?, :random_incomplete_submission?, to: :grade?
-  alias_rule :show?, :get_annotations?, :print?, to: :view?
+  alias_rule :show?, :get_annotations?, to: :view?
   alias_rule :edit?, :toggle_marking_state?, :update_overall_comment?, :next_grouping?, to: :review?
   alias_rule :refresh_view_tokens?, :update_view_token_expiry?, to: :set_released_to_students?