2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/a66e4111ba2a/ Changeset: a66e4111ba2a Branch: next-stable User: carlfeberhard Date: 2014-02-06 19:21:24 Summary: Fix: HDA API show on imported, non-shared histories (thanks, John Chilton) Affected #: 1 file diff -r 7dd1f6db0e3ff3affa9a01a63b8c11efbaa2380b -r a66e4111ba2aeca52572d203e1713153a5ee293a lib/galaxy/web/base/controller.py --- a/lib/galaxy/web/base/controller.py +++ b/lib/galaxy/web/base/controller.py @@ -616,11 +616,12 @@ check_ownership=False, check_accessible=False ) if check_accessible: - if not trans.app.security_agent.can_access_dataset( trans.get_current_user_roles(), hda.dataset ): + if( not trans.user_is_admin() + and not trans.app.security_agent.can_access_dataset( trans.get_current_user_roles(), hda.dataset ) ): error( "You are not allowed to access this dataset" ) - if check_state and hda.state == trans.model.Dataset.states.UPLOAD: - error( "Please wait until this dataset finishes uploading before attempting to view it." ) + if check_state and hda.state == trans.model.Dataset.states.UPLOAD: + error( "Please wait until this dataset finishes uploading before attempting to view it." ) return hda def get_history_dataset_association_from_ids( self, trans, id, history_id ): @@ -646,8 +647,6 @@ check_ownership=True, check_accessible=True ) return hda - - def get_hda_list( self, trans, hda_ids, check_ownership=True, check_accessible=False, check_state=True ): """ Returns one or more datasets in a list. https://bitbucket.org/galaxy/galaxy-central/commits/3db994bbb579/ Changeset: 3db994bbb579 User: carlfeberhard Date: 2014-02-06 19:21:55 Summary: merge Affected #: 1 file diff -r 8922d9e14d83d2bbcb06ea8498b17c2e3ea460b2 -r 3db994bbb5794de782a824b5ea8b2220b99e97ec lib/galaxy/web/base/controller.py --- a/lib/galaxy/web/base/controller.py +++ b/lib/galaxy/web/base/controller.py @@ -659,11 +659,12 @@ check_ownership=False, check_accessible=False ) if check_accessible: - if not trans.app.security_agent.can_access_dataset( trans.get_current_user_roles(), hda.dataset ): + if( not trans.user_is_admin() + and not trans.app.security_agent.can_access_dataset( trans.get_current_user_roles(), hda.dataset ) ): error( "You are not allowed to access this dataset" ) - if check_state and hda.state == trans.model.Dataset.states.UPLOAD: - error( "Please wait until this dataset finishes uploading before attempting to view it." ) + if check_state and hda.state == trans.model.Dataset.states.UPLOAD: + error( "Please wait until this dataset finishes uploading before attempting to view it." ) return hda def get_history_dataset_association_from_ids( self, trans, id, history_id ): @@ -689,8 +690,6 @@ check_ownership=True, check_accessible=True ) return hda - - def get_hda_list( self, trans, hda_ids, check_ownership=True, check_accessible=False, check_state=True ): """ Returns one or more datasets in a list. 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.