diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-09-24 16:59:15 +0000 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-09-24 17:45:37 +0000 |
| commit | d67b2483e5bfa5d8c1e6ef1a64fb933f5e080ad5 (patch) | |
| tree | 25a7fd39ac993f3c04c5d8408beb628b3c9948ce /addons/survey/controllers/main.py | |
| parent | 38d8b0526f0fccc32df5a11f5d086a3522ed5fcf (diff) | |
| parent | 9ed4872ea03f28012118ed48a43d0800617a84f3 (diff) | |
[MERGE] forward port branch saas-12.4 up to 9ed4872ea03
closes odoo/odoo#37372
Signed-off-by: Christophe Simonis <chs@odoo.com>
Diffstat (limited to 'addons/survey/controllers/main.py')
| -rw-r--r-- | addons/survey/controllers/main.py | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/addons/survey/controllers/main.py b/addons/survey/controllers/main.py index 7eabe92f733..75945503aa2 100644 --- a/addons/survey/controllers/main.py +++ b/addons/survey/controllers/main.py @@ -411,10 +411,11 @@ class Survey(http.Controller): answer_tag = "%s_%s" % (survey_sudo.id, question.id) request.env['survey.user_input_line'].sudo().save_lines(answer_sudo.id, question, post, answer_tag) + vals = {} if answer_sudo.is_time_limit_reached or survey_sudo.questions_layout == 'one_page': go_back = False answer_sudo._mark_done() - else: + elif 'button_submit' in post: go_back = post['button_submit'] == 'previous' next_page, last = request.env['survey.survey'].next_page_or_question(answer_sudo, page_or_question_id, go_back=go_back) vals = {'last_displayed_page_id': page_or_question_id} @@ -423,11 +424,16 @@ class Survey(http.Controller): answer_sudo._mark_done() else: vals.update({'state': 'skip'}) - answer_sudo.write(vals) - ret['redirect'] = '/survey/fill/%s/%s' % (survey_sudo.access_token, answer_token) - if go_back: - ret['redirect'] += '?prev=prev' + if 'breadcrumb_redirect' in post: + ret['redirect'] = post['breadcrumb_redirect'] + else: + if vals: + answer_sudo.write(vals) + + ret['redirect'] = '/survey/fill/%s/%s' % (survey_sudo.access_token, answer_token) + if go_back: + ret['redirect'] += '?prev=prev' return json.dumps(ret) |