From 42540ef48b80835df105ffa3397ce2791ea2b25b Mon Sep 17 00:00:00 2001 From: Jochen Klar Date: Sat, 10 Feb 2024 15:23:37 +0100 Subject: [PATCH 1/5] Fix migration --- rdmo/options/migrations/0032_alter_option_additional_input.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rdmo/options/migrations/0032_alter_option_additional_input.py b/rdmo/options/migrations/0032_alter_option_additional_input.py index 26a1685c6a..520bf6d1cd 100644 --- a/rdmo/options/migrations/0032_alter_option_additional_input.py +++ b/rdmo/options/migrations/0032_alter_option_additional_input.py @@ -7,7 +7,7 @@ def run_data_migration(apps, schema_editor): Option = apps.get_model('options', 'Option') for option in Option.objects.all(): - option.additional_input = 'text' if option.additional_input == 'True' else '' + option.additional_input = 'text' if option.additional_input == 'true' else '' option.save() From 289e7770a4cfae5f828f47f4ae88831714227e90 Mon Sep 17 00:00:00 2001 From: Jochen Klar Date: Tue, 13 Feb 2024 10:52:13 +0100 Subject: [PATCH 2/5] Fix migration, again --- .../0032_alter_option_additional_input.py | 17 +++++++++++++---- rdmo/options/models.py | 2 +- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/rdmo/options/migrations/0032_alter_option_additional_input.py b/rdmo/options/migrations/0032_alter_option_additional_input.py index 520bf6d1cd..1744d953b9 100644 --- a/rdmo/options/migrations/0032_alter_option_additional_input.py +++ b/rdmo/options/migrations/0032_alter_option_additional_input.py @@ -7,7 +7,7 @@ def run_data_migration(apps, schema_editor): Option = apps.get_model('options', 'Option') for option in Option.objects.all(): - option.additional_input = 'text' if option.additional_input == 'true' else '' + option.additional_input_string = 'text' if option.additional_input is True else '' option.save() @@ -18,10 +18,19 @@ class Migration(migrations.Migration): ] operations = [ - migrations.AlterField( + migrations.AddField( model_name='option', - name='additional_input', - field=models.CharField(blank=True, choices=[('', '---------'), ('text', 'Text'), ('textarea', 'Textarea')], default=False, help_text='Designates whether an additional input is possible for this option.', max_length=256, verbose_name='Additional input'), + name='additional_input_string', + field=models.CharField(blank=True, choices=[('', '---------'), ('text', 'Text'), ('textarea', 'Textarea')], default='', help_text='Designates whether an additional input is possible for this option.', max_length=256, verbose_name='Additional input'), ), migrations.RunPython(run_data_migration), + migrations.RemoveField( + model_name='option', + name='additional_input', + ), + migrations.RenameField( + model_name='option', + old_name='additional_input_string', + new_name='additional_input', + ), ] diff --git a/rdmo/options/models.py b/rdmo/options/models.py index 286d0d0d8c..5933291122 100644 --- a/rdmo/options/models.py +++ b/rdmo/options/models.py @@ -262,7 +262,7 @@ class Option(models.Model, TranslationMixin): help_text=_('The view text for this option (in the quinary language).') ) additional_input = models.CharField( - max_length=256, blank=True, default=False, choices=ADDITIONAL_INPUT_CHOICES, + max_length=256, blank=True, default=ADDITIONAL_INPUT_NONE, choices=ADDITIONAL_INPUT_CHOICES, verbose_name=_('Additional input'), help_text=_('Designates whether an additional input is possible for this option.') ) From a9de0b10fda44e799494432f14936d4820a57af7 Mon Sep 17 00:00:00 2001 From: David Wallace Date: Tue, 13 Feb 2024 11:25:14 +0100 Subject: [PATCH 3/5] fix boolean True condition in data migration Signed-off-by: David Wallace --- rdmo/options/migrations/0032_alter_option_additional_input.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rdmo/options/migrations/0032_alter_option_additional_input.py b/rdmo/options/migrations/0032_alter_option_additional_input.py index 1744d953b9..a0269afb05 100644 --- a/rdmo/options/migrations/0032_alter_option_additional_input.py +++ b/rdmo/options/migrations/0032_alter_option_additional_input.py @@ -7,7 +7,7 @@ def run_data_migration(apps, schema_editor): Option = apps.get_model('options', 'Option') for option in Option.objects.all(): - option.additional_input_string = 'text' if option.additional_input is True else '' + option.additional_input_string = 'text' if option.additional_input else '' option.save() From b8d5db279c770da1cde07cb94c836a2f6d6c484c Mon Sep 17 00:00:00 2001 From: Jochen Klar Date: Tue, 13 Feb 2024 12:26:34 +0100 Subject: [PATCH 4/5] Add baseUrl to management export urls (#915) --- .../assets/js/components/sidebar/ElementsSidebar.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/rdmo/management/assets/js/components/sidebar/ElementsSidebar.js b/rdmo/management/assets/js/components/sidebar/ElementsSidebar.js index 16780f7e8e..337aa8600b 100644 --- a/rdmo/management/assets/js/components/sidebar/ElementsSidebar.js +++ b/rdmo/management/assets/js/components/sidebar/ElementsSidebar.js @@ -3,6 +3,8 @@ import PropTypes from 'prop-types' import isNil from 'lodash/isNil' import invert from 'lodash/invert' +import baseUrl from 'rdmo/core/assets/js/utils/baseUrl' + import { elementTypes, elementModules } from '../../constants/elements' import { buildPath } from '../../utils/location' @@ -16,8 +18,8 @@ const ElementsSidebar = ({ config, elements, elementActions, importActions }) => const { elementType, elementId } = elements const model = invert(elementTypes)[elementType] - const exportUrl = isNil(elementId) ? `/api/v1/${elementModules[model]}/${elementType}/export/` - : `/api/v1/${elementModules[model]}/${elementType}/${elementId}/export/` + const exportUrl = isNil(elementId) ? `${baseUrl}/api/v1/${elementModules[model]}/${elementType}/export/` + : `${baseUrl}/api/v1/${elementModules[model]}/${elementType}/${elementId}/export/` const exportParams = getExportParams(config.filter[elementType]) return ( @@ -27,7 +29,7 @@ const ElementsSidebar = ({ config, elements, elementActions, importActions }) =>
  • elementActions.fetchElements('catalogs')}>{gettext('Catalogs')} + onClick={() => elementActions.fetchElements('catalogs')}>{gettext('Catalogs1')}
  • Date: Tue, 13 Feb 2024 15:57:45 +0100 Subject: [PATCH 5/5] Update CHANGELOG.md --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 853f9baf1e..da9802b461 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## [RDMO 2.1.3](https://github.com/rdmorganiser/rdmo/compare/2.1.2...2.1.3) (Feb 13, 2024) + +* Fix the migration of options with additional_input (#912) +* Fix export urls in management when using BASE_PATH (#915) + ## [RDMO 2.1.2](https://github.com/rdmorganiser/rdmo/compare/2.1.1...2.1.2) (Jan 15, 2024) * Fix a bug with webpack font paths