Compare commits
1 Commits
16.0
...
survey_rec
| Author | SHA1 | Date | |
|---|---|---|---|
| 0a4d4e8553 |
@@ -1,42 +0,0 @@
|
||||
#!/bin/bash
|
||||
#
|
||||
# Run the Python tests of the given Odoo modules.
|
||||
#
|
||||
# This script is meant to be executed *inside* an Elabore doodba image
|
||||
# (docker.0k.io/mirror/odoo:rc_<version>-ELABORE-LIGHT), with a
|
||||
# PostgreSQL service reachable at $PGHOST. The modules under test are
|
||||
# read from the current working directory (the checked-out repository),
|
||||
# which is prepended to the addons path so that the PR's code takes
|
||||
# precedence over the modules already baked in the image.
|
||||
#
|
||||
# Usage: odoo-tests.sh <module1,module2,...>
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
modules="${1:?usage: odoo-tests.sh <module1,module2,...>}"
|
||||
|
||||
export PGHOST=postgres
|
||||
export PGUSER=odoo
|
||||
export PGPASSWORD=odoopassword
|
||||
export PGDATABASE="test_$(basename "$PWD" | tr '.-' '__')"
|
||||
export WITHOUT_DEMO=all
|
||||
export DB_FILTER='.*'
|
||||
|
||||
# Generate /opt/odoo/auto/odoo.conf from the environment and wait for
|
||||
# the database to accept connections.
|
||||
/opt/odoo/common/entrypoint
|
||||
|
||||
# Odoo test-tags format: "/module1,/module2" (one leading slash).
|
||||
tags="/$(echo "$modules" | tr ',' ',/')"
|
||||
|
||||
exec odoo \
|
||||
--config=/opt/odoo/auto/odoo.conf \
|
||||
--max-cron-threads=0 \
|
||||
--limit-time-real=10000 \
|
||||
--workers=0 \
|
||||
--test-enable \
|
||||
--stop-after-init \
|
||||
--addons-path="$PWD,/opt/odoo/auto/addons" \
|
||||
-d "$PGDATABASE" \
|
||||
-i "$modules" \
|
||||
--test-tags "$tags"
|
||||
@@ -2,6 +2,8 @@ name: pre-commit
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
branches:
|
||||
- "16.0*"
|
||||
|
||||
jobs:
|
||||
pre-commit:
|
||||
@@ -13,10 +15,10 @@ jobs:
|
||||
python-version: "3.11"
|
||||
- name: Get python version
|
||||
run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
|
||||
- uses: https://gitea.com/actions/cache@v3
|
||||
with:
|
||||
path: ~/.cache/pre-commit
|
||||
key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }}
|
||||
# - uses: actions/cache@v4
|
||||
# with:
|
||||
# path: ~/.cache/pre-commit
|
||||
# key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }}
|
||||
- name: Install pre-commit
|
||||
run: pip install pre-commit
|
||||
- name: Run pre-commit
|
||||
|
||||
@@ -1,79 +0,0 @@
|
||||
name: tests
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
branches:
|
||||
- "16.0*"
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
test:
|
||||
runs-on: odoo-ci
|
||||
container:
|
||||
image: docker.0k.io/mirror/odoo:rc_16.0-ELABORE-LIGHT
|
||||
services:
|
||||
postgres:
|
||||
image: docker.0k.io/postgres:17.2.0-myc
|
||||
env:
|
||||
POSTGRES_USER: odoo
|
||||
POSTGRES_PASSWORD: odoopassword
|
||||
POSTGRES_DB: postgres
|
||||
steps:
|
||||
# The doodba image ships no Node.js, so actions/checkout@v4 cannot
|
||||
# run here. The repository is private, so the job token is required.
|
||||
- name: Checkout
|
||||
env:
|
||||
SECRET_GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
|
||||
SECRET_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
run: |
|
||||
set -eu
|
||||
token="${GITEA_TOKEN:-${GITHUB_TOKEN:-${SECRET_GITEA_TOKEN:-${SECRET_GITHUB_TOKEN:-}}}}"
|
||||
if [ -z "$token" ]; then
|
||||
echo "::error::No job token available to clone the repository"
|
||||
exit 1
|
||||
fi
|
||||
server="${GITHUB_SERVER_URL:-https://git.elabore.coop}"
|
||||
repo="${GITHUB_REPOSITORY:?GITHUB_REPOSITORY is not set}"
|
||||
ref="${GITHUB_REF:-${GITHUB_SHA:?neither GITHUB_REF nor GITHUB_SHA is set}}"
|
||||
auth_url="$(printf '%s' "${server%/}/${repo}.git" |
|
||||
sed -E "s#^https://#https://${token}@#")"
|
||||
git init -q .
|
||||
git config --global --add safe.directory "$PWD"
|
||||
git remote add origin "$auth_url"
|
||||
git fetch -q --depth=1 origin "$ref"
|
||||
git checkout -q FETCH_HEAD
|
||||
|
||||
- name: Detect changed modules
|
||||
id: changed
|
||||
run: |
|
||||
set -eu
|
||||
if [ -n "${GITHUB_BASE_REF:-}" ]; then
|
||||
git fetch -q --depth=1 origin "refs/heads/$GITHUB_BASE_REF"
|
||||
base_rev="FETCH_HEAD"
|
||||
scope="diff against $GITHUB_BASE_REF"
|
||||
else
|
||||
base_rev=""
|
||||
scope="all installable modules (manual run)"
|
||||
fi
|
||||
if [ -n "$base_rev" ]; then
|
||||
modules="$(
|
||||
git diff --name-only "$base_rev" HEAD |
|
||||
awk -F/ '{print $1}' | sort -u |
|
||||
while read -r dir; do
|
||||
[ -f "$dir/__manifest__.py" ] && echo "$dir"
|
||||
done | paste -sd, -
|
||||
)"
|
||||
else
|
||||
modules="$(
|
||||
for dir in */; do
|
||||
dir="${dir%/}"
|
||||
[ -f "$dir/__manifest__.py" ] && echo "$dir"
|
||||
done | paste -sd, -
|
||||
)"
|
||||
fi
|
||||
echo "modules=$modules" >> "$GITHUB_OUTPUT"
|
||||
echo "Modules to test ($scope): ${modules:-<none>}"
|
||||
|
||||
- name: Run Odoo tests
|
||||
if: steps.changed.outputs.modules != ''
|
||||
run: bash .gitea/scripts/odoo-tests.sh "${{ steps.changed.outputs.modules }}"
|
||||
161
.gitignore
vendored
161
.gitignore
vendored
@@ -1,42 +1,40 @@
|
||||
*.docx
|
||||
|
||||
.~*
|
||||
|
||||
# Byte-compiled / optimized / DLL files
|
||||
__pycache__/
|
||||
*.py[cod]
|
||||
/.venv
|
||||
/.pytest_cache
|
||||
/.ruff_cache
|
||||
*$py.class
|
||||
|
||||
# C extensions
|
||||
*.so
|
||||
|
||||
# Distribution / packaging
|
||||
.Python
|
||||
env/
|
||||
bin/
|
||||
build/
|
||||
develop-eggs/
|
||||
dist/
|
||||
downloads/
|
||||
eggs/
|
||||
.eggs/
|
||||
lib/
|
||||
lib64/
|
||||
parts/
|
||||
sdist/
|
||||
var/
|
||||
wheels/
|
||||
share/python-wheels/
|
||||
*.egg-info/
|
||||
.installed.cfg
|
||||
*.egg
|
||||
*.eggs
|
||||
MANIFEST
|
||||
|
||||
# Windows installers
|
||||
*.msi
|
||||
|
||||
# Debian packages
|
||||
*.deb
|
||||
|
||||
# Redhat packages
|
||||
*.rpm
|
||||
|
||||
# MacOS packages
|
||||
*.dmg
|
||||
*.pkg
|
||||
# PyInstaller
|
||||
# Usually these files are written by a python script from a template
|
||||
# before PyInstaller builds the exe, so as to inject date/other infos into it.
|
||||
*.manifest
|
||||
*.spec
|
||||
|
||||
# Installer logs
|
||||
pip-log.txt
|
||||
@@ -45,44 +43,123 @@ pip-delete-this-directory.txt
|
||||
# Unit test / coverage reports
|
||||
htmlcov/
|
||||
.tox/
|
||||
.nox/
|
||||
.coverage
|
||||
.coverage.*
|
||||
.cache
|
||||
nosetests.xml
|
||||
coverage.xml
|
||||
*.cover
|
||||
*.py,cover
|
||||
.hypothesis/
|
||||
.pytest_cache/
|
||||
cover/
|
||||
|
||||
# Translations
|
||||
*.mo
|
||||
|
||||
# Pycharm
|
||||
.idea
|
||||
|
||||
# Eclipse
|
||||
.settings
|
||||
|
||||
# Visual Studio cache/options directory
|
||||
.vs/
|
||||
.vscode
|
||||
|
||||
# OSX Files
|
||||
.DS_Store
|
||||
*.pot
|
||||
|
||||
# Django stuff:
|
||||
*.log
|
||||
local_settings.py
|
||||
db.sqlite3
|
||||
db.sqlite3-journal
|
||||
|
||||
# Mr Developer
|
||||
.mr.developer.cfg
|
||||
.project
|
||||
.pydevproject
|
||||
# Flask stuff:
|
||||
instance/
|
||||
.webassets-cache
|
||||
|
||||
# Rope
|
||||
.ropeproject
|
||||
# Scrapy stuff:
|
||||
.scrapy
|
||||
|
||||
# Sphinx documentation
|
||||
docs/_build/
|
||||
|
||||
# Backup files
|
||||
*~
|
||||
*.swp
|
||||
# PyBuilder
|
||||
.pybuilder/
|
||||
target/
|
||||
|
||||
# Jupyter Notebook
|
||||
.ipynb_checkpoints
|
||||
|
||||
# IPython
|
||||
profile_default/
|
||||
ipython_config.py
|
||||
|
||||
# pyenv
|
||||
# For a library or package, you might want to ignore these files since the code is
|
||||
# intended to run in multiple environments; otherwise, check them in:
|
||||
# .python-version
|
||||
|
||||
# pipenv
|
||||
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
|
||||
# However, in case of collaboration, if having platform-specific dependencies or dependencies
|
||||
# having no cross-platform support, pipenv may install dependencies that don't work, or not
|
||||
# install all needed dependencies.
|
||||
#Pipfile.lock
|
||||
|
||||
# poetry
|
||||
# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
|
||||
# This is especially recommended for binary packages to ensure reproducibility, and is more
|
||||
# commonly ignored for libraries.
|
||||
# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
|
||||
#poetry.lock
|
||||
|
||||
# pdm
|
||||
# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
|
||||
#pdm.lock
|
||||
# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
|
||||
# in version control.
|
||||
# https://pdm.fming.dev/#use-with-ide
|
||||
.pdm.toml
|
||||
|
||||
# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
|
||||
__pypackages__/
|
||||
|
||||
# Celery stuff
|
||||
celerybeat-schedule
|
||||
celerybeat.pid
|
||||
|
||||
# SageMath parsed files
|
||||
*.sage.py
|
||||
|
||||
# Environments
|
||||
.env
|
||||
.venv
|
||||
env/
|
||||
venv/
|
||||
ENV/
|
||||
env.bak/
|
||||
venv.bak/
|
||||
|
||||
# Spyder project settings
|
||||
.spyderproject
|
||||
.spyproject
|
||||
|
||||
# Rope project settings
|
||||
.ropeproject
|
||||
|
||||
# mkdocs documentation
|
||||
/site
|
||||
|
||||
# mypy
|
||||
.mypy_cache/
|
||||
.dmypy.json
|
||||
dmypy.json
|
||||
|
||||
# Pyre type checker
|
||||
.pyre/
|
||||
|
||||
# pytype static type analyzer
|
||||
.pytype/
|
||||
|
||||
# Cython debug symbols
|
||||
cython_debug/
|
||||
|
||||
# PyCharm
|
||||
# JetBrains specific template is maintained in a separate JetBrains.gitignore that can
|
||||
# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
|
||||
# and can be added to the global gitignore or merged into this file. For a more nuclear
|
||||
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
|
||||
#.idea/
|
||||
|
||||
# OCA rules
|
||||
!static/lib/
|
||||
|
||||
@@ -49,9 +49,12 @@ repos:
|
||||
$(git rev-parse --show-toplevel))"'
|
||||
- id: oca-gen-addon-readme
|
||||
entry:
|
||||
bash -c 'oca-gen-addon-readme --addons-dir=. --branch=$(git symbolic-ref
|
||||
bash -c 'oca-gen-addon-readme
|
||||
--addons-dir=.
|
||||
--branch=$(git symbolic-ref
|
||||
refs/remotes/origin/HEAD | sed "s@^refs/remotes/origin/@@")
|
||||
--repo-name=$(basename $(git rev-parse --show-toplevel)) --org-name="Elabore"
|
||||
--repo-name=$(basename $(git rev-parse --show-toplevel))
|
||||
--org-name="Elabore"
|
||||
--if-source-changed --keep-source-digest'
|
||||
|
||||
- repo: https://github.com/OCA/odoo-pre-commit-hooks
|
||||
|
||||
@@ -1,54 +0,0 @@
|
||||
# Translation of Odoo Server.
|
||||
# This file contains the translation of the following modules:
|
||||
# * survey_base
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Odoo Server 16.0\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2026-02-17 14:44+0000\n"
|
||||
"PO-Revision-Date: 2026-02-17 14:44+0000\n"
|
||||
"Last-Translator: \n"
|
||||
"Language-Team: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: \n"
|
||||
"Plural-Forms: \n"
|
||||
|
||||
#. module: survey_base
|
||||
#: model:ir.model.fields,field_description:survey_base.field_survey_user_input_line__value_file
|
||||
msgid "File"
|
||||
msgstr "Fichier"
|
||||
|
||||
#. module: survey_base
|
||||
#: model:ir.model.fields,field_description:survey_base.field_survey_user_input_line__value_file_fname
|
||||
msgid "File Name"
|
||||
msgstr "Nom du fichier"
|
||||
|
||||
#. module: survey_base
|
||||
#: model:ir.model.fields,field_description:survey_base.field_survey_question_answer__record_reference
|
||||
#: model:ir.model.fields,field_description:survey_base.field_survey_user_input_line__record_reference
|
||||
msgid "Record"
|
||||
msgstr "Enregistrement"
|
||||
|
||||
#. module: survey_base
|
||||
#: model:ir.model.fields,field_description:survey_base.field_survey_question_answer__record_reference_model
|
||||
#: model:ir.model.fields,field_description:survey_base.field_survey_user_input_line__record_reference_model
|
||||
msgid "Record Model"
|
||||
msgstr "Modèle de l'enregistrement"
|
||||
|
||||
#. module: survey_base
|
||||
#: model:ir.model.fields,field_description:survey_base.field_survey_question_answer__smart_search
|
||||
#: model:ir.model.fields,field_description:survey_base.field_survey_user_input_line__smart_search
|
||||
msgid "Smart Search"
|
||||
msgstr "Recherche intelligente"
|
||||
|
||||
#. module: survey_base
|
||||
#: model:ir.model,name:survey_base.model_survey_question_answer
|
||||
msgid "Survey Label"
|
||||
msgstr "Étiquette du sondage"
|
||||
|
||||
#. module: survey_base
|
||||
#: model:ir.model,name:survey_base.model_survey_user_input_line
|
||||
msgid "Survey User Input Line"
|
||||
msgstr "Ligne d'entrée pour l'utilisateur du sondage"
|
||||
@@ -21,7 +21,7 @@ class SurveyUserInputLine(models.Model):
|
||||
|
||||
#record reference fields
|
||||
record_reference = fields.Many2oneReference(model_field="record_reference_model", string="Record")
|
||||
record_reference_model = fields.Char('Record Model')
|
||||
record_reference_model = fields.Char('Record model')
|
||||
|
||||
"""set record_reference when saving survey_user_input line
|
||||
"""
|
||||
|
||||
@@ -1,2 +0,0 @@
|
||||
from . import controllers
|
||||
from . import models
|
||||
@@ -1,33 +0,0 @@
|
||||
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
|
||||
|
||||
{
|
||||
"name": "Survey extra fields",
|
||||
"summary": "Add extra question types to surveys",
|
||||
"description": """
|
||||
Add extra question types to surveys:
|
||||
----------------------------------------------------
|
||||
* File upload question type
|
||||
- Allows survey participants to upload a file as an answer
|
||||
- Configurable maximum file size (in MB) per question (default: 10 MB, 0 = no limit)
|
||||
- Configurable allowed file extensions per question (e.g. .pdf,.docx — empty = all types allowed)
|
||||
- Client-side validation (size and extension) before form submission
|
||||
- Server-side validation on save to enforce constraints
|
||||
""",
|
||||
"version": "16.0.1.0.0",
|
||||
"license": "AGPL-3",
|
||||
"author": "Elabore",
|
||||
"website": "https://www.elabore.coop",
|
||||
"category": "",
|
||||
"depends": ["base", "survey_base"],
|
||||
"data": [
|
||||
"views/survey_templates.xml",
|
||||
"views/survey_user_views.xml",
|
||||
"views/survey_question_views.xml",
|
||||
],
|
||||
"assets": {
|
||||
"survey.survey_assets": [
|
||||
"/survey_extra_fields/static/src/js/survey_form.js",
|
||||
],
|
||||
},
|
||||
"installable": True,
|
||||
}
|
||||
@@ -1 +0,0 @@
|
||||
from . import main
|
||||
@@ -1,61 +0,0 @@
|
||||
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import base64
|
||||
from typing import TYPE_CHECKING, Any
|
||||
|
||||
from odoo import http
|
||||
from odoo.http import request, content_disposition
|
||||
from odoo.addons.survey.controllers.main import Survey
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from werkzeug.wrappers import Response
|
||||
|
||||
|
||||
class SurveyExtraFieldsController(Survey):
|
||||
|
||||
@http.route(
|
||||
"/survey/file/<string:survey_token>/<string:answer_token>/<int:line_id>",
|
||||
type="http",
|
||||
auth="public",
|
||||
)
|
||||
def survey_file_download(
|
||||
self,
|
||||
survey_token: str,
|
||||
answer_token: str,
|
||||
line_id: int,
|
||||
**kwargs: Any
|
||||
) -> Response:
|
||||
survey = request.env["survey.survey"].sudo().search(
|
||||
[("access_token", "=", survey_token)], limit=1
|
||||
)
|
||||
if not survey:
|
||||
return request.not_found()
|
||||
|
||||
answer = request.env["survey.user_input"].sudo().search(
|
||||
[
|
||||
("survey_id", "=", survey.id),
|
||||
("access_token", "=", answer_token),
|
||||
],
|
||||
limit=1,
|
||||
)
|
||||
if not answer:
|
||||
return request.not_found()
|
||||
|
||||
line = request.env["survey.user_input.line"].sudo().browse(line_id)
|
||||
if not line.exists() or line.user_input_id != answer:
|
||||
return request.not_found()
|
||||
|
||||
if not line.value_file:
|
||||
return request.not_found()
|
||||
|
||||
file_content = base64.b64decode(line.value_file)
|
||||
filename = line.value_file_fname or "file"
|
||||
return request.make_response(
|
||||
file_content,
|
||||
headers=[
|
||||
("Content-Type", "application/octet-stream"),
|
||||
("Content-Disposition", content_disposition(filename)),
|
||||
],
|
||||
)
|
||||
@@ -1,129 +0,0 @@
|
||||
# Translation of Odoo Server.
|
||||
# This file contains the translation of the following modules:
|
||||
# * survey_extra_fields
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Odoo Server 16.0\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2026-02-18 16:38+0000\n"
|
||||
"PO-Revision-Date: 2026-02-18 16:38+0000\n"
|
||||
"Last-Translator: \n"
|
||||
"Language-Team: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: \n"
|
||||
"Plural-Forms: \n"
|
||||
|
||||
#. module: survey_extra_fields
|
||||
#: model_terms:ir.ui.view,arch_db:survey_extra_fields.survey_question_form_inh
|
||||
msgid ".pdf,.docx,.xlsx"
|
||||
msgstr ""
|
||||
|
||||
#. module: survey_extra_fields
|
||||
#: model_terms:ir.ui.view,arch_db:survey_extra_fields.question_file
|
||||
msgid "<i class=\"fa fa-times me-1\"/>Remove file"
|
||||
msgstr "<i class=\"fa fa-times me-1\"/>Supprimer le fichier"
|
||||
|
||||
#. module: survey_extra_fields
|
||||
#: model:ir.model.fields,field_description:survey_extra_fields.field_survey_question__allowed_extensions
|
||||
msgid "Allowed Extensions"
|
||||
msgstr "Extensions autorisées"
|
||||
|
||||
#. module: survey_extra_fields
|
||||
#: model:ir.model.fields,field_description:survey_extra_fields.field_survey_user_input_line__answer_type
|
||||
msgid "Answer Type"
|
||||
msgstr "Type de réponse"
|
||||
|
||||
#. module: survey_extra_fields
|
||||
#: model:ir.model.fields,help:survey_extra_fields.field_survey_question__allowed_extensions
|
||||
msgid ""
|
||||
"Comma-separated list of allowed extensions (e.g. .pdf,.docx). Leave empty to"
|
||||
" allow all types."
|
||||
msgstr ""
|
||||
"Liste d'extensions autorisées séparées par une virgule (e.g. .pdf,.docx). Laisser vide pour"
|
||||
" autoriser tous les types de fichier."
|
||||
|
||||
#. module: survey_extra_fields
|
||||
#: model:ir.model.fields.selection,name:survey_extra_fields.selection__survey_question__question_type__file
|
||||
#: model:ir.model.fields.selection,name:survey_extra_fields.selection__survey_user_input_line__answer_type__file
|
||||
msgid "File"
|
||||
msgstr "Fichier"
|
||||
|
||||
#. module: survey_extra_fields
|
||||
#: model:ir.model.fields,field_description:survey_extra_fields.field_survey_question__max_file_size
|
||||
#: model_terms:ir.ui.view,arch_db:survey_extra_fields.survey_question_form_inh
|
||||
msgid "Max File Size (MB)"
|
||||
msgstr "Taille maximale du fichier"
|
||||
|
||||
#. module: survey_extra_fields
|
||||
#: model:ir.model.fields,help:survey_extra_fields.field_survey_question__max_file_size
|
||||
msgid "Maximum file size in MB. Leave 0 for no limit."
|
||||
msgstr "Taille maximale du fichier en MB. Laisser à 0 pour ne pas restreindre la taille. La valeur par défaut est 10 MB."
|
||||
|
||||
#. module: survey_extra_fields
|
||||
#: model:ir.model.fields,field_description:survey_extra_fields.field_survey_question__question_type
|
||||
msgid "Question Type"
|
||||
msgstr "Type de question"
|
||||
|
||||
#. module: survey_extra_fields
|
||||
#: model_terms:ir.ui.view,arch_db:survey_extra_fields.survey_page_print_inh_type_file
|
||||
msgid "Skipped"
|
||||
msgstr "Ignoré"
|
||||
|
||||
#. module: survey_extra_fields
|
||||
#: model:ir.model.fields,field_description:survey_extra_fields.field_survey_question__smart_search
|
||||
#: model:ir.model.fields,field_description:survey_extra_fields.field_survey_user_input__smart_search
|
||||
#: model:ir.model.fields,field_description:survey_extra_fields.field_survey_user_input_line__smart_search
|
||||
msgid "Smart Search"
|
||||
msgstr "Recherche intelligente"
|
||||
|
||||
#. module: survey_extra_fields
|
||||
#: model:ir.model,name:survey_extra_fields.model_survey_question
|
||||
msgid "Survey Question"
|
||||
msgstr "Question du sondage"
|
||||
|
||||
#. module: survey_extra_fields
|
||||
#: model:ir.model,name:survey_extra_fields.model_survey_user_input
|
||||
msgid "Survey User Input"
|
||||
msgstr "Entrée utilisateur du sondage"
|
||||
|
||||
#. module: survey_extra_fields
|
||||
#: model:ir.model,name:survey_extra_fields.model_survey_user_input_line
|
||||
msgid "Survey User Input Line"
|
||||
msgstr "Ligne d'entrée pour l'utilisateur du sondage"
|
||||
|
||||
#. module: survey_extra_fields
|
||||
#. odoo-python
|
||||
#: code:addons/survey_extra_fields/models/survey_user_input.py:0
|
||||
#, python-format
|
||||
msgid "The file '%(name)s' exceeds the maximum allowed size of %(size)s MB."
|
||||
msgstr "Le fichier '%(name)s' dépasse la taille maximale autorisée de %(size)s MB."
|
||||
|
||||
#. module: survey_extra_fields
|
||||
#. odoo-python
|
||||
#: code:addons/survey_extra_fields/models/survey_user_input.py:0
|
||||
#, python-format
|
||||
msgid "The file '%(name)s' is not allowed. Accepted formats: %(exts)s."
|
||||
msgstr "Le fichier '%(name)s' n'est pas autorisé. Les formats de fichier autorisés sont : %(exts)s."
|
||||
|
||||
#. module: survey_extra_fields
|
||||
#. odoo-javascript
|
||||
#: code:addons/survey_extra_fields/static/src/js/survey_form.js:0
|
||||
#, python-format
|
||||
msgid "The file exceeds the maximum allowed size of %s MB."
|
||||
msgstr "Le fichier dépasse la taille maximale autorisée de %s MB."
|
||||
|
||||
#. module: survey_extra_fields
|
||||
#. odoo-javascript
|
||||
#: code:addons/survey_extra_fields/static/src/js/survey_form.js:0
|
||||
#, python-format
|
||||
msgid "This file type is not allowed. Accepted formats: %s."
|
||||
msgstr "Le fichier n'est pas autorisé. Les formats de fichier autorisés sont : %s."
|
||||
|
||||
#. module: survey_extra_fields
|
||||
#. odoo-javascript
|
||||
#: code:addons/survey_extra_fields/static/src/js/survey_form.js:0
|
||||
#, python-format
|
||||
msgid "This question requires an answer."
|
||||
msgstr "Cette question requiert une réponse."
|
||||
@@ -1,3 +0,0 @@
|
||||
from . import survey_question
|
||||
from . import survey_user_input
|
||||
from . import survey_user_input_line
|
||||
@@ -1,20 +0,0 @@
|
||||
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
|
||||
|
||||
from odoo import fields, models
|
||||
|
||||
|
||||
class SurveyQuestion(models.Model):
|
||||
_inherit = "survey.question"
|
||||
|
||||
question_type = fields.Selection(
|
||||
selection_add=[("file", "File")]
|
||||
)
|
||||
max_file_size = fields.Integer(
|
||||
string="Max File Size (MB)",
|
||||
default=10,
|
||||
help="Maximum file size in MB. Leave 0 for no limit.",
|
||||
)
|
||||
allowed_extensions = fields.Char(
|
||||
string="Allowed Extensions",
|
||||
help="Comma-separated list of allowed extensions (e.g. .pdf,.docx). Leave empty to allow all types.",
|
||||
)
|
||||
@@ -1,84 +0,0 @@
|
||||
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import base64
|
||||
import json
|
||||
import os
|
||||
from typing import TYPE_CHECKING
|
||||
|
||||
from odoo import _, models
|
||||
from odoo.exceptions import ValidationError
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from odoo.addons.survey_extra_fields.models.survey_question import SurveyQuestion
|
||||
|
||||
|
||||
class SurveyUserInput(models.Model):
|
||||
_inherit = "survey.user_input"
|
||||
|
||||
def save_lines(self, question: SurveyQuestion, answer: str | None, comment: str | None = None) -> None:
|
||||
if question.question_type == "file":
|
||||
old_answers = self.env["survey.user_input.line"].search([
|
||||
("user_input_id", "=", self.id),
|
||||
("question_id", "=", question.id),
|
||||
])
|
||||
if not answer and any(line.value_file for line in old_answers):
|
||||
# No new file was submitted: a file input cannot be pre-filled
|
||||
# by the browser when navigating back to a previous page, so an
|
||||
# empty answer here does not mean the user removed their file.
|
||||
# Keep the previously uploaded file instead of overwriting it
|
||||
# with a skipped answer.
|
||||
return
|
||||
vals = {
|
||||
"user_input_id": self.id,
|
||||
"question_id": question.id,
|
||||
"skipped": False,
|
||||
"answer_type": "file",
|
||||
}
|
||||
file_data = json.loads(answer) if answer else {}
|
||||
if file_data.get("cleared"):
|
||||
# The user explicitly removed the file: drop the stored data and
|
||||
# mark the line as skipped.
|
||||
vals.update(answer_type=None, skipped=True, value_file=False, value_file_fname=False)
|
||||
elif file_data:
|
||||
file_b64 = file_data.get("data", "")
|
||||
file_name = file_data.get("name", "")
|
||||
self._check_file_constraints(question, file_b64, file_name)
|
||||
vals["value_file"] = file_b64
|
||||
vals["value_file_fname"] = file_name
|
||||
else:
|
||||
vals.update(answer_type=None, skipped=True)
|
||||
if old_answers:
|
||||
old_answers.write(vals)
|
||||
else:
|
||||
self.env["survey.user_input.line"].create(vals)
|
||||
else:
|
||||
return super().save_lines(question, answer, comment=comment)
|
||||
|
||||
def _check_file_constraints(
|
||||
self,
|
||||
question: SurveyQuestion,
|
||||
file_b64: str,
|
||||
file_name: str
|
||||
) -> None:
|
||||
if question.max_file_size:
|
||||
file_size = len(base64.b64decode(file_b64))
|
||||
max_bytes = question.max_file_size * 1024 * 1024
|
||||
if file_size > max_bytes:
|
||||
raise ValidationError(
|
||||
_("The file '%(name)s' exceeds the maximum allowed size of %(size)s MB.",
|
||||
name=file_name, size=question.max_file_size)
|
||||
)
|
||||
if question.allowed_extensions:
|
||||
allowed = [
|
||||
allowed_extension.strip().lower()
|
||||
for allowed_extension in question.allowed_extensions.split(",")
|
||||
if allowed_extension.strip()
|
||||
]
|
||||
file_extension = os.path.splitext(file_name)[1].lower()
|
||||
if file_extension not in allowed:
|
||||
raise ValidationError(
|
||||
_("The file '%(name)s' is not allowed. Accepted formats: %(exts)s.",
|
||||
name=file_name, exts=question.allowed_extensions)
|
||||
)
|
||||
@@ -1,17 +0,0 @@
|
||||
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
|
||||
|
||||
from odoo import fields, models
|
||||
|
||||
|
||||
class SurveyUserInputLine(models.Model):
|
||||
_inherit = "survey.user_input.line"
|
||||
|
||||
answer_type = fields.Selection(
|
||||
selection_add=[("file", "File")]
|
||||
)
|
||||
|
||||
def _compute_display_name(self):
|
||||
super()._compute_display_name()
|
||||
for line in self:
|
||||
if line.answer_type == "file" and line.value_file_fname:
|
||||
line.display_name = line.value_file_fname
|
||||
@@ -1,231 +0,0 @@
|
||||
odoo.define("survey_extra_fields.survey_form", function (require) {
|
||||
"use strict";
|
||||
|
||||
var core = require("web.core");
|
||||
var _t = core._t;
|
||||
var survey_form = require("survey.form");
|
||||
|
||||
survey_form.include({
|
||||
/**
|
||||
* @override
|
||||
* Bind delegated listeners on the form root so they keep working after
|
||||
* each page is re-rendered (the inner content is replaced on navigation,
|
||||
* but the root element persists). They let the user clear a selected
|
||||
* file before submitting the form.
|
||||
*/
|
||||
start: function () {
|
||||
var self = this;
|
||||
return this._super.apply(this, arguments).then(function () {
|
||||
self.$el.on(
|
||||
"change.surveyExtraFile",
|
||||
'input[data-question-type="file"]',
|
||||
self._onFileInputChange.bind(self)
|
||||
);
|
||||
self.$el.on(
|
||||
"click.surveyExtraFile",
|
||||
".o_survey_file_clear",
|
||||
self._onFileClearClick.bind(self)
|
||||
);
|
||||
});
|
||||
},
|
||||
|
||||
/**
|
||||
* On selection, show the file "chip" (filename + remove button) and hide
|
||||
* the raw input, so a freshly selected file looks exactly like an already
|
||||
* stored one (rendered server-side when navigating back).
|
||||
*/
|
||||
_onFileInputChange: function (ev) {
|
||||
var input = ev.currentTarget;
|
||||
var $container = $(input).closest(".o_survey_comment_container");
|
||||
if (!$container.length || !(input.files && input.files.length > 0)) {
|
||||
return;
|
||||
}
|
||||
$container.find(".o_survey_file_name").text(input.files[0].name);
|
||||
$container.find(".o_survey_file_selected").removeClass("d-none");
|
||||
delete input.dataset.fileCleared;
|
||||
$(input).addClass("d-none");
|
||||
},
|
||||
|
||||
/**
|
||||
* Discard the current file: hide the chip and bring back the input so the
|
||||
* user can pick a new one. A file already stored server-side is only
|
||||
* really replaced once a new file is submitted (see save_lines).
|
||||
*/
|
||||
_onFileClearClick: function (ev) {
|
||||
ev.preventDefault();
|
||||
var $container = $(ev.currentTarget).closest(".o_survey_comment_container");
|
||||
if (!$container.length) {
|
||||
return;
|
||||
}
|
||||
var $input = $container.find('input[data-question-type="file"]');
|
||||
if ($input.length) {
|
||||
$input.val("");
|
||||
// Flag the explicit removal so the submit tells the server to
|
||||
// drop any previously stored file (instead of preserving it).
|
||||
$input[0].dataset.fileCleared = "1";
|
||||
$input.removeClass("d-none");
|
||||
}
|
||||
$container.find(".o_survey_file_selected").addClass("d-none");
|
||||
},
|
||||
|
||||
_readFileAsDataURL: function (file) {
|
||||
return new Promise(function (resolve, reject) {
|
||||
var reader = new FileReader();
|
||||
reader.onload = function (e) {
|
||||
resolve(e.target.result);
|
||||
};
|
||||
reader.onerror = function () {
|
||||
reject(reader.error);
|
||||
};
|
||||
reader.readAsDataURL(file);
|
||||
});
|
||||
},
|
||||
|
||||
/**
|
||||
* @override
|
||||
* The base implementation builds the submit params synchronously and
|
||||
* fires the RPC immediately. File inputs need to be read asynchronously
|
||||
* (FileReader), so when the current page contains file answers we
|
||||
* replicate the submit flow here, injecting the base64 file payload
|
||||
* before submitting.
|
||||
*/
|
||||
_submitForm: function (options) {
|
||||
var self = this;
|
||||
var $fileInputs = this.$('input[data-question-type="file"]');
|
||||
// A file action is either a new selection or an explicit removal of
|
||||
// a previously stored file (which must be communicated to the server).
|
||||
var hasFileAction = false;
|
||||
$fileInputs.each(function () {
|
||||
if ((this.files && this.files.length > 0) || this.dataset.fileCleared) {
|
||||
hasFileAction = true;
|
||||
return false;
|
||||
}
|
||||
});
|
||||
|
||||
if (!hasFileAction || this.options.isStartScreen) {
|
||||
return this._super(options);
|
||||
}
|
||||
|
||||
// Async flow: read files then submit
|
||||
var params = {};
|
||||
if (options.previousPageId) {
|
||||
params.previous_page_id = options.previousPageId;
|
||||
}
|
||||
|
||||
var $form = this.$("form");
|
||||
var formData = new FormData($form[0]);
|
||||
|
||||
if (!options.skipValidation) {
|
||||
if (!this._validateForm($form, formData)) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
this._prepareSubmitValues(formData, params);
|
||||
|
||||
// Read all selected files as base64 and add them to the submit
|
||||
// params. Explicitly cleared inputs (no new file) send a "cleared"
|
||||
// sentinel so the server removes the previously stored file.
|
||||
var filePromises = [];
|
||||
$fileInputs.each(function () {
|
||||
if (this.files && this.files.length > 0) {
|
||||
var file = this.files[0];
|
||||
var name = this.name;
|
||||
filePromises.push(
|
||||
self._readFileAsDataURL(file).then(function (dataURL) {
|
||||
params[name] = JSON.stringify({
|
||||
data: dataURL.split(",")[1],
|
||||
name: file.name,
|
||||
});
|
||||
})
|
||||
);
|
||||
} else if (this.dataset.fileCleared) {
|
||||
params[this.name] = JSON.stringify({ cleared: true });
|
||||
}
|
||||
});
|
||||
|
||||
this.preventEnterSubmit = true;
|
||||
|
||||
if (this.options.sessionInProgress) {
|
||||
this.fadeInOutDelay = 400;
|
||||
this.readonly = true;
|
||||
}
|
||||
|
||||
Promise.all(filePromises).then(function () {
|
||||
var submitPromise = self._rpc({
|
||||
route: _.str.sprintf(
|
||||
"%s/%s/%s",
|
||||
"/survey/submit",
|
||||
self.options.surveyToken,
|
||||
self.options.answerToken
|
||||
),
|
||||
params: params,
|
||||
});
|
||||
self._nextScreen(submitPromise, options);
|
||||
});
|
||||
},
|
||||
|
||||
_validateForm: function ($form, formData) {
|
||||
var result = this._super.apply(this, arguments);
|
||||
var errors = {};
|
||||
var inactiveQuestionIds = this.options.sessionInProgress
|
||||
? []
|
||||
: this._getInactiveConditionalQuestionIds();
|
||||
|
||||
$form.find('input[data-question-type="file"]').each(function () {
|
||||
var $questionWrapper = $(this).closest(".js_question-wrapper");
|
||||
var questionId = $questionWrapper.attr("id");
|
||||
if (inactiveQuestionIds.includes(parseInt(questionId))) {
|
||||
return;
|
||||
}
|
||||
var questionRequired = $questionWrapper.data("required");
|
||||
var constrErrorMsg =
|
||||
$questionWrapper.data("constrErrorMsg") ||
|
||||
_t("This question requires an answer.");
|
||||
if (questionRequired && !(this.files && this.files.length > 0)) {
|
||||
// A file may already be stored server-side (e.g. uploaded
|
||||
// then navigating back): the chip is visible even though the
|
||||
// input is empty. Treat that as a valid answer.
|
||||
var $chip = $(this)
|
||||
.closest(".o_survey_comment_container")
|
||||
.find(".o_survey_file_selected");
|
||||
var hasExistingFile = $chip.length && !$chip.hasClass("d-none");
|
||||
if (!hasExistingFile) {
|
||||
errors[questionId] = constrErrorMsg;
|
||||
}
|
||||
return;
|
||||
}
|
||||
if (this.files && this.files.length > 0) {
|
||||
var file = this.files[0];
|
||||
var maxSizeMB = parseInt($(this).data("maxFileSize"));
|
||||
if (maxSizeMB && file.size > maxSizeMB * 1024 * 1024) {
|
||||
errors[questionId] = _.str.sprintf(
|
||||
_t("The file exceeds the maximum allowed size of %s MB."),
|
||||
maxSizeMB
|
||||
);
|
||||
return;
|
||||
}
|
||||
var allowedExtensions = $(this).data("allowedExtensions");
|
||||
if (allowedExtensions) {
|
||||
var allowed = allowedExtensions.split(",").map(function (e) {
|
||||
return e.trim().toLowerCase();
|
||||
});
|
||||
var ext = "." + file.name.split(".").pop().toLowerCase();
|
||||
if (!allowed.includes(ext)) {
|
||||
errors[questionId] = _.str.sprintf(
|
||||
_t("This file type is not allowed. Accepted formats: %s."),
|
||||
allowedExtensions
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
if (_.keys(errors).length > 0) {
|
||||
this._showErrors(errors);
|
||||
return false;
|
||||
}
|
||||
return result;
|
||||
},
|
||||
});
|
||||
});
|
||||
@@ -1 +0,0 @@
|
||||
from . import test_survey_file
|
||||
@@ -1,297 +0,0 @@
|
||||
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
|
||||
|
||||
import base64
|
||||
import json
|
||||
from unittest.mock import patch, MagicMock
|
||||
|
||||
from werkzeug.exceptions import NotFound
|
||||
from werkzeug.wrappers import Response
|
||||
|
||||
from odoo.addons.survey.tests import common
|
||||
|
||||
|
||||
class TestSurveyFileCommon(common.TestSurveyCommon):
|
||||
def setUp(self):
|
||||
super().setUp()
|
||||
self.file_content = b"Hello, this is a test file."
|
||||
self.file_b64 = base64.b64encode(self.file_content).decode()
|
||||
self.file_name = "test_document.pdf"
|
||||
|
||||
self.question_file = self._add_question(
|
||||
self.page_0,
|
||||
"Upload your document",
|
||||
"file",
|
||||
constr_mandatory=False,
|
||||
survey_id=self.survey.id,
|
||||
)
|
||||
self.question_file_required = self._add_question(
|
||||
self.page_0,
|
||||
"Upload your required document",
|
||||
"file",
|
||||
constr_mandatory=True,
|
||||
survey_id=self.survey.id,
|
||||
)
|
||||
|
||||
def _create_answer_with_file(self):
|
||||
answer = self._add_answer(self.survey, False, email="test@example.com")
|
||||
line = self.env["survey.user_input.line"].create({
|
||||
"user_input_id": answer.id,
|
||||
"question_id": self.question_file.id,
|
||||
"answer_type": "file",
|
||||
"skipped": False,
|
||||
"value_file": self.file_b64,
|
||||
"value_file_fname": self.file_name,
|
||||
})
|
||||
return answer, line
|
||||
|
||||
|
||||
class TestSurveyFileSaveLines(TestSurveyFileCommon):
|
||||
"""Test the save_lines method for file question type."""
|
||||
|
||||
def test_save_file_answer(self):
|
||||
"""Submitting a file stores base64 data and filename."""
|
||||
answer = self._add_answer(self.survey, self.survey_manager.partner_id)
|
||||
file_json = json.dumps({"data": self.file_b64, "name": self.file_name})
|
||||
|
||||
answer.save_lines(self.question_file, file_json)
|
||||
|
||||
line = answer.user_input_line_ids.filtered(
|
||||
lambda l: l.question_id == self.question_file
|
||||
)
|
||||
self.assertEqual(len(line), 1)
|
||||
self.assertEqual(line.answer_type, "file")
|
||||
self.assertFalse(line.skipped)
|
||||
self.assertEqual(line.value_file, self.file_b64.encode())
|
||||
self.assertEqual(line.value_file_fname, self.file_name)
|
||||
|
||||
def test_save_file_skipped(self):
|
||||
"""Submitting empty answer marks the line as skipped."""
|
||||
answer = self._add_answer(self.survey, self.survey_manager.partner_id)
|
||||
|
||||
answer.save_lines(self.question_file, "")
|
||||
|
||||
line = answer.user_input_line_ids.filtered(
|
||||
lambda l: l.question_id == self.question_file
|
||||
)
|
||||
self.assertEqual(len(line), 1)
|
||||
self.assertTrue(line.skipped)
|
||||
self.assertFalse(line.answer_type)
|
||||
|
||||
def test_save_file_update_existing(self):
|
||||
"""Submitting a new file updates the existing answer line."""
|
||||
answer = self._add_answer(self.survey, self.survey_manager.partner_id)
|
||||
file_json_1 = json.dumps({"data": self.file_b64, "name": "first.pdf"})
|
||||
answer.save_lines(self.question_file, file_json_1)
|
||||
|
||||
new_b64 = base64.b64encode(b"Updated content").decode()
|
||||
file_json_2 = json.dumps({"data": new_b64, "name": "second.pdf"})
|
||||
answer.save_lines(self.question_file, file_json_2)
|
||||
|
||||
lines = answer.user_input_line_ids.filtered(
|
||||
lambda l: l.question_id == self.question_file
|
||||
)
|
||||
self.assertEqual(len(lines), 1, "Should update, not create a second line")
|
||||
self.assertEqual(lines.value_file, new_b64.encode())
|
||||
self.assertEqual(lines.value_file_fname, "second.pdf")
|
||||
|
||||
def test_save_file_then_empty_keeps_file(self):
|
||||
"""Submitting empty after a file keeps it (file inputs cannot be
|
||||
pre-filled when navigating back, so an empty answer must not erase it)."""
|
||||
answer = self._add_answer(self.survey, self.survey_manager.partner_id)
|
||||
file_json = json.dumps({"data": self.file_b64, "name": self.file_name})
|
||||
answer.save_lines(self.question_file, file_json)
|
||||
|
||||
answer.save_lines(self.question_file, "")
|
||||
|
||||
line = answer.user_input_line_ids.filtered(
|
||||
lambda l: l.question_id == self.question_file
|
||||
)
|
||||
self.assertEqual(len(line), 1)
|
||||
self.assertFalse(line.skipped)
|
||||
self.assertEqual(line.value_file, self.file_b64.encode())
|
||||
self.assertEqual(line.value_file_fname, self.file_name)
|
||||
|
||||
def test_save_file_explicitly_cleared(self):
|
||||
"""Submitting the 'cleared' sentinel after a file removes it."""
|
||||
answer = self._add_answer(self.survey, self.survey_manager.partner_id)
|
||||
file_json = json.dumps({"data": self.file_b64, "name": self.file_name})
|
||||
answer.save_lines(self.question_file, file_json)
|
||||
|
||||
answer.save_lines(self.question_file, json.dumps({"cleared": True}))
|
||||
|
||||
line = answer.user_input_line_ids.filtered(
|
||||
lambda l: l.question_id == self.question_file
|
||||
)
|
||||
self.assertEqual(len(line), 1)
|
||||
self.assertTrue(line.skipped)
|
||||
self.assertFalse(line.value_file)
|
||||
self.assertFalse(line.value_file_fname)
|
||||
|
||||
|
||||
class TestSurveyFileConstraints(TestSurveyFileCommon):
|
||||
"""Test _check_file_constraints validation logic."""
|
||||
|
||||
def test_no_constraints(self):
|
||||
"""No max_file_size and no allowed_extensions: any file passes."""
|
||||
self.question_file.write({"max_file_size": 0, "allowed_extensions": False})
|
||||
answer = self._add_answer(self.survey, self.survey_manager.partner_id)
|
||||
file_json = json.dumps({"data": self.file_b64, "name": "anything.exe"})
|
||||
answer.save_lines(self.question_file, file_json)
|
||||
line = answer.user_input_line_ids.filtered(
|
||||
lambda l: l.question_id == self.question_file
|
||||
)
|
||||
self.assertFalse(line.skipped)
|
||||
|
||||
def test_file_within_size_limit(self):
|
||||
"""File smaller than max_file_size passes."""
|
||||
self.question_file.write({"max_file_size": 10})
|
||||
answer = self._add_answer(self.survey, self.survey_manager.partner_id)
|
||||
file_json = json.dumps({"data": self.file_b64, "name": self.file_name})
|
||||
answer.save_lines(self.question_file, file_json)
|
||||
line = answer.user_input_line_ids.filtered(
|
||||
lambda l: l.question_id == self.question_file
|
||||
)
|
||||
self.assertFalse(line.skipped)
|
||||
|
||||
def test_file_exceeds_size_limit(self):
|
||||
"""File larger than max_file_size raises ValidationError."""
|
||||
self.question_file.write({"max_file_size": 1})
|
||||
large_content = b"x" * (1 * 1024 * 1024 + 1)
|
||||
large_b64 = base64.b64encode(large_content).decode()
|
||||
answer = self._add_answer(self.survey, self.survey_manager.partner_id)
|
||||
file_json = json.dumps({"data": large_b64, "name": self.file_name})
|
||||
with self.assertRaises(Exception):
|
||||
answer.save_lines(self.question_file, file_json)
|
||||
|
||||
def test_allowed_extension_passes(self):
|
||||
"""File with an allowed extension passes."""
|
||||
self.question_file.write({"allowed_extensions": ".pdf,.docx"})
|
||||
answer = self._add_answer(self.survey, self.survey_manager.partner_id)
|
||||
file_json = json.dumps({"data": self.file_b64, "name": "report.docx"})
|
||||
answer.save_lines(self.question_file, file_json)
|
||||
line = answer.user_input_line_ids.filtered(
|
||||
lambda l: l.question_id == self.question_file
|
||||
)
|
||||
self.assertFalse(line.skipped)
|
||||
|
||||
def test_disallowed_extension_raises(self):
|
||||
"""File with a disallowed extension raises ValidationError."""
|
||||
self.question_file.write({"allowed_extensions": ".pdf,.docx"})
|
||||
answer = self._add_answer(self.survey, self.survey_manager.partner_id)
|
||||
file_json = json.dumps({"data": self.file_b64, "name": "script.exe"})
|
||||
with self.assertRaises(Exception):
|
||||
answer.save_lines(self.question_file, file_json)
|
||||
|
||||
def test_both_constraints_valid(self):
|
||||
"""File respecting both size and extension constraints passes."""
|
||||
self.question_file.write({"max_file_size": 10, "allowed_extensions": ".pdf"})
|
||||
answer = self._add_answer(self.survey, self.survey_manager.partner_id)
|
||||
file_json = json.dumps({"data": self.file_b64, "name": self.file_name})
|
||||
answer.save_lines(self.question_file, file_json)
|
||||
line = answer.user_input_line_ids.filtered(
|
||||
lambda l: l.question_id == self.question_file
|
||||
)
|
||||
self.assertFalse(line.skipped)
|
||||
|
||||
|
||||
class TestSurveyFileDisplayName(TestSurveyFileCommon):
|
||||
"""Test the display_name computation for file answer lines."""
|
||||
|
||||
def test_display_name_filename(self):
|
||||
answer = self._add_answer(self.survey, self.survey_manager.partner_id)
|
||||
line = self.env["survey.user_input.line"].create({
|
||||
"user_input_id": answer.id,
|
||||
"question_id": self.question_file.id,
|
||||
"answer_type": "file",
|
||||
"skipped": False,
|
||||
"value_file": self.file_b64,
|
||||
"value_file_fname": "my_filename.pdf",
|
||||
})
|
||||
self.assertEqual(line.display_name, "my_filename.pdf")
|
||||
|
||||
|
||||
class TestSurveyFileDownloadController(TestSurveyFileCommon):
|
||||
"""Test the file download controller logic with mocked request."""
|
||||
|
||||
def _call_download(self, survey_token, answer_token, line_id):
|
||||
"""Call the controller method with a mocked request context."""
|
||||
from odoo.addons.survey_extra_fields.controllers.main import (
|
||||
SurveyExtraFieldsController,
|
||||
)
|
||||
|
||||
mock_request = MagicMock()
|
||||
mock_request.env = self.env
|
||||
mock_request.not_found.return_value = NotFound()
|
||||
mock_request.make_response.side_effect = (
|
||||
lambda content, headers=None: Response(content, headers=headers)
|
||||
)
|
||||
|
||||
controller = SurveyExtraFieldsController()
|
||||
with patch(
|
||||
"odoo.addons.survey_extra_fields.controllers.main.request",
|
||||
mock_request,
|
||||
):
|
||||
try:
|
||||
return controller.survey_file_download(
|
||||
survey_token, answer_token, line_id
|
||||
)
|
||||
except NotFound:
|
||||
return NotFound()
|
||||
|
||||
def test_download_valid(self):
|
||||
"""Valid tokens return the file content."""
|
||||
answer, line = self._create_answer_with_file()
|
||||
|
||||
response = self._call_download(
|
||||
self.survey.access_token, answer.access_token, line.id
|
||||
)
|
||||
|
||||
self.assertIsInstance(response, Response)
|
||||
self.assertEqual(response.status_code, 200)
|
||||
self.assertEqual(response.data, self.file_content)
|
||||
|
||||
def test_download_invalid_survey_token(self):
|
||||
"""Invalid survey token returns not_found."""
|
||||
answer, line = self._create_answer_with_file()
|
||||
|
||||
response = self._call_download(
|
||||
"invalid-token", answer.access_token, line.id
|
||||
)
|
||||
|
||||
self.assertIsInstance(response, NotFound)
|
||||
|
||||
def test_download_invalid_answer_token(self):
|
||||
"""Invalid answer token returns not_found."""
|
||||
answer, line = self._create_answer_with_file()
|
||||
|
||||
response = self._call_download(
|
||||
self.survey.access_token, "invalid-token", line.id
|
||||
)
|
||||
|
||||
self.assertIsInstance(response, NotFound)
|
||||
|
||||
def test_download_line_not_belonging_to_answer(self):
|
||||
"""Accessing a line from another answer returns not_found."""
|
||||
answer, line = self._create_answer_with_file()
|
||||
other_answer = self._add_answer(self.survey, False, email="other@example.com")
|
||||
|
||||
response = self._call_download(
|
||||
self.survey.access_token, other_answer.access_token, line.id
|
||||
)
|
||||
|
||||
self.assertIsInstance(response, NotFound)
|
||||
|
||||
def test_download_no_file(self):
|
||||
"""Accessing a line without file data returns not_found."""
|
||||
answer = self._add_answer(self.survey, False, email="test@example.com")
|
||||
line = self.env["survey.user_input.line"].create({
|
||||
"user_input_id": answer.id,
|
||||
"question_id": self.question_file.id,
|
||||
"skipped": True,
|
||||
})
|
||||
|
||||
response = self._call_download(
|
||||
self.survey.access_token, answer.access_token, line.id
|
||||
)
|
||||
|
||||
self.assertIsInstance(response, NotFound)
|
||||
@@ -1,20 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<odoo>
|
||||
|
||||
<record id="survey_question_form_inh" model="ir.ui.view">
|
||||
<field name="name">survey.question.form.inherit.extra_fields</field>
|
||||
<field name="model">survey.question</field>
|
||||
<field name="inherit_id" ref="survey.survey_question_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="//page[@name='options']//field[@name='matrix_subtype']" position="before">
|
||||
<field name="max_file_size"
|
||||
attrs="{'invisible': [('question_type', '!=', 'file')]}"
|
||||
string="Max File Size (MB)"/>
|
||||
<field name="allowed_extensions"
|
||||
attrs="{'invisible': [('question_type', '!=', 'file')]}"
|
||||
placeholder=".pdf,.docx,.xlsx"/>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
</odoo>
|
||||
@@ -1,81 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<odoo>
|
||||
|
||||
<!-- Extend question_container (form view during survey filling) -->
|
||||
<template
|
||||
id="question_container_inh_type_file"
|
||||
inherit_id="survey.question_container"
|
||||
>
|
||||
<xpath expr="//t[@t-call='survey.question_matrix']/.." position="after">
|
||||
<t t-if="question.question_type == 'file'">
|
||||
<t t-call="survey_extra_fields.question_file"/>
|
||||
</t>
|
||||
</xpath>
|
||||
</template>
|
||||
|
||||
<template id="question_file" name="Question: File">
|
||||
<div class="o_survey_comment_container p-0">
|
||||
<t t-set="existing_fname" t-value="answer_lines and answer_lines[0].value_file_fname"/>
|
||||
<t t-if="survey_form_readonly">
|
||||
<p t-if="existing_fname" class="mb-1">
|
||||
<i class="fa fa-paperclip me-1"/><t t-out="answer_lines[0].value_file_fname"/>
|
||||
</p>
|
||||
</t>
|
||||
<t t-else="">
|
||||
<!-- Uploaded file display, shown both for a fresh selection and when a
|
||||
file was already stored server-side (e.g. navigating back). The raw
|
||||
file input is hidden until the user clicks "Remove file". -->
|
||||
<span t-attf-class="o_survey_file_selected d-inline-flex align-items-center #{'' if existing_fname else 'd-none'}">
|
||||
<i class="fa fa-paperclip me-1"/>
|
||||
<span class="o_survey_file_name"><t t-out="existing_fname or ''"/></span>
|
||||
<button type="button" class="btn btn-link btn-sm text-danger o_survey_file_clear ms-2 py-0">
|
||||
<i class="fa fa-times me-1"/>Remove file
|
||||
</button>
|
||||
</span>
|
||||
<input
|
||||
type="file"
|
||||
t-attf-class="o_survey_question_file #{'d-none' if existing_fname else ''}"
|
||||
t-att-name="question.id"
|
||||
t-att-data-question-type="question.question_type"
|
||||
t-att-accept="question.allowed_extensions or None"
|
||||
t-att-data-max-file-size="question.max_file_size or None"
|
||||
t-att-data-allowed-extensions="question.allowed_extensions or None"
|
||||
/>
|
||||
</t>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<!-- Extend print/review page to show file answers -->
|
||||
<template
|
||||
id="survey_page_print_inh_type_file"
|
||||
inherit_id="survey.survey_page_print"
|
||||
>
|
||||
<xpath expr="//div[hasclass('o_survey_question_error')]" position="before">
|
||||
<t t-if="question.question_type == 'file'">
|
||||
<t t-if="answer_lines">
|
||||
<t t-set="answer_line" t-value="answer_lines[0]"/>
|
||||
<t t-if="answer_line.skipped">
|
||||
<div class="row g-0">
|
||||
<div class="col-12 col-md-6 col-lg-4 rounded ps-4 o_survey_question_skipped">
|
||||
<input type="text"
|
||||
class="form-control fst-italic o_survey_question_file bg-transparent rounded-0 p-0"
|
||||
value="Skipped"/>
|
||||
</div>
|
||||
</div>
|
||||
</t>
|
||||
<t t-elif="answer_line.value_file_fname">
|
||||
<div class="row g-0">
|
||||
<div class="col-12 col-md-6 col-lg-4">
|
||||
<a t-attf-href="/survey/file/#{survey.access_token}/#{answer.access_token}/#{answer_line.id}"
|
||||
target="_blank">
|
||||
<i class="fa fa-download me-1"/><t t-out="answer_line.value_file_fname"/>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</t>
|
||||
</t>
|
||||
</t>
|
||||
</xpath>
|
||||
</template>
|
||||
|
||||
</odoo>
|
||||
@@ -1,17 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<odoo>
|
||||
|
||||
<record id="survey_user_input_line_view_form_inh" model="ir.ui.view">
|
||||
<field name="name">survey.user_input.line.view.form.inherit.extra_fields</field>
|
||||
<field name="model">survey.user_input.line</field>
|
||||
<field name="inherit_id" ref="survey.survey_user_input_line_view_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="//field[@name='suggested_answer_id']" position="after">
|
||||
<field name="value_file" filename="value_file_fname" colspan="2"
|
||||
attrs="{'invisible': [('answer_type', '!=', 'file')]}"/>
|
||||
<field name="value_file_fname" invisible="1"/>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
</odoo>
|
||||
@@ -72,12 +72,7 @@ Record generation configuration
|
||||
For m2o or m2m links, question should be configured before. See Question answers configuration section below.
|
||||
* **other created record**: If value come from other created record (m2o case only)
|
||||
|
||||
#. Several options exist for the *record creation* :
|
||||
|
||||
#. You can check "Ignore creation if a mandatory field is missing" to prevent the form to crash if some record creations fail.
|
||||
#. You can check "Update existing records" to update existing records instead of creating it. For this, you need to
|
||||
precise the "Field to retrieve existing records". Only the first matched record will be updated. By default
|
||||
the existing values are not replaced, except if you check the option "Update existing values".
|
||||
|
||||
Question answers configuration
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
{
|
||||
"name": "Survey record generation",
|
||||
'summary': 'Allow to create or update record of any model when sending the form',
|
||||
'summary': 'Allow to create record of any model when sending the form',
|
||||
'description': """
|
||||
Allow to create record of any model when sending the form :
|
||||
----------------------------------------------------
|
||||
@@ -11,7 +11,7 @@ Allow to create record of any model when sending the form :
|
||||
* Associate question with fields
|
||||
* For x2m fields : Associate values to questions
|
||||
""",
|
||||
"version": "16.0.1.0.3",
|
||||
"version": "16.0.1.0.2",
|
||||
"license": "AGPL-3",
|
||||
"author": "Elabore",
|
||||
"website": "https://www.elabore.coop",
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Odoo Server 16.0\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2026-04-09 07:55+0000\n"
|
||||
"PO-Revision-Date: 2026-04-09 07:55+0000\n"
|
||||
"POT-Creation-Date: 2025-11-13 16:41+0000\n"
|
||||
"PO-Revision-Date: 2025-11-13 16:41+0000\n"
|
||||
"Last-Translator: \n"
|
||||
"Language-Team: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
@@ -44,6 +44,8 @@ msgstr "Question autorisée"
|
||||
#. module: survey_record_generation
|
||||
#. odoo-python
|
||||
#: code:addons/survey_record_generation/models/survey_record_creation_field_values.py:0
|
||||
#: code:addons/survey_record_generation/models/survey_record_creation_field_values.py:0
|
||||
#, python-format
|
||||
msgid "Answer to question: %s"
|
||||
msgstr "Réponse à la question : %s"
|
||||
|
||||
@@ -128,6 +130,8 @@ msgstr "Type de champ"
|
||||
#. module: survey_record_generation
|
||||
#. odoo-python
|
||||
#: code:addons/survey_record_generation/models/survey_record_creation_field_values.py:0
|
||||
#: code:addons/survey_record_generation/models/survey_record_creation_field_values.py:0
|
||||
#, python-format
|
||||
msgid "Field type is : <b>%s</b>"
|
||||
msgstr "Le type de champ est : <b>%s</b>"
|
||||
|
||||
@@ -194,14 +198,22 @@ msgid ""
|
||||
"error is ignored."
|
||||
msgstr ""
|
||||
"Si un champs requis est manquant lors de la création de l'enregistrement, "
|
||||
"une erreur est levée lors de la soumission du formulaire. En activant cette "
|
||||
"option, l'erreur sera ignorée."
|
||||
"une erreur est levée lors de la soumission du formulaire. "
|
||||
"En activant cette option, l'erreur sera ignorée."
|
||||
|
||||
#. module: survey_record_generation
|
||||
#: model:ir.model.fields,field_description:survey_record_generation.field_survey_record_creation__ignore_if_mandatory_field_is_missing
|
||||
msgid "Ignore creation if a mandatory field is missing"
|
||||
msgstr "Ignorer la création si un champs requis est manquant"
|
||||
|
||||
#. module: survey_record_generation
|
||||
#: model:ir.model.fields,field_description:survey_record_generation.field_survey_generated_record____last_update
|
||||
#: model:ir.model.fields,field_description:survey_record_generation.field_survey_record_creation____last_update
|
||||
#: model:ir.model.fields,field_description:survey_record_generation.field_survey_record_creation_field_values____last_update
|
||||
#: model:ir.model.fields,field_description:survey_record_generation.field_survey_record_creation_field_values_x2m____last_update
|
||||
msgid "Last Modified on"
|
||||
msgstr "Dernière modification le"
|
||||
|
||||
#. module: survey_record_generation
|
||||
#: model:ir.model.fields,field_description:survey_record_generation.field_survey_generated_record__write_uid
|
||||
#: model:ir.model.fields,field_description:survey_record_generation.field_survey_record_creation__write_uid
|
||||
@@ -257,6 +269,8 @@ msgstr "Pas d'enregistrements générés trouvés"
|
||||
#. module: survey_record_generation
|
||||
#. odoo-python
|
||||
#: code:addons/survey_record_generation/models/survey_question.py:0
|
||||
#: code:addons/survey_record_generation/models/survey_question.py:0
|
||||
#, python-format
|
||||
msgid "No record found in %s"
|
||||
msgstr "Pas d'enregistrements trouvés parmis %s"
|
||||
|
||||
@@ -278,7 +292,7 @@ msgstr ""
|
||||
#: model_terms:ir.ui.view,arch_db:survey_record_generation.survey_survey_view_form
|
||||
msgid ""
|
||||
"Only the first matched record will be updated.\n"
|
||||
" Also to be noticed, the unicity check feature has priority over updating the existing record."
|
||||
" Also to be noticed, the unicity check feature has priority over updating the existing record."
|
||||
msgstr ""
|
||||
"Attention, seul le premier enregistrement trouvé sera mis à jour. Aussi, si "
|
||||
"vous avez des champs avec une contrainte d'unicité, cette contrainte aura la"
|
||||
@@ -287,6 +301,8 @@ msgstr ""
|
||||
#. module: survey_record_generation
|
||||
#. odoo-python
|
||||
#: code:addons/survey_record_generation/models/survey_record_creation_field_values.py:0
|
||||
#: code:addons/survey_record_generation/models/survey_record_creation_field_values.py:0
|
||||
#, python-format
|
||||
msgid "Other created record: "
|
||||
msgstr "Autre enregistrement créé : "
|
||||
|
||||
@@ -337,6 +353,8 @@ msgstr "Modèle relatif"
|
||||
#. module: survey_record_generation
|
||||
#. odoo-python
|
||||
#: code:addons/survey_record_generation/models/survey_record_creation.py:0
|
||||
#: code:addons/survey_record_generation/models/survey_record_creation.py:0
|
||||
#, python-format
|
||||
msgid "Some required fields are not set : %s"
|
||||
msgstr "Certains champs requis ne sont pas remplis : %s"
|
||||
|
||||
@@ -370,25 +388,17 @@ msgstr "Sondage Création d'enregistrement Valeur des champs"
|
||||
#. module: survey_record_generation
|
||||
#: model:ir.model,name:survey_record_generation.model_survey_user_input
|
||||
msgid "Survey User Input"
|
||||
msgstr "Entrée utilisateur du sondage"
|
||||
msgstr "Saisie utilisateur du sondage"
|
||||
|
||||
#. module: survey_record_generation
|
||||
#: model:ir.model.fields,field_description:survey_record_generation.field_survey_generated_record__survey_record_creation_id
|
||||
msgid "Survey record creation"
|
||||
msgstr "Génération d'enregistrement depuis la participation"
|
||||
|
||||
#. module: survey_record_generation
|
||||
#: model:ir.model.fields,help:survey_record_generation.field_survey_record_creation__update_existing_values
|
||||
msgid ""
|
||||
"The default behavior is to not update the existing fields. If checked, the "
|
||||
"existing fields will be updated. "
|
||||
msgstr ""
|
||||
"Le comportement par défaut est de ne pas mettre à jour les valeurs existantes. Si cette option est cochée, "
|
||||
"les valeurs existantes seront écrasées."
|
||||
|
||||
#. module: survey_record_generation
|
||||
#. odoo-python
|
||||
#: code:addons/survey_record_generation/models/survey_user_input.py:0
|
||||
#, python-format
|
||||
msgid ""
|
||||
"The field %(field)s is mandatory for model %(model)s. In Record Creation "
|
||||
"tab, drag %(record)s on top of the model %(model)s."
|
||||
@@ -397,16 +407,20 @@ msgstr ""
|
||||
"Création d'un enregistrement, placez la ligne %(record)s au dessus de la "
|
||||
"ligne du modèle %(model)s."
|
||||
|
||||
#. module: survey_record_generation
|
||||
#. odoo-python
|
||||
#: code:addons/survey_record_generation/models/survey_user_input.py:0
|
||||
#, python-format
|
||||
msgid ""
|
||||
"The field %s is mandatory. In Record Creation tab, drag %s at the top of the"
|
||||
" table"
|
||||
msgstr ""
|
||||
|
||||
#. module: survey_record_generation
|
||||
#: model:ir.model.fields,field_description:survey_record_generation.field_survey_record_creation_field_values__unicity_check
|
||||
msgid "Unicity constraint"
|
||||
msgstr "Contrainte d'unicité"
|
||||
|
||||
#. module: survey_record_generation
|
||||
#: model:ir.model.fields,field_description:survey_record_generation.field_survey_record_creation__update_existing_values
|
||||
msgid "Update existing values"
|
||||
msgstr "Écraser les valeurs existantes"
|
||||
|
||||
#. module: survey_record_generation
|
||||
#: model:ir.model.fields,field_description:survey_record_generation.field_survey_record_creation__update_existing_records
|
||||
msgid "Update existing records"
|
||||
@@ -441,12 +455,17 @@ msgstr "Message d'erreur"
|
||||
#. module: survey_record_generation
|
||||
#. odoo-python
|
||||
#: code:addons/survey_record_generation/models/survey_record_creation_field_values.py:0
|
||||
#: code:addons/survey_record_generation/models/survey_record_creation_field_values.py:0
|
||||
#: code:addons/survey_record_generation/models/survey_record_creation_field_values.py:0
|
||||
#: code:addons/survey_record_generation/models/survey_record_creation_field_values.py:0
|
||||
#, python-format
|
||||
msgid "You should append at least one record in %s"
|
||||
msgstr "Vous devez au moins ajouter un enregistrement dans %s"
|
||||
|
||||
#. module: survey_record_generation
|
||||
#. odoo-python
|
||||
#: code:addons/survey_record_generation/models/survey_user_input.py:0
|
||||
#, python-format
|
||||
msgid ""
|
||||
"[Survey record generation] The answer values type '%(type)s' is not "
|
||||
"supported (for question %(question)s). Use 'record' or 'value' instead."
|
||||
@@ -458,6 +477,7 @@ msgstr ""
|
||||
#. module: survey_record_generation
|
||||
#. odoo-python
|
||||
#: code:addons/survey_record_generation/models/survey_user_input.py:0
|
||||
#, python-format
|
||||
msgid ""
|
||||
"[Survey record generation] The boolean value %s(value)s is not supported "
|
||||
"(for question %(question)s)."
|
||||
@@ -468,6 +488,7 @@ msgstr ""
|
||||
#. module: survey_record_generation
|
||||
#. odoo-python
|
||||
#: code:addons/survey_record_generation/models/survey_user_input.py:0
|
||||
#, python-format
|
||||
msgid ""
|
||||
"[Survey record generation] The question type %(type)s is not recognized (for"
|
||||
" question %(question)s)."
|
||||
@@ -478,6 +499,7 @@ msgstr ""
|
||||
#. module: survey_record_generation
|
||||
#. odoo-python
|
||||
#: code:addons/survey_record_generation/models/survey_user_input.py:0
|
||||
#, python-format
|
||||
msgid ""
|
||||
"[Survey record generation] The question type %(type)s is not supported yet."
|
||||
msgstr ""
|
||||
@@ -487,6 +509,8 @@ msgstr ""
|
||||
#. module: survey_record_generation
|
||||
#. odoo-python
|
||||
#: code:addons/survey_record_generation/models/survey_record_creation_field_values.py:0
|
||||
#: code:addons/survey_record_generation/models/survey_record_creation_field_values.py:0
|
||||
#, python-format
|
||||
msgid "possible values are %s"
|
||||
msgstr "les valeurs possibles sont %s"
|
||||
|
||||
|
||||
@@ -1,159 +0,0 @@
|
||||
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
|
||||
"""Relink survey.user_input.partner_id/email to the contact that actually
|
||||
matches each participant's own answers.
|
||||
|
||||
Before this version, survey.user_input.partner_id/email were only updated
|
||||
when _mark_done() created a *new* res.partner. If the answer already had a
|
||||
partner_id/email (e.g. inherited from the Odoo user who was logged in when
|
||||
the /survey/start link was opened, or from some other unidentified cause),
|
||||
_mark_done() silently kept that value even when the survey_record_creation
|
||||
config found or created a different, correct contact from the participant's
|
||||
own answers. This backfill re-runs that resolution for every already-done
|
||||
answer and fixes partner_id/email accordingly.
|
||||
|
||||
It never re-triggers the other survey.user_input._mark_done() overrides
|
||||
(crm lead / event registration / notification modules, ...): it only calls
|
||||
the res.partner-matching helpers directly, so it can't create duplicate
|
||||
leads, registrations, etc. for historical submissions.
|
||||
|
||||
A res.partner is expected to already exist for every done submission (it
|
||||
was necessarily found or created the first time _mark_done() ran), so this
|
||||
backfill never creates one. It first looks for the survey.generated.record
|
||||
row _mark_done() logged when it created that partner, and falls back to
|
||||
re-deriving the match through find_existing_record()/
|
||||
find_duplicate_if_there_are_fields_with_unicity_check() when there is no
|
||||
such row (existing partner matched instead of created) or it points to a
|
||||
partner that has since been deleted (e.g. merged into another contact). If
|
||||
neither approach finds anything, the record is left untouched and logged
|
||||
for manual review instead.
|
||||
"""
|
||||
import logging
|
||||
|
||||
from odoo import SUPERUSER_ID, api
|
||||
|
||||
_logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def migrate(cr, version):
|
||||
env = api.Environment(cr, SUPERUSER_ID, {})
|
||||
user_input_model = env["survey.user_input"]
|
||||
|
||||
surveys_with_partner_creation = env["survey.record.creation"].search(
|
||||
[("model_id.model", "=", "res.partner")]
|
||||
).survey_id
|
||||
|
||||
user_inputs = user_input_model.search(
|
||||
[
|
||||
("survey_id", "in", surveys_with_partner_creation.ids),
|
||||
("state", "=", "done"),
|
||||
]
|
||||
)
|
||||
|
||||
_logger.info(
|
||||
"survey_record_generation: relinking partner_id/email on %d done "
|
||||
"survey.user_input records",
|
||||
len(user_inputs),
|
||||
)
|
||||
|
||||
fixed_count = 0
|
||||
not_found_count = 0
|
||||
|
||||
for user_input in user_inputs:
|
||||
record_creations = user_input.survey_id.survey_record_creation_ids.filtered(
|
||||
lambda rc: rc.model_id.model == "res.partner"
|
||||
).sorted("sequence")
|
||||
|
||||
record_creation = record_creations[:1]
|
||||
if not record_creation:
|
||||
continue
|
||||
|
||||
# 1) Prefer the res.partner this very submission created, if any
|
||||
# (the first one, by id, in the rare case there is more than one):
|
||||
# it's the exact record _mark_done() produced for this answer, no
|
||||
# guessing involved. This is also the only option for surveys whose
|
||||
# record creation has neither update_existing_records nor any
|
||||
# unicity_check field configured, since find_existing_record()/
|
||||
# find_duplicate...() can then never find anything (nothing to
|
||||
# search on).
|
||||
record = False
|
||||
for generated in user_input.generated_record_ids.sorted("id"):
|
||||
if (
|
||||
generated.survey_record_creation_id == record_creation
|
||||
and generated.created_record_id
|
||||
and generated.created_record_id._name == "res.partner"
|
||||
and generated.created_record_id.exists()
|
||||
):
|
||||
# The referenced partner may have since been deleted (e.g.
|
||||
# merged into another contact): in that case it's not usable
|
||||
# and we fall through to the search-based lookup below.
|
||||
record = generated.created_record_id
|
||||
break
|
||||
|
||||
# 2) Otherwise, this submission matched an already-existing partner
|
||||
# instead of creating one (find_existing_record()/find_duplicate...()
|
||||
# branch of _mark_done()): re-derive it the same way.
|
||||
if not record:
|
||||
# Only compute the fields find_existing_record()/find_duplicate...()
|
||||
# actually read (the search field, and any unicity_check field),
|
||||
# not every field of the record creation: other fields (e.g. a
|
||||
# "record" reference to a model defined in a module that depends
|
||||
# on this one) may not be loadable yet at this point of the
|
||||
# upgrade, and are useless here anyway since this backfill never
|
||||
# writes to res.partner.
|
||||
needed_field_names = set()
|
||||
if (
|
||||
record_creation.update_existing_records
|
||||
and record_creation.field_to_retrieve_existing_records
|
||||
):
|
||||
needed_field_names.add(
|
||||
record_creation.field_to_retrieve_existing_records.name
|
||||
)
|
||||
unicity_field_values = record_creation.field_values_ids.filtered(
|
||||
lambda field_value: field_value.unicity_check
|
||||
)
|
||||
needed_field_names.update(unicity_field_values.mapped("field_id.name"))
|
||||
|
||||
vals = {}
|
||||
for field_value in record_creation.field_values_ids:
|
||||
if field_value.field_id.name not in needed_field_names:
|
||||
continue
|
||||
value, __ = user_input_model.get_value_based_on_value_origin(
|
||||
field_value=field_value,
|
||||
user_input=user_input,
|
||||
created_records={},
|
||||
model="res.partner",
|
||||
other_record_fields_to_update=[],
|
||||
)
|
||||
vals[field_value.field_id.name] = value
|
||||
|
||||
existing_record = user_input_model.find_existing_record(
|
||||
record_creation, vals
|
||||
)
|
||||
duplicate = (
|
||||
user_input_model.find_duplicate_if_there_are_fields_with_unicity_check(
|
||||
"res.partner", record_creation, vals
|
||||
)
|
||||
)
|
||||
record = duplicate or existing_record
|
||||
|
||||
if not record:
|
||||
_logger.warning(
|
||||
"survey_record_generation: no existing res.partner found for "
|
||||
"survey.user_input %s while backfilling partner_id/email, "
|
||||
"leaving it untouched",
|
||||
user_input.id,
|
||||
)
|
||||
not_found_count += 1
|
||||
continue
|
||||
|
||||
if user_input.partner_id != record or user_input.email != record.email:
|
||||
user_input.partner_id = record.id
|
||||
user_input.email = record.email
|
||||
fixed_count += 1
|
||||
|
||||
_logger.info(
|
||||
"survey_record_generation: fixed %d survey.user_input records "
|
||||
"(%d without a matching res.partner)",
|
||||
fixed_count,
|
||||
not_found_count,
|
||||
)
|
||||
@@ -4,7 +4,6 @@ from odoo import models, fields, api
|
||||
|
||||
class SurveyGeneratedRecord(models.Model):
|
||||
_name = "survey.generated.record"
|
||||
_rec_name = "survey_record_creation_name"
|
||||
|
||||
survey_record_creation_name = fields.Char('Name', readonly=True)
|
||||
survey_record_creation_id = fields.Many2one('survey.record.creation', 'Survey record creation', readonly=True)
|
||||
|
||||
@@ -22,16 +22,11 @@ class SurveyRecordCreation(models.Model):
|
||||
)
|
||||
field_to_retrieve_existing_records = fields.Many2one(
|
||||
"ir.model.fields",
|
||||
domain="[('id', 'in', allowed_field_ids)]",
|
||||
domain="[('id', 'in', allowed_field_ids), ('readonly', '=', False)]",
|
||||
ondelete="cascade",
|
||||
help="Choose the field you want to use to retrieve the existing record. "
|
||||
"WARNING: We update only the first record found.",
|
||||
)
|
||||
update_existing_values = fields.Boolean(
|
||||
string="Update existing values",
|
||||
help="The default behavior is to not update the existing fields. "
|
||||
"If checked, the existing fields will be updated. ",
|
||||
)
|
||||
allowed_field_ids = fields.Many2many(
|
||||
"ir.model.fields",
|
||||
compute="_compute_allowed_field_ids",
|
||||
@@ -59,8 +54,8 @@ class SurveyRecordCreation(models.Model):
|
||||
for record_creation in self:
|
||||
# check if all mandatory fields set
|
||||
if record_creation.model_id:
|
||||
required_field_ids = record_creation.model_id.field_id.filtered(lambda f:f.required and "property_" not in f.name)
|
||||
set_field_ids = record_creation.field_values_ids.field_id
|
||||
required_field_ids = self.model_id.field_id.filtered(lambda f:f.required and "property_" not in f.name)
|
||||
set_field_ids = self.field_values_ids.field_id
|
||||
missing_fields = required_field_ids - set_field_ids
|
||||
|
||||
if missing_fields:
|
||||
|
||||
@@ -26,7 +26,6 @@ class SurveyRecordCreationFieldValues(models.Model):
|
||||
"""Configure default values of records created on survey submission
|
||||
"""
|
||||
_name = 'survey.record.creation.field.values'
|
||||
_rec_name = 'displayed_value'
|
||||
|
||||
survey_record_creation_id = fields.Many2one('survey.record.creation')
|
||||
survey_id = fields.Many2one('survey.survey', related="survey_record_creation_id.survey_id")
|
||||
@@ -34,8 +33,10 @@ class SurveyRecordCreationFieldValues(models.Model):
|
||||
|
||||
field_id = fields.Many2one(
|
||||
'ir.model.fields',
|
||||
domain="[('model_id','=',model_id),('ttype','in',['char','selection','text','html','integer','float','date','datetime','many2one','many2many', 'boolean'])]",
|
||||
ondelete="cascade")
|
||||
domain="[('model_id','=',model_id),('readonly','=',False),('ttype','in',['char','selection','text','html','integer','float','date','datetime','many2one','many2many', 'boolean'])]",
|
||||
ondelete="cascade",
|
||||
required=True
|
||||
)
|
||||
field_relation = fields.Char(related='field_id.relation')
|
||||
field_type = fields.Selection(related="field_id.ttype")
|
||||
field_help = fields.Html('Help', compute="_compute_field_help")
|
||||
@@ -83,7 +84,7 @@ class SurveyRecordCreationFieldValues(models.Model):
|
||||
for record_creation_field_values in self:
|
||||
if not record_creation_field_values.survey_id or not record_creation_field_values.field_id:
|
||||
record_creation_field_values.allowed_question_ids = None
|
||||
return
|
||||
continue
|
||||
question_domain = [('survey_id','=',record_creation_field_values.survey_id.id)]
|
||||
|
||||
if record_creation_field_values.field_id.ttype in ['many2one','many2many']:
|
||||
@@ -176,7 +177,6 @@ class SurveyRecordCreationFieldValuesX2m(models.Model):
|
||||
"""O2m an M2m default values
|
||||
"""
|
||||
_name = 'survey.record.creation.field.values.x2m'
|
||||
_rec_name = 'value_reference'
|
||||
|
||||
survey_record_creation_field_values_id = fields.Many2one('survey.record.creation.field.values')
|
||||
value_reference = fields.Reference(string='Record', selection='_selection_target_model')
|
||||
|
||||
@@ -31,15 +31,16 @@ class SurveyUserInput(models.Model):
|
||||
action = self.env["ir.actions.act_window"]._for_xml_id(
|
||||
"survey_record_generation.survey_generated_record_action"
|
||||
)
|
||||
action['domain'] = [('user_input_id.survey_id', '=', self.survey_id.id)]
|
||||
|
||||
return action
|
||||
|
||||
def _mark_done(self):
|
||||
def _mark_done(
|
||||
self, ignore_when_res_partner_mandatory_fields_are_missing: bool = False
|
||||
):
|
||||
# generate records
|
||||
for user_input in self:
|
||||
created_records = {}
|
||||
other_record_fields_to_update: list[SurveyRecordCreationFieldValues] = []
|
||||
partner_linked_in_this_run = False
|
||||
|
||||
record_creation: SurveyRecordCreation
|
||||
for (
|
||||
@@ -72,15 +73,12 @@ class SurveyUserInput(models.Model):
|
||||
if duplicate:
|
||||
record = duplicate
|
||||
elif existing_record:
|
||||
if record_creation.update_existing_values:
|
||||
existing_record.write(vals)
|
||||
else:
|
||||
vals_with_keys_not_in_record = {
|
||||
k: v
|
||||
for k, v in vals.items()
|
||||
if not getattr(existing_record, k, False)
|
||||
}
|
||||
existing_record.write(vals_with_keys_not_in_record)
|
||||
vals_with_keys_not_in_record = {
|
||||
k: v
|
||||
for k, v in vals.items()
|
||||
if not getattr(existing_record, k, False)
|
||||
}
|
||||
existing_record.write(vals_with_keys_not_in_record)
|
||||
record = existing_record
|
||||
else:
|
||||
try:
|
||||
@@ -102,17 +100,6 @@ class SurveyUserInput(models.Model):
|
||||
}
|
||||
)
|
||||
|
||||
if model == "res.partner" and not partner_linked_in_this_run:
|
||||
# Always reflect the partner actually matched/created from
|
||||
# this participant's own answers, even if partner_id/email
|
||||
# were already set on the answer (e.g. inherited from the
|
||||
# logged-in user when the survey link was opened). Only the
|
||||
# first res.partner record creation of this run wins, in
|
||||
# case several are configured on the same survey.
|
||||
user_input.partner_id = record.id
|
||||
user_input.email = record.email
|
||||
partner_linked_in_this_run = True
|
||||
|
||||
created_records[record_creation.id] = record
|
||||
|
||||
# update linked record
|
||||
@@ -325,44 +312,28 @@ class SurveyUserInput(models.Model):
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
def _get_boolean_true_values(self):
|
||||
"""Tokens interpreted as true, normalized to lowercase.
|
||||
|
||||
Instance method so that a third-party module or a localization can
|
||||
extend the list without rewriting get_boolean_value.
|
||||
"""
|
||||
return {"1", "true", "vrai", "yes", "y", "oui", "o", "on", "x"}
|
||||
|
||||
def _get_boolean_false_values(self):
|
||||
"""Tokens interpreted as false, normalized to lowercase."""
|
||||
return {"0", "false", "faux", "no", "n", "non", "off", ""}
|
||||
|
||||
def get_boolean_value(self, answer_value_char: str, question_title: str) -> bool:
|
||||
"""Convert the technical value of an answer into a boolean.
|
||||
|
||||
Allows a boolean field to be filled from a "simple_choice" question
|
||||
whose suggested answers carry yes/no values.
|
||||
"""
|
||||
if not answer_value_char:
|
||||
# Empty answer: an unset boolean is false, this is not a
|
||||
# configuration error.
|
||||
return False
|
||||
|
||||
token = str(answer_value_char).strip().casefold()
|
||||
|
||||
if token in self._get_boolean_true_values():
|
||||
return True
|
||||
if token in self._get_boolean_false_values():
|
||||
return False
|
||||
|
||||
raise UserError(
|
||||
_(
|
||||
"[Survey record generation] The boolean value %(value)s is not "
|
||||
"supported (for question %(question)s)"
|
||||
@staticmethod
|
||||
def get_boolean_value(answer_value_char: str, question_title: str) -> bool:
|
||||
# Below code is a trick to be able to use "simple_choice" question
|
||||
# with values 'yes' and 'no' and transform it to boolean.
|
||||
if boolean_value := answer_value_char in [
|
||||
"1",
|
||||
"True",
|
||||
"true",
|
||||
"Oui",
|
||||
"oui",
|
||||
"Yes",
|
||||
"yes",
|
||||
]:
|
||||
return boolean_value
|
||||
else:
|
||||
raise UserError(
|
||||
_(
|
||||
"[Survey record generation] The boolean value %s(value)s "
|
||||
"is not supported (for question %(question)s)."
|
||||
)
|
||||
% {
|
||||
"value": answer_value_char,
|
||||
"question": question_title,
|
||||
}
|
||||
)
|
||||
% {
|
||||
"value": answer_value_char,
|
||||
"question": question_title,
|
||||
}
|
||||
)
|
||||
|
||||
@@ -1,2 +1 @@
|
||||
from . import test_survey_record_creation
|
||||
from . import test_end_migration_16_0_1_0_3
|
||||
|
||||
@@ -1,156 +0,0 @@
|
||||
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
|
||||
import importlib.util
|
||||
import os
|
||||
|
||||
from odoo.addons.survey.tests.common import SurveyCase
|
||||
|
||||
|
||||
def _load_end_migration():
|
||||
migration_path = os.path.join(
|
||||
os.path.dirname(os.path.dirname(os.path.abspath(__file__))),
|
||||
"migrations",
|
||||
"16.0.1.0.3",
|
||||
"end-migration.py",
|
||||
)
|
||||
spec = importlib.util.spec_from_file_location(
|
||||
"survey_record_generation_end_migration_16_0_1_0_3", migration_path
|
||||
)
|
||||
module = importlib.util.module_from_spec(spec)
|
||||
spec.loader.exec_module(module)
|
||||
return module
|
||||
|
||||
|
||||
class TestEndMigration160103(SurveyCase):
|
||||
"""Covers the use cases the 16.0.1.0.3 end-migration backfill must
|
||||
handle: relinking survey.user_input.partner_id/email to the contact
|
||||
that actually matches each participant's own answers, for submissions
|
||||
whose partner_id/email were left wrong before the fix in this version.
|
||||
"""
|
||||
|
||||
def setUp(self):
|
||||
super().setUp()
|
||||
self.migration = _load_end_migration()
|
||||
|
||||
self.survey = self.env["survey.survey"].create({"title": "Test Survey"})
|
||||
self.question_name = self._add_question(
|
||||
page=None,
|
||||
name="Name",
|
||||
qtype="char_box",
|
||||
survey_id=self.survey.id,
|
||||
sequence=1,
|
||||
)
|
||||
self.res_partner_model = self.env["ir.model"]._get("res.partner")
|
||||
self.survey_record_creation = self.env["survey.record.creation"].create(
|
||||
{
|
||||
"name": "Contact",
|
||||
"survey_id": self.survey.id,
|
||||
"model_id": self.res_partner_model.id,
|
||||
}
|
||||
)
|
||||
self.name_field = self.env["ir.model.fields"].search(
|
||||
[("model", "=", "res.partner"), ("name", "=", "name")]
|
||||
)
|
||||
self.env["survey.record.creation.field.values"].create(
|
||||
{
|
||||
"survey_record_creation_id": self.survey_record_creation.id,
|
||||
"survey_id": self.survey.id,
|
||||
"model_id": self.res_partner_model.id,
|
||||
"field_id": self.name_field.id,
|
||||
"value_origin": "question",
|
||||
"question_id": self.question_name.id,
|
||||
}
|
||||
)
|
||||
|
||||
def _submit_answer(self, name):
|
||||
answer = self._add_answer(survey=self.survey, partner=False, email=False)
|
||||
self._add_answer_line(
|
||||
question=self.question_name, answer=answer, answer_value=name
|
||||
)
|
||||
answer._mark_done()
|
||||
return answer
|
||||
|
||||
def _corrupt_with_wrong_partner(self, answer):
|
||||
# Simulate a pre-fix record: partner_id/email point to someone
|
||||
# unrelated to this participant's own answers.
|
||||
wrong_partner = self.env["res.partner"].create({"name": "Wrong Partner"})
|
||||
answer.write({"partner_id": wrong_partner.id, "email": "wrong@test.fr"})
|
||||
return wrong_partner
|
||||
|
||||
def test_migrate_uses_generated_record_when_available(self):
|
||||
# The submission created its own res.partner: the migration must
|
||||
# relink partner_id/email to that exact contact.
|
||||
answer = self._submit_answer("Jean")
|
||||
jean = self.env["res.partner"].search([("name", "=", "Jean")])
|
||||
self._corrupt_with_wrong_partner(answer)
|
||||
|
||||
self.migration.migrate(self.cr, "16.0.1.0.2")
|
||||
answer.invalidate_recordset()
|
||||
|
||||
self.assertEqual(answer.partner_id, jean)
|
||||
self.assertEqual(answer.email, jean.email)
|
||||
|
||||
def test_migrate_falls_back_to_search_when_no_generated_record(self):
|
||||
# The submission matched an already-existing partner instead of
|
||||
# creating one: no survey.generated.record row exists for it, so the
|
||||
# migration must fall back to re-deriving the match through search.
|
||||
jean = self.env["res.partner"].create(
|
||||
{"name": "Jean", "email": "jean@test.fr"}
|
||||
)
|
||||
self.survey_record_creation.write(
|
||||
{
|
||||
"update_existing_records": True,
|
||||
"field_to_retrieve_existing_records": self.name_field.id,
|
||||
}
|
||||
)
|
||||
|
||||
answer = self._submit_answer("Jean")
|
||||
self.assertFalse(answer.generated_record_ids)
|
||||
self._corrupt_with_wrong_partner(answer)
|
||||
|
||||
self.migration.migrate(self.cr, "16.0.1.0.2")
|
||||
answer.invalidate_recordset()
|
||||
|
||||
self.assertEqual(answer.partner_id, jean)
|
||||
self.assertEqual(answer.email, jean.email)
|
||||
|
||||
def test_migrate_falls_back_to_search_when_generated_partner_was_deleted(self):
|
||||
# The res.partner the submission created has since been deleted
|
||||
# (e.g. merged into another contact): the migration must not crash
|
||||
# on the stale reference and must fall back to search instead.
|
||||
self.survey_record_creation.write(
|
||||
{
|
||||
"update_existing_records": True,
|
||||
"field_to_retrieve_existing_records": self.name_field.id,
|
||||
}
|
||||
)
|
||||
|
||||
answer = self._submit_answer("Jean")
|
||||
first_jean = self.env["res.partner"].search([("name", "=", "Jean")])
|
||||
first_jean.unlink()
|
||||
|
||||
# A new contact with the same name takes over.
|
||||
second_jean = self.env["res.partner"].create(
|
||||
{"name": "Jean", "email": "jean2@test.fr"}
|
||||
)
|
||||
self._corrupt_with_wrong_partner(answer)
|
||||
|
||||
self.migration.migrate(self.cr, "16.0.1.0.2")
|
||||
answer.invalidate_recordset()
|
||||
|
||||
self.assertEqual(answer.partner_id, second_jean)
|
||||
self.assertEqual(answer.email, second_jean.email)
|
||||
|
||||
def test_migrate_leaves_answer_untouched_when_no_partner_can_be_found(self):
|
||||
# No survey.generated.record row (e.g. historical data predating
|
||||
# that log) and no way to search (neither update_existing_records
|
||||
# nor unicity_check configured): the migration must leave
|
||||
# partner_id/email as they are instead of guessing or crashing.
|
||||
answer = self._submit_answer("Jean")
|
||||
answer.generated_record_ids.unlink()
|
||||
wrong_partner = self._corrupt_with_wrong_partner(answer)
|
||||
|
||||
self.migration.migrate(self.cr, "16.0.1.0.2")
|
||||
answer.invalidate_recordset()
|
||||
|
||||
self.assertEqual(answer.partner_id, wrong_partner)
|
||||
self.assertEqual(answer.email, "wrong@test.fr")
|
||||
@@ -3,7 +3,6 @@ from datetime import date
|
||||
from psycopg2 import IntegrityError
|
||||
|
||||
from odoo.addons.survey.tests.common import SurveyCase
|
||||
from odoo.tools import mute_logger
|
||||
|
||||
|
||||
class TestSurveyRecordCreation(SurveyCase):
|
||||
@@ -376,7 +375,7 @@ class TestSurveyRecordCreation(SurveyCase):
|
||||
|
||||
self.second_contact_creation = self.env["survey.record.creation"].create(
|
||||
{
|
||||
"name": "Contact 2",
|
||||
"name": "Second contact",
|
||||
"survey_id": self.survey.id,
|
||||
"model_id": self.res_partner_model.id,
|
||||
}
|
||||
@@ -746,91 +745,9 @@ class TestSurveyRecordCreation(SurveyCase):
|
||||
self.answer._mark_done()
|
||||
|
||||
partner = self.env["res.partner"].search([("name", "=", "Jean")])
|
||||
self.assertEqual(len(partner), 1)
|
||||
self.assertEqual(partner.email, "jean@test.fr")
|
||||
self.assertEqual(partner.function, "happiness office manager")
|
||||
|
||||
def test_update_all_fields_when_updating_records(self):
|
||||
# A contact with name 'Jean' and email 'jean@test.fr' already exists.
|
||||
# We'll update the fields 'function' AND 'email' of this partner
|
||||
# because the option 'update_existing_values' is True
|
||||
self.env["res.partner"].create(
|
||||
{
|
||||
"name": "Jean",
|
||||
"email": "jean@test.fr",
|
||||
}
|
||||
)
|
||||
self.question_email = self._add_question(
|
||||
page=None,
|
||||
name="Email",
|
||||
qtype="char_box",
|
||||
survey_id=self.survey.id,
|
||||
sequence=1,
|
||||
)
|
||||
self.question_function = self._add_question(
|
||||
page=None,
|
||||
name="Function",
|
||||
qtype="char_box",
|
||||
survey_id=self.survey.id,
|
||||
sequence=1,
|
||||
)
|
||||
|
||||
self.survey_record_creation.write(
|
||||
{
|
||||
"update_existing_records": True,
|
||||
"field_to_retrieve_existing_records": self.name_field.id,
|
||||
"update_existing_values": True,
|
||||
}
|
||||
)
|
||||
email_field = self.env["ir.model.fields"].search(
|
||||
[("model", "=", "res.partner"), ("name", "=", "email")]
|
||||
)
|
||||
self.env["survey.record.creation.field.values"].create(
|
||||
{
|
||||
"survey_record_creation_id": self.survey_record_creation.id,
|
||||
"survey_id": self.survey.id,
|
||||
"model_id": self.res_partner_model.id,
|
||||
"field_id": email_field.id,
|
||||
"value_origin": "question",
|
||||
"question_id": self.question_email.id,
|
||||
}
|
||||
)
|
||||
function_field = self.env["ir.model.fields"].search(
|
||||
[("model", "=", "res.partner"), ("name", "=", "function")]
|
||||
)
|
||||
self.env["survey.record.creation.field.values"].create(
|
||||
{
|
||||
"survey_record_creation_id": self.survey_record_creation.id,
|
||||
"survey_id": self.survey.id,
|
||||
"model_id": self.res_partner_model.id,
|
||||
"field_id": function_field.id,
|
||||
"value_origin": "question",
|
||||
"question_id": self.question_function.id,
|
||||
}
|
||||
)
|
||||
|
||||
self.answer = self._add_answer(
|
||||
survey=self.survey, partner=False, email="jean@test.fr"
|
||||
)
|
||||
self._add_answer_line(
|
||||
question=self.question_name, answer=self.answer, answer_value="Jean"
|
||||
)
|
||||
self._add_answer_line(
|
||||
question=self.question_email,
|
||||
answer=self.answer,
|
||||
answer_value="IAmTheNewEmailReplacingTheOldOne@test.fr",
|
||||
)
|
||||
self._add_answer_line(
|
||||
question=self.question_function,
|
||||
answer=self.answer,
|
||||
answer_value="happiness office manager",
|
||||
)
|
||||
self.answer._mark_done()
|
||||
|
||||
partner = self.env["res.partner"].search([("name", "=", "Jean")])
|
||||
self.assertEqual(len(partner), 1)
|
||||
self.assertEqual(partner.email, "IAmTheNewEmailReplacingTheOldOne@test.fr")
|
||||
self.assertEqual(partner.function, "happiness office manager")
|
||||
self.assertTrue(len(partner) == 1)
|
||||
self.assertTrue(partner.email == "jean@test.fr")
|
||||
self.assertTrue(partner.function == "happiness office manager")
|
||||
|
||||
def test_unicity_check_has_priority_over_update(self):
|
||||
# In this test, we verify that if a field is set up with unicity_check
|
||||
@@ -893,8 +810,7 @@ class TestSurveyRecordCreation(SurveyCase):
|
||||
with self.assertRaises(IntegrityError):
|
||||
# TODO : propose a better user experience than IntegrityError when
|
||||
# a mandatory field is missing
|
||||
with mute_logger("odoo.sql_db"):
|
||||
self.answer._mark_done()
|
||||
self.answer._mark_done()
|
||||
|
||||
def test_ignore_if_mandatory_field_is_missing(self):
|
||||
# In this test, we check the behavior of ignore_if_mandatory_field_is_missing
|
||||
@@ -907,192 +823,8 @@ class TestSurveyRecordCreation(SurveyCase):
|
||||
survey=self.survey, partner=False, email="jean@test.fr"
|
||||
)
|
||||
|
||||
with mute_logger("odoo.sql_db"):
|
||||
self.answer._mark_done()
|
||||
self.answer._mark_done()
|
||||
|
||||
# No partner has been created, and no IntegrityError has been raised
|
||||
partner = self.env["res.partner"].search([("name", "=", "Jean")])
|
||||
self.assertEqual(len(partner), 0)
|
||||
|
||||
def test_fill_up_partner_id_in_survey_input(self):
|
||||
# In this test, we check that the field partner_id is filled up
|
||||
# when we create a res.partner
|
||||
|
||||
self.answer = self._add_answer(
|
||||
survey=self.survey, partner=False, email="jean@test.fr"
|
||||
)
|
||||
self._add_answer_line(
|
||||
question=self.question_name, answer=self.answer, answer_value="Jean"
|
||||
)
|
||||
|
||||
self.answer._mark_done()
|
||||
|
||||
partner = self.env["res.partner"].search([("name", "=", "Jean")])
|
||||
self.assertEqual(self.answer.partner_id, partner)
|
||||
|
||||
def test_partner_id_and_email_are_corrected_when_creating_a_new_partner(self):
|
||||
# A wrong partner_id/email is already set on the answer (e.g.
|
||||
# inherited from the Odoo user who was logged in when the
|
||||
# /survey/start link was opened). The record creation must still
|
||||
# fill partner_id/email with the contact actually created from the
|
||||
# participant's own answers, overriding that wrong value.
|
||||
wrong_partner = self.env["res.partner"].create({"name": "Wrong Partner"})
|
||||
|
||||
self.answer = self._add_answer(
|
||||
survey=self.survey, partner=wrong_partner, email="wrong@test.fr"
|
||||
)
|
||||
self._add_answer_line(
|
||||
question=self.question_name, answer=self.answer, answer_value="Jean"
|
||||
)
|
||||
self.answer._mark_done()
|
||||
|
||||
partner = self.env["res.partner"].search([("name", "=", "Jean")])
|
||||
self.assertEqual(self.answer.partner_id, partner)
|
||||
self.assertNotEqual(self.answer.partner_id, wrong_partner)
|
||||
self.assertEqual(self.answer.email, partner.email)
|
||||
|
||||
def test_partner_id_and_email_are_corrected_when_matching_an_existing_partner(self):
|
||||
# Same as above, but this time the record creation matches an
|
||||
# already-existing partner (via update_existing_records) instead of
|
||||
# creating a new one: partner_id/email must still be corrected to
|
||||
# that matched partner, not left as the wrong pre-existing value.
|
||||
jean = self.env["res.partner"].create({"name": "Jean", "email": "jean@test.fr"})
|
||||
wrong_partner = self.env["res.partner"].create({"name": "Wrong Partner"})
|
||||
|
||||
self.survey_record_creation.write(
|
||||
{
|
||||
"update_existing_records": True,
|
||||
"field_to_retrieve_existing_records": self.name_field.id,
|
||||
}
|
||||
)
|
||||
|
||||
self.answer = self._add_answer(
|
||||
survey=self.survey, partner=wrong_partner, email="wrong@test.fr"
|
||||
)
|
||||
self._add_answer_line(
|
||||
question=self.question_name, answer=self.answer, answer_value="Jean"
|
||||
)
|
||||
self.answer._mark_done()
|
||||
|
||||
self.assertEqual(self.answer.partner_id, jean)
|
||||
self.assertEqual(self.answer.email, jean.email)
|
||||
|
||||
def test_partner_id_and_email_are_corrected_when_matching_a_duplicate(self):
|
||||
# Same as above, but through the unicity_check/find_duplicate branch
|
||||
# instead of update_existing_records.
|
||||
self.name_survey_record_creation_field_values.unicity_check = True
|
||||
jean = self.env["res.partner"].create({"name": "Jean", "email": "jean@test.fr"})
|
||||
wrong_partner = self.env["res.partner"].create({"name": "Wrong Partner"})
|
||||
|
||||
self.answer = self._add_answer(
|
||||
survey=self.survey, partner=wrong_partner, email="wrong@test.fr"
|
||||
)
|
||||
self._add_answer_line(
|
||||
question=self.question_name, answer=self.answer, answer_value="Jean"
|
||||
)
|
||||
self.answer._mark_done()
|
||||
|
||||
self.assertEqual(self.answer.partner_id, jean)
|
||||
self.assertEqual(self.answer.email, jean.email)
|
||||
|
||||
def test_partner_id_in_survey_input_is_filled_up_by_first_contact_record_creation(self):
|
||||
# In this test, we verify that when creating several contacts with the same survey,
|
||||
# the 1st created contact is used to fill up survey_input.partner_id
|
||||
self.second_question_name = self._add_question(
|
||||
page=None,
|
||||
name="Name of second person",
|
||||
qtype="char_box",
|
||||
survey_id=self.survey.id,
|
||||
sequence=1,
|
||||
)
|
||||
|
||||
self.second_contact_creation = self.env["survey.record.creation"].create(
|
||||
{
|
||||
"name": "Contact 2",
|
||||
"survey_id": self.survey.id,
|
||||
"model_id": self.res_partner_model.id,
|
||||
}
|
||||
)
|
||||
self.env["survey.record.creation.field.values"].create(
|
||||
{
|
||||
"survey_record_creation_id": self.second_contact_creation.id,
|
||||
"survey_id": self.survey.id,
|
||||
"model_id": self.res_partner_model.id,
|
||||
"field_id": self.name_field.id,
|
||||
"value_origin": "question",
|
||||
"question_id": self.second_question_name.id,
|
||||
}
|
||||
)
|
||||
|
||||
self.answer = self._add_answer(
|
||||
survey=self.survey, partner=False, email="jean@test.fr"
|
||||
)
|
||||
self._add_answer_line(
|
||||
question=self.question_name,
|
||||
answer=self.answer,
|
||||
answer_value="Jean",
|
||||
)
|
||||
self._add_answer_line(
|
||||
question=self.second_question_name,
|
||||
answer=self.answer,
|
||||
answer_value="Jeanne",
|
||||
)
|
||||
self.answer._mark_done()
|
||||
|
||||
partner = self.env["res.partner"].search([("name", "=", "Jean")])
|
||||
self.assertEqual(self.answer.partner_id, partner)
|
||||
|
||||
def test_partner_id_is_not_overridden_by_second_contact_record_creation(self):
|
||||
# When several res.partner record creations run on the same survey,
|
||||
# partner_id/email must be corrected to match the first contact
|
||||
# created, and the second contact created must not override that
|
||||
# choice, even though the answer started with a wrong
|
||||
# partner_id/email.
|
||||
self.second_question_name = self._add_question(
|
||||
page=None,
|
||||
name="Name of second person",
|
||||
qtype="char_box",
|
||||
survey_id=self.survey.id,
|
||||
sequence=1,
|
||||
)
|
||||
|
||||
self.second_contact_creation = self.env["survey.record.creation"].create(
|
||||
{
|
||||
"name": "Contact 2",
|
||||
"survey_id": self.survey.id,
|
||||
"model_id": self.res_partner_model.id,
|
||||
}
|
||||
)
|
||||
self.env["survey.record.creation.field.values"].create(
|
||||
{
|
||||
"survey_record_creation_id": self.second_contact_creation.id,
|
||||
"survey_id": self.survey.id,
|
||||
"model_id": self.res_partner_model.id,
|
||||
"field_id": self.name_field.id,
|
||||
"value_origin": "question",
|
||||
"question_id": self.second_question_name.id,
|
||||
}
|
||||
)
|
||||
|
||||
wrong_partner = self.env["res.partner"].create({"name": "Wrong Partner"})
|
||||
|
||||
self.answer = self._add_answer(
|
||||
survey=self.survey, partner=wrong_partner, email="wrong@test.fr"
|
||||
)
|
||||
self._add_answer_line(
|
||||
question=self.question_name,
|
||||
answer=self.answer,
|
||||
answer_value="Jean",
|
||||
)
|
||||
self._add_answer_line(
|
||||
question=self.second_question_name,
|
||||
answer=self.answer,
|
||||
answer_value="Jeanne",
|
||||
)
|
||||
self.answer._mark_done()
|
||||
|
||||
jean = self.env["res.partner"].search([("name", "=", "Jean")])
|
||||
jeanne = self.env["res.partner"].search([("name", "=", "Jeanne")])
|
||||
self.assertEqual(self.answer.partner_id, jean)
|
||||
self.assertNotEqual(self.answer.partner_id, jeanne)
|
||||
self.assertEqual(self.answer.email, jean.email)
|
||||
|
||||
@@ -19,8 +19,8 @@
|
||||
<field name="arch" type="xml">
|
||||
<search>
|
||||
<filter string="Active survey input" name="active_input"
|
||||
domain="[('user_input_id.id', '=', context.get('active_id'))]"
|
||||
/>
|
||||
domain="[('user_input_id.id', '=', active_id)]"
|
||||
/>
|
||||
<field name="survey_record_creation_name" />
|
||||
<field name="survey_record_creation_id" />
|
||||
<field name="user_input_id" />
|
||||
|
||||
@@ -16,19 +16,12 @@
|
||||
</tree>
|
||||
<form>
|
||||
<group>
|
||||
<group colspan="4">
|
||||
<field name="name" />
|
||||
<field name="model_id" />
|
||||
<field name="ignore_if_mandatory_field_is_missing" />
|
||||
<field name="allowed_field_ids" attrs="{'invisible': True}"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="update_existing_records" />
|
||||
</group>
|
||||
<group attrs="{'invisible': [('update_existing_records', '=', False)]}">
|
||||
<field name="field_to_retrieve_existing_records"/>
|
||||
<field name="update_existing_values"/>
|
||||
</group>
|
||||
<field name="name" />
|
||||
<field name="model_id" />
|
||||
<field name="ignore_if_mandatory_field_is_missing" />
|
||||
<field name="update_existing_records" />
|
||||
<field name="allowed_field_ids" attrs="{'invisible': True}"/>
|
||||
<field name="field_to_retrieve_existing_records" attrs="{'invisible': [('update_existing_records', '=', False)]}"/>
|
||||
<div colspan="2" style="width:100%;">
|
||||
<div class="alert alert-warning"
|
||||
attrs="{'invisible': [('update_existing_records', '=', False)]}">
|
||||
|
||||
Reference in New Issue
Block a user