Merge branch 'release_22.01' into release_22.05 (522e0c25) · Commits · NDIP / Galaxy

lib/galaxy/webapps/base/webapp.py

+1 −1

Original line number	Diff line number	Diff line
		@@ -448,7 +448,7 @@ class GalaxyWebTransaction(base.DefaultWebTransaction, context.ProvidesHistoryCo
		def set_user(self, user):
		"""Set the current user."""
		if self.galaxy_session:
		if user.bootstrap_admin_user:
		if user and not user.bootstrap_admin_user:
		self.galaxy_session.user = user
		self.sa_session.add(self.galaxy_session)
		self.sa_session.flush()

+6 −1

Original line number	Diff line number	Diff line
		@@ -2,7 +2,10 @@
		API operations on the contents of a history dataset.
		"""
		import logging
		from io import IOBase
		from io import (
		BytesIO,
		IOBase,
		)
		from typing import (
		Any,
		cast,
		@@ -255,6 +258,8 @@ class FastAPIDatasets:
		return FileResponse(file_name, headers=headers)
		elif isinstance(display_data, ZipstreamWrapper):
		return StreamingResponse(display_data.response(), headers=headers)
		elif isinstance(display_data, bytes):
		return StreamingResponse(BytesIO(display_data), headers=headers)
		return StreamingResponse(display_data, headers=headers)

		@router.get(