1 new changeset in galaxy-central:
http://bitbucket.org/galaxy/galaxy-central/changeset/ca0c4ad2bb39/ changeset: r5070:ca0c4ad2bb39 user: greg date: 2011-02-16 16:14:24 summary: When rendering the contents of a data library, make sure a LibraryDataset has an associated LibraryDatasetDatasetAssociation. There should always be an ldda, but some users running their own instances have reported that some of their LibraryDatasets are missing these associations. affected #: 1 file (554 bytes)
--- a/templates/library/common/browse_library.mako Wed Feb 16 09:54:49 2011 -0500 +++ b/templates/library/common/browse_library.mako Wed Feb 16 10:14:24 2011 -0500 @@ -438,9 +438,14 @@ %for library_dataset in library_datasets: <% ldda = library_dataset.library_dataset_dataset_association - selected = created_ldda_ids and str( ldda.id ) in created_ldda_ids + if ldda: + # There should always be an ldda, but some users running their own instances have reported that + # some of their LibraryDatasets have no associated lddas + selected = created_ldda_ids and str( ldda.id ) in created_ldda_ids %> - ${render_dataset( cntrller, ldda, library_dataset, selected, library, folder, pad, my_row, row_counter, tracked_datasets, show_deleted=show_deleted )} + %if ldda: + ${render_dataset( cntrller, ldda, library_dataset, selected, library, folder, pad, my_row, row_counter, tracked_datasets, show_deleted=show_deleted )} + %endif %endfor %else: %for sub_folder in sub_folders: @@ -449,8 +454,13 @@ %for library_dataset in library_datasets: <% ldda = library_dataset.library_dataset_dataset_association - can_access = trans.app.security_agent.can_access_dataset( current_user_roles, ldda.dataset ) - selected = created_ldda_ids and str( ldda.id ) in created_ldda_ids + if ldda: + # There should always be an ldda, but some users running their own instances have reported that + # some of their LibraryDatasets have no associated lddas + can_access = trans.app.security_agent.can_access_dataset( current_user_roles, ldda.dataset ) + selected = created_ldda_ids and str( ldda.id ) in created_ldda_ids + else: + can_access = False %> %if can_access: ${render_dataset( cntrller, ldda, library_dataset, selected, library, folder, pad, my_row, row_counter, tracked_datasets, show_deleted=show_deleted )}
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.