1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/d36e62d38e67/
Changeset: d36e62d38e67
User: Dave Bouvier
Date: 2013-12-06 18:31:11
Summary: Fix tool description being displayed in version column.
Affected #: 1 file
diff -r b469e14ff34c91e747057f91086969ef726fe78d -r d36e62d38e670ca18d294ce03b8e2aeba75fa8ee lib/tool_shed/util/container_util.py
--- a/lib/tool_shed/util/container_util.py
+++ b/lib/tool_shed/util/container_util.py
@@ -987,7 +987,7 @@
tool_id = str( tool_dict.get( 'id', 'unknown' ) )
name = str( tool_dict.get( 'name', 'unknown' ) )
description = str( tool_dict.get( 'description', '' ) )
- version = str( tool_dict.get( 'description', 'unknown' ) )
+ version = str( tool_dict.get( 'version', 'unknown' ) )
except Exception, e:
tool_config = str( e )
tool_id = 'unknown'
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.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/3bf36025f174/
Changeset: 3bf36025f174
User: dan
Date: 2013-12-06 18:15:45
Summary: Fix for determining pre-existing trans.app.model.GalaxySessionToHistoryAssociation when switching histories.
Affected #: 1 file
diff -r bba4f8883afb62b142dd9ffa229db387f7e9f857 -r 3bf36025f174e2b2a47d33be555026be343e37c5 lib/galaxy/webapps/galaxy/controllers/history.py
--- a/lib/galaxy/webapps/galaxy/controllers/history.py
+++ b/lib/galaxy/webapps/galaxy/controllers/history.py
@@ -377,7 +377,7 @@
galaxy_session = trans.get_galaxy_session()
try:
association = trans.sa_session.query( trans.app.model.GalaxySessionToHistoryAssociation ) \
- .filter_by( session_id=galaxy_session.id, history_id=trans.security.decode_id( new_history.id ) ) \
+ .filter_by( session_id=galaxy_session.id, history_id=new_history.id ) \
.first()
except:
association = None
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.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/bba4f8883afb/
Changeset: bba4f8883afb
User: jmchilton
Date: 2013-12-06 16:45:59
Summary: Allow override of util.unicodify default encoding with GALAXY_DEFAULT_ENCODING.
See mailing list for more information : http://dev.list.galaxyproject.org/error-with-unicode-output-tp4662783.html. It would be more correct to add a database_encoding option to universe_wsgi.ini, but that would be more work and the even correcter approach is for deployers to configure their databases to store UTF-8 data.
Affected #: 1 file
diff -r a29d54619813d5da992b897557162a360b8d610c -r bba4f8883afb62b142dd9ffa229db387f7e9f857 lib/galaxy/util/__init__.py
--- a/lib/galaxy/util/__init__.py
+++ b/lib/galaxy/util/__init__.py
@@ -37,7 +37,7 @@
gzip_magic = '\037\213'
bz2_magic = 'BZh'
-DEFAULT_ENCODING = 'utf-8'
+DEFAULT_ENCODING = os.environ.get('GALAXY_DEFAULT_ENCODING', 'utf-8')
NULL_CHAR = '\000'
BINARY_CHARS = [ NULL_CHAR ]
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.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/6be4eb823a7e/
Changeset: 6be4eb823a7e
User: carlfeberhard
Date: 2013-12-05 20:15:43
Summary: HDA API: return purged with summary data, allow purge flag in query or payload for DELETE
Affected #: 1 file
diff -r bba295ef97e41acfcf3e160d1d3067d4ee0e81a1 -r 6be4eb823a7ea30f35411251900487ee92734b7e 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
@@ -120,6 +120,7 @@
'state' : hda.state,
'deleted': hda.deleted,
'visible': hda.visible,
+ 'purged': hda.purged,
'hid' : hda.hid,
'url' : url_for( 'history_content', history_id=encoded_history_id, id=encoded_id, ),
}
@@ -309,8 +310,9 @@
return { 'error': str( exception ) }
return changed
+ #TODO: allow anonymous del/purge and test security on this
@web.expose_api
- def delete( self, trans, history_id, id, **kwd ):
+ def delete( self, trans, history_id, id, purge=False, **kwd ):
"""
delete( self, trans, history_id, id, **kwd )
* DELETE /api/histories/{history_id}/contents/{id}
@@ -319,22 +321,29 @@
:type id: str
:param id: the encoded id of the history to delete
+ :type purge: bool
+ :param purge: if True, purge the HDA
:type kwd: dict
:param kwd: (optional) dictionary structure containing:
* payload: a dictionary itself containing:
* purge: if True, purge the HDA
+ .. note:: that payload optionally can be placed in the query string of the request.
+ This allows clients that strip the request body to still purge the dataset.
+
:rtype: dict
:returns: an error object if an error occurred or a dictionary containing:
* id: the encoded id of the history,
* deleted: if the history was marked as deleted,
* purged: if the history was purged
"""
- # a request body is optional here
- purge = False
+ # get purge from the query or from the request body payload (a request body is optional here)
+ purge = util.string_as_bool( purge )
if kwd.get( 'payload', None ):
- purge = util.string_as_bool( kwd['payload'].get( 'purge', False ) )
+ # payload takes priority
+ purge = util.string_as_bool( kwd['payload'].get( 'purge', purge ) )
+
rval = { 'id' : id }
try:
hda = self.get_dataset( trans, id,
@@ -356,8 +365,10 @@
# flush now to preserve deleted state in case of later interruption
trans.sa_session.flush()
rval[ 'purged' ] = True
+
trans.sa_session.flush()
rval[ 'deleted' ] = True
+
except exceptions.httpexceptions.HTTPInternalServerError, http_server_err:
log.exception( 'HDA API, delete: uncaught HTTPInternalServerError: %s, %s\n%s',
id, str( kwd ), str( http_server_err ) )
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.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/66e0f985ad0b/
Changeset: 66e0f985ad0b
User: carlfeberhard
Date: 2013-12-05 19:42:05
Summary: Dataset, purge and purge async: allow non-deleted datasets to be purged (setting delete in the process)
Affected #: 1 file
diff -r 5b1f793c3227d3eb13240a4730627d9f17a5d556 -r 66e0f985ad0b9b33e5429979651e363a656ac686 lib/galaxy/webapps/galaxy/controllers/dataset.py
--- a/lib/galaxy/webapps/galaxy/controllers/dataset.py
+++ b/lib/galaxy/webapps/galaxy/controllers/dataset.py
@@ -887,8 +887,8 @@
# If the user is known, make sure the HDA is owned by the current user.
else:
assert topmost_parent.history.user == trans.user, 'Invalid history dataset ID'
- # HDA is not deleted
- assert hda.deleted, 'History dataset is not marked as deleted'
+ # Ensure HDA is deleted
+ hda.deleted = True
# HDA is purgeable
# Decrease disk usage first
if user:
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.