From 16815d0b3215b303f98d55576a7b75fdb35238be Mon Sep 17 00:00:00 2001 From: BrainIsDead Date: Wed, 5 Jun 2024 13:13:50 +0300 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=9B=A0=EF=B8=8F=20src/datasources/adm?= =?UTF-8?q?in.py=20->=20Removed=20unused=20tuple=20=F0=9F=9F=A2=20src/data?= =?UTF-8?q?sources/migrations/0005=5Fsourcesubdivision=5Fexternal=5Fname.p?= =?UTF-8?q?y=20=F0=9F=9B=A0=EF=B8=8F=20src/datasources/models.py=20->=20Ad?= =?UTF-8?q?ded=20external=5Fname=20field=20=F0=9F=9B=A0=EF=B8=8F=20src/dat?= =?UTF-8?q?asources/resources.py=20->=20Added=20external=5Fname=20field?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/datasources/admin.py | 3 --- .../0005_sourcesubdivision_external_name.py | 18 ++++++++++++++++++ src/datasources/models.py | 5 +++++ src/datasources/resources.py | 1 + 4 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 src/datasources/migrations/0005_sourcesubdivision_external_name.py diff --git a/src/datasources/admin.py b/src/datasources/admin.py index 4874cd7..645c876 100644 --- a/src/datasources/admin.py +++ b/src/datasources/admin.py @@ -17,9 +17,6 @@ class SourceSubdivisionAdmin(ImportExportModelAdmin): resource_classes: list[type[SourceSubdivisionResource]] = [SourceSubdivisionResource] -data_source_search_fields_type = tuple[Literal['name'], Literal['source_subdivision__db_source'], Literal['source_subdivision__name'], Literal['description']] - - @admin.register(DataSource) class DataSourceAdmin(ImportExportModelAdmin): """ diff --git a/src/datasources/migrations/0005_sourcesubdivision_external_name.py b/src/datasources/migrations/0005_sourcesubdivision_external_name.py new file mode 100644 index 0000000..5c7bc4a --- /dev/null +++ b/src/datasources/migrations/0005_sourcesubdivision_external_name.py @@ -0,0 +1,18 @@ +# Generated by Django 5.0.3 on 2024-06-05 10:09 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('datasources', '0004_alter_datasource_options_and_more'), + ] + + operations = [ + migrations.AddField( + model_name='sourcesubdivision', + name='external_name', + field=models.CharField(help_text='External Name', max_length=128, null=True), + ), + ] diff --git a/src/datasources/models.py b/src/datasources/models.py index 179ee83..72a6d4b 100644 --- a/src/datasources/models.py +++ b/src/datasources/models.py @@ -17,6 +17,11 @@ class SourceSubdivision(TimeStampedModel): max_length=128, unique=True ) + external_name: models.CharField = models.CharField( + help_text=_('External Name'), + max_length=128, + null=True, + ) description: models.TextField = models.TextField( help_text=_('Source description'), max_length=1000, diff --git a/src/datasources/resources.py b/src/datasources/resources.py index b2bc3b1..b1d3e45 100644 --- a/src/datasources/resources.py +++ b/src/datasources/resources.py @@ -12,6 +12,7 @@ class SourceSubdivisionResource(resources.ModelResource): name = Field(attribute='name', column_name='Source Subdivision') display_name = Field(attribute='display_name', column_name='Source Subdivision') + external_name = Field(attribute='external_name', column_name='External Name') description = Field(attribute='description', column_name='Description') db_source = Field(attribute='db_source', column_name='DB Source') data_source = Field( From cd5118d0292b83c745ca856661910cf129549370 Mon Sep 17 00:00:00 2001 From: BrainIsDead Date: Wed, 5 Jun 2024 13:17:57 +0300 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=9B=A0=EF=B8=8F=20src/templates/signa?= =?UTF-8?q?ls/signals.html=20->=20Updated=20data=20source=20display?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/templates/signals/signals.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/templates/signals/signals.html b/src/templates/signals/signals.html index 3e5303c..f35c032 100644 --- a/src/templates/signals/signals.html +++ b/src/templates/signals/signals.html @@ -316,7 +316,7 @@

{% endif %} - {{ signal.source.data_source }} + {{ signal.source.external_name }} {{ signal.description}}