From 1f4502185c22802dbe59d62a880f00a854a886f8 Mon Sep 17 00:00:00 2001 From: Bernie Chiu Date: Fri, 25 Oct 2013 16:29:17 +0800 Subject: [PATCH] Merge Conflicts: vendor/built_in_modules/survey/app/controllers/panel/survey/back_end/surveys_controller.rb --- .../controllers/panel/survey/back_end/surveys_controller.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vendor/built_in_modules/survey/app/controllers/panel/survey/back_end/surveys_controller.rb b/vendor/built_in_modules/survey/app/controllers/panel/survey/back_end/surveys_controller.rb index d3c5fa87d..af5f96e1a 100644 --- a/vendor/built_in_modules/survey/app/controllers/panel/survey/back_end/surveys_controller.rb +++ b/vendor/built_in_modules/survey/app/controllers/panel/survey/back_end/surveys_controller.rb @@ -109,7 +109,7 @@ class Panel::Survey::BackEnd::SurveysController < OrbitBackendController question.update_attributes(title: titles[index]) end - @survey.survey_answers.destroy + @survey_answers.destroy # End of speadsheet @end_row = @spreadsheet.count @@ -117,6 +117,7 @@ class Panel::Survey::BackEnd::SurveysController < OrbitBackendController # Modify multiline options if changed @survey_questions.each_with_index do |question, index| case question.type + when ::SurveyQuestion::Radio, ::SurveyQuestion::Select ((question.survey_question_options.count + 2)..@end_row).each do |row| @answer_model = @survey.survey_answers.new