diff --git a/lib/galaxy/web/controllers/requests_admin.py b/lib/galaxy/web/controllers/requests_admin.py index 9e5c669e27d..0038ec38236 100644 --- a/lib/galaxy/web/controllers/requests_admin.py +++ b/lib/galaxy/web/controllers/requests_admin.py @@ -102,8 +102,7 @@ class DataTransferGrid( grids.Grid ): return sample_dataset.status # Grid definition title = "Sample Datasets" - # TODO: can this be grid.mako??? - template = "admin/requests/datasets_grid.mako" + template = "admin/requests/grid.mako" model_class = model.SampleDataset default_sort_key = "-create_time" num_rows_per_page = 50 @@ -118,7 +117,9 @@ class DataTransferGrid( grids.Grid ): SizeColumn( "Size", #key='size', filterable="advanced" ), - grids.GridColumn( "Last Updated", key="update_time", format=time_ago ), + grids.GridColumn( "Last Updated", + key="update_time", + format=time_ago ), StatusColumn( "Status", #key='status', filterable="advanced" ), @@ -560,7 +561,7 @@ class RequestsAdmin( BaseController, UsesFormDefinitionWidgets ): lfp = trans.model.LibraryFolderPermissions( trans.app.security_agent.permitted_actions.LIBRARY_ADD.action, folder, datatx_user_private_role ) - trans.sa_session.add( dp ) + trans.sa_session.add( lfp ) trans.sa_session.flush() return datatx_user def __send_message( self, trans, datatx_info, sample, id_list ): diff --git a/templates/admin/requests/datasets_grid.mako b/templates/admin/requests/datasets_grid.mako deleted file mode 100644 index c226face0a2..00000000000 --- a/templates/admin/requests/datasets_grid.mako +++ /dev/null @@ -1,27 +0,0 @@ -<%def name="custom_javascripts()"> - - - -<%def name="javascripts()"> - ${h.js( "galaxy.base", "galaxy.panels", "json2", "jquery", "jquery.event.drag", "jquery.autocomplete", "jquery.mousewheel", "trackster", "ui.core", "ui.sortable" )} - ${self.custom_javascripts()} - ${parent.javascripts()} - - -<%inherit file="/grid_base.mako"/>