From c1412acc231d589ae7f9e2e1c7a36b3d7a2d1105 Mon Sep 17 00:00:00 2001
From: Jochen Klar <mail@jochenklar.de>
Date: Mon, 30 Mar 2026 16:46:09 +0200
Subject: [PATCH 1/8] Fix fix filter_for_project in Plugin manager

---
 rdmo/config/managers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rdmo/config/managers.py b/rdmo/config/managers.py
index eace2fc080..931321051f 100644
--- a/rdmo/config/managers.py
+++ b/rdmo/config/managers.py
@@ -20,7 +20,7 @@ def filter_for_project(self, project):
         return (
             self
                 .filter_for_site(project.site)
-                .filter(catalogs=project.catalog)
+                .filter(models.Q(catalogs=None) | models.Q(catalogs=project.catalog))
                 .filter(models.Q(groups=None) | models.Q(groups__in=project.groups))
                 .filter(available=True)
         )

From d8c7550848d88a8d7a725cdd6572b14b2636af5c Mon Sep 17 00:00:00 2001
From: Jochen Klar <mail@jochenklar.de>
Date: Mon, 30 Mar 2026 16:50:00 +0200
Subject: [PATCH 2/8] Add export/import plugins to project view

---
 .../projects/static/projects/css/project.scss |  5 ++
 .../projects/project_detail_sidebar.html      | 28 ++++---
 .../projects/project_detail_snapshots.html    | 10 +--
 rdmo/projects/urls/__init__.py                |  8 +-
 rdmo/projects/views/project.py                | 82 ++++++++++++++-----
 rdmo/projects/views/snapshot.py               | 33 ++++----
 6 files changed, 110 insertions(+), 56 deletions(-)

diff --git a/rdmo/projects/static/projects/css/project.scss b/rdmo/projects/static/projects/css/project.scss
index 1fda0c6b55..21d48021b2 100644
--- a/rdmo/projects/static/projects/css/project.scss
+++ b/rdmo/projects/static/projects/css/project.scss
@@ -22,3 +22,8 @@
         width: 11px;
     }
 }
+
+.snapshot-export-button {
+    padding: 0;
+    border: none;
+}
diff --git a/rdmo/projects/templates/projects/project_detail_sidebar.html b/rdmo/projects/templates/projects/project_detail_sidebar.html
index fc51cee15a..6d563115ab 100644
--- a/rdmo/projects/templates/projects/project_detail_sidebar.html
+++ b/rdmo/projects/templates/projects/project_detail_sidebar.html
@@ -123,14 +123,14 @@ <h2>{% trans 'Options' %}</h2>
 </ul>
 
 {% has_perm 'projects.export_project_object' request.user project as can_export_project %}
-{% if settings.PROJECT_EXPORTS and can_export_project %}
+{% if exports and can_export_project %}
 <h2 id="export-project">{% trans 'Export' %}</h2>
 
 <ul class="list-unstyled">
-    {% for key, label, class in settings.PROJECT_EXPORTS %}
+    {% for url_name, title in exports %}
     <li>
-        <a href="{% url 'project_export' project.pk key %}" target="_blank">
-            {{ label }}
+        <a href="{% url 'project_export' project.pk url_name %}" target="_blank">
+            {{ title }}
         </a>
     </li>
     {% endfor %}
@@ -138,10 +138,12 @@ <h2 id="export-project">{% trans 'Export' %}</h2>
 {% endif %}
 
 {% has_perm 'projects.import_project_object' request.user project as can_import_project %}
-{% if settings.PROJECT_IMPORTS and can_import_project %}
+{% if can_import_project %}
+{% if upload_import or ancestors_import or imports %}
 <h2 id="import-project">{% trans 'Import values' %}</h2>
 
 <ul class="list-unstyled">
+    {% if upload_import %}
     <li>
         <p>
             <strong>{% trans 'Import from file' %}</strong>
@@ -149,7 +151,9 @@ <h2 id="import-project">{% trans 'Import values' %}</h2>
         {% url 'project_update_import' project.id as upload_url %}
         {% include 'core/upload_form.html' with upload_url=upload_url label=True %}
     </li>
-    {% if settings.NESTED_PROJECTS and ancestors_import %}
+    {% endif %}
+
+    {% if ancestors_import %}
     <li>
         <p>
             <strong>{% trans 'Import from parent project' %}</strong>
@@ -157,21 +161,21 @@ <h2 id="import-project">{% trans 'Import values' %}</h2>
         {% include 'projects/project_detail_sidebar_parent_import.html' %}
     </li>
     {% endif %}
