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) ) 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/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}) => { {% 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 %}

{% trans 'Export' %}