1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/8c57fc528cb7/
Changeset: 8c57fc528cb7
User: dannon
Date: 2015-01-07 19:10:42+00:00
Summary: Clarify source of errors reported by anonymous users who don't provide a contact email address.
Affected #: 1 file
diff -r 81e27001166b0e01b89eabc79d32b0adf72d5ef5 -r 8c57fc528cb7255ab11d20b03b5dd8509e3ea5a0 lib/galaxy/tools/errors.py
--- a/lib/galaxy/tools/errors.py
+++ b/lib/galaxy/tools/errors.py
@@ -86,7 +86,7 @@
if user and user.email != email:
email_str = "'%s' (providing preferred contact email '%s')" % (user.email, email)
else:
- email_str = "'%s'" % email
+ email_str = "'%s'" % (email or 'anonymously')
self.report = string.Template( error_report_template ) \
.safe_substitute( host=host,
dataset_id=hda.dataset_id,
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/81e27001166b/
Changeset: 81e27001166b
User: dannon
Date: 2015-01-07 18:45:12+00:00
Summary: Use set_tags_from_list for PJA instead of apply_item_tags.
Affected #: 2 files
diff -r 53e839193da1f58b15834b07a61a3c131267795f -r 81e27001166b0e01b89eabc79d32b0adf72d5ef5 lib/galaxy/jobs/actions/post.py
--- a/lib/galaxy/jobs/actions/post.py
+++ b/lib/galaxy/jobs/actions/post.py
@@ -428,12 +428,11 @@
@classmethod
def execute(cls, app, sa_session, action, job, replacement_dict):
if action.action_arguments:
- tags = ','.join([t.strip() for t in action.action_arguments.get('tags', '').split(',')])
+ tags = [t.strip() for t in action.action_arguments.get('tags', '').split(',')]
if tags:
for dataset_assoc in job.output_datasets:
if action.output_name == '' or dataset_assoc.name == action.output_name:
- app.tag_handler.apply_item_tags( job.user, dataset_assoc.dataset,
- unicode(tags.encode('utf-8'), 'utf-8'))
+ app.tag_handler.set_tags_from_list( job.user, dataset_assoc.dataset, tags)
sa_session.flush()
@classmethod
diff -r 53e839193da1f58b15834b07a61a3c131267795f -r 81e27001166b0e01b89eabc79d32b0adf72d5ef5 lib/galaxy/managers/tags.py
--- a/lib/galaxy/managers/tags.py
+++ b/lib/galaxy/managers/tags.py
@@ -1,5 +1,5 @@
+import logging
import re
-import logging
from sqlalchemy.sql import select
from sqlalchemy.sql.expression import func
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.