From b4814bb1b10579b059ae89de58d149a6f472b355 Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Wed, 27 Jun 2018 08:13:49 -0700 Subject: [PATCH] Remove datatpes registry template/endpoint (previous commit replaces this functionality on the client side). --- .../webapps/galaxy/controllers/admin.py | 7 --- templates/admin/view_datatypes_registry.mako | 57 ------------------- 2 files changed, 64 deletions(-) delete mode 100644 templates/admin/view_datatypes_registry.mako diff --git a/lib/galaxy/webapps/galaxy/controllers/admin.py b/lib/galaxy/webapps/galaxy/controllers/admin.py index 07b7bf0a9d5..b0625c29409 100644 --- a/lib/galaxy/webapps/galaxy/controllers/admin.py +++ b/lib/galaxy/webapps/galaxy/controllers/admin.py @@ -908,13 +908,6 @@ class AdminGalaxy(controller.JSAppLauncher, AdminActions, UsesQuotaMixin, QuotaP def tool_errors(self, trans, **kwd): return trans.fill_template('admin/tool_errors.mako', tool_errors=global_tool_errors.error_stack) - @web.expose - @web.require_admin - def view_datatypes_registry(self, trans, **kwd): - message = escape(util.restore_text(kwd.get('message', ''))) - status = util.restore_text(kwd.get('status', 'done')) - return trans.fill_template('admin/view_datatypes_registry.mako', message=message, status=status) - @web.expose @web.require_admin def display_applications(self, trans, **kwd): diff --git a/templates/admin/view_datatypes_registry.mako b/templates/admin/view_datatypes_registry.mako deleted file mode 100644 index c3f4c194024..00000000000 --- a/templates/admin/view_datatypes_registry.mako +++ /dev/null @@ -1,57 +0,0 @@ -<%inherit file="/base.mako"/> -<%namespace file="/message.mako" import="render_msg" /> - -%if message: - ${render_msg( message, status )} -%endif - -<% - import galaxy.util - from galaxy.web.base.controller import sort_by_attr, Datatype - ctr = 0 - datatypes = [] - for elem in trans.app.datatypes_registry.datatype_elems: - # Build a list of objects that can be sorted. - extension = elem.get( 'extension', None ) - dtype = elem.get( 'type', None ) - type_extension = elem.get( 'type_extension', None ) - mimetype = elem.get( 'mimetype', None ) - display_in_upload = galaxy.util.string_as_bool( elem.get( 'display_in_upload', False ) ) - datatypes.append( Datatype( extension, dtype, type_extension, mimetype, display_in_upload ) ) - sorted_datatypes = sort_by_attr( datatypes, 'extension' ) -%> - -
-
Current data types registry contains ${len( sorted_datatypes )} data types
-
- - - - - - - - %for datatype in sorted_datatypes: - %if ctr % 2 == 1: - - %else: - - %endif - - - - - - <% ctr += 1 %> - %endfor -
ExtensionTypeMimetypeDisplay in upload
${datatype.extension|h}${datatype.dtype|h} - %if datatype.mimetype: - ${datatype.mimetype|h} - %endif - - %if datatype.display_in_upload: - ${datatype.display_in_upload|h} - %endif -
-
-