Skip to content

Commit

Permalink
Merge branch 'main' into feat/Tapis-v3-redesign
Browse files Browse the repository at this point in the history
  • Loading branch information
jarosenb authored Apr 29, 2024
2 parents b953f05 + d09fa3d commit 178e15b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion designsafe/apps/api/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
namespace='ds_projects_api')),

url(r'^datafiles/', include('designsafe.apps.api.datafiles.urls')),
# url(r'^publications/', include('designsafe.apps.api.publications.urls')),
url(r'^publications/', include('designsafe.apps.api.publications.urls')),

url(r'^filemeta/', include('designsafe.apps.api.filemeta.urls')),

Expand Down
2 changes: 1 addition & 1 deletion designsafe/apps/data/views/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -235,8 +235,8 @@ def get_context_data(self, **kwargs):
context['simulations'] = getattr(pub, 'simulations', [])
context['hybrid_simulations'] = getattr(pub, 'hybrid_simulations',[])

proj = ProjectsManager(service_account()).get_project_by_id(pub.projectId)
try:
proj = ProjectsManager(service_account()).get_project_by_id(pub.projectId)
context['dc_json'] = json.dumps(proj.to_dataset_json())
except Exception:
# If we can't generate DataCite JSON, render the page without meta tags.
Expand Down

0 comments on commit 178e15b

Please sign in to comment.