1 new changeset in galaxy-central: http://bitbucket.org/galaxy/galaxy-central/changeset/70a9d3998da6/ changeset: r5162:70a9d3998da6 user: jgoecks date: 2011-03-02 23:31:09 summary: Set message type to error when history deletion fails due to sharing. Fixes #477 affected #: 1 file (31 bytes) --- a/lib/galaxy/web/controllers/history.py Wed Mar 02 17:15:08 2011 -0500 +++ b/lib/galaxy/web/controllers/history.py Wed Mar 02 17:31:09 2011 -0500 @@ -250,9 +250,11 @@ n_deleted = 0 deleted_current = False message_parts = [] + status = SUCCESS for history in histories: if history.users_shared_with: message_parts.append( "History (%s) has been shared with others, unshare it before deleting it. " % history.name ) + status = ERROR elif not history.deleted: # We'll not eliminate any DefaultHistoryPermissions in case we undelete the history later history.deleted = True @@ -262,7 +264,6 @@ trans.new_history() trans.log_event( "History (%s) marked as deleted" % history.name ) n_deleted += 1 - status = SUCCESS if n_deleted: message_parts.append( "Deleted %d %s. " % ( n_deleted, iff( n_deleted != 1, "histories", "history" ) ) ) if deleted_current: 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.