2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/changeset/81e6e2f44d32/ changeset: 81e6e2f44d32 user: cjav date: 2012-05-03 01:30:11 summary: expose dataset full path through the API affected #: 1 file diff -r c5f3e218266e8b82cd509b9177461839c74971c3 -r 81e6e2f44d32845b8d48459ea779030d596c7c48 lib/galaxy/model/__init__.py --- a/lib/galaxy/model/__init__.py +++ b/lib/galaxy/model/__init__.py @@ -1167,6 +1167,7 @@ deleted = hda.deleted, visible = hda.visible, state = hda.state, + file_name = hda.file_name, file_size = int( hda.get_size() ), data_type = hda.ext, genome_build = hda.dbkey, https://bitbucket.org/galaxy/galaxy-central/changeset/4d7077d8d2b8/ changeset: 4d7077d8d2b8 user: dannon date: 2012-05-03 16:18:38 summary: Incorporation and slight update to pull request #43. The original contribution allowed access to file_path regardless of admin status and config setting. affected #: 2 files diff -r 81e6e2f44d32845b8d48459ea779030d596c7c48 -r 4d7077d8d2b875feed71fa8c9ab7bd701957b909 lib/galaxy/model/__init__.py --- a/lib/galaxy/model/__init__.py +++ b/lib/galaxy/model/__init__.py @@ -1167,7 +1167,6 @@ deleted = hda.deleted, visible = hda.visible, state = hda.state, - file_name = hda.file_name, file_size = int( hda.get_size() ), data_type = hda.ext, genome_build = hda.dbkey, diff -r 81e6e2f44d32845b8d48459ea779030d596c7c48 -r 4d7077d8d2b875feed71fa8c9ab7bd701957b909 lib/galaxy/web/api/history_contents.py --- a/lib/galaxy/web/api/history_contents.py +++ b/lib/galaxy/web/api/history_contents.py @@ -1,11 +1,9 @@ """ API operations on the contents of a history. """ -import logging, os, string, shutil, urllib, re, socket -from cgi import escape, FieldStorage -from galaxy import util, datatypes, jobs, web, util +import logging +from galaxy import web from galaxy.web.base.controller import * -from galaxy.util.sanitize_html import sanitize_html from galaxy.model.orm import * import pkg_resources @@ -56,6 +54,8 @@ return str( e ) try: item = content.get_api_value( view='element' ) + if trans.user_is_admin() or trans.app.config.expose_dataset_path: + item['file_name'] = hda.file_name if not item['deleted']: # Problem: Method url_for cannot use the dataset controller # Get the environment from DefaultWebTransaction and use default webapp mapper instead of webapp API mapper @@ -76,7 +76,6 @@ POST /api/libraries/{encoded_history_id}/contents Creates a new history content item (file, aka HistoryDatasetAssociation). """ - params = util.Params( payload ) from_ld_id = payload.get( 'from_ld_id', None ) try: 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.