5 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/c78e28a5f748/ Changeset: c78e28a5f748 Branch: stable User: dan Date: 2013-03-22 17:23:05 Summary: Do not display old-style display links in server-side history when they are disabled. Affected #: 1 file diff -r c0a665a31e9160fa344255d6f3fe22a0ab2b6a6f -r c78e28a5f748e16b0a168d36ba55e5625f322548 lib/galaxy/datatypes/data.py --- a/lib/galaxy/datatypes/data.py +++ b/lib/galaxy/datatypes/data.py @@ -437,12 +437,12 @@ apply anyway. """ try: - if type in self.get_display_types(): + if app.config.enable_old_display_applications and type in self.get_display_types(): return target_frame, getattr ( self, self.supported_display_apps[type]['links_function'] ) ( dataset, type, app, base_url, **kwd ) except: log.exception( 'Function %s is referred to in datatype %s for generating links for type %s, but is not accessible' \ % ( self.supported_display_apps[type]['links_function'], self.__class__.__name__, type ) ) - return [] + return target_frame, [] def get_converter_types(self, original_dataset, datatypes_registry): """Returns available converters by type for this dataset""" return datatypes_registry.get_converters_by_datatype(original_dataset.ext) https://bitbucket.org/galaxy/galaxy-central/commits/12b05ec9d3de/ Changeset: 12b05ec9d3de Branch: next-stable User: dan Date: 2013-03-22 17:23:05 Summary: Do not display old-style display links in server-side history when they are disabled. Affected #: 1 file diff -r 66c67f015f9e8beb1bfaf4365bdaeb41d9090fe2 -r 12b05ec9d3de16202bb3005c39d61b6d643bfdcb lib/galaxy/datatypes/data.py --- a/lib/galaxy/datatypes/data.py +++ b/lib/galaxy/datatypes/data.py @@ -448,12 +448,12 @@ apply anyway. """ try: - if type in self.get_display_types(): + if app.config.enable_old_display_applications and type in self.get_display_types(): return target_frame, getattr ( self, self.supported_display_apps[type]['links_function'] ) ( dataset, type, app, base_url, **kwd ) except: log.exception( 'Function %s is referred to in datatype %s for generating links for type %s, but is not accessible' \ % ( self.supported_display_apps[type]['links_function'], self.__class__.__name__, type ) ) - return [] + return target_frame, [] def get_converter_types(self, original_dataset, datatypes_registry): """Returns available converters by type for this dataset""" return datatypes_registry.get_converters_by_datatype(original_dataset.ext) https://bitbucket.org/galaxy/galaxy-central/commits/6701d9bb937e/ Changeset: 6701d9bb937e User: dan Date: 2013-03-22 17:23:05 Summary: Do not display old-style display links in server-side history when they are disabled. Affected #: 1 file diff -r 56799709a0f35d1f5cde0aa8f38939eafea98294 -r 6701d9bb937e488ac9797d14ad81ef1ced48cd41 lib/galaxy/datatypes/data.py --- a/lib/galaxy/datatypes/data.py +++ b/lib/galaxy/datatypes/data.py @@ -448,12 +448,12 @@ apply anyway. """ try: - if type in self.get_display_types(): + if app.config.enable_old_display_applications and type in self.get_display_types(): return target_frame, getattr ( self, self.supported_display_apps[type]['links_function'] ) ( dataset, type, app, base_url, **kwd ) except: log.exception( 'Function %s is referred to in datatype %s for generating links for type %s, but is not accessible' \ % ( self.supported_display_apps[type]['links_function'], self.__class__.__name__, type ) ) - return [] + return target_frame, [] def get_converter_types(self, original_dataset, datatypes_registry): """Returns available converters by type for this dataset""" return datatypes_registry.get_converters_by_datatype(original_dataset.ext) https://bitbucket.org/galaxy/galaxy-central/commits/fc236ecff8ec/ Changeset: fc236ecff8ec Branch: next-stable User: dan Date: 2013-03-22 17:26:03 Summary: Do not display old-style display links in client-side history when they are disabled. Affected #: 1 file diff -r 12b05ec9d3de16202bb3005c39d61b6d643bfdcb -r fc236ecff8ecd8864dee797e9a70ec800e63948d lib/galaxy/web/base/controller.py --- a/lib/galaxy/web/base/controller.py +++ b/lib/galaxy/web/base/controller.py @@ -394,6 +394,8 @@ def get_old_display_applications( self, trans, hda ): display_apps = [] + if not trans.app.config.enable_old_display_applications: + return display_apps for display_app_name in hda.datatype.get_display_types(): link_generator = get_display_app_link_generator( display_app_name ) display_links = link_generator.generate_links( trans, hda ) https://bitbucket.org/galaxy/galaxy-central/commits/49c09e9f8c8b/ Changeset: 49c09e9f8c8b User: dan Date: 2013-03-22 17:26:03 Summary: Do not display old-style display links in client-side history when they are disabled. Affected #: 1 file Diff not available. 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.