-    {% if settings.PROJECT_IMPORTS_LIST %}
+
+    {% if url_import %}
     <li>
         <p>
             <strong>{% trans 'Import directly' %}</strong>
         </p>
     </li>
-    {% for key, label, class in settings.PROJECT_IMPORTS %}
-    {% if key in settings.PROJECT_IMPORTS_LIST %}
+    {% for url_name, title in url_import %}
     <li>
-        <a href="{% url 'project_update_import' project.id key %}" target="_blank">
-            {{ label }}
+        <a href="{% url 'project_update_import' project.id url_name %}" target="_blank">
+            {{ title }}
         </a>
     </li>
-    {% endif %}
     {% endfor %}
     {% endif %}
 </ul>
 {% endif %}
+{% endif %}
diff --git a/rdmo/projects/templates/projects/project_detail_snapshots.html b/rdmo/projects/templates/projects/project_detail_snapshots.html
index c825276b97..e91dc45d05 100644
--- a/rdmo/projects/templates/projects/project_detail_snapshots.html
+++ b/rdmo/projects/templates/projects/project_detail_snapshots.html
@@ -56,17 +56,17 @@ <h2>{% trans 'Snapshots' %}</h2>
                         {% endif %}
 
                         {% has_perm 'projects.export_project_object' request.user project as can_export_project %}
-                        {% if settings.PROJECT_SNAPSHOT_EXPORTS and can_export_project %}
+                        {% if snapshot_exports and can_export_project %}
                         <span class="dropdown">
-                            <button type="submit" class="btn-link fa fa-download"
+                            <button type="submit" class="btn-link fa fa-download snapshot-export-button"
                                     title="{% trans 'Export snapshot' %}" aria-label="{% trans 'Export snapshot' %}"
                                     data-toggle="dropdown"></button>
 
                             <ul class="dropdown-menu">
-                                {% for key, label, class in settings.PROJECT_SNAPSHOT_EXPORTS %}
+                                {% for url_name, title in snapshot_exports %}
                                 <li>
-                                    <a href="{% url 'snapshot_export' project.id snapshot.id key %}" target="_blank">
-                                        {{ label }}
+                                    <a href="{% url 'snapshot_export' project.id snapshot.id url_name %}" target="_blank">
+                                        {{ title }}
                                     </a>
                                 </li>
                                 {% endfor %}
diff --git a/rdmo/projects/urls/__init__.py b/rdmo/projects/urls/__init__.py
index 4c11792617..2b7e6c9d1b 100644
--- a/rdmo/projects/urls/__init__.py
+++ b/rdmo/projects/urls/__init__.py
@@ -53,7 +53,7 @@
             ProjectCancelView.as_view(), name='project_cancel'),
     re_path(r'^import/$',
             ProjectCreateImportView.as_view(), name='project_create_import'),
