2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/9435e231590a/ Changeset: 9435e231590a Branch: external_display_application User: BjoernGruening Date: 2014-01-21 17:28:35 Summary: fix display_application with login_required=True Affected #: 1 file diff -r f04a1c3c060ed6bd4febfdd9e86ed3cc74cb810e -r 9435e231590ae159dd06bd309cb2e2ca2142bcff lib/galaxy/web/framework/__init__.py --- a/lib/galaxy/web/framework/__init__.py +++ b/lib/galaxy/web/framework/__init__.py @@ -812,11 +812,13 @@ host = None if host in UCSC_SERVERS: return - external_display_path = url_for( controller='dataset', action='display_application' ) + external_display_path = url_for( controller='',action='display_application' ) if self.request.path.startswith( external_display_path ): - request_path_split = external_display_path.split( '/' ) + request_path_split = self.request.path.split( '/' ) try: - if self.app.datatypes_registry.display_applications.get( request_path_split[-5] ) and request_path_split[-4] in self.app.datatypes_registry.display_applications.get( request_path_split[-5] ).links and request_path_split[-3] != 'None': + if self.app.datatypes_registry.display_applications.get( request_path_split[-5] ) and \ + request_path_split[-4] in self.app.datatypes_registry.display_applications.get( request_path_split[-5] ).links and \ + request_path_split[-3] != 'None': return except IndexError: pass https://bitbucket.org/galaxy/galaxy-central/commits/f81f3667dfd8/ Changeset: f81f3667dfd8 User: dan Date: 2014-01-21 17:54:24 Summary: Merged in BjoernGruening/galaxy-central-bgruening/external_display_application (pull request #303) fix display_application with login_required=True Affected #: 1 file diff -r 85a5461ef02d692b4893c16a2a878fa844ebd697 -r f81f3667dfd843da3dcbe20f0e25188721e14168 lib/galaxy/web/framework/__init__.py --- a/lib/galaxy/web/framework/__init__.py +++ b/lib/galaxy/web/framework/__init__.py @@ -812,11 +812,13 @@ host = None if host in UCSC_SERVERS: return - external_display_path = url_for( controller='dataset', action='display_application' ) + external_display_path = url_for( controller='',action='display_application' ) if self.request.path.startswith( external_display_path ): - request_path_split = external_display_path.split( '/' ) + request_path_split = self.request.path.split( '/' ) try: - if self.app.datatypes_registry.display_applications.get( request_path_split[-5] ) and request_path_split[-4] in self.app.datatypes_registry.display_applications.get( request_path_split[-5] ).links and request_path_split[-3] != 'None': + if self.app.datatypes_registry.display_applications.get( request_path_split[-5] ) and \ + request_path_split[-4] in self.app.datatypes_registry.display_applications.get( request_path_split[-5] ).links and \ + request_path_split[-3] != 'None': return except IndexError: pass Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.