From 0b6d925b8a65bf5764b21ed3dea535c349832be8 Mon Sep 17 00:00:00 2001 From: mvdbeek Date: Wed, 29 May 2024 18:45:23 +0200 Subject: [PATCH 1/2] Set page importable to false when serializing Fixes https://github.com/galaxyproject/galaxy/issues/18258 --- lib/galaxy/model/__init__.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/galaxy/model/__init__.py b/lib/galaxy/model/__init__.py index 172aab242b0..cf8b819f49b 100644 --- a/lib/galaxy/model/__init__.py +++ b/lib/galaxy/model/__init__.py @@ -10085,7 +10085,7 @@ class Page(Base, HasTags, Dictifiable, RepresentById, UsesCreateAndUpdateTime): ) title = Column(TEXT) deleted = Column(Boolean, index=True, default=False) - importable = Column(Boolean, index=True, default=False) + importable = Column(Boolean, index=True, default=False, key="_importable") slug = Column(TEXT) published = Column(Boolean, index=True, default=False) user = relationship("User") @@ -10135,6 +10135,10 @@ class Page(Base, HasTags, Dictifiable, RepresentById, UsesCreateAndUpdateTime): def to_dict(self, view="element"): rval = super().to_dict(view=view) + if "importable" in rval and rval["importable"] is None: + # pages created prior to 2011 might not have importable field + # probably not worth creating a migration to fix that + rval["importable"] = False rev = [] for a in self.revisions: rev.append(a.id) From 48231391a8d9ecde5b88a49a9f600588c0ada3c0 Mon Sep 17 00:00:00 2001 From: Marius van den Beek Date: Fri, 31 May 2024 10:18:23 +0200 Subject: [PATCH 2/2] Drop key argument Did not want to do that actually --- lib/galaxy/model/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/galaxy/model/__init__.py b/lib/galaxy/model/__init__.py index cf8b819f49b..66631e13609 100644 --- a/lib/galaxy/model/__init__.py +++ b/lib/galaxy/model/__init__.py @@ -10085,7 +10085,7 @@ class Page(Base, HasTags, Dictifiable, RepresentById, UsesCreateAndUpdateTime): ) title = Column(TEXT) deleted = Column(Boolean, index=True, default=False) - importable = Column(Boolean, index=True, default=False, key="_importable") + importable = Column(Boolean, index=True, default=False) slug = Column(TEXT) published = Column(Boolean, index=True, default=False) user = relationship("User")