fix post path
This commit is contained in:
parent
817a2d9afd
commit
bae8bad12a
|
@ -36,7 +36,7 @@ class SurveysController < ApplicationController
|
||||||
"th_result" => t('survey.result')
|
"th_result" => t('survey.result')
|
||||||
},
|
},
|
||||||
"total_pages" => questionnairesurveys.total_pages
|
"total_pages" => questionnairesurveys.total_pages
|
||||||
}
|
}
|
||||||
|
|
||||||
end
|
end
|
||||||
def my_record
|
def my_record
|
||||||
|
@ -86,7 +86,6 @@ class SurveysController < ApplicationController
|
||||||
end
|
end
|
||||||
|
|
||||||
def show
|
def show
|
||||||
|
|
||||||
params = OrbitHelper.params
|
params = OrbitHelper.params
|
||||||
|
|
||||||
survey = QuestionnaireSurvey.find_by(uid: params[:uid])
|
survey = QuestionnaireSurvey.find_by(uid: params[:uid])
|
||||||
|
@ -129,10 +128,9 @@ class SurveysController < ApplicationController
|
||||||
end
|
end
|
||||||
|
|
||||||
def update
|
def update
|
||||||
|
|
||||||
uid = params[:id].split('-').last
|
uid = params[:id].split('-').last
|
||||||
@survey = QuestionnaireSurvey.find_by(:uid=>uid)
|
@survey = QuestionnaireSurvey.find_by(:uid=>uid)
|
||||||
|
|
||||||
total = 0
|
total = 0
|
||||||
individual_total = []
|
individual_total = []
|
||||||
answer = params[:answer]
|
answer = params[:answer]
|
||||||
|
@ -236,7 +234,7 @@ class SurveysController < ApplicationController
|
||||||
tmp['other'] = answer["#{qid}_#{oid}_custom_option"]
|
tmp['other'] = answer["#{qid}_#{oid}_custom_option"]
|
||||||
end
|
end
|
||||||
p = (opt.points.to_i * weight) rescue 0
|
p = (opt.points.to_i * weight) rescue 0
|
||||||
opt2_names = Array(answer["#{qid}_#{oid}"]).collect do |o2id|
|
opt2_names = Array(answer["#{qid}_#{oid}"]).collect do |o2id|
|
||||||
opt2 = opt.level2.find(o2id)
|
opt2 = opt.level2.find(o2id)
|
||||||
p += opt2.points.to_i * weight
|
p += opt2.points.to_i * weight
|
||||||
opt2.name_translations
|
opt2.name_translations
|
||||||
|
@ -304,7 +302,7 @@ class SurveysController < ApplicationController
|
||||||
show_page_url = show_page.get_url rescue show_page.url
|
show_page_url = show_page.get_url rescue show_page.url
|
||||||
params[:url] = show_page_url
|
params[:url] = show_page_url
|
||||||
OrbitHelper.set_params(params,current_user)
|
OrbitHelper.set_params(params,current_user)
|
||||||
redirect_to OrbitHelper.url_to_show(@survey.to_param) + "?method=answer_success&ans=#{@answer_model.id.to_s}"
|
redirect_to "/#{params['locale']}#{params['show_page_url']}/#{params['id']}?method=answer_success&ans=#{@answer_model.id.to_s}"
|
||||||
else
|
else
|
||||||
@survey_answer_error = @answer_model.errors.full_messages.join('\n')
|
@survey_answer_error = @answer_model.errors.full_messages.join('\n')
|
||||||
render :answer_error
|
render :answer_error
|
||||||
|
@ -312,7 +310,7 @@ class SurveysController < ApplicationController
|
||||||
end
|
end
|
||||||
|
|
||||||
def answer_success
|
def answer_success
|
||||||
|
|
||||||
params = OrbitHelper.params
|
params = OrbitHelper.params
|
||||||
survey = QuestionnaireSurvey.find_by(uid: params[:uid])
|
survey = QuestionnaireSurvey.find_by(uid: params[:uid])
|
||||||
answer = SurveyAnswer.find(params[:ans])
|
answer = SurveyAnswer.find(params[:ans])
|
||||||
|
@ -332,7 +330,7 @@ class SurveysController < ApplicationController
|
||||||
case survey.result_type
|
case survey.result_type
|
||||||
when QuestionnaireSurvey::ResultChart
|
when QuestionnaireSurvey::ResultChart
|
||||||
begin
|
begin
|
||||||
chart_data, survey_questions, survey_answers = survey.generate_chart_data
|
chart_data, survey_questions, survey_answers = survey.generate_chart_data
|
||||||
rescue => e
|
rescue => e
|
||||||
puts [e,e.backtrace]
|
puts [e,e.backtrace]
|
||||||
end
|
end
|
||||||
|
@ -347,4 +345,4 @@ class SurveysController < ApplicationController
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
|
@ -71,7 +71,7 @@ Rails.application.routes.draw do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
post "surveys/:id", to: "surveys#update"
|
||||||
resources :surveys do
|
resources :surveys do
|
||||||
collection do
|
collection do
|
||||||
get ':slug_title-:uid', to: 'surveys#show'
|
get ':slug_title-:uid', to: 'surveys#show'
|
||||||
|
@ -82,5 +82,5 @@ Rails.application.routes.draw do
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue