Bug fix: unalbe to display review rubric for asgt w/o vary_rubric_by_rd

expertiza · Aug 15, 2015 · 47105cf · 47105cf
1 parent 2c9b4a9
commit 47105cf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/app/controllers/response_controller.rb b/app/controllers/response_controller.rb
@@ -326,7 +326,6 @@ def get_content(new_response=false)
       reviewees_topic=SignedUpTeam.topic_id_by_team_id(@contributor.id)
       @current_round = @assignment.get_current_round(reviewees_topic)
       @questionnaire = @map.questionnaire(@current_round)
-      @questionnaire = @map.questionnaire(@current_round)
     elsif @map.type="MetareviewResponseMap" && new_response
       @questionnaire = @map.questionnaire
     else

diff --git a/app/models/review_response_map.rb b/app/models/review_response_map.rb
@@ -8,7 +8,11 @@ class ReviewResponseMap < ResponseMap
   # otherwise this assignment does not use the "varying rubrics", so in assignment_questionnaires table there should
   # be only 1 questionnaire with type 'ReviewQuestionnaire'.    -Yang
   def questionnaire(round)
-    Questionnaire.find(self.assignment.get_review_questionnaire_id(round))
+    if self.assignment.varying_rubrics_by_round?
+      Questionnaire.find(self.assignment.get_review_questionnaire_id(round))
+    else
+      Questionnaire.find(self.assignment.get_review_questionnaire_id)
+    end
   end
 
   def get_title