2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/92258dc7b1e3/ Changeset: 92258dc7b1e3 User: dannon Date: 2015-01-23 13:13:45+00:00 Summary: Add missing parameter in provenance controller. Affected #: 1 file diff -r fc8e37c905ef95395f3aeb2ea24f52d1a622015f -r 92258dc7b1e37eb21ad648724ffd1f3026fb59ab lib/galaxy/webapps/galaxy/api/provenance.py --- a/lib/galaxy/webapps/galaxy/api/provenance.py +++ b/lib/galaxy/webapps/galaxy/api/provenance.py @@ -41,7 +41,7 @@ def _get_provenance( self, trans, item_class_name, item_id, follow=True ): provenance_item = self.get_object( trans, item_id, item_class_name, check_ownership=False, check_accessible=False) if item_class_name == "HistoryDatasetAssociation": - self.hda_manager.error_unless_accessible( trans, provenance_item ) + self.hda_manager.error_unless_accessible( trans, provenance_item, trans.user ) else: self.security_check( trans, provenance_item, check_accessible=True ) out = self._get_record( trans, provenance_item, follow ) https://bitbucket.org/galaxy/galaxy-central/commits/58e5b7165b1a/ Changeset: 58e5b7165b1a User: dannon Date: 2015-01-23 13:14:02+00:00 Summary: Merge. Affected #: 1 file diff -r 92258dc7b1e37eb21ad648724ffd1f3026fb59ab -r 58e5b7165b1ad59d0547bf287e24988a3271449e templates/galaxy_client_app.mako --- a/templates/galaxy_client_app.mako +++ b/templates/galaxy_client_app.mako @@ -83,7 +83,7 @@ users_api_controller = trans.webapp.api_controllers[ 'users' ] tags_used = [] for tag in users_api_controller.get_user_tags_used( trans, user=trans.user ): - tag = tag | h + tag = escape( tag ) if tag: tags_used.append( tag ) user_dict[ 'tags_used' ] = tags_used @@ -106,6 +106,8 @@ except Exception, exc: pass + #TODO: no logging available? + #log.exception( exc ) return user_dict %> 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.