From 4144d295294dad831af71deb76b3868dd8edfea0 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Sat, 6 Apr 2019 13:46:47 +0200 Subject: [PATCH 05/10] models: hide related_name and related_query_name for BaseResource.users (#31595) It creates errors if a connector names its connector model 'Resource', as all related names on users get the same name. --- passerelle/apps/actesweb/migrations/0001_initial.py | 2 +- passerelle/apps/airquality/migrations/0001_initial.py | 2 +- passerelle/apps/api_particulier/migrations/0001_initial.py | 2 +- passerelle/apps/arcgis/migrations/0001_initial.py | 2 +- passerelle/apps/arpege_ecp/migrations/0001_initial.py | 2 +- passerelle/apps/atos_genesys/migrations/0001_initial.py | 2 +- passerelle/apps/base_adresse/migrations/0001_initial.py | 2 +- passerelle/apps/bdp/migrations/0001_initial.py | 2 +- passerelle/apps/cartads_cs/migrations/0001_initial.py | 2 +- passerelle/apps/choosit/migrations/0001_initial.py | 2 +- passerelle/apps/cityweb/migrations/0001_initial.py | 2 +- .../clicrdv/migrations/0001_squashed_0006_auto_20170920_0951.py | 2 +- passerelle/apps/clicrdv/migrations/0004_newclicrdv.py | 2 +- passerelle/apps/cmis/migrations/0001_initial.py | 2 +- passerelle/apps/csvdatasource/migrations/0001_initial.py | 2 +- passerelle/apps/family/migrations/0001_initial.py | 2 +- passerelle/apps/feeds/migrations/0001_initial.py | 2 +- passerelle/apps/gdc/migrations/0001_initial.py | 2 +- passerelle/apps/jsondatastore/migrations/0001_initial.py | 2 +- passerelle/apps/mobyt/migrations/0001_initial.py | 2 +- passerelle/apps/okina/migrations/0001_initial.py | 2 +- passerelle/apps/opengis/migrations/0001_initial.py | 2 +- passerelle/apps/orange/migrations/0001_initial.py | 2 +- passerelle/apps/ovh/migrations/0001_initial.py | 2 +- passerelle/apps/oxyd/migrations/0001_initial.py | 2 +- passerelle/apps/pastell/migrations/0001_initial.py | 2 +- passerelle/apps/phonecalls/migrations/0001_initial.py | 2 +- passerelle/apps/solis/migrations/0001_initial.py | 2 +- passerelle/apps/vivaticket/migrations/0001_initial.py | 2 +- passerelle/base/models.py | 2 +- passerelle/contrib/adict/migrations/0001_initial.py | 2 +- passerelle/contrib/agoraplus/migrations/0001_initial.py | 2 +- passerelle/contrib/dpark/migrations/0001_initial.py | 2 +- passerelle/contrib/fake_family/migrations/0001_initial.py | 2 +- passerelle/contrib/gdema/migrations/0001_initial.py | 2 +- .../contrib/grandlyon_streetsections/migrations/0001_initial.py | 2 +- passerelle/contrib/greco/migrations/0001_initial.py | 2 +- passerelle/contrib/grenoble_gru/migrations/0001_initial.py | 2 +- passerelle/contrib/iparapheur/migrations/0001_initial.py | 2 +- passerelle/contrib/iws/migrations/0001_initial.py | 2 +- passerelle/contrib/maarch/migrations/0001_initial.py | 2 +- passerelle/contrib/mdel/migrations/0001_initial.py | 2 +- passerelle/contrib/mdph13/migrations/0001_initial.py | 2 +- .../contrib/meyzieu_newsletters/migrations/0001_initial.py | 2 +- passerelle/contrib/nancypoll/migrations/0001_initial.py | 2 +- passerelle/contrib/planitech/migrations/0001_initial.py | 2 +- passerelle/contrib/seisin_by_email/migrations/0001_initial.py | 2 +- passerelle/contrib/solis_apa/migrations/0001_initial.py | 2 +- passerelle/contrib/strasbourg_eu/migrations/0001_initial.py | 2 +- passerelle/contrib/stub_invoices/migrations/0001_initial.py | 2 +- passerelle/contrib/tcl/migrations/0001_initial.py | 2 +- passerelle/contrib/teamnet_axel/migrations/0001_initial.py | 2 +- passerelle/contrib/tlmcom/migrations/0001_initial.py | 2 +- 53 files changed, 53 insertions(+), 53 deletions(-) diff --git a/passerelle/apps/actesweb/migrations/0001_initial.py b/passerelle/apps/actesweb/migrations/0001_initial.py index 80e6a76c..5d9c0b23 100644 --- a/passerelle/apps/actesweb/migrations/0001_initial.py +++ b/passerelle/apps/actesweb/migrations/0001_initial.py @@ -19,7 +19,7 @@ class Migration(migrations.Migration): ('description', models.TextField(verbose_name='Description')), ('slug', models.SlugField(verbose_name='Identifier', unique=True)), ('log_level', models.CharField(default=b'INFO', max_length=10, verbose_name='Log Level', choices=[(b'NOTSET', b'NOTSET'), (b'DEBUG', b'DEBUG'), (b'INFO', b'INFO'), (b'WARNING', b'WARNING'), (b'ERROR', b'ERROR'), (b'CRITICAL', b'CRITICAL')])), - ('users', models.ManyToManyField(to='base.ApiUser', blank=True)), + ('users', models.ManyToManyField(to='base.ApiUser', related_name='_actesweb_users_+', related_query_name='+', blank=True)), ], options={ 'verbose_name': "ActesWeb - Demande d'acte d'\xe9tat civil", diff --git a/passerelle/apps/airquality/migrations/0001_initial.py b/passerelle/apps/airquality/migrations/0001_initial.py index c7afa0b3..aeabcabb 100644 --- a/passerelle/apps/airquality/migrations/0001_initial.py +++ b/passerelle/apps/airquality/migrations/0001_initial.py @@ -19,7 +19,7 @@ class Migration(migrations.Migration): ('slug', models.SlugField(verbose_name='Identifier', unique=True)), ('description', models.TextField(verbose_name='Description')), ('log_level', models.CharField(default=b'INFO', max_length=10, verbose_name='Log Level', choices=[(b'NOTSET', b'NOTSET'), (b'DEBUG', b'DEBUG'), (b'INFO', b'INFO'), (b'WARNING', b'WARNING'), (b'ERROR', b'ERROR'), (b'CRITICAL', b'CRITICAL')])), - ('users', models.ManyToManyField(to='base.ApiUser', blank=True)), + ('users', models.ManyToManyField(to='base.ApiUser', related_name='_airquality_users_+', related_query_name='+', blank=True)), ], options={ 'verbose_name': 'Air Quality', diff --git a/passerelle/apps/api_particulier/migrations/0001_initial.py b/passerelle/apps/api_particulier/migrations/0001_initial.py index 291ae998..c111fe00 100644 --- a/passerelle/apps/api_particulier/migrations/0001_initial.py +++ b/passerelle/apps/api_particulier/migrations/0001_initial.py @@ -21,7 +21,7 @@ class Migration(migrations.Migration): ('log_level', models.CharField(default=b'NOTSET', max_length=10, verbose_name='Log Level', choices=[(b'NOTSET', b'NOTSET'), (b'DEBUG', b'DEBUG'), (b'INFO', b'INFO'), (b'WARNING', b'WARNING'), (b'ERROR', b'ERROR'), (b'CRITICAL', b'CRITICAL')])), ('_platform', models.CharField(choices=[(b'prod', 'Production'), (b'test', 'Test')], max_length=8, verbose_name='Platform')), ('_api_key', models.CharField(default=b'', max_length=64, verbose_name='API key', blank=True)), - ('users', models.ManyToManyField(to='base.ApiUser', blank=True)), + ('users', models.ManyToManyField(to='base.ApiUser', related_name='_apiparticulier_users_+', related_query_name='+', blank=True)), ], options={ 'abstract': False, diff --git a/passerelle/apps/arcgis/migrations/0001_initial.py b/passerelle/apps/arcgis/migrations/0001_initial.py index ca4e2577..6eabe730 100644 --- a/passerelle/apps/arcgis/migrations/0001_initial.py +++ b/passerelle/apps/arcgis/migrations/0001_initial.py @@ -20,7 +20,7 @@ class Migration(migrations.Migration): ('description', models.TextField(verbose_name='Description')), ('log_level', models.CharField(default=b'NOTSET', max_length=10, verbose_name='Log Level', choices=[(b'NOTSET', b'NOTSET'), (b'DEBUG', b'DEBUG'), (b'INFO', b'INFO'), (b'WARNING', b'WARNING'), (b'ERROR', b'ERROR'), (b'CRITICAL', b'CRITICAL')])), ('base_url', models.CharField(max_length=256, verbose_name='SIG Url')), - ('users', models.ManyToManyField(to='base.ApiUser', blank=True)), + ('users', models.ManyToManyField(to='base.ApiUser', related_name='_arcgis_users_+', related_query_name='+', blank=True)), ], options={ 'verbose_name': 'Arcgis Webservice', diff --git a/passerelle/apps/arpege_ecp/migrations/0001_initial.py b/passerelle/apps/arpege_ecp/migrations/0001_initial.py index 8c8c8507..0d5b15af 100644 --- a/passerelle/apps/arpege_ecp/migrations/0001_initial.py +++ b/passerelle/apps/arpege_ecp/migrations/0001_initial.py @@ -22,7 +22,7 @@ class Migration(migrations.Migration): ('webservice_base_url', models.URLField(verbose_name='Webservice Base URL')), ('hawk_auth_id', models.CharField(max_length=64, verbose_name='Hawk Authentication id')), ('hawk_auth_key', models.CharField(max_length=64, verbose_name='Hawk Authentication secret')), - ('users', models.ManyToManyField(to='base.ApiUser', blank=True)), + ('users', models.ManyToManyField(to='base.ApiUser', related_name='_arpegeecp_users_+', related_query_name='+', blank=True)), ], options={ 'verbose_name': 'Arpege ECP', diff --git a/passerelle/apps/atos_genesys/migrations/0001_initial.py b/passerelle/apps/atos_genesys/migrations/0001_initial.py index 4c2de961..acebfa46 100644 --- a/passerelle/apps/atos_genesys/migrations/0001_initial.py +++ b/passerelle/apps/atos_genesys/migrations/0001_initial.py @@ -45,7 +45,7 @@ class Migration(migrations.Migration): ('http_proxy', models.CharField(blank=True, max_length=128, verbose_name='HTTP and HTTPS proxy')), ('webservice_base_url', models.URLField(verbose_name='Webservice Base URL')), ('cod_rgp', models.CharField(default=b'RGP_PUB', max_length=64, verbose_name='Code RGP')), - ('users', models.ManyToManyField(blank=True, to='base.ApiUser')), + ('users', models.ManyToManyField(blank=True, related_name='_link_users_+', related_query_name='+', to='base.ApiUser')), ], options={ 'verbose_name': 'ATOS Genesys', diff --git a/passerelle/apps/base_adresse/migrations/0001_initial.py b/passerelle/apps/base_adresse/migrations/0001_initial.py index 513adf42..0a5afc0d 100644 --- a/passerelle/apps/base_adresse/migrations/0001_initial.py +++ b/passerelle/apps/base_adresse/migrations/0001_initial.py @@ -19,7 +19,7 @@ class Migration(migrations.Migration): ('slug', models.SlugField(verbose_name='Identifier', unique=True)), ('description', models.TextField(verbose_name='Description')), ('service_url', models.CharField(help_text='Base Adresse Web Service URL', max_length=128, verbose_name='Service URL')), - ('users', models.ManyToManyField(to='base.ApiUser', blank=True)), + ('users', models.ManyToManyField(to='base.ApiUser', related_name='_baseaddresse_users_+', related_query_name='+', blank=True)), ], options={ 'verbose_name': 'Base Adresse Web Service', diff --git a/passerelle/apps/bdp/migrations/0001_initial.py b/passerelle/apps/bdp/migrations/0001_initial.py index 4cebbd7d..5f8604d8 100644 --- a/passerelle/apps/bdp/migrations/0001_initial.py +++ b/passerelle/apps/bdp/migrations/0001_initial.py @@ -23,7 +23,7 @@ class Migration(migrations.Migration): ('password', models.CharField(max_length=128, verbose_name='Password', blank=True)), ('verify_cert', models.BooleanField(default=True, verbose_name='Check HTTPS Certificate validity')), ('keystore', models.FileField(help_text='Certificate and private key in PEM format', upload_to=b'bdp', null=True, verbose_name='Keystore', blank=True)), - ('users', models.ManyToManyField(to='base.ApiUser', blank=True)), + ('users', models.ManyToManyField(to='base.ApiUser', related_name='_bdp_users_+', related_query_name='+', blank=True)), ], options={ 'verbose_name': 'BDP Web Service', diff --git a/passerelle/apps/cartads_cs/migrations/0001_initial.py b/passerelle/apps/cartads_cs/migrations/0001_initial.py index 3bff45b5..29d6b2a5 100644 --- a/passerelle/apps/cartads_cs/migrations/0001_initial.py +++ b/passerelle/apps/cartads_cs/migrations/0001_initial.py @@ -31,7 +31,7 @@ class Migration(migrations.Migration): ('ftp_username', models.CharField(max_length=64, verbose_name='FTP Username')), ('ftp_password', models.CharField(max_length=64, verbose_name='FTP Password')), ('ftp_client_name', models.CharField(max_length=64, verbose_name='FTP Client Name')), - ('users', models.ManyToManyField(blank=True, to='base.ApiUser')), + ('users', models.ManyToManyField(blank=True, related_name='_cartadscs_users_+', related_query_name='+', to='base.ApiUser')), ], options={ 'verbose_name': 'Cart@DS CS', diff --git a/passerelle/apps/choosit/migrations/0001_initial.py b/passerelle/apps/choosit/migrations/0001_initial.py index d96c30a0..47f13e02 100644 --- a/passerelle/apps/choosit/migrations/0001_initial.py +++ b/passerelle/apps/choosit/migrations/0001_initial.py @@ -50,7 +50,7 @@ class Migration(migrations.Migration): ('description', models.TextField(verbose_name='Description')), ('key', models.CharField(max_length=64)), ('default_country_code', models.CharField(default='33', max_length=3)), - ('users', models.ManyToManyField(to='base.ApiUser', blank=True)), + ('users', models.ManyToManyField(to='base.ApiUser', related_name='_choositsmsgateway_users_+', related_query_name='+', blank=True)), ], options={ 'db_table': 'sms_choosit', diff --git a/passerelle/apps/cityweb/migrations/0001_initial.py b/passerelle/apps/cityweb/migrations/0001_initial.py index 00069a1c..c3370869 100644 --- a/passerelle/apps/cityweb/migrations/0001_initial.py +++ b/passerelle/apps/cityweb/migrations/0001_initial.py @@ -19,7 +19,7 @@ class Migration(migrations.Migration): ('slug', models.SlugField(verbose_name='Identifier', unique=True)), ('description', models.TextField(verbose_name='Description')), ('log_level', models.CharField(default=b'INFO', max_length=10, verbose_name='Log Level', choices=[(b'NOTSET', b'NOTSET'), (b'DEBUG', b'DEBUG'), (b'INFO', b'INFO'), (b'WARNING', b'WARNING'), (b'ERROR', b'ERROR'), (b'CRITICAL', b'CRITICAL')])), - ('users', models.ManyToManyField(to='base.ApiUser', blank=True)), + ('users', models.ManyToManyField(to='base.ApiUser', related_name='_cityweb_users_+', related_query_name='+', blank=True)), ], options={ 'verbose_name': "CityWeb - Demande d'acte d'\xe9tat civil", diff --git a/passerelle/apps/clicrdv/migrations/0001_squashed_0006_auto_20170920_0951.py b/passerelle/apps/clicrdv/migrations/0001_squashed_0006_auto_20170920_0951.py index eb3aa371..2b810bc7 100644 --- a/passerelle/apps/clicrdv/migrations/0001_squashed_0006_auto_20170920_0951.py +++ b/passerelle/apps/clicrdv/migrations/0001_squashed_0006_auto_20170920_0951.py @@ -32,7 +32,7 @@ class Migration(migrations.Migration): (b'password', models.CharField(max_length=64, verbose_name='Password')), (b'websource', models.CharField(blank=True, max_length=64, null=True, verbose_name='Web source')), (b'default_comment', models.CharField(blank=True, max_length=250, null=True, verbose_name='Default comment')), - (b'users', models.ManyToManyField(blank=True, to=b'base.ApiUser')), + (b'users', models.ManyToManyField(blank=True, related_name='_clicrdv_users_+', related_query_name='+', to='base.ApiUser')), ], options={ b'verbose_name': b'Clicrdv Agenda', diff --git a/passerelle/apps/clicrdv/migrations/0004_newclicrdv.py b/passerelle/apps/clicrdv/migrations/0004_newclicrdv.py index c3f91328..f1491a03 100644 --- a/passerelle/apps/clicrdv/migrations/0004_newclicrdv.py +++ b/passerelle/apps/clicrdv/migrations/0004_newclicrdv.py @@ -25,7 +25,7 @@ class Migration(migrations.Migration): ('password', models.CharField(max_length=64)), ('websource', models.CharField(max_length=64, null=True, blank=True)), ('default_comment', models.CharField(max_length=250, null=True, blank=True)), - ('users', models.ManyToManyField(to='base.ApiUser', blank=True)), + ('users', models.ManyToManyField(to='base.ApiUser', related_name='_newclicrdv_users_+', related_query_name='+', blank=True)), ], options={ 'verbose_name': 'Clicrdv Agenda', diff --git a/passerelle/apps/cmis/migrations/0001_initial.py b/passerelle/apps/cmis/migrations/0001_initial.py index a0d1fa7b..03b8143b 100644 --- a/passerelle/apps/cmis/migrations/0001_initial.py +++ b/passerelle/apps/cmis/migrations/0001_initial.py @@ -22,7 +22,7 @@ class Migration(migrations.Migration): ('cmis_endpoint', models.URLField(help_text='URL of the CMIS Atom endpoint', max_length=400, verbose_name='CMIS Atom endpoint')), ('username', models.CharField(max_length=128, verbose_name='Service username')), ('password', models.CharField(max_length=128, verbose_name='Password')), - ('users', models.ManyToManyField(to='base.ApiUser', blank=True)), + ('users', models.ManyToManyField(to='base.ApiUser', related_name='_cmisconnector_users_+', related_query_name='+', blank=True)), ], options={ 'verbose_name': 'CMIS connector', diff --git a/passerelle/apps/csvdatasource/migrations/0001_initial.py b/passerelle/apps/csvdatasource/migrations/0001_initial.py index 9607956f..d89de06f 100644 --- a/passerelle/apps/csvdatasource/migrations/0001_initial.py +++ b/passerelle/apps/csvdatasource/migrations/0001_initial.py @@ -26,7 +26,7 @@ class Migration(migrations.Migration): verbose_name='Column keynames', blank=True)), ('skip_header', models.BooleanField(default=False, verbose_name='Skip first line')), - ('users', models.ManyToManyField(to='base.ApiUser', blank=True)), + ('users', models.ManyToManyField(to='base.ApiUser', related_name='_csvdatasource_users_+', related_query_name='+', blank=True)), ], options={ 'verbose_name': 'CSV File', diff --git a/passerelle/apps/family/migrations/0001_initial.py b/passerelle/apps/family/migrations/0001_initial.py index ebdb0a44..f174d791 100644 --- a/passerelle/apps/family/migrations/0001_initial.py +++ b/passerelle/apps/family/migrations/0001_initial.py @@ -80,7 +80,7 @@ class Migration(migrations.Migration): ('description', models.TextField(verbose_name='Description')), ('log_level', models.CharField(default=b'NOTSET', max_length=10, verbose_name='Log Level', choices=[(b'NOTSET', b'NOTSET'), (b'DEBUG', b'DEBUG'), (b'INFO', b'INFO'), (b'WARNING', b'WARNING'), (b'ERROR', b'ERROR'), (b'CRITICAL', b'CRITICAL')])), ('archive', models.FileField(upload_to=b'archives', verbose_name='Data Archive')), - ('users', models.ManyToManyField(to='base.ApiUser', blank=True)), + ('users', models.ManyToManyField(to='base.ApiUser', related_name='_genericfamily_users_+', related_query_name='+', blank=True)), ], options={ 'verbose_name': 'Generic Family Connector', diff --git a/passerelle/apps/feeds/migrations/0001_initial.py b/passerelle/apps/feeds/migrations/0001_initial.py index 090ecfc1..e6438099 100644 --- a/passerelle/apps/feeds/migrations/0001_initial.py +++ b/passerelle/apps/feeds/migrations/0001_initial.py @@ -20,7 +20,7 @@ class Migration(migrations.Migration): ('description', models.TextField(verbose_name='Description')), ('log_level', models.CharField(default=b'INFO', max_length=10, verbose_name='Log Level', choices=[(b'NOTSET', b'NOTSET'), (b'DEBUG', b'DEBUG'), (b'INFO', b'INFO'), (b'WARNING', b'WARNING'), (b'ERROR', b'ERROR'), (b'CRITICAL', b'CRITICAL')])), ('url', models.URLField(max_length=1000, verbose_name='URL')), - ('users', models.ManyToManyField(to='base.ApiUser', blank=True)), + ('users', models.ManyToManyField(to='base.ApiUser', related_name='_feed_users_+', related_query_name='+', blank=True)), ], options={ 'verbose_name': 'Feed', diff --git a/passerelle/apps/gdc/migrations/0001_initial.py b/passerelle/apps/gdc/migrations/0001_initial.py index 76e675bf..3657e114 100644 --- a/passerelle/apps/gdc/migrations/0001_initial.py +++ b/passerelle/apps/gdc/migrations/0001_initial.py @@ -19,7 +19,7 @@ class Migration(migrations.Migration): ('slug', models.SlugField(verbose_name='Identifier', unique=True)), ('description', models.TextField(verbose_name='Description')), ('service_url', models.CharField(help_text='GDC Web Service URL', max_length=128, verbose_name='Service URL')), - ('users', models.ManyToManyField(to='base.ApiUser', blank=True)), + ('users', models.ManyToManyField(to='base.ApiUser', related_name='_gdc_users_+', related_query_name='+', blank=True)), ], options={ 'verbose_name': 'GDC Web Service', diff --git a/passerelle/apps/jsondatastore/migrations/0001_initial.py b/passerelle/apps/jsondatastore/migrations/0001_initial.py index b98c188c..4395365c 100644 --- a/passerelle/apps/jsondatastore/migrations/0001_initial.py +++ b/passerelle/apps/jsondatastore/migrations/0001_initial.py @@ -32,7 +32,7 @@ class Migration(migrations.Migration): ('slug', models.SlugField(verbose_name='Identifier', unique=True)), ('description', models.TextField(verbose_name='Description')), ('log_level', models.CharField(default=b'INFO', max_length=10, verbose_name='Log Level', choices=[(b'NOTSET', b'NOTSET'), (b'DEBUG', b'DEBUG'), (b'INFO', b'INFO'), (b'WARNING', b'WARNING'), (b'ERROR', b'ERROR'), (b'CRITICAL', b'CRITICAL')])), - ('users', models.ManyToManyField(to='base.ApiUser', blank=True)), + ('users', models.ManyToManyField(to='base.ApiUser', related_name='_jsondata_users_+', related_query_name='+', blank=True)), ], options={ 'verbose_name': 'JSON Data Store', diff --git a/passerelle/apps/mobyt/migrations/0001_initial.py b/passerelle/apps/mobyt/migrations/0001_initial.py index 9490e365..94efd8f5 100644 --- a/passerelle/apps/mobyt/migrations/0001_initial.py +++ b/passerelle/apps/mobyt/migrations/0001_initial.py @@ -23,7 +23,7 @@ class Migration(migrations.Migration): ('password', models.CharField(max_length=64)), ('quality', models.CharField(default=b'l', max_length=4, verbose_name='message quality', choices=[(b'l', 'sms direct'), (b'll', 'sms low-cost'), (b'n', 'sms top')])), ('default_country_code', models.CharField(default='33', max_length=3)), - ('users', models.ManyToManyField(to='base.ApiUser', blank=True)), + ('users', models.ManyToManyField(to='base.ApiUser', related_name='_mobytsmsgateway_users_+', related_query_name='+', blank=True)), ], options={ 'db_table': 'sms_mobyt', diff --git a/passerelle/apps/okina/migrations/0001_initial.py b/passerelle/apps/okina/migrations/0001_initial.py index 6a6b212f..f75d0957 100644 --- a/passerelle/apps/okina/migrations/0001_initial.py +++ b/passerelle/apps/okina/migrations/0001_initial.py @@ -22,7 +22,7 @@ class Migration(migrations.Migration): ('service_url', models.URLField(help_text='Okina API base URL', max_length=256, verbose_name='Service URL')), ('username', models.CharField(max_length=128, verbose_name='Username')), ('password', models.CharField(max_length=128, verbose_name='Password')), - ('users', models.ManyToManyField(to='base.ApiUser', blank=True)), + ('users', models.ManyToManyField(to='base.ApiUser', related_name='_okina_users_+', related_query_name='+', blank=True)), ], options={ 'verbose_name': 'Okina', diff --git a/passerelle/apps/opengis/migrations/0001_initial.py b/passerelle/apps/opengis/migrations/0001_initial.py index 919b123e..3062d302 100644 --- a/passerelle/apps/opengis/migrations/0001_initial.py +++ b/passerelle/apps/opengis/migrations/0001_initial.py @@ -21,7 +21,7 @@ class Migration(migrations.Migration): ('log_level', models.CharField(default=b'NOTSET', max_length=10, verbose_name='Log Level', choices=[(b'NOTSET', b'NOTSET'), (b'DEBUG', b'DEBUG'), (b'INFO', b'INFO'), (b'WARNING', b'WARNING'), (b'ERROR', b'ERROR'), (b'CRITICAL', b'CRITICAL')])), ('service_root_url', models.URLField(max_length=256, verbose_name='Service Root URL')), ('query_layer', models.CharField(max_length=256, verbose_name='Query Layer')), - ('users', models.ManyToManyField(to='base.ApiUser', blank=True)), + ('users', models.ManyToManyField(to='base.ApiUser', related_name='_opengis_users_+', related_query_name='+', blank=True)), ], options={ 'verbose_name': 'OpenGIS', diff --git a/passerelle/apps/orange/migrations/0001_initial.py b/passerelle/apps/orange/migrations/0001_initial.py index c2bc369f..a6d6d1e8 100644 --- a/passerelle/apps/orange/migrations/0001_initial.py +++ b/passerelle/apps/orange/migrations/0001_initial.py @@ -20,7 +20,7 @@ class Migration(migrations.Migration): ('slug', models.SlugField(verbose_name='Identifier', unique=True)), ('description', models.TextField(verbose_name='Description')), ('keystore', models.FileField(help_text='Certificate and private key in PEM format', upload_to=b'orange', null=True, verbose_name='Keystore', blank=True)), - ('users', models.ManyToManyField(to='base.ApiUser', blank=True)), + ('users', models.ManyToManyField(to='base.ApiUser', related_name='_orangesmsgateway_users_+', related_query_name='+', blank=True)), ], options={ 'db_table': 'sms_orange', diff --git a/passerelle/apps/ovh/migrations/0001_initial.py b/passerelle/apps/ovh/migrations/0001_initial.py index 4a14a83d..eed4013c 100644 --- a/passerelle/apps/ovh/migrations/0001_initial.py +++ b/passerelle/apps/ovh/migrations/0001_initial.py @@ -26,7 +26,7 @@ class Migration(migrations.Migration): ('credit_threshold_alert', models.PositiveIntegerField(default=100)), ('default_country_code', models.CharField(default='33', max_length=3)), ('credit_left', models.PositiveIntegerField(default=0)), - ('users', models.ManyToManyField(to='base.ApiUser', blank=True)), + ('users', models.ManyToManyField(to='base.ApiUser', related_name='_ovhsmsgateway_users_+', related_query_name='+', blank=True)), ], options={ 'db_table': 'sms_ovh', diff --git a/passerelle/apps/oxyd/migrations/0001_initial.py b/passerelle/apps/oxyd/migrations/0001_initial.py index cd4a0023..95f7258e 100644 --- a/passerelle/apps/oxyd/migrations/0001_initial.py +++ b/passerelle/apps/oxyd/migrations/0001_initial.py @@ -22,7 +22,7 @@ class Migration(migrations.Migration): ('username', models.CharField(max_length=64)), ('password', models.CharField(max_length=64)), ('default_country_code', models.CharField(default='33', max_length=3)), - ('users', models.ManyToManyField(to='base.ApiUser', blank=True)), + ('users', models.ManyToManyField(to='base.ApiUser', related_name='_oxydsmsgateway_users_+', related_query_name='+', blank=True)), ], options={ 'db_table': 'sms_oxyd', diff --git a/passerelle/apps/pastell/migrations/0001_initial.py b/passerelle/apps/pastell/migrations/0001_initial.py index 461b5044..cd4baea3 100644 --- a/passerelle/apps/pastell/migrations/0001_initial.py +++ b/passerelle/apps/pastell/migrations/0001_initial.py @@ -26,7 +26,7 @@ class Migration(migrations.Migration): ('keystore', models.FileField(help_text='Certificate and private key in PEM format', upload_to=b'pastell', null=True, verbose_name='Keystore')), ('document_type', models.CharField(max_length=128, verbose_name='Document Type', blank=True)), ('document_fields', jsonfield.fields.JSONField(null=True, verbose_name='Fields')), - ('users', models.ManyToManyField(to='base.ApiUser', blank=True)), + ('users', models.ManyToManyField(to='base.ApiUser', related_name='_pastell_users_+', related_query_name='+', blank=True)), ], options={ 'verbose_name': 'Pastell', diff --git a/passerelle/apps/phonecalls/migrations/0001_initial.py b/passerelle/apps/phonecalls/migrations/0001_initial.py index ed8fcf3e..28eccc55 100644 --- a/passerelle/apps/phonecalls/migrations/0001_initial.py +++ b/passerelle/apps/phonecalls/migrations/0001_initial.py @@ -40,7 +40,7 @@ class Migration(migrations.Migration): ('slug', models.SlugField(unique=True, verbose_name='Identifier')), ('max_call_duration', models.PositiveIntegerField(default=120, help_text='Each hour, too long calls are closed.', verbose_name='Maximum duration of a call, in minutes.')), ('data_retention_period', models.PositiveIntegerField(default=60, help_text='Each day, old calls are removed.', verbose_name='Data retention period, in days.')), - ('users', models.ManyToManyField(blank=True, to='base.ApiUser')), + ('users', models.ManyToManyField(blank=True, related_name='_phonecalls_users_+', related_query_name='+', to='base.ApiUser')), ], options={ 'verbose_name': 'Phone Calls', diff --git a/passerelle/apps/solis/migrations/0001_initial.py b/passerelle/apps/solis/migrations/0001_initial.py index 91ac6709..656aab91 100644 --- a/passerelle/apps/solis/migrations/0001_initial.py +++ b/passerelle/apps/solis/migrations/0001_initial.py @@ -22,7 +22,7 @@ class Migration(migrations.Migration): ('service_url', models.URLField(help_text='Solis API base URL', max_length=256, verbose_name='Service URL')), ('username', models.CharField(max_length=128, verbose_name='Username')), ('password', models.CharField(max_length=128, verbose_name='Password')), - ('users', models.ManyToManyField(to='base.ApiUser', blank=True)), + ('users', models.ManyToManyField(to='base.ApiUser', related_name='_solis_users_+', related_query_name='+', blank=True)), ], options={ 'verbose_name': 'Solis', diff --git a/passerelle/apps/vivaticket/migrations/0001_initial.py b/passerelle/apps/vivaticket/migrations/0001_initial.py index c825e433..703db869 100644 --- a/passerelle/apps/vivaticket/migrations/0001_initial.py +++ b/passerelle/apps/vivaticket/migrations/0001_initial.py @@ -21,7 +21,7 @@ class Migration(migrations.Migration): ('url', models.URLField(verbose_name='API URL')), ('login', models.CharField(max_length=256, verbose_name='API Login')), ('password', models.CharField(max_length=256, verbose_name='API Password')), - ('users', models.ManyToManyField(to='base.ApiUser', blank=True)), + ('users', models.ManyToManyField(to='base.ApiUser', related_name='_vivaticket_users_+', related_query_name='+', blank=True)), ], options={ 'verbose_name': 'VivaTicket', diff --git a/passerelle/base/models.py b/passerelle/base/models.py index 6f22d4a2..9856549c 100644 --- a/passerelle/base/models.py +++ b/passerelle/base/models.py @@ -117,7 +117,7 @@ class BaseResource(models.Model): title = models.CharField(max_length=50, verbose_name=_('Title')) description = models.TextField(verbose_name=_('Description')) slug = models.SlugField(verbose_name=_('Identifier'), unique=True) - users = models.ManyToManyField(ApiUser, blank=True) + users = models.ManyToManyField(ApiUser, blank=True, related_name='+', related_query_name='+') objects = InheritanceManager() parameters = None diff --git a/passerelle/contrib/adict/migrations/0001_initial.py b/passerelle/contrib/adict/migrations/0001_initial.py index 0e13050f..e02983ff 100644 --- a/passerelle/contrib/adict/migrations/0001_initial.py +++ b/passerelle/contrib/adict/migrations/0001_initial.py @@ -22,7 +22,7 @@ class Migration(migrations.Migration): ('service_root_url', models.URLField(max_length=256, verbose_name='Service Root URL')), ('sector_type', models.CharField(max_length=256, verbose_name='Sector Type')), ('api_token', models.CharField(max_length=256, verbose_name='API Token')), - ('users', models.ManyToManyField(to='base.ApiUser', blank=True)), + ('users', models.ManyToManyField(to='base.ApiUser', related_name='_adict_users_+', related_query_name='+', blank=True)), ], options={ 'verbose_name': 'ADICT (Strasbourg GIS)', diff --git a/passerelle/contrib/agoraplus/migrations/0001_initial.py b/passerelle/contrib/agoraplus/migrations/0001_initial.py index e2586cbb..a6546e68 100644 --- a/passerelle/contrib/agoraplus/migrations/0001_initial.py +++ b/passerelle/contrib/agoraplus/migrations/0001_initial.py @@ -25,7 +25,7 @@ class Migration(migrations.Migration): ('username', models.CharField(max_length=128, verbose_name='HTTP Basic Auth username', blank=True)), ('password', models.CharField(max_length=128, verbose_name='HTTP Basic Auth password', blank=True)), ('keystore', models.FileField(help_text='Certificate and private key in PEM format', upload_to=b'agoraplus', null=True, verbose_name='Keystore', blank=True)), - ('users', models.ManyToManyField(to='base.ApiUser', blank=True)), + ('users', models.ManyToManyField(to='base.ApiUser', related_name='_agoraplus_users_+', related_query_name='+', blank=True)), ], options={ 'verbose_name': 'Agora+', diff --git a/passerelle/contrib/dpark/migrations/0001_initial.py b/passerelle/contrib/dpark/migrations/0001_initial.py index ef87bcf1..9569c1c7 100644 --- a/passerelle/contrib/dpark/migrations/0001_initial.py +++ b/passerelle/contrib/dpark/migrations/0001_initial.py @@ -21,7 +21,7 @@ class Migration(migrations.Migration): ('log_level', models.CharField(default=b'INFO', max_length=10, verbose_name='Log Level', choices=[(b'NOTSET', b'NOTSET'), (b'DEBUG', b'DEBUG'), (b'INFO', b'INFO'), (b'WARNING', b'WARNING'), (b'ERROR', b'ERROR'), (b'CRITICAL', b'CRITICAL')])), ('wsdl_url', models.URLField(help_text='URL of the SOAP wsdl endpoint', max_length=512, verbose_name='SOAP wsdl endpoint')), ('operation_url', models.URLField(help_text='URL of the SOAP operation endpoint', max_length=512, verbose_name='SOAP operation endpoint')), - ('users', models.ManyToManyField(to='base.ApiUser', blank=True)), + ('users', models.ManyToManyField(to='base.ApiUser', related_name='_dpark_users_+', related_query_name='+', blank=True)), ], options={ 'verbose_name': 'D-Park connector', diff --git a/passerelle/contrib/fake_family/migrations/0001_initial.py b/passerelle/contrib/fake_family/migrations/0001_initial.py index df584d55..e1ddbc72 100644 --- a/passerelle/contrib/fake_family/migrations/0001_initial.py +++ b/passerelle/contrib/fake_family/migrations/0001_initial.py @@ -20,7 +20,7 @@ class Migration(migrations.Migration): ('slug', models.SlugField(verbose_name='Identifier', unique=True)), ('description', models.TextField(verbose_name='Description')), ('jsondatabase', jsonfield.fields.JSONField(default=dict, verbose_name='Fake Database (JSON)', blank=True)), - ('users', models.ManyToManyField(to='base.ApiUser', blank=True)), + ('users', models.ManyToManyField(to='base.ApiUser', related_name='_fakefamily_users_+', related_query_name='+', blank=True)), ], options={ 'verbose_name': 'Fake Family System', diff --git a/passerelle/contrib/gdema/migrations/0001_initial.py b/passerelle/contrib/gdema/migrations/0001_initial.py index c4442153..6cf903cb 100644 --- a/passerelle/contrib/gdema/migrations/0001_initial.py +++ b/passerelle/contrib/gdema/migrations/0001_initial.py @@ -22,7 +22,7 @@ class Migration(migrations.Migration): ('service_url', models.URLField(help_text='GDEMA API base URL', max_length=256, verbose_name='Service URL')), ('username', models.CharField(max_length=128, verbose_name='Username')), ('password', models.CharField(max_length=128, verbose_name='Password')), - ('users', models.ManyToManyField(to='base.ApiUser', blank=True)), + ('users', models.ManyToManyField(to='base.ApiUser', related_name='_gdema_users_+', related_query_name='+', blank=True)), ], options={ 'verbose_name': 'GDEMA', diff --git a/passerelle/contrib/grandlyon_streetsections/migrations/0001_initial.py b/passerelle/contrib/grandlyon_streetsections/migrations/0001_initial.py index 30ed9d45..2dbdc1ff 100644 --- a/passerelle/contrib/grandlyon_streetsections/migrations/0001_initial.py +++ b/passerelle/contrib/grandlyon_streetsections/migrations/0001_initial.py @@ -19,7 +19,7 @@ class Migration(migrations.Migration): ('slug', models.SlugField(verbose_name='Identifier', unique=True)), ('description', models.TextField(verbose_name='Description')), ('log_level', models.CharField(default=b'INFO', max_length=10, verbose_name='Log Level', choices=[(b'NOTSET', b'NOTSET'), (b'DEBUG', b'DEBUG'), (b'INFO', b'INFO'), (b'WARNING', b'WARNING'), (b'ERROR', b'ERROR'), (b'CRITICAL', b'CRITICAL')])), - ('users', models.ManyToManyField(to='base.ApiUser', blank=True)), + ('users', models.ManyToManyField(to='base.ApiUser', related_name='_grandlyonstreetsections_users_+', related_query_name='+', blank=True)), ], options={ 'verbose_name': 'Sections of Grand Lyon Streets', diff --git a/passerelle/contrib/greco/migrations/0001_initial.py b/passerelle/contrib/greco/migrations/0001_initial.py index 6c229744..f1a96c4a 100644 --- a/passerelle/contrib/greco/migrations/0001_initial.py +++ b/passerelle/contrib/greco/migrations/0001_initial.py @@ -24,7 +24,7 @@ class Migration(migrations.Migration): ('token_authorization', models.CharField(max_length=128, verbose_name='Token Authorization')), ('wsdl_url', models.CharField(max_length=256, verbose_name='WSDL URL')), ('verify_cert', models.BooleanField(default=True, verbose_name='Check HTTPS Certificate validity')), - ('users', models.ManyToManyField(to='base.ApiUser', blank=True)), + ('users', models.ManyToManyField(to='base.ApiUser', related_name='_greco_users_+', related_query_name='+', blank=True)), ], options={ 'verbose_name': 'GRECO Webservices', diff --git a/passerelle/contrib/grenoble_gru/migrations/0001_initial.py b/passerelle/contrib/grenoble_gru/migrations/0001_initial.py index 4ea0ae80..e296faf2 100644 --- a/passerelle/contrib/grenoble_gru/migrations/0001_initial.py +++ b/passerelle/contrib/grenoble_gru/migrations/0001_initial.py @@ -22,7 +22,7 @@ class Migration(migrations.Migration): ('base_url', models.URLField(help_text='Grenoble GRU API base URL', max_length=256, verbose_name='Base URL')), ('username', models.CharField(max_length=128, verbose_name='Username')), ('password', models.CharField(max_length=128, verbose_name='Password')), - ('users', models.ManyToManyField(to='base.ApiUser', blank=True)), + ('users', models.ManyToManyField(to='base.ApiUser', related_name='_grenoblegru_users_+', related_query_name='+', blank=True)), ], options={ 'verbose_name': 'Grenoble - Gestion des signalements', diff --git a/passerelle/contrib/iparapheur/migrations/0001_initial.py b/passerelle/contrib/iparapheur/migrations/0001_initial.py index ac73fbda..a75ea669 100644 --- a/passerelle/contrib/iparapheur/migrations/0001_initial.py +++ b/passerelle/contrib/iparapheur/migrations/0001_initial.py @@ -23,7 +23,7 @@ class Migration(migrations.Migration): ('username', models.CharField(max_length=128, verbose_name='Username', blank=True)), ('password', models.CharField(max_length=128, verbose_name='Password', blank=True)), ('keystore', models.FileField(help_text='Certificate and private key in PEM format', upload_to=b'iparapheur', null=True, verbose_name='Keystore', blank=True)), - ('users', models.ManyToManyField(to='base.ApiUser', blank=True)), + ('users', models.ManyToManyField(to='base.ApiUser', related_name='_management_users_+', related_query_name='+', blank=True)), ], options={ 'verbose_name': 'i-Parapheur', diff --git a/passerelle/contrib/iws/migrations/0001_initial.py b/passerelle/contrib/iws/migrations/0001_initial.py index 73a5b2e8..f4ab00f5 100644 --- a/passerelle/contrib/iws/migrations/0001_initial.py +++ b/passerelle/contrib/iws/migrations/0001_initial.py @@ -24,7 +24,7 @@ class Migration(migrations.Migration): ('username', models.CharField(max_length=128, verbose_name='Service username')), ('password', models.CharField(max_length=128, null=True, verbose_name='Service password', blank=True)), ('database', models.CharField(max_length=128, verbose_name='Service database')), - ('users', models.ManyToManyField(to='base.ApiUser', blank=True)), + ('users', models.ManyToManyField(to='base.ApiUser', related_name='_iwsconnector_users_+', related_query_name='+', blank=True)), ], options={ 'verbose_name': 'IWS connector', diff --git a/passerelle/contrib/maarch/migrations/0001_initial.py b/passerelle/contrib/maarch/migrations/0001_initial.py index c9657461..197d0559 100644 --- a/passerelle/contrib/maarch/migrations/0001_initial.py +++ b/passerelle/contrib/maarch/migrations/0001_initial.py @@ -23,7 +23,7 @@ class Migration(migrations.Migration): ('username', models.CharField(max_length=128, verbose_name='Username', blank=True)), ('password', models.CharField(max_length=128, verbose_name='Password', blank=True)), ('keystore', models.FileField(help_text='Certificate and private key in PEM format', upload_to=b'maarch', null=True, verbose_name='Keystore', blank=True)), - ('users', models.ManyToManyField(to='base.ApiUser', blank=True)), + ('users', models.ManyToManyField(to='base.ApiUser', related_name='_management_users_+', related_query_name='+', blank=True)), ], options={ 'verbose_name': 'Maarch', diff --git a/passerelle/contrib/mdel/migrations/0001_initial.py b/passerelle/contrib/mdel/migrations/0001_initial.py index 34483336..b4699ef6 100644 --- a/passerelle/contrib/mdel/migrations/0001_initial.py +++ b/passerelle/contrib/mdel/migrations/0001_initial.py @@ -29,7 +29,7 @@ class Migration(migrations.Migration): ('slug', models.SlugField(verbose_name='Identifier', unique=True)), ('description', models.TextField(verbose_name='Description')), ('log_level', models.CharField(default=b'NOTSET', max_length=10, verbose_name='Log Level', choices=[(b'NOTSET', b'NOTSET'), (b'DEBUG', b'DEBUG'), (b'INFO', b'INFO'), (b'WARNING', b'WARNING'), (b'ERROR', b'ERROR'), (b'CRITICAL', b'CRITICAL')])), - ('users', models.ManyToManyField(to='base.ApiUser', blank=True)), + ('users', models.ManyToManyField(to='base.ApiUser', related_name='_demand_users_+', related_query_name='+', blank=True)), ], options={ 'verbose_name': 'Mes Demarches En Ligne', diff --git a/passerelle/contrib/mdph13/migrations/0001_initial.py b/passerelle/contrib/mdph13/migrations/0001_initial.py index 96b76c9d..38a66529 100644 --- a/passerelle/contrib/mdph13/migrations/0001_initial.py +++ b/passerelle/contrib/mdph13/migrations/0001_initial.py @@ -43,7 +43,7 @@ class Migration(migrations.Migration): ('verify_cert', models.BooleanField(default=True, verbose_name='TLS verify certificates')), ('http_proxy', models.CharField(blank=True, max_length=128, verbose_name='HTTP and HTTPS proxy')), ('webservice_base_url', models.URLField(verbose_name='Webservice Base URL')), - ('users', models.ManyToManyField(blank=True, to='base.ApiUser')), + ('users', models.ManyToManyField(blank=True, related_name='_link_users_+', related_query_name='+', to='base.ApiUser')), ], options={ 'verbose_name': 'MDPH CD13', diff --git a/passerelle/contrib/meyzieu_newsletters/migrations/0001_initial.py b/passerelle/contrib/meyzieu_newsletters/migrations/0001_initial.py index 5ff599d3..8ed88bc9 100644 --- a/passerelle/contrib/meyzieu_newsletters/migrations/0001_initial.py +++ b/passerelle/contrib/meyzieu_newsletters/migrations/0001_initial.py @@ -22,7 +22,7 @@ class Migration(migrations.Migration): ('url', models.URLField(verbose_name='Newsletter service URL')), ('apikey', models.CharField(max_length=32, verbose_name='API key')), ('transport_titles_mapping', jsonfield.fields.JSONField(default=dict, verbose_name='Mapping of transports ids and titles')), - ('users', models.ManyToManyField(to='base.ApiUser', blank=True)), + ('users', models.ManyToManyField(to='base.ApiUser', related_name='_meyzieunewsletters_users_+', related_query_name='+', blank=True)), ], options={ 'verbose_name': 'Meyzieu Newsletters', diff --git a/passerelle/contrib/nancypoll/migrations/0001_initial.py b/passerelle/contrib/nancypoll/migrations/0001_initial.py index 6b6dadff..80b8724d 100644 --- a/passerelle/contrib/nancypoll/migrations/0001_initial.py +++ b/passerelle/contrib/nancypoll/migrations/0001_initial.py @@ -20,7 +20,7 @@ class Migration(migrations.Migration): ('description', models.TextField(verbose_name='Description')), ('log_level', models.CharField(default=b'NOTSET', max_length=10, verbose_name='Log Level', choices=[(b'NOTSET', b'NOTSET'), (b'DEBUG', b'DEBUG'), (b'INFO', b'INFO'), (b'WARNING', b'WARNING'), (b'ERROR', b'ERROR'), (b'CRITICAL', b'CRITICAL')])), ('csv_file', models.FileField(upload_to=b'csv', verbose_name='CSV File')), - ('users', models.ManyToManyField(to='base.ApiUser', blank=True)), + ('users', models.ManyToManyField(to='base.ApiUser', related_name='_nancypoll_users_+', related_query_name='+', blank=True)), ], options={ 'verbose_name': 'NancyPoll', diff --git a/passerelle/contrib/planitech/migrations/0001_initial.py b/passerelle/contrib/planitech/migrations/0001_initial.py index f85a8301..dd832e02 100644 --- a/passerelle/contrib/planitech/migrations/0001_initial.py +++ b/passerelle/contrib/planitech/migrations/0001_initial.py @@ -25,7 +25,7 @@ class Migration(migrations.Migration): ('username', models.CharField(max_length=128, verbose_name='Service username')), ('password', models.CharField(blank=True, max_length=128, null=True, verbose_name='Service password')), ('verify_cert', models.BooleanField(default=True, verbose_name='Check HTTPS Certificate validity')), - ('users', models.ManyToManyField(blank=True, to='base.ApiUser')), + ('users', models.ManyToManyField(blank=True, related_name='_planitechconnector_users_+', related_query_name='+', to='base.ApiUser')), ], options={ 'verbose_name': 'Planitech', diff --git a/passerelle/contrib/seisin_by_email/migrations/0001_initial.py b/passerelle/contrib/seisin_by_email/migrations/0001_initial.py index 08cacfdd..ce137f22 100644 --- a/passerelle/contrib/seisin_by_email/migrations/0001_initial.py +++ b/passerelle/contrib/seisin_by_email/migrations/0001_initial.py @@ -23,7 +23,7 @@ class Migration(migrations.Migration): ('username', models.CharField(max_length=128, verbose_name='Username', blank=True)), ('password', models.CharField(max_length=128, verbose_name='Password', blank=True)), ('keystore', models.FileField(help_text='Certificate and private key in PEM format', upload_to=b'seisin-by-email', null=True, verbose_name='Keystore', blank=True)), - ('users', models.ManyToManyField(to='base.ApiUser', blank=True)), + ('users', models.ManyToManyField(to='base.ApiUser', related_name='_seisinbyemailmanagement_users_+', related_query_name='+', blank=True)), ], options={ 'verbose_name': 'Seisin-by-Email', diff --git a/passerelle/contrib/solis_apa/migrations/0001_initial.py b/passerelle/contrib/solis_apa/migrations/0001_initial.py index 3ed642c5..c8f03e49 100644 --- a/passerelle/contrib/solis_apa/migrations/0001_initial.py +++ b/passerelle/contrib/solis_apa/migrations/0001_initial.py @@ -24,7 +24,7 @@ class Migration(migrations.Migration): ('username', models.CharField(max_length=128, verbose_name='Username', blank=True)), ('password', models.CharField(max_length=128, verbose_name='Password', blank=True)), ('keystore', models.FileField(help_text='Certificate and private key in PEM format', upload_to=b'solis_apa', null=True, verbose_name='Keystore', blank=True)), - ('users', models.ManyToManyField(to='base.ApiUser', blank=True)), + ('users', models.ManyToManyField(to='base.ApiUser', related_name='_solisapa_users_+', related_query_name='+', blank=True)), ], options={ 'verbose_name': 'Solis', diff --git a/passerelle/contrib/strasbourg_eu/migrations/0001_initial.py b/passerelle/contrib/strasbourg_eu/migrations/0001_initial.py index dc0735ed..a9dd2050 100644 --- a/passerelle/contrib/strasbourg_eu/migrations/0001_initial.py +++ b/passerelle/contrib/strasbourg_eu/migrations/0001_initial.py @@ -23,7 +23,7 @@ class Migration(migrations.Migration): ('slug', models.SlugField(verbose_name='Identifier', unique=True)), ('log_level', models.CharField(choices=[(b'NOTSET', b'NOTSET'), (b'DEBUG', b'DEBUG'), (b'INFO', b'INFO'), (b'WARNING', b'WARNING'), (b'ERROR', b'ERROR'), (b'CRITICAL', b'CRITICAL')], default=b'INFO', max_length=10, verbose_name='Log Level')), ('liferay_api_url', models.URLField(max_length=256, verbose_name='Liferay API URL')), - ('users', models.ManyToManyField(blank=True, to='base.ApiUser')), + ('users', models.ManyToManyField(blank=True, related_name='_strasbourgeu_users_+', related_query_name='+', to='base.ApiUser')), ], options={ 'verbose_name': 'Strasbourg.eu', diff --git a/passerelle/contrib/stub_invoices/migrations/0001_initial.py b/passerelle/contrib/stub_invoices/migrations/0001_initial.py index e070f39b..0c5de42e 100644 --- a/passerelle/contrib/stub_invoices/migrations/0001_initial.py +++ b/passerelle/contrib/stub_invoices/migrations/0001_initial.py @@ -18,7 +18,7 @@ class Migration(migrations.Migration): ('title', models.CharField(verbose_name='Title', max_length=50)), ('slug', models.SlugField(verbose_name='Identifier', unique=True)), ('description', models.TextField(verbose_name='Description')), - ('users', models.ManyToManyField(to='base.ApiUser', blank=True)), + ('users', models.ManyToManyField(to='base.ApiUser', related_name='_stubinvoicesconnector_users_+', related_query_name='+', blank=True)), ], options={ 'verbose_name': 'Invoices', diff --git a/passerelle/contrib/tcl/migrations/0001_initial.py b/passerelle/contrib/tcl/migrations/0001_initial.py index a8177e12..4ae18575 100644 --- a/passerelle/contrib/tcl/migrations/0001_initial.py +++ b/passerelle/contrib/tcl/migrations/0001_initial.py @@ -51,7 +51,7 @@ class Migration(migrations.Migration): ('slug', models.SlugField(verbose_name='Identifier', unique=True)), ('description', models.TextField(verbose_name='Description')), ('log_level', models.CharField(default=b'INFO', max_length=10, verbose_name='Log Level', choices=[(b'NOTSET', b'NOTSET'), (b'DEBUG', b'DEBUG'), (b'INFO', b'INFO'), (b'WARNING', b'WARNING'), (b'ERROR', b'ERROR'), (b'CRITICAL', b'CRITICAL')])), - ('users', models.ManyToManyField(to='base.ApiUser', blank=True)), + ('users', models.ManyToManyField(to='base.ApiUser', related_name='_line_users_+', related_query_name='+', blank=True)), ], options={ 'verbose_name': 'TCL', diff --git a/passerelle/contrib/teamnet_axel/migrations/0001_initial.py b/passerelle/contrib/teamnet_axel/migrations/0001_initial.py index 0832ac57..b7ac49b7 100644 --- a/passerelle/contrib/teamnet_axel/migrations/0001_initial.py +++ b/passerelle/contrib/teamnet_axel/migrations/0001_initial.py @@ -35,7 +35,7 @@ class Migration(migrations.Migration): ('username', models.CharField(max_length=128, verbose_name='Username', blank=True)), ('password', models.CharField(max_length=128, verbose_name='Password', blank=True)), ('keystore', models.FileField(help_text='Certificate and private key in PEM format', upload_to=b'teamnet_axel', null=True, verbose_name='Keystore', blank=True)), - ('users', models.ManyToManyField(to='base.ApiUser', blank=True)), + ('users', models.ManyToManyField(to='base.ApiUser', related_name='_link_users_+', related_query_name='+', blank=True)), ], options={ 'verbose_name': 'Teamnet Axel', diff --git a/passerelle/contrib/tlmcom/migrations/0001_initial.py b/passerelle/contrib/tlmcom/migrations/0001_initial.py index 0bd5d702..1ac9b20b 100644 --- a/passerelle/contrib/tlmcom/migrations/0001_initial.py +++ b/passerelle/contrib/tlmcom/migrations/0001_initial.py @@ -20,7 +20,7 @@ class Migration(migrations.Migration): ('slug', models.SlugField(verbose_name='Identifier', unique=True)), ('description', models.TextField(verbose_name='Description')), ('welco_url', models.URLField(default=passerelle.pbx.models.get_default_welco_url, max_length=120, verbose_name='welco URL')), - ('users', models.ManyToManyField(to='base.ApiUser', blank=True)), + ('users', models.ManyToManyField(to='base.ApiUser', related_name='_tlmcom_users_+', related_query_name='+', blank=True)), ], options={ 'verbose_name': 'TLM COM gateway', -- 2.20.1