ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

restore custom proficiency colors to speedgrader rubrics 

closes OUT-3676
flag=none

Test plan:
- without custom outcome proficiency ratings, create
  an assignment with an outcome-based rubric
- in speedgrader, verify that choosing different rubric cells
  uses default colors
- add custom proficiency ratings at /accounts/self/rubrics
- in speedgrader, verify that choosing different rubric cells
  uses the customized colors

Change-Id: I772c5c57e11ede5053aaeaa11f4e7d24db25bceb
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/239123
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Pat Renner <prenner@instructure.com>
Reviewed-by: Augusto Callejas <acallejas@instructure.com>
QA-Review: Adam Lenning <adam.lenning@instructure.com>
Product-Review: Michael Brewer-Davis <mbd@instructure.com>
This commit is contained in:
Michael Brewer-Davis 2020-06-03 09:45:12 -05:00 committed by Michael Brewer-Davis
parent 23f1f83e0d
commit bd3cf180b7
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/gradebooks_controller.rb
View File

@ -886,7 +886,8 @@ class GradebooksController < ApplicationController
assignment_title: @assignment.title, assignment_title: @assignment.title,
rubric: rubric ? rubric_json(rubric, @current_user, session, style: 'full') : nil, rubric: rubric ? rubric_json(rubric, @current_user, session, style: 'full') : nil,
nonScoringRubrics: @domain_root_account.feature_enabled?(:non_scoring_rubrics), nonScoringRubrics: @domain_root_account.feature_enabled?(:non_scoring_rubrics),
outcome_extra_credit_enabled: @context.feature_enabled?(:outcome_extra_credit), outcome_extra_credit_enabled: @context.feature_enabled?(:outcome_extra_credit), # for outcome-based rubrics
outcome_proficiency: outcome_proficiency, # for outcome-based rubrics
group_comments_per_attempt: @assignment.a2_enabled?, group_comments_per_attempt: @assignment.a2_enabled?,
can_comment_on_submission: @can_comment_on_submission, can_comment_on_submission: @can_comment_on_submission,
show_help_menu_item: show_help_link?, show_help_menu_item: show_help_link?,

6
spec/controllers/gradebooks_controller_spec.rb
View File

@ -2385,6 +2385,12 @@ describe GradebooksController do
expect(js_env.fetch(:filter_speed_grader_by_student_group_feature_enabled)).to be false expect(js_env.fetch(:filter_speed_grader_by_student_group_feature_enabled)).to be false
end end
it "sets outcomes keys" do
get 'speed_grader', params: {course_id: @course, assignment_id: @assignment.id}
expect(js_env).to have_key :outcome_proficiency
expect(js_env).to have_key :outcome_extra_credit_enabled
end
describe "student group filtering" do describe "student group filtering" do
before(:each) do before(:each) do
@course.root_account.enable_feature!(:filter_speed_grader_by_student_group) @course.root_account.enable_feature!(:filter_speed_grader_by_student_group)