diff --git a/lib/galaxy/webapps/galaxy/api/lda_datasets.py b/lib/galaxy/webapps/galaxy/api/lda_datasets.py index bb2ef0ca49a..fbb37f76904 100644 --- a/lib/galaxy/webapps/galaxy/api/lda_datasets.py +++ b/lib/galaxy/webapps/galaxy/api/lda_datasets.py @@ -14,9 +14,9 @@ import urllib import urllib2 import zipfile from paste.httpexceptions import HTTPBadRequest +from galaxy import util, web from galaxy.exceptions import ItemAccessibilityException, MessageException, ItemDeletionException, ObjectNotFound from galaxy.security import Action -from galaxy import util, web from galaxy.util.streamball import StreamBall from galaxy.web.base.controller import BaseAPIController, UsesVisualizationMixin @@ -39,14 +39,12 @@ class LibraryDatasetsController( BaseAPIController, UsesVisualizationMixin ): :returns: detailed dataset information from base controller .. seealso:: :attr:`galaxy.web.base.controller.UsesLibraryMixinItems.get_library_dataset` """ - # Get dataset. try: dataset = self.get_library_dataset( trans, id = id, check_ownership=False, check_accessible=True ) except Exception, e: trans.response.status = 500 return str( e ) try: - # Default: return dataset as dict. rval = dataset.to_dict() except Exception, e: rval = "Error in dataset API at listing contents: " + str( e ) diff --git a/static/scripts/galaxy.library.js b/static/scripts/galaxy.library.js index 1ff2f6e6063..40f89acb12d 100644 --- a/static/scripts/galaxy.library.js +++ b/static/scripts/galaxy.library.js @@ -122,7 +122,7 @@ var FolderContentView = Backbone.View.extend({ // CONTAINER tmpl_array.push('
| ');r.push(' | view | ');r.push("name | ");r.push("data type | ");r.push("size | ");r.push("date (UTC) | ");r.push(" ");r.push(" ");r.push("");r.push(' | ');r.push(" | ");r.push(" | ");r.push(" | ");r.push(" | ");r.push(" ");r.push(" <% _.each(items, function(content_item) { %>");r.push(' |
|---|---|---|---|---|---|---|---|---|---|---|
| ");r.push(' | ');r.push(' | <%- content_item.get("name") %>');r.push(' <% if (content_item.get("item_count") === 0) { %>');r.push(' (empty folder)');r.push(" <% } %>");r.push(" | ");r.push("folder | ");r.push('<%= _.escape(content_item.get("item_count")) %> item(s) | ');r.push(" <% } else { %>");r.push('');r.push(" | ");r.push(' ");r.push(" | ");r.push('<%- content_item.get("name") %> | ');r.push('<%= _.escape(content_item.get("data_type")) %> | ');r.push('<%= _.escape(content_item.get("readable_size")) %> | ');r.push(" <% } %> ");r.push('<%= _.escape(content_item.get("time_updated")) %> | ');r.push("
| ">Name | ');r.push('<%= _.escape(item.get("name")) %> | ');r.push("
|---|---|
| Data type | ');r.push('<%= _.escape(item.get("data_type")) %> | ');r.push("
| Genome build | ');r.push('<%= _.escape(item.get("genome_build")) %> | ');r.push("Size | ');r.push("<%= _.escape(size) %> | ");r.push(" ");r.push("
| Date uploaded (UTC) | ');r.push('<%= _.escape(item.get("date_uploaded")) %> | ');r.push("
| Uploaded by | ');r.push('<%= _.escape(item.get("uploaded_by")) %> | ');r.push("
| Data Lines | ');r.push('<%= _.escape(item.get("metadata_data_lines")) %> | ');r.push("Comment Lines | ');r.push(' <% if (item.get("metadata_comment_lines") === "") { %>');r.push('<%= _.escape(item.get("metadata_comment_lines")) %> | ');r.push(" <% } else { %>");r.push('unknown | ');r.push(" <% } %>");r.push(" ");r.push("
| Number of Columns | ');r.push('<%= _.escape(item.get("metadata_columns")) %> | ');r.push("
| Column Types | ');r.push('<%= _.escape(item.get("metadata_column_types")) %> | ');r.push("
| Miscellaneous information | ');r.push('<%= _.escape(item.get("misc_blurb")) %> | ');r.push("
');r.push(" ");r.push("| ');tmpl_array.push(" | name | ");tmpl_array.push("description | ");tmpl_array.push("synopsis | ");tmpl_array.push("model type | ");tmpl_array.push(" ");tmpl_array.push(" ");tmpl_array.push(" <% _.each(libraries, function(library) { %>");tmpl_array.push("
|---|---|---|---|---|
| ');tmpl_array.push(' | <%- library.get("name") %> | ');tmpl_array.push('<%= _.escape(library.get("description")) %> | ');tmpl_array.push('<%= _.escape(library.get("synopsis")) %> | ');tmpl_array.push('<%= _.escape(library.get("model_class")) %> | ');tmpl_array.push("
| ');r.push(' | view | ');r.push("name | ");r.push("data type | ");r.push("size | ");r.push("date (UTC) | ");r.push(" ");r.push(" ");r.push("");r.push(' | ');r.push(" | ");r.push(" | ");r.push(" | ");r.push(" | ");r.push(" ");r.push(" <% _.each(items, function(content_item) { %>");r.push(' |
|---|---|---|---|---|---|---|---|---|---|---|
| ");r.push(' | ');r.push(' | <%- content_item.get("name") %>');r.push(' <% if (content_item.get("item_count") === 0) { %>');r.push(' (empty folder)');r.push(" <% } %>");r.push(" | ");r.push("folder | ");r.push('<%= _.escape(content_item.get("item_count")) %> item(s) | ');r.push(" <% } else { %>");r.push('');r.push(" | ");r.push(' ");r.push(" | ");r.push('<%- content_item.get("name") %> | ');r.push('<%= _.escape(content_item.get("data_type")) %> | ');r.push('<%= _.escape(content_item.get("readable_size")) %> | ');r.push(" <% } %> ");r.push('<%= _.escape(content_item.get("time_updated")) %> | ');r.push("
| ">Name | ');r.push('<%= _.escape(item.get("name")) %> | ');r.push("
|---|---|
| Data type | ');r.push('<%= _.escape(item.get("data_type")) %> | ');r.push("
| Genome build | ');r.push('<%= _.escape(item.get("genome_build")) %> | ');r.push("Size | ');r.push("<%= _.escape(size) %> | ");r.push(" ");r.push("
| Date uploaded (UTC) | ');r.push('<%= _.escape(item.get("date_uploaded")) %> | ');r.push("
| Uploaded by | ');r.push('<%= _.escape(item.get("uploaded_by")) %> | ');r.push("
| Data Lines | ');r.push('<%= _.escape(item.get("metadata_data_lines")) %> | ');r.push("Comment Lines | ');r.push(' <% if (item.get("metadata_comment_lines") === "") { %>');r.push('<%= _.escape(item.get("metadata_comment_lines")) %> | ');r.push(" <% } else { %>");r.push('unknown | ');r.push(" <% } %>");r.push(" ");r.push("
| Number of Columns | ');r.push('<%= _.escape(item.get("metadata_columns")) %> | ');r.push("
| Column Types | ');r.push('<%= _.escape(item.get("metadata_column_types")) %> | ');r.push("
| Miscellaneous information | ');r.push('<%= _.escape(item.get("misc_blurb")) %> | ');r.push("
');r.push(" ");r.push("| ');tmpl_array.push(" | name | ");tmpl_array.push("description | ");tmpl_array.push("synopsis | ");tmpl_array.push("model type | ");tmpl_array.push(" ");tmpl_array.push(" ");tmpl_array.push(" <% _.each(libraries, function(library) { %>");tmpl_array.push("
|---|---|---|---|---|
| ');tmpl_array.push(' | <%- library.get("name") %> | ');tmpl_array.push('<%= _.escape(library.get("description")) %> | ');tmpl_array.push('<%= _.escape(library.get("synopsis")) %> | ');tmpl_array.push('<%= _.escape(library.get("model_class")) %> | ');tmpl_array.push("