diff --git a/addons/survey/survey.py b/addons/survey/survey.py index 241b9739016..6e7198ae591 100644 --- a/addons/survey/survey.py +++ b/addons/survey/survey.py @@ -502,7 +502,7 @@ class survey_question(osv.osv): def create(self, cr, uid, vals, context=None): minimum_ans = 0 maximum_ans = 0 - page = self.pool.get('survey.page').browse(cr, uid, vals['page_id'], context=context).title + page = self.pool.get('survey.page').browse(cr, uid, int(vals.get('page_id', 0)), context=context).title if vals.has_key('answer_choice_ids') and not len(vals['answer_choice_ids']): if vals.has_key('type') and vals['type'] not in ['descriptive_text', 'single_textbox', 'comment','table']: raise osv.except_osv(_('Warning!'),_('You must enter one or more answers for question "%s" of page %s .') % (vals['question'], page)) diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml index f41d257cf63..2a94dc59e62 100644 --- a/addons/survey/survey_view.xml +++ b/addons/survey/survey_view.xml @@ -772,6 +772,7 @@
+ diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py index d935eb92ade..d2390bc6225 100644 --- a/addons/survey/wizard/survey_answer.py +++ b/addons/survey/wizard/survey_answer.py @@ -1036,6 +1036,7 @@ class survey_question_wiz(osv.osv_memory): 'type': 'ir.actions.act_window', 'target': 'new', 'view_id': view_id, + 'page_id': int(context.get('page_id',0)), 'context': context }