developers
/
Orbit
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge 

Conflicts:

	vendor/built_in_modules/survey/app/controllers/panel/survey/back_end/surveys_controller.rb
This commit is contained in:
Bernie Chiu 2013-10-25 16:29:17 +08:00 committed by Manson Wang
parent 74b89f1fac
commit 9b96f2eeb0
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vendor/built_in_modules/survey/app/controllers/panel/survey/back_end/surveys_controller.rb vendored
View File

@ -109,7 +109,7 @@ class Panel::Survey::BackEnd::SurveysController < OrbitBackendController
question.update_attributes(title: titles[index]) question.update_attributes(title: titles[index])
end end
@survey.survey_answers.destroy @survey_answers.destroy
# End of speadsheet # End of speadsheet
@end_row = @spreadsheet.count @end_row = @spreadsheet.count
@ -117,6 +117,7 @@ class Panel::Survey::BackEnd::SurveysController < OrbitBackendController
# Modify multiline options if changed # Modify multiline options if changed
@survey_questions.each_with_index do |question, index| @survey_questions.each_with_index do |question, index|
case question.type case question.type
when ::SurveyQuestion::Radio, ::SurveyQuestion::Select when ::SurveyQuestion::Radio, ::SurveyQuestion::Select
((question.survey_question_options.count + 2)..@end_row).each do |row| ((question.survey_question_options.count + 2)..@end_row).each do |row|
@answer_model = @survey.survey_answers.new @answer_model = @survey.survey_answers.new