diff --git a/addons/survey/controllers/survey_session_manage.py b/addons/survey/controllers/survey_session_manage.py index 04923c99aca..c8e18f2935b 100644 --- a/addons/survey/controllers/survey_session_manage.py +++ b/addons/survey/controllers/survey_session_manage.py @@ -21,13 +21,14 @@ class UserInputSession(http.Controller): def _fetch_from_session_code(self, session_code): """ Matches a survey against a passed session_code. - We force the session_state to be reachable (ready / in_progress) to avoid people - using this route to access other (private) surveys. + We don't limit the session_state to be reachable (ready / in_progress) here because + in some cases, we want closed session as well (where session_state = False). + Instead, when necessary, the reachability is forced in routes calling this method to + avoid people using those routes to access other (private) surveys. We limit to sessions opened within the last 7 days to avoid potential abuses. """ if session_code: matching_survey = request.env['survey.survey'].sudo().search([ ('state', '=', 'open'), - ('session_state', 'in', ['ready', 'in_progress']), ('session_start_time', '>', fields.Datetime.now() - relativedelta(days=7)), ('session_code', '=', session_code), ], limit=1) @@ -169,7 +170,7 @@ class UserInputSession(http.Controller): This route is used in survey sessions where we need short links for people to type. """ survey = self._fetch_from_session_code(session_code) - if survey: + if survey and survey.session_state in ['ready', 'in_progress']: return werkzeug.utils.redirect("/survey/start/%s" % survey.access_token) return werkzeug.utils.redirect("/s") @@ -181,7 +182,10 @@ class UserInputSession(http.Controller): If not, return error. The user is invited to type again the code. """ survey = self._fetch_from_session_code(session_code) if survey: - return {"survey_url": "/survey/start/%s" % survey.access_token} + if survey.session_state in ['ready', 'in_progress']: + return {"survey_url": "/survey/start/%s" % survey.access_token} + else: + return {"error": "survey_session_closed"} return {"error": "survey_wrong"} diff --git a/addons/survey/static/src/js/survey_quick_access.js b/addons/survey/static/src/js/survey_quick_access.js index ff0f3e88473..bf41ab71643 100644 --- a/addons/survey/static/src/js/survey_quick_access.js +++ b/addons/survey/static/src/js/survey_quick_access.js @@ -7,6 +7,7 @@ publicWidget.registry.SurveyQuickAccessWidget = publicWidget.Widget.extend({ selector: '.o_survey_quick_access', events: { 'click button[type="submit"]': '_onSubmit', + 'input #session_code': '_onSessionCodeInput', }, //-------------------------------------------------------------------------- @@ -35,6 +36,10 @@ publicWidget.registry.SurveyQuickAccessWidget = publicWidget.Widget.extend({ // Handlers // ------------------------------------------------------------------------- + _onSessionCodeInput: function () { + this.el.querySelectorAll('.o_survey_error > span').forEach((elem) => elem.classList.add('d-none')); + }, + _onKeyPress: function (event) { if (event.keyCode === 13) { // Enter event.preventDefault(); @@ -49,15 +54,23 @@ publicWidget.registry.SurveyQuickAccessWidget = publicWidget.Widget.extend({ _submitCode: function () { var self = this; - this.$('.o_survey_error').addClass("d-none"); - var $sessionCodeInput = this.$('input#session_code'); + this.$('.o_survey_error > span').addClass("d-none"); + const sessionCodeInputVal = this.$('input#session_code').val().trim(); + if (!sessionCodeInputVal) { + self.$('.o_survey_session_error_invalid_code').removeClass("d-none"); + return; + } this._rpc({ - route: `/survey/check_session_code/${$sessionCodeInput.val()}`, + route: `/survey/check_session_code/${sessionCodeInputVal}`, }).then(function (response) { if (response.survey_url) { window.location = response.survey_url; } else { - self.$('.o_survey_error').removeClass("d-none"); + if (response.error && response.error === 'survey_session_closed') { + self.$('.o_survey_session_error_closed').removeClass("d-none"); + } else { + self.$('.o_survey_session_error_invalid_code').removeClass("d-none"); + } } }); }, diff --git a/addons/survey/static/src/scss/survey_form.scss b/addons/survey/static/src/scss/survey_form.scss index 270b0e613de..e6fcd12cb60 100644 --- a/addons/survey/static/src/scss/survey_form.scss +++ b/addons/survey/static/src/scss/survey_form.scss @@ -18,6 +18,12 @@ nav#oe_main_menu_navbar { min-height: 100%; } +// Safari(v 7.1+) specific fix (min-height given above doesn't work with safari) +// see https://stackoverflow.com/a/25975282 for info on safari specific css +_::-webkit-full-page-media, _:future, :root .o_survey_wrap { + min-height: 90vh; +} + .o_survey_progress_wrapper { min-width: 11rem; max-width: 15rem; @@ -169,6 +175,15 @@ nav#oe_main_menu_navbar { } } +.o_survey_quick_access { + .o_survey_error { + min-height: 2rem; + } + #session_code { + font-size: 4rem; + } +} + .o_survey_form, .o_survey_session_manage { .o_survey_question_matrix { th { diff --git a/addons/survey/views/survey_survey_views.xml b/addons/survey/views/survey_survey_views.xml index c332a04d27e..7fa7c76969d 100644 --- a/addons/survey/views/survey_survey_views.xml +++ b/addons/survey/views/survey_survey_views.xml @@ -75,8 +75,8 @@ - -
- The code is found on the screen in front of you +