From e72ba4c940da286bbc63f5d942ccb7f4b395f58a Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Tue, 28 Sep 2021 15:34:15 +0200 Subject: [PATCH 1/7] bypass ACL restriction --- .../ChillThirdPartyBundle/Security/Voter/ThirdPartyVoter.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Bundle/ChillThirdPartyBundle/Security/Voter/ThirdPartyVoter.php b/src/Bundle/ChillThirdPartyBundle/Security/Voter/ThirdPartyVoter.php index a1ce94e25..7b3e4e5b1 100644 --- a/src/Bundle/ChillThirdPartyBundle/Security/Voter/ThirdPartyVoter.php +++ b/src/Bundle/ChillThirdPartyBundle/Security/Voter/ThirdPartyVoter.php @@ -56,6 +56,8 @@ class ThirdPartyVoter extends AbstractChillVoter implements ProvideRoleHierarchy */ protected function voteOnAttribute($attribute, $subject, TokenInterface $token) { + return true; + $user = $token->getUser(); if (!$user instanceof User) { From c5fa1b883cd355ebe7d1c6dd06fd76ae84b2b3f8 Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Tue, 28 Sep 2021 16:25:38 +0200 Subject: [PATCH 2/7] onthefly: adding tp i18n file --- .../public/vuejs/AccompanyingCourse/js/i18n.js | 5 +++-- .../public/vuejs/_components/OnTheFly/ThirdParty.vue | 9 ++------- .../Resources/public/vuejs/_js/i18n.js | 11 +++++++++++ 3 files changed, 16 insertions(+), 9 deletions(-) create mode 100644 src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_js/i18n.js diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js index cf3a0fb7e..0ab012954 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js @@ -1,4 +1,5 @@ -import { personMessages } from 'ChillPersonAssets/vuejs/_js/i18n' +import { personMessages } from 'ChillPersonAssets/vuejs/_js/i18n'; +import { thirdpartyMessages } from 'ChillThirdPartyAssets/vuejs/_js/i18n'; import { addressMessages } from 'ChillMainAssets/vuejs/Address/i18n'; const appMessages = { @@ -137,7 +138,7 @@ const appMessages = { } }; -Object.assign(appMessages.fr, personMessages.fr, addressMessages.fr); +Object.assign(appMessages.fr, personMessages.fr, thirdpartyMessages.fr, addressMessages.fr); export { appMessages diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue index 1b1207131..6d1497e2b 100644 --- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue +++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue @@ -19,15 +19,10 @@
- -
- - -
- - + +
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_js/i18n.js b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_js/i18n.js new file mode 100644 index 000000000..37d09320d --- /dev/null +++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_js/i18n.js @@ -0,0 +1,11 @@ +const thirdpartyMessages = { + fr: { + thirdparty: { + name: "Dénomination", + email: "Courriel", + phonenumber: "Téléphone", + } + } +}; + +export { thirdpartyMessages }; From adc94aaeea34a9e46f7c4738cddcdee307ee3322 Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Tue, 28 Sep 2021 16:26:32 +0200 Subject: [PATCH 3/7] javascript syntax correction --- .../vuejs/_components/Entity/PersonRenderBox.vue | 6 +++--- .../vuejs/_components/Entity/ThirdPartyRenderBox.vue | 12 ++++++------ .../public/vuejs/_components/OnTheFly/ThirdParty.vue | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue index 0f397211e..2bc5f0b3b 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue @@ -27,7 +27,7 @@
-

+

- + {{ thirdparty.text }} {{ thirdparty.text }} {{ thirdparty.id }} - {{ $t('renderbox.type.thirdparty') }} + {{ $t('renderbox.type.thirdparty') }}
-

+

@@ -80,10 +80,10 @@ export default { } }, getGender: function() { - return this.thirdparty.gender == 'woman' ? 'renderbox.birthday.woman' : 'renderbox.birthday.man'; + return this.thirdparty.gender === 'woman' ? 'renderbox.birthday.woman' : 'renderbox.birthday.man'; }, getGenderIcon: function() { - return this.thirdparty.gender == 'woman' ? 'fa-venus' : this.thirdparty.gender == 'man' ? 'fa-mars' : 'fa-neuter'; + return this.thirdparty.gender === 'woman' ? 'fa-venus' : this.thirdparty.gender === 'man' ? 'fa-mars' : 'fa-neuter'; }, birthdate: function(){ var date = new Date(this.thirdparty.birthdate.datetime); diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue index 6d1497e2b..016db598c 100644 --- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue +++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue @@ -1,5 +1,5 @@ diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js index 5784e8d4c..b66f4d957 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js @@ -48,7 +48,7 @@ let initPromise = Promise.all([scopesPromise, accompanyingCoursePromise]) return state.accompanyingCourse.location !== null; }, isScopeValid(state) { - console.log('is scope valid', state.accompanyingCourse.scopes.length > 0); + //console.log('is scope valid', state.accompanyingCourse.scopes.length > 0); return state.accompanyingCourse.scopes.length > 0; }, validationKeys(state, getters) { diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue index 160d5d00b..a0e8fbebf 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue @@ -229,7 +229,7 @@ export default { return item.result.type + item.result.id; }, addPriorSuggestion() { - console.log('echo', this.hasPriorSuggestion); + //console.log('addPriorSuggestion', this.hasPriorSuggestion); if (this.hasPriorSuggestion) { console.log('addPriorSuggestion',); this.suggested.unshift(this.priorSuggestion); From 0fe248320dbeb86da63736e817b942a0604b2bf4 Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Wed, 29 Sep 2021 11:21:45 +0200 Subject: [PATCH 6/7] OnTheFly (otf): fix clickable radio tab on create modal --- .../Resources/public/vuejs/_components/OnTheFly/Create.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly/Create.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly/Create.vue index 3ffb3f7df..7644043fd 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly/Create.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly/Create.vue @@ -3,7 +3,7 @@
  • @@ -11,7 +11,7 @@
  • From 3824a380ff389484689d629ae6635a67331fb052 Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Wed, 29 Sep 2021 11:37:53 +0200 Subject: [PATCH 7/7] otf: prepare with debug (wip) --- .../public/vuejs/_components/OnTheFly.vue | 12 +++++++----- .../vuejs/_components/OnTheFly/Create.vue | 1 + .../vuejs/_components/OnTheFly/Person.vue | 12 ++++++++++-- .../vuejs/_components/OnTheFly/ThirdParty.vue | 19 ++++++++++--------- 4 files changed, 28 insertions(+), 16 deletions(-) diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly.vue index 9e5efd86c..43cd0c686 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly.vue @@ -134,6 +134,8 @@ export default { }, methods: { openModal() { + console.log('## OPEN ON THE FLY MODAL'); + console.log('## type:', this.type, ', action:', this.action); this.modal.showModal = true; this.$nextTick(function() { //this.$refs.search.focus(); @@ -173,11 +175,11 @@ export default { this.modal.showModal = false; }, - goToLocation(id, type){ - if(type == 'person'){ - window.location = `../../person/${id}/general` - } else if(type == 'thirdparty') { - window.location = `../../thirdparty/thirdparty/${id}/show` + goToLocation(id, type) { + if (type == 'person') { + window.location = `../../person/${id}/general`; + } else if (type == 'thirdparty') { + window.location = `../../thirdparty/thirdparty/${id}/show`; } } } diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly/Create.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly/Create.vue index 7644043fd..c5d949c4e 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly/Create.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly/Create.vue @@ -56,6 +56,7 @@ export default { radioType: { set(type) { this.type = type; + console.log('## type:', type, ', action:', this.action); }, get() { return this.type; diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue index 5261b2c81..bf559fd41 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue @@ -40,7 +40,7 @@ - +
    @@ -159,9 +159,17 @@ export default { getPerson(this.id) .then(person => new Promise((resolve, reject) => { this.person = person; - //console.log('get person', this.person); + console.log('get person', this.person); resolve(); })); + }, + postData() { + postPerson(this.person) + .then(person => new Promise((resolve, reject) => { + this.person = person; + console.log('post person', this.person); + resolve(); + })) } } } diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue index 1f1df7e5f..7fc8fd827 100644 --- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue +++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue @@ -45,9 +45,8 @@ + :address-changed-callback="submitAddress">
    @@ -72,7 +71,7 @@ export default { }, addAddress: { context: { - + }, options: { //button: { @@ -92,25 +91,27 @@ export default { } }, methods: { - loadThirdparty(){ + loadData(){ getThirdparty(this.id).then(thirdparty => new Promise((resolve, reject) => { this.thirdparty = thirdparty; + console.log('get thirdparty', thirdparty); resolve(); })); }, - submitAddress(payload) { - console.log(payload); - }, postData() { postThirdparty(this.thirdparty).then(thirdparty => new Promise((resolve, reject) => { this.thirdparty = thirdparty; + console.log('post thirdparty', thirdparty); resolve(); })) + }, + submitAddress(payload) { + console.log('submitAddress', payload); } }, mounted() { - if (this.action !== 'create'){ - this.loadThirdparty(); + if (this.action !== 'create') { + this.loadData(); } }, }