Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-12 21:34:25 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge branch 'issue427_returnPath' into 'master'

Browse Source 
on the fly component: add returnPath when viewing

See merge request Chill-Projet/chill-bundles!324
This commit is contained in:
Julien Fastré 2022-02-11 13:16:51 +00:00
commit db4aec9a18
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -11,6 +11,7 @@ and this project adheres to
## Unreleased ## Unreleased
<!-- write down unreleased development here --> <!-- write down unreleased development here -->
* [person] add a returnPath when clicking on some Person or ThirdParty badge (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/427)
* [person] accompanying course work: fix on-the-fly update of thirdParty * [person] accompanying course work: fix on-the-fly update of thirdParty
* [on-the-fly] close modal only after validation * [on-the-fly] close modal only after validation
* [person] correct thirdparty PATCH url + add email and altnames in AddPerson and serializer (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/433) * [person] correct thirdparty PATCH url + add email and altnames in AddPerson and serializer (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/433)
@ -24,7 +25,6 @@ and this project adheres to
## Test releases ## Test releases
### test release 2021-02-01 ### test release 2021-02-01
>>>>>>> master
* renommer "dossier numéro" en "parcours numéro" dans les résultats de recherche * renommer "dossier numéro" en "parcours numéro" dans les résultats de recherche
* renomme date de début en date d'ouverture dans le formulaire parcours * renomme date de début en date d'ouverture dans le formulaire parcours

9
src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
View File

@ -160,7 +160,10 @@ export default {
}, },
badgeType() { badgeType() {
return 'entity-' + this.type + ' badge-' + this.type; return 'entity-' + this.type + ' badge-' + this.type;
} },
getReturnPath() {
return `?returnPath=${window.location.pathname}${window.location.search}${window.location.hash}`;
},
}, },
methods: { methods: {
closeModal() { closeModal() {
@ -207,9 +210,9 @@ export default {
buildLocation(id, type) { buildLocation(id, type) {
if (type === 'person') { if (type === 'person') {
// TODO i18n // TODO i18n
return `/fr/person/${id}/general`; return encodeURI(`/fr/person/${id}/general${this.getReturnPath}`);
} else if (type === 'thirdparty') { } else if (type === 'thirdparty') {
return `/fr/3party/3party/${id}/view`; return encodeURI(`/fr/3party/3party/${id}/view${this.getReturnPath}`);
} }
} }
} }