Commit dd83a55a authored by Cage, Gregory's avatar Cage, Gregory
Browse files

Temporary fix for model migration async

parent fd5aae58

lib/galaxy/managers/interactivetool.py

+3 −3
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ class InteractiveToolManager: 
                requires_path_in_url=entry["requires_path_in_url"],

                requires_path_in_header_named=entry["requires_path_in_header_named"],

                protocol=entry["protocol"],

                short_token=self.app.config.interactivetools_shorten_url,

                short_token=None,

            )

            self.sa_session.add(ep)

        if flush:
@@ -314,8 +314,8 @@ class InteractiveToolManager: 
        entry_point_class = entry_point.__class__.__name__.lower()

        entry_point_prefix = self.app.config.interactivetools_prefix

        entry_point_token = entry_point.token

        if self.app.config.interactivetools_shorten_url:

            return f"{entry_point_encoded_id}-{entry_point_token[:10]}.{entry_point_prefix}"

        # if self.app.config.interactivetools_shorten_url:

        #     return f"{entry_point_encoded_id}-{entry_point_token[:10]}.{entry_point_prefix}"

        return f"{entry_point_encoded_id}-{entry_point_token}.{entry_point_class}.{entry_point_prefix}"



    def target_if_active(self, trans, entry_point):

lib/galaxy/model/migrations/alembic/versions_gxy/8a19186a6ee7_add_columns_to_interactivetool_entry_point.py

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ from galaxy.model.migrations.util import ( 


# revision identifiers, used by Alembic.

revision = "8a19186a6ee7"

down_revision = "ddbdbc40bdc1"

down_revision = "0a5669ff37cc"

branch_labels = None

depends_on = None