1 new commit in galaxy-central:

https://bitbucket.org/galaxy/galaxy-central/commits/c8cd70be284e/ Changeset: c8cd70be284e User: carlfeberhard Date: 2013-04-01 18:28:44 Summary: api: history_contents.show, datasets.show add both types of display app links for consistency Affected #: 2 files

diff -r f97689cd28c4e3dd516d277dee1000af33a98d67 -r c8cd70be284ebc129412ec030e4041c4bff342d3 lib/galaxy/webapps/galaxy/api/datasets.py --- a/lib/galaxy/webapps/galaxy/api/datasets.py +++ b/lib/galaxy/webapps/galaxy/api/datasets.py @@ -53,6 +53,9 @@ # Default: return dataset as dict. if hda_ldda == 'hda': rval = self.get_hda_dict( trans, dataset ) + # add these to match api/history_contents.py, show + rval[ 'display_types' ] = self.get_old_display_applications( trans, dataset ) + rval[ 'display_apps' ] = self.get_display_apps( trans, dataset ) else: rval = dataset.get_api_value()

diff -r f97689cd28c4e3dd516d277dee1000af33a98d67 -r c8cd70be284ebc129412ec030e4041c4bff342d3 lib/galaxy/webapps/galaxy/api/history_contents.py --- a/lib/galaxy/webapps/galaxy/api/history_contents.py +++ b/lib/galaxy/webapps/galaxy/api/history_contents.py @@ -142,6 +142,8 @@ check_ownership=True, check_accessible=True )

hda_dict = self.get_hda_dict( trans, hda ) + hda_dict[ 'display_types' ] = self.get_old_display_applications( trans, hda ) + hda_dict[ 'display_apps' ] = self.get_display_apps( trans, hda )

except Exception, e: msg = "Error in history API at listing dataset: %s" % ( str(e) )

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.