1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/changeset/87be4c8d7f7f/ changeset: 87be4c8d7f7f user: afgane date: 2012-06-18 06:53:02 summary: Fix API history purge; a few documentation corrections affected #: 3 files
diff -r aaf5c82a55794c97125696aecb27056b5087fdb7 -r 87be4c8d7f7fa32f6023f0e251e3c9af8447f5cd lib/galaxy/web/api/histories.py --- a/lib/galaxy/web/api/histories.py +++ b/lib/galaxy/web/api/histories.py @@ -130,6 +130,7 @@
history.deleted = True if purge and trans.app.config.allow_user_dataset_purge: + # First purge all the datasets for hda in history.datasets: if hda.purged: continue @@ -143,6 +144,9 @@ except: pass trans.sa_session.flush() + # Now mark the history as purged + history.purged = True + self.sa_session.add( history )
trans.sa_session.flush() return 'OK' @@ -150,8 +154,8 @@ @web.expose_api def undelete( self, trans, id, **kwd ): """ - POST /api/histories/deleted/{encoded_quota_id}/undelete - Undeletes a quota + POST /api/histories/deleted/{encoded_history_id}/undelete + Undeletes a history """ history_id = id history = self.get_history( trans, history_id, check_ownership=True, check_accessible=False, deleted=True )
diff -r aaf5c82a55794c97125696aecb27056b5087fdb7 -r 87be4c8d7f7fa32f6023f0e251e3c9af8447f5cd lib/galaxy/web/api/users.py --- a/lib/galaxy/web/api/users.py +++ b/lib/galaxy/web/api/users.py @@ -65,7 +65,7 @@ @web.expose_api def create( self, trans, payload, **kwd ): """ - /api/users + POST /api/users Creates a new Galaxy user. """ if not trans.app.config.allow_user_creation:
diff -r aaf5c82a55794c97125696aecb27056b5087fdb7 -r 87be4c8d7f7fa32f6023f0e251e3c9af8447f5cd scripts/api/library_upload_from_import_dir.py --- a/scripts/api/library_upload_from_import_dir.py +++ b/scripts/api/library_upload_from_import_dir.py @@ -1,5 +1,8 @@ #!/usr/bin/env python - +""" +Example usage: +./library_upload_from_import_dir.py <key> http://127.0.0.1:8080/api/libraries/dda47097d9189f15/contents Fdda47097d9189f15 auto /Users/EnisAfgan/projects/pprojects/galaxy/lib_upload_dir ? +""" import os, sys sys.path.insert( 0, os.path.dirname( __file__ ) ) from common import submit
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.