2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/7dd1f6db0e3f/ Changeset: 7dd1f6db0e3f Branch: next-stable User: jmchilton Date: 2014-02-06 17:48:02 Summary: Bugfix: Allow users to 'unshare' histories shared with them. Affected #: 1 file diff -r d557d5dd942f5bbf820e19ec3fe7278401489555 -r 7dd1f6db0e3ff3affa9a01a63b8c11efbaa2380b lib/galaxy/webapps/galaxy/controllers/history.py --- a/lib/galaxy/webapps/galaxy/controllers/history.py +++ b/lib/galaxy/webapps/galaxy/controllers/history.py @@ -413,7 +413,9 @@ if not ids: message = "Select a history to unshare" return self.shared_list_grid( trans, status='error', message=message, **kwargs ) - histories = [ self.get_history( trans, history_id ) for history_id in ids ] + # No need to check security, association below won't yield a + # hit if this user isn't having the history shared with her. + histories = [ self.get_history( trans, history_id, check_ownership=False ) for history_id in ids ] for history in histories: # Current user is the user with which the histories were shared association = trans.sa_session.query( trans.app.model.HistoryUserShareAssociation ).filter_by( user=trans.user, history=history ).one() https://bitbucket.org/galaxy/galaxy-central/commits/8922d9e14d83/ Changeset: 8922d9e14d83 User: jmchilton Date: 2014-02-06 17:48:18 Summary: Merge next-stable. Affected #: 1 file diff -r 75a81fcf38c477420f96035c9ed4b27edb55dd94 -r 8922d9e14d83d2bbcb06ea8498b17c2e3ea460b2 lib/galaxy/webapps/galaxy/controllers/history.py --- a/lib/galaxy/webapps/galaxy/controllers/history.py +++ b/lib/galaxy/webapps/galaxy/controllers/history.py @@ -417,7 +417,9 @@ if not ids: message = "Select a history to unshare" return self.shared_list_grid( trans, status='error', message=message, **kwargs ) - histories = [ self.get_history( trans, history_id ) for history_id in ids ] + # No need to check security, association below won't yield a + # hit if this user isn't having the history shared with her. + histories = [ self.get_history( trans, history_id, check_ownership=False ) for history_id in ids ] for history in histories: # Current user is the user with which the histories were shared association = trans.sa_session.query( trans.app.model.HistoryUserShareAssociation ).filter_by( user=trans.user, history=history ).one() 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.