Merge pull request #913 from rdmorganiser/dev-2.1.3

RDMO 2.1.3
rdmorganiser · Feb 13, 2024 · be51933 · be51933
2 parents 14f94ed + b3a9592
commit be51933
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 8 deletions.
diff --git 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

diff --git 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 }) =>
       <ul className="list-unstyled">
         <li>
           <Link href={buildPath(config.baseUrl, 'catalogs')}
-                onClick={() => elementActions.fetchElements('catalogs')}>{gettext('Catalogs')}</Link>
+                onClick={() => elementActions.fetchElements('catalogs')}>{gettext('Catalogs1')}</Link>
         </li>
         <li>
           <Link href={buildPath(config.baseUrl, 'sections')}

diff --git 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 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
@@ -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.')
     )