-    re_path(r'^import/(?P<format>[a-z-]+)/$',
+    re_path(r'^import/(?P<url_name>[a-z-]+)/$',
             ProjectCreateImportView.as_view(), name='project_create_import'),
 
     re_path(r'^(?P<pk>[0-9]+)/$',
@@ -78,11 +78,11 @@
             ProjectDeleteView.as_view(), name='project_delete'),
     re_path(r'^(?P<pk>[0-9]+)/leave/$',
             ProjectLeaveView.as_view(), name='project_leave'),
-    re_path(r'^(?P<pk>[0-9]+)/export/(?P<format>[a-z-]+)/$',
+    re_path(r'^(?P<pk>[0-9]+)/export/(?P<url_name>[a-z-]+)/$',
             ProjectExportView.as_view(), name='project_export'),
     re_path(r'^(?P<pk>[0-9]+)/import/$',
             ProjectUpdateImportView.as_view(), name='project_update_import'),
-    re_path(r'^(?P<pk>[0-9]+)/import/(?P<format>[a-z-]+)/$',
+    re_path(r'^(?P<pk>[0-9]+)/import/(?P<url_name>[a-z-]+)/$',
             ProjectUpdateImportView.as_view(), name='project_update_import'),
 
     re_path(r'^(?P<project_id>[0-9]+)/memberships/create/$',
@@ -116,7 +116,7 @@
             SnapshotUpdateView.as_view(), name='snapshot_update'),
     re_path(r'^(?P<project_id>[0-9]+)/snapshots/(?P<pk>[0-9]+)/rollback/$',
             SnapshotRollbackView.as_view(), name='snapshot_rollback'),
-    re_path(r'^(?P<project_id>[0-9]+)/snapshots/(?P<pk>[0-9]+)/export/(?P<format>[a-z-]+)/$',
+    re_path(r'^(?P<project_id>[0-9]+)/snapshots/(?P<pk>[0-9]+)/export/(?P<url_name>[a-z-]+)/$',
             SnapshotExportView.as_view(), name='snapshot_export'),
 
     re_path(r'^(?P<pk>[0-9]+)/answers/$',
diff --git a/rdmo/projects/views/project.py b/rdmo/projects/views/project.py
index 902483eb13..384aa3cb59 100644
--- a/rdmo/projects/views/project.py
+++ b/rdmo/projects/views/project.py
@@ -79,11 +79,13 @@ def get_context_data(self, **kwargs):
                 filter_tasks_or_views_for_project(View, project).filter_availability(self.request.user).exists()
             )
 
-        ancestors_import = []
-        for instance in ancestors.exclude(id=project.id):
-            if self.request.user.has_perm('projects.view_project_object', instance):
-                ancestors_import.append(instance)
-        context['ancestors_import'] = ancestors_import
+        if settings.NESTED_PROJECTS:
+            ancestors_import = []
+            for instance in ancestors.exclude(id=project.id):
+                if self.request.user.has_perm('projects.view_project_object', instance):
+                    ancestors_import.append(instance)
+            context['ancestors_import'] = ancestors_import
+
         context['memberships'] = memberships.order_by('user__last_name', '-project__level')
         context['integrations'] = integrations.order_by('provider_key', '-project__level')
         context['providers'] = {}
@@ -91,9 +93,8 @@ def get_context_data(self, **kwargs):
             plugin_type=PLUGIN_TYPES.PROJECT_ISSUE_PROVIDER,
             project=project,
             user=self.request.user
-        ):
-            if plugin.url_name:
-                context['providers'][plugin.url_name] = plugin.initialize_class()
+        ).exclude(url_name=""):
+            context['providers'][plugin.url_name] = plugin.initialize_class()
 
         context['issues'] = [
             issue for issue in project.issues.order_by('-status', 'task__order', 'task__uri') if issue.resolve(values)
@@ -103,11 +104,43 @@ def get_context_data(self, **kwargs):
         context['invites'] = project.invites.all()
         context['membership'] = Membership.objects.filter(project=project, user=self.request.user).first()
         upload_plugins = Plugin.objects.for_context(
-            plugin_type=PLUGIN_TYPES.PROJECT_IMPORT, project=project,user=self.request.user
+            plugin_type=PLUGIN_TYPES.PROJECT_IMPORT,
+            project=project,
+            user=self.request.user,
         )
         context['upload_accept'] = ','.join([
             suffix for suffixes in get_upload_accept(upload_plugins).values() for suffix in suffixes
         ])
+
+        context['exports'] = [
+            (plugin.url_name, plugin.title)
+            for plugin in Plugin.objects.for_context(
+                plugin_type=PLUGIN_TYPES.PROJECT_EXPORT,
+                project=project,
+                user=self.request.user,
+            ).exclude(url_name="")
+        ]
+
+        context['snapshot_exports'] = [
+            (plugin.url_name, plugin.title)
+            for plugin in Plugin.objects.for_context(
+                plugin_type=PLUGIN_TYPES.PROJECT_SNAPSHOT_EXPORT,
+                project=project,
+                user=self.request.user,
+            ).exclude(url_name="")
+        ]
+
+        import_plugins = Plugin.objects.for_context(
+            plugin_type=PLUGIN_TYPES.PROJECT_IMPORT,
+            project=project,
+            user=self.request.user,
+        )
+        context['upload_import'] = import_plugins.filter(plugin_meta__upload=True).exists()
+        context['url_import'] = [
+            (plugin.url_name, plugin.title)
+            for plugin in import_plugins.exclude(plugin_meta__upload=True)
+        ]
+
         return context
 
 
@@ -186,19 +219,26 @@ class ProjectExportView(ObjectPermissionMixin, DetailView):
     queryset = Project.objects.all()
     permission_required = 'projects.export_project_object'
 
+    def get_plugin_by_url_name(self, url_name, project=None):
+        for plugin in Plugin.objects.for_context(
+            plugin_type=PLUGIN_TYPES.PROJECT_EXPORT,
+            project=project,
+            user=self.request.user,
+        ):
+            if plugin.url_name == url_name:
+                return plugin
+
     def get_export_plugin(self):
-        export_plugin_instance = Plugin.objects.for_context(
-            project=self.object, plugin_type=PLUGIN_TYPES.PROJECT_EXPORT,
-            user=self.request.user, format=self.kwargs.get('format')
-        ).first()
-        if export_plugin_instance is None:
-            raise Http404
-
-        export_plugin = export_plugin_instance.initialize_class()
-        export_plugin.request = self.request
-        export_plugin.project = self.object
-
-        return export_plugin
+        plugin = self.get_plugin_by_url_name(self.kwargs.get('url_name'), self.object)
+        if plugin:
+            import_plugin = plugin.initialize_class()
+            import_plugin.request = self.request
+            import_plugin.project = self.object
+
+            return import_plugin
+
+        # no plugin for this url_name found
+        raise Http404
 
     def get(self, request, *args, **kwargs):
         self.object = self.get_object()
diff --git a/rdmo/projects/views/snapshot.py b/rdmo/projects/views/snapshot.py
index 5b0793ce00..a76d3388f3 100644
--- a/rdmo/projects/views/snapshot.py
+++ b/rdmo/projects/views/snapshot.py
@@ -78,21 +78,26 @@ def get_queryset(self):
     def get_permission_object(self):
         return self.get_object().project
 
+    def get_plugin_by_url_name(self, url_name, project=None):
+        for plugin in Plugin.objects.for_context(
+            plugin_type=PLUGIN_TYPES.PROJECT_SNAPSHOT_EXPORT,
+            project=project,
+            user=self.request.user,
+        ):
+            if plugin.url_name == url_name:
+                return plugin
+
     def get_export_plugin(self):
-        export_plugins = Plugin.objects.for_context(
-            project=self.get_object().project,
-            plugin_type=PLUGIN_TYPES.PROJECT_EXPORT,
-            user=self.request.user, format=self.kwargs.get('format')
-        )
-        if not export_plugins.exists():
-            raise Http404
-        export_plugin_instance = export_plugins.first()
-
-        export_plugin = export_plugin_instance.initialize_class()
-        export_plugin.request = self.request
-        export_plugin.snapshot = self.object
-
-        return export_plugin
+        plugin = self.get_plugin_by_url_name(self.kwargs.get('url_name'), self.object.project)
+        if plugin:
+            import_plugin = plugin.initialize_class()
+            import_plugin.request = self.request
+            import_plugin.snapshot = self.object
+
+            return import_plugin
+
+        # no plugin for this url_name found
+        raise Http404
 
     def get(self, request, *args, **kwargs):
         self.object = self.get_object()

From a8df96c50118dbc615bbbe769bd0694df9fa99e9 Mon Sep 17 00:00:00 2001
From: Jochen Klar <mail@jochenklar.de>
Date: Mon, 30 Mar 2026 16:51:47 +0200
Subject: [PATCH 3/8] Add RDMOSnapshotXMLExport to default export plugins

---
 rdmo/core/settings.py    |  1 +
 rdmo/projects/exports.py | 24 ++++++++++++++++++------
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/rdmo/core/settings.py b/rdmo/core/settings.py
index 0cfec237d2..7d9e9a1fa7 100644
--- a/rdmo/core/settings.py
+++ b/rdmo/core/settings.py
@@ -330,6 +330,7 @@
 
 PLUGINS = [  # introduced in 2.5
     'rdmo.projects.exports.RDMOXMLExport',
+    'rdmo.projects.exports.RDMOSnapshotXMLExport',
     'rdmo.projects.imports.RDMOXMLImport',
 ]
 
diff --git a/rdmo/projects/exports.py b/rdmo/projects/exports.py
index 9c3c374484..23237fcd14 100644
--- a/rdmo/projects/exports.py
+++ b/rdmo/projects/exports.py
@@ -156,13 +156,25 @@ def render(self):
 class RDMOXMLExport(Export):
 
     def render(self):
-        if self.project:
-            content_disposition = f'attachment; filename="{self.project.title}.xml"'
-            serializer = ProjectExportSerializer(self.project)
+        content_disposition = f'attachment; filename="{self.project.title}.xml"'
+        serializer = ProjectExportSerializer(self.project)
 
-        else:
-            content_disposition = f'attachment; filename="{self.snapshot.title}.xml"'
-            serializer = SnapshotExportSerializer(self.snapshot)
+        xmldata = XMLRenderer().render(serializer.data)
+        response = HttpResponse(prettify_xml(xmldata), content_type="application/xml")
+
+        if settings.EXPORT_CONTENT_DISPOSITION == 'attachment':
+            response['Content-Disposition'] = content_disposition
+
+        return response
+
+
+class RDMOSnapshotXMLExport(Export):
+
+    plugin_type = 'project_snapshot_export'
+
+    def render(self):
+        content_disposition = f'attachment; filename="{self.snapshot.title}.xml"'
+        serializer = SnapshotExportSerializer(self.snapshot)
 
         xmldata = XMLRenderer().render(serializer.data)
         response = HttpResponse(prettify_xml(xmldata), content_type="application/xml")

From 4f4ec99448583a1478a37616d6b7cf6fb12cb44e Mon Sep 17 00:00:00 2001
From: Jochen Klar <mail@jochenklar.de>
Date: Mon, 30 Mar 2026 16:55:17 +0200
Subject: [PATCH 4/8] Refactor project import mixins

---
 .../components/helper/ProjectImport.js        |   4 +-
 rdmo/projects/mixins.py                       | 125 +++++++++++-------
 rdmo/projects/serializers/v1/__init__.py      |   8 +-
 rdmo/projects/views/project_create.py         |   6 +-
 rdmo/projects/views/project_update.py         |   6 +-
 5 files changed, 84 insertions(+), 65 deletions(-)

diff --git a/rdmo/projects/assets/js/projects/components/helper/ProjectImport.js b/rdmo/projects/assets/js/projects/components/helper/ProjectImport.js
index fccf9b4139..9fbc29c278 100644
--- a/rdmo/projects/assets/js/projects/components/helper/ProjectImport.js
+++ b/rdmo/projects/assets/js/projects/components/helper/ProjectImport.js
@@ -11,9 +11,9 @@ const ProjectImport = ({ allowedTypes, handleImport, importUrls}) => {
         <label className="control-label">{gettext('Import directly')}</label>
         <ul className='list-unstyled mb-0'>
         {importUrls.map((url) => (
-          <li key={url.key}>
+          <li key={url.url_name}>
             <a href={url.href} target='_blank' rel='noopener noreferrer'>
-              {url.label}
+              {url.title}
             </a>
           </li>
         ))}
diff --git a/rdmo/projects/mixins.py b/rdmo/projects/mixins.py
index 530f742b4c..80ddac4612 100644
--- a/rdmo/projects/mixins.py
+++ b/rdmo/projects/mixins.py
@@ -63,22 +63,38 @@ def update_values(self, current_project, catalog, values, snapshots=None):
                                                   .get(value.set_index, {}) \
                                                   .get(value.collection_index)
 
-    def get_import_plugin(self, key, current_project=None):
-        plugins = Plugin.objects.for_context(
+    def get_plugin_by_url_name(self, url_name, project=None):
+        for plugin in Plugin.objects.for_context(
             plugin_type=PLUGIN_TYPES.PROJECT_IMPORT,
-            project=current_project,
+            project=project,
             user=self.request.user,
-            format=key
-        )
-        plugin = next((i for i in plugins if i.url_name == key), None)
-        if plugin is None:
-            raise Http404
+        ):
+            if plugin.url_name == url_name:
+                return plugin
 
-        import_plugin = plugin.initialize_class()
-        import_plugin.request = self.request
-        import_plugin.current_project = current_project
+    def get_plugin_by_suffix(self, suffix, project=None):
+        for plugin in Plugin.objects.for_context(
+            plugin_type=PLUGIN_TYPES.PROJECT_IMPORT,
+            project=project,
+            user=self.request.user,
+        ):
+            accept = plugin.plugin_meta.get('accept')
+            if isinstance(accept, dict):
+                for _mime_type, suffixes in accept.items():
+                    if suffix in suffixes:
+                        return plugin
+
+    def get_import_plugin(self):
+        plugin = self.get_plugin_by_url_name(self.kwargs.get('url_name'), self.object)
+        if plugin:
+            import_plugin = plugin.initialize_class()
+            import_plugin.request = self.request
+            import_plugin.current_project = self.object
+
+            return import_plugin
 
-        return import_plugin
+        # no plugin for this url_name found
+        raise Http404
 
     def upload_file(self):
         try:
@@ -106,47 +122,46 @@ def import_form(self):
                 'errors': [_('There has been an error with your import. No uploaded or retrieved file could be found.')]
             }, status=400)
 
-        for plugin in Plugin.objects.for_context(
-                plugin_type=PLUGIN_TYPES.PROJECT_IMPORT, project=current_project,
-                user=self.request.user, format=Path(import_file_name).suffix.lstrip('.')
-            ):
-            import_plugin = plugin.initialize_class()
-            import_plugin.current_project = current_project
-            import_plugin.file_name = import_file_name
-            import_plugin.source_title = import_source_title
-            import_plugin.request = self.request
+        suffix = Path(import_file_name).suffix
+        plugin = self.get_plugin_by_suffix(suffix, current_project)
+        if plugin is None:
+            return render(self.request, 'core/error.html', {
+                'title': _('Import error'),
+                'errors': [_('Files of this type cannot be imported.')]
+            }, status=400)
 
-            if import_plugin.check():
-                try:
-                    import_plugin.process()
-                except ValidationError as e:
-                    return render(self.request, 'core/error.html', {
-                        'title': _('Import error'),
-                        'errors': e
-                    }, status=400)
+        import_plugin = plugin.initialize_class()
+        import_plugin.request = self.request
+        import_plugin.current_project = current_project
+        import_plugin.file_name = import_file_name
+        import_plugin.source_title = import_source_title
 
-                # store information in session for ProjectCreateImportView
-                self.request.session['import_key'] = plugin.url_name
+        if import_plugin.check():
+            try:
+                import_plugin.process()
+            except ValidationError as e:
+                return render(self.request, 'core/error.html', {
+                    'title': _('Import error'),
+                    'errors': e
+                }, status=400)
 
-                # attach questions and current values
-                self.update_values(current_project, import_plugin.catalog,
-                                   import_plugin.values, import_plugin.snapshots)
+            # store information in session for ProjectCreateImportView
+            self.request.session['import_plugin_id'] = plugin.id
 
-                return render(self.request, 'projects/project_import.html', {
-                    'method': 'import_file',
-                    'current_project': current_project,
-                    'source_title': import_plugin.source_title,
-                    'source_project': import_plugin.project,
-                    'values': import_plugin.values,
-                    'snapshots': import_plugin.snapshots if not current_project else None,
-                    'tasks': import_plugin.tasks,
-                    'views': import_plugin.views
-                })
+            # attach questions and current values
+            self.update_values(current_project, import_plugin.catalog,
+                               import_plugin.values, import_plugin.snapshots)
 
-        return render(self.request, 'core/error.html', {
-            'title': _('Import error'),
-            'errors': [_('Files of this type cannot be imported.')]
-        }, status=400)
+            return render(self.request, 'projects/project_import.html', {
+                'method': 'import_file',
+                'current_project': current_project,
+                'source_title': import_plugin.source_title,
+                'source_project': import_plugin.project,
+                'values': import_plugin.values,
+                'snapshots': import_plugin.snapshots if not current_project else None,
+                'tasks': import_plugin.tasks,
+                'views': import_plugin.views
+            })
 
     def import_file(self):
         current_project = self.object
@@ -159,7 +174,7 @@ def import_file(self):
 
         try:
             import_tmpfile_name = self.request.session.pop('import_file_name')
-            import_key = self.request.session.pop('import_key')
+            plugin_id = self.request.session.pop('import_plugin_id')
         except KeyError:
             return render(self.request, 'core/error.html', {
                 'title': _('Import error'),
@@ -168,8 +183,16 @@ def import_file(self):
 
         checked = [key for key, value in self.request.POST.items() if 'on' in value]
 
-        if import_tmpfile_name and import_key:
-            import_plugin = self.get_import_plugin(import_key, current_project)
+        if import_tmpfile_name and plugin_id:
+            plugin = Plugin.objects.for_context(
+                plugin_type=PLUGIN_TYPES.PROJECT_IMPORT,
+                project=current_project,
+                user=self.request.user,
+            ).get(id=plugin_id)
+
+            import_plugin = plugin.initialize_class()
+            import_plugin.request = self.request
+            import_plugin.current_project = current_project
             import_plugin.file_name = import_tmpfile_name
 
             if import_plugin.check():
diff --git a/rdmo/projects/serializers/v1/__init__.py b/rdmo/projects/serializers/v1/__init__.py
index b5cdf415f7..6d273ea8d3 100644
--- a/rdmo/projects/serializers/v1/__init__.py
+++ b/rdmo/projects/serializers/v1/__init__.py
@@ -151,17 +151,13 @@ class Meta:
 
 class ProjectImportPluginSerializer(serializers.ModelSerializer):
 
-    key = serializers.CharField(source='url_name')
-    label = serializers.CharField(source='title')
-    class_name = serializers.CharField(source='python_path')
     href = serializers.SerializerMethodField()
 
     class Meta:
         model = Plugin
         fields = (
-            'key',
-            'label',
-            'class_name',
+            'title',
+            'url_name',
             'href',
         )
 
diff --git a/rdmo/projects/views/project_create.py b/rdmo/projects/views/project_create.py
index 2e78b0d608..f4abea3eab 100644
--- a/rdmo/projects/views/project_create.py
+++ b/rdmo/projects/views/project_create.py
@@ -70,10 +70,10 @@ class ProjectCreateImportView(ObjectPermissionMixin, LoginRequiredMixin,
     def get(self, request, *args, **kwargs):
         self.object = None
 
-        if kwargs.get('format') is None:
+        if kwargs.get('url_name') is None:
             return self.import_form()
         else:
-            return self.get_import_plugin(self.kwargs.get('format'), self.object).render()
+            return self.get_import_plugin().render()
 
     def post(self, request, *args, **kwargs):
         self.object = None
@@ -82,4 +82,4 @@ def post(self, request, *args, **kwargs):
         if method in ['upload_file', 'import_file']:
             return getattr(self, method)()
         else:
-            return self.get_import_plugin(self.kwargs.get('format'), self.object).submit()
+            return self.get_import_plugin().submit()
diff --git a/rdmo/projects/views/project_update.py b/rdmo/projects/views/project_update.py
index 805444e1c3..375e0af5ad 100644
--- a/rdmo/projects/views/project_update.py
+++ b/rdmo/projects/views/project_update.py
@@ -181,10 +181,10 @@ class ProjectUpdateImportView(ProjectImportMixin, ObjectPermissionMixin, Redirec
     def get(self, request, *args, **kwargs):
         self.object = self.get_object()
 
-        if kwargs.get('format') is None:
+        if kwargs.get('url_name') is None:
             return self.import_form()
         else:
-            return self.get_import_plugin(self.kwargs.get('format'), self.object).render()
+            return self.get_import_plugin().render()
 
     def post(self, request, *args, **kwargs):
         self.object = self.get_object()
@@ -193,4 +193,4 @@ def post(self, request, *args, **kwargs):
         if method in ['upload_file', 'import_file', 'import_project']:
             return getattr(self, method)()
         else:
-            return self.get_import_plugin(self.kwargs.get('format'), self.object).submit()
+            return self.get_import_plugin().submit()

From f646efb5d1a14ea118e3f47289bb0081a96161cd Mon Sep 17 00:00:00 2001
From: Jochen Klar <mail@jochenklar.de>
Date: Mon, 30 Mar 2026 16:55:35 +0200
Subject: [PATCH 5/8] Add SimpleURLImportPlugin to testing plugins

---
 testing/plugins/project_import/imports.py | 55 ++++++++++++++++++++++-
 1 file changed, 54 insertions(+), 1 deletion(-)

diff --git a/testing/plugins/project_import/imports.py b/testing/plugins/project_import/imports.py
index 94ea3b8e1d..12bd79009b 100644
--- a/testing/plugins/project_import/imports.py
+++ b/testing/plugins/project_import/imports.py
@@ -1,4 +1,11 @@
-from rdmo.projects.imports import Import
+from django import forms
+from django.shortcuts import redirect, render
+from django.utils.translation import gettext_lazy as _
+
+import requests
+
+from rdmo.core.imports import handle_fetched_file
+from rdmo.projects.imports import Import, RDMOXMLImport
 from rdmo.projects.models import Project
 
 
@@ -15,3 +22,49 @@ def check(self) -> bool:
     def process(self):
         # Create a new Project for testing.  You could populate values/tasks/etc.
         self.project = Project(title="Imported test project")
+
+
+class SimpleURLImportPlugin(RDMOXMLImport):
+
+    accept = False
+    upload = False
+
+    class Form(forms.Form):
+        url = forms.URLField(label=_('Import project from this URL'), required=True)
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        self.provider = RDMOXMLImport(*args, **kwargs)
+
+    def render(self):
+        form = self.Form()
+        return render(self.request, 'projects/project_import_form.html', {
+            'source_title': 'URL',
+            'form': form
+        }, status=200)
+
+    def submit(self):
+        form = self.Form(self.request.POST)
+
+        if 'cancel' in self.request.POST:
+            if self.project is None:
+                return redirect('projects')
+            else:
+                return redirect('project', self.project.id)
+
+        if form.is_valid():
+            self.source_title = form.cleaned_data['url']
+
+            response = requests.get(form.cleaned_data['url'])
+            self.request.session['import_file_name'] = handle_fetched_file(response.content)
+
+            if self.current_project:
+                return redirect('project_update_import', self.current_project.id)
+            else:
+                return redirect('project_create_import')
+
+        return render(self.request, 'projects/project_import_form.html', {
+            'source_title': 'URL',
+            'form': form
+        }, status=200)

From 42d14f437f6304ba5019cbe266ebe6da27ae1d00 Mon Sep 17 00:00:00 2001
From: Jochen Klar <mail@jochenklar.de>
Date: Mon, 30 Mar 2026 16:56:15 +0200
Subject: [PATCH 6/8] Use has_provider in project OptionSetSerializer

---
 rdmo/projects/serializers/v1/page.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rdmo/projects/serializers/v1/page.py b/rdmo/projects/serializers/v1/page.py
index 12e99676f8..0b707dc7b1 100644
--- a/rdmo/projects/serializers/v1/page.py
+++ b/rdmo/projects/serializers/v1/page.py
@@ -41,6 +41,7 @@ class OptionSetSerializer(ElementModelSerializerMixin, serializers.ModelSerializ
 
     model = serializers.SerializerMethodField()
     options = OptionSerializer(source='elements', many=True)
+    has_provider = serializers.BooleanField(source='has_plugins')
 
     class Meta:
         model = OptionSet
@@ -49,7 +50,7 @@ class Meta:
             'uri',
             'model',
             'options',
-            'has_plugins',
+            'has_provider',
             'has_search',
             'has_refresh',
             'has_conditions'

From f9754a815672f90d770222dbf01dd0c8ab32ed0f Mon Sep 17 00:00:00 2001
From: Jochen Klar <mail@jochenklar.de>
Date: Mon, 30 Mar 2026 16:56:34 +0200
Subject: [PATCH 7/8] Fix format

---
 rdmo/projects/viewsets.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/rdmo/projects/viewsets.py b/rdmo/projects/viewsets.py
index 54616ff8f2..6112522c67 100644
--- a/rdmo/projects/viewsets.py
+++ b/rdmo/projects/viewsets.py
@@ -397,12 +397,20 @@ def contact(self, request, pk):
 
     @action(detail=False, url_path='upload-accept', permission_classes=(IsAuthenticated, ))
     def upload_accept(self, request):
-        plugins = Plugin.objects.for_context(plugin_type=PLUGIN_TYPES.PROJECT_IMPORT, user=self.request.user)
+        plugins = Plugin.objects.for_context(
+            plugin_type=PLUGIN_TYPES.PROJECT_IMPORT,
+            user=self.request.user,
+        )
         return Response(get_upload_accept(plugins))
 
     @action(detail=False, permission_classes=(IsAuthenticated, ))
     def imports(self, request):
-        plugins = Plugin.objects.for_context(plugin_type=PLUGIN_TYPES.PROJECT_IMPORT, user=request.user)
+        plugins = (
+            Plugin.objects.for_context(
+                plugin_type=PLUGIN_TYPES.PROJECT_IMPORT,
+                user=request.user,
+            ).exclude(url_name='')
+        )
         serializer = ProjectImportPluginSerializer(plugins, many=True)
         return Response(serializer.data)
 

From 1c5f8eb4bf310559a2e0f40eedd2513b78b6f26e Mon Sep 17 00:00:00 2001
From: Jochen Klar <mail@jochenklar.de>
Date: Mon, 30 Mar 2026 16:56:49 +0200
Subject: [PATCH 8/8] Fix ValueConflictValidator

---
 rdmo/projects/validators.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/rdmo/projects/validators.py b/rdmo/projects/validators.py
index 6153d650d1..50921881e0 100644
--- a/rdmo/projects/validators.py
+++ b/rdmo/projects/validators.py
@@ -58,11 +58,15 @@ def __call__(self, data, serializer):
                 'set_index': data.get('set_index')
             }
 
+
             # check the widget type, which is provided with the post request
             widget_type = serializer.context['view'].request.data.get('widget_type')
             if widget_type == 'checkbox':
                 # for checkboxes, fail if a value with the same option exist
-                get_kwargs['option'] = data.get('option')
+                if data.get('option'):
+                    get_kwargs['option'] = data.get('option')
+                if data.get('external_id'):
+                    get_kwargs['external_id'] = data.get('external_id')
             else:
                 # for all other widget_types, fail if a value with the same collection_index exist
                 get_kwargs['collection_index'] = data.get('collection_index')