"Duplicate": import 11 previous commits from Person bundle, before merging monorepo

Last 11 commits are rewritten to maintain history :

5e461dc Mathieu Jaumotte        Mon Mar 8 18:37:11 2021 +0100   oups
f2179b5 Mathieu Jaumotte        Mon Mar 8 18:33:32 2021 +0100   count linked objects in merge person side panel
7bc76f3 Mathieu Jaumotte        Mon Mar 8 16:54:01 2021 +0100   improve duplicate ux
71aa9f4 Mathieu Jaumotte        Thu Mar 4 21:52:42 2021 +0100   improve duplicates templates
d3c13ce Mathieu Jaumotte        Thu Mar 4 16:15:55 2021 +0100   design UX for duplicate person feature
a8b306e Mathieu Jaumotte        Wed Mar 3 18:38:00 2021 +0100   change migration namespace
8752c71 Jean-Francois Monfort   Thu Feb 18 14:24:37 2021 +0100  Unit testf for duplicate person
0799980 Jean-Francois Monfort   Thu Feb 18 11:39:23 2021 +0100  New screen to find duplicate person manually
a7fa7a5 Jean-Francois Monfort   Thu Feb 11 16:31:30 2021 +0100  New permission for duplicate & export duplicate persons
2980441 Jean-Francois Monfort   Thu Feb 4 17:21:15 2021 +0100   Duplicate module
d06ab66 Jean-Francois Monfort   Thu Jan 28 17:26:20 2021 +0100  List duplicate persons
This commit is contained in:
Mathieu Jaumotte 2021-03-21 15:02:04 +01:00
parent 31ef7ba74f
commit f4c556812e

View File

@ -89,6 +89,22 @@ chill_person_admin:
path: "/{_locale}/admin/person" path: "/{_locale}/admin/person"
controller: Chill\PersonBundle\Controller\AdminController::indexAction controller: Chill\PersonBundle\Controller\AdminController::indexAction
chill_person_duplicate_view:
path: /{_locale}/person/{person_id}/duplicate/view
controller: Chill\PersonBundle\Controller\PersonDuplicateController::viewAction
chill_person_duplicate_confirm:
path: /{_locale}/person/{person1_id}/duplicate/{person2_id}/confirm
controller: Chill\PersonBundle\Controller\PersonDuplicateController::confirmAction
chill_person_duplicate_not_duplicate:
path: /{_locale}/person/{person1_id}/duplicate/{person2_id}/not-duplicate
controller: Chill\PersonBundle\Controller\PersonDuplicateController::notDuplicateAction
chill_person_remove_duplicate_not_duplicate:
path: /{_locale}/person/{person1_id}/duplicate/{person2_id}/remove-not-duplicate
controller: Chill\PersonBundle\Controller\PersonDuplicateController::removeNotDuplicateAction
chill_person_find_manually_duplicate: chill_person_find_manually_duplicate:
path: /{_locale}/person/{person_id}/find-manually path: /{_locale}/person/{person_id}/find-manually
controller: Chill\PersonBundle\Controller\PersonDuplicateController::findManuallyDuplicateAction controller: Chill\PersonBundle\Controller\PersonDuplicateController::findManuallyDuplicateAction
@ -102,10 +118,6 @@ chill_person_admin_redirect_to_admin_index:
order: 0 order: 0
label: Main admin menu label: Main admin menu
chill_person_duplicate_view:
path: /{_locale}/person/{person_id}/duplicate/view
controller: Chill\PersonBundle\Controller\PersonDuplicateController::viewAction
chill_person_closingmotive_admin: chill_person_closingmotive_admin:
path: /{_locale}/admin/closing-motive path: /{_locale}/admin/closing-motive
controller: cscrud_closing_motive_controller:index controller: cscrud_closing_motive_controller:index
@ -115,10 +127,6 @@ chill_person_closingmotive_admin:
order: 90 order: 90
label: 'person_admin.closing motives' label: 'person_admin.closing motives'
chill_person_duplicate_confirm:
path: /{_locale}/person/{person1_id}/duplicate/{person2_id}/confirm
controller: Chill\PersonBundle\Controller\PersonDuplicateController::confirmAction
chill_person_maritalstatus_admin: chill_person_maritalstatus_admin:
path: /{_locale}/admin/marital-status path: /{_locale}/admin/marital-status
controller: cscrud_marital_status_controller:index controller: cscrud_marital_status_controller:index
@ -127,11 +135,3 @@ chill_person_maritalstatus_admin:
admin_person: admin_person:
order: 120 order: 120
label: 'person_admin.marital status' label: 'person_admin.marital status'
chill_person_duplicate_not_duplicate:
path: /{_locale}/person/{person1_id}/duplicate/{person2_id}/not-duplicate
controller: Chill\PersonBundle\Controller\PersonDuplicateController::notDuplicateAction
chill_person_remove_duplicate_not_duplicate:
path: /{_locale}/person/{person1_id}/duplicate/{person2_id}/remove-not-duplicate
controller: Chill\PersonBundle\Controller\PersonDuplicateController::removeNotDuplicateAction