From 6c25fba31e505d3dbbc610384302510f4f3c61cb Mon Sep 17 00:00:00 2001 From: Irwan Fathurrahman Date: Mon, 21 Aug 2023 09:14:43 +0700 Subject: [PATCH] Remove default for georepo url --- .../core/migrations/0002_auto_20220621_0516.py | 2 +- .../0010_alter_sitepreferences_georepo_url.py | 2 +- .../0011_sitepreferences_site_url.py | 2 +- ...sitepreferences_landing_page_banner_text.py | 18 ++++++++++++++++++ django_project/core/models/preferences.py | 5 +++-- .../geosight/georepo/request/request.py | 5 ----- 6 files changed, 24 insertions(+), 10 deletions(-) create mode 100644 django_project/core/migrations/0021_alter_sitepreferences_landing_page_banner_text.py diff --git a/django_project/core/migrations/0002_auto_20220621_0516.py b/django_project/core/migrations/0002_auto_20220621_0516.py index 6a278226d..150dc1b54 100644 --- a/django_project/core/migrations/0002_auto_20220621_0516.py +++ b/django_project/core/migrations/0002_auto_20220621_0516.py @@ -32,7 +32,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='sitepreferences', name='georepo_url', - field=models.CharField(default='https://staging.georepo.kartoza.com/', max_length=512), + field=models.CharField(default='', max_length=512), ), migrations.AlterField( model_name='sitepreferences', diff --git a/django_project/core/migrations/0010_alter_sitepreferences_georepo_url.py b/django_project/core/migrations/0010_alter_sitepreferences_georepo_url.py index 7aeaca5d4..a4760693e 100644 --- a/django_project/core/migrations/0010_alter_sitepreferences_georepo_url.py +++ b/django_project/core/migrations/0010_alter_sitepreferences_georepo_url.py @@ -27,6 +27,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='sitepreferences', name='georepo_url', - field=models.CharField(default='https://georepo.kartoza.com/', max_length=512), + field=models.CharField(default='', max_length=512), ), ] diff --git a/django_project/core/migrations/0011_sitepreferences_site_url.py b/django_project/core/migrations/0011_sitepreferences_site_url.py index b51210944..a7d826842 100644 --- a/django_project/core/migrations/0011_sitepreferences_site_url.py +++ b/django_project/core/migrations/0011_sitepreferences_site_url.py @@ -27,6 +27,6 @@ class Migration(migrations.Migration): migrations.AddField( model_name='sitepreferences', name='site_url', - field=models.CharField(default='https://geosight.kartoza.com', max_length=512), + field=models.CharField(default='', max_length=512), ), ] diff --git a/django_project/core/migrations/0021_alter_sitepreferences_landing_page_banner_text.py b/django_project/core/migrations/0021_alter_sitepreferences_landing_page_banner_text.py new file mode 100644 index 000000000..9d9a86e31 --- /dev/null +++ b/django_project/core/migrations/0021_alter_sitepreferences_landing_page_banner_text.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.16 on 2023-08-21 02:03 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0020_sitepreferences_georepo_azure_authentication_url'), + ] + + operations = [ + migrations.AlterField( + model_name='sitepreferences', + name='landing_page_banner_text', + field=models.TextField(blank=True, default='', null=True), + ), + ] diff --git a/django_project/core/models/preferences.py b/django_project/core/models/preferences.py index fbd525256..faff723d1 100644 --- a/django_project/core/models/preferences.py +++ b/django_project/core/models/preferences.py @@ -41,7 +41,7 @@ class SitePreferences(SingletonModel): site_url = models.CharField( max_length=512, - default='https://geosight.kartoza.com' + default='' ) disclaimer = models.TextField( @@ -64,7 +64,7 @@ class SitePreferences(SingletonModel): # ----------------------------------------------- georepo_url = models.CharField( max_length=512, - default='https://georepo.kartoza.com/' + default='' ) georepo_api_key_level_1 = models.CharField( max_length=512, @@ -86,6 +86,7 @@ class SitePreferences(SingletonModel): upload_to='settings/images' ) landing_page_banner_text = models.TextField( + null=True, blank=True, default='' ) diff --git a/django_project/geosight/georepo/request/request.py b/django_project/geosight/georepo/request/request.py index 822e574d5..1e4284dbc 100644 --- a/django_project/geosight/georepo/request/request.py +++ b/django_project/geosight/georepo/request/request.py @@ -71,9 +71,6 @@ class GeorepoUrl: def __init__(self, api_key: str = None): """Init Class.""" pref = SitePreferences.preferences() - if not pref.georepo_url: - raise GeorepoUrlDoesNotExist() - self.georepo_url = pref.georepo_url.strip('/') parsed = urlparse(self.georepo_url) self.georepo_domain = parsed.scheme + '://' + parsed.netloc @@ -173,8 +170,6 @@ class GeorepoRequest: def __init__(self): """Init Class.""" pref = SitePreferences.preferences() - if not pref.georepo_url: - raise GeorepoUrlDoesNotExist() self.urls = GeorepoUrl( api_key=pref.georepo_api_key_level_4 )