drop comments from rubric_assessments
Change-Id: I653ebae164ea588756b16091af9033bda988e35e Reviewed-on: https://gerrit.instructure.com/62005 Tested-by: Jenkins Reviewed-by: Jeremy Stanley <jeremy@instructure.com> Product-Review: James Williams <jamesw@instructure.com> QA-Review: James Williams <jamesw@instructure.com>
This commit is contained in:
parent
a998795e67
commit
e2f64145a9
|
@ -23,7 +23,7 @@ class RubricAssessment < ActiveRecord::Base
|
|||
include TextHelper
|
||||
include HtmlTextHelper
|
||||
|
||||
attr_accessible :rubric, :rubric_association, :user, :score, :data, :comments, :assessor, :artifact, :assessment_type
|
||||
attr_accessible :rubric, :rubric_association, :user, :score, :data, :assessor, :artifact, :assessment_type
|
||||
belongs_to :rubric
|
||||
belongs_to :rubric_association
|
||||
belongs_to :user
|
||||
|
@ -35,11 +35,10 @@ class RubricAssessment < ActiveRecord::Base
|
|||
|
||||
simply_versioned
|
||||
|
||||
EXPORTABLE_ATTRIBUTES = [:id, :user_id, :rubric_id, :rubric_association_id, :score, :data, :comments, :created_at, :updated_at, :artifact_id, :artifact_type, :assessment_type, :assessor_id, :artifact_attempt]
|
||||
EXPORTABLE_ATTRIBUTES = [:id, :user_id, :rubric_id, :rubric_association_id, :score, :data, :created_at, :updated_at, :artifact_id, :artifact_type, :assessment_type, :assessor_id, :artifact_attempt]
|
||||
EXPORTABLE_ASSOCIATIONS = [:rubric, :rubric_association, :user, :assessor, :artifact, :assessment_requests]
|
||||
|
||||
validates_presence_of :assessment_type, :rubric_id, :artifact_id, :artifact_type, :assessor_id
|
||||
validates_length_of :comments, :maximum => maximum_text_length, :allow_nil => true, :allow_blank => true
|
||||
|
||||
before_save :update_artifact_parameters
|
||||
before_save :htmlify_rating_comments
|
||||
|
|
|
@ -310,7 +310,6 @@ class RubricAssociation < ActiveRecord::Base
|
|||
assessment ||= association.rubric_assessments.build(:assessor => opts[:assessor], :artifact => artifact, :user => artifact.student, :rubric => self.rubric, :assessment_type => params[:assessment_type])
|
||||
assessment.score = score if replace_ratings
|
||||
assessment.data = ratings if replace_ratings
|
||||
assessment.comments = params[:comments] if params[:comments]
|
||||
|
||||
assessment.save
|
||||
assessment_to_return = assessment if assessment.artifact == opts[:artifact]
|
||||
|
|
|
@ -101,6 +101,7 @@ class ActiveRecord::Base
|
|||
crypted_webdav_access_code
|
||||
type).freeze,
|
||||
'role_overrides' => %w(context_code enrollment_type).freeze,
|
||||
'rubric_assessments' => %w{comments}.freeze,
|
||||
'users' => %w(type
|
||||
creation_unique_id
|
||||
creation_sis_batch_id
|
||||
|
|
|
@ -0,0 +1,13 @@
|
|||
class DropCommentsFromRubricAssessments < ActiveRecord::Migration
|
||||
tag :postdeploy
|
||||
|
||||
def up
|
||||
def up
|
||||
remove_column :rubric_assessments, :comments
|
||||
end
|
||||
|
||||
def down
|
||||
add_column :rubric_assessments, :comments, :text
|
||||
end
|
||||
end
|
||||
end
|
|
@ -57,14 +57,6 @@ describe RubricAssessmentsController do
|
|||
put 'update', :course_id => @course.id, :rubric_association_id => @rubric_association.id, :id => @rubric_assessment.id, :rubric_assessment => {:user_id => @user.to_param, :assessment_type => "no_reason"}
|
||||
expect(response).to be_success
|
||||
end
|
||||
it "should update the assessment" do
|
||||
course_with_teacher_logged_in(:active_all => true)
|
||||
rubric_assessment_model(:user => @user, :context => @course, :purpose => 'grading')
|
||||
put 'update', :course_id => @course.id, :rubric_association_id => @rubric_association.id, :id => @rubric_assessment.id, :rubric_assessment => {:comments => "dude!", :user_id => @user.to_param, :assessment_type => "no_reason"}
|
||||
expect(response).to be_success
|
||||
expect(assigns[:assessment]).not_to be_nil
|
||||
expect(assigns[:assessment].comments).to eql("dude!")
|
||||
end
|
||||
end
|
||||
|
||||
describe "POST 'remind'" do
|
||||
|
|
Loading…
Reference in New Issue