# HG changeset patch -- Bitbucket.org # Project galaxy-dist # URL http://bitbucket.org/galaxy/galaxy-dist/overview # User Greg Von Kuster greg@bx.psu.edu # Date 1289427445 18000 # Node ID bbc0f56e3e16f93bf3c81d09b0fa12876a3f2579 # Parent b1813ff5bb4ef20d0b5d5a1fdcfc16cf6ec3ba53 A few more bug fixes in the new sample tracking code.
--- a/templates/admin/requests/select_datasets_to_transfer.mako +++ b/templates/admin/requests/select_datasets_to_transfer.mako @@ -127,7 +127,7 @@ </div>
%if sample and sample.datasets: - <% title = 'Datasets currently selected for "%s"' % sample.name %> + <% title = 'All selected datasets for "%s"' % sample.name %><p/> ${render_sample_datasets( 'requests_admin', sample, sample.datasets, title )} %endif
--- a/lib/galaxy/web/controllers/requests_common.py +++ b/lib/galaxy/web/controllers/requests_common.py @@ -952,9 +952,10 @@ class RequestsCommon( BaseController, Us sample_datasets = sample.transfer_error_dataset_files return trans.fill_template( '/requests/common/view_sample_datasets.mako', cntrller=cntrller, + title=title, sample=sample, sample_datasets=sample_datasets, - transfer_status=transferr_status, + transfer_status=transfer_status, message=message, status=status, files=[],
--- a/templates/requests/common/common.mako +++ b/templates/requests/common/common.mako @@ -329,10 +329,26 @@ %endif </td><td> - %if is_admin and sample.untransferred_dataset_files: - <a id="sampleDatasets-${sample.id}" href="${h.url_for( controller='requests_admin', action='manage_datasets', cntrller=cntrller, sample_id=trans.security.encode_id( sample.id ) )}">${len( sample.transferred_dataset_files )}</a> + %if is_admin: + %if sample.untransferred_dataset_files: + ## At least 1 selected dataset is not yet transferred, so this link + ## will direct the admin to a page allowing them to transfer datasets. + <a href="${h.url_for( controller='requests_common', action='manage_datasets', cntrller=cntrller, sample_id=trans.security.encode_id( sample.id ) )}">${len( sample.transferred_dataset_files )}</a> + %else: + ## All selected datasets have successfully transferred, so this link + ## will direct the admin to a page displaying all transferred datasets. + <a href="${h.url_for( controller='requests_common', action='view_sample_datasets', cntrller=cntrller, sample_id=trans.security.encode_id( sample.id ), transfer_status=trans.model.SampleDataset.transfer_status.COMPLETE )}">${len( sample.transferred_dataset_files )}</a> + %endif %else: - ${len( sample.transferred_dataset_files )} + %if sample.transferred_dataset_files: + ## The cuurent user is not an admin, so this link will direct the + ## user to the target data library containing those datasets that + ## were successfully transferred. + <a href="${h.url_for( controller='library_common', action='browse_library', cntrller='library', id=trans.security.encode_id( sample.library.id ) )}">${len( sample.transferred_dataset_files )}</a> + %else: + ## Display a 0 with no link. + ${len( sample.transferred_dataset_files )} + %endif %endif </td> %endif
--- a/templates/requests/common/view_sample_datasets.mako +++ b/templates/requests/common/view_sample_datasets.mako @@ -40,4 +40,5 @@ No datasets with status ${transfer_status}" belong to this sample %else: No datasets have been selected for this sample. + %endif %endif