3 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/a8f45564f23f/ Changeset: a8f45564f23f Branch: workflow-input-fix User: kell...@gmail.com Date: 2014-11-05 22:39:08+00:00 Summary: Fixing workflow import to correctly set the uuid Affected #: 1 file diff -r f9e8de1c84b2d60cc727ec5b64da6fe67616b7ed -r a8f45564f23fdacc27bec05364be7d99176bdec2 lib/galaxy/web/base/controller.py --- a/lib/galaxy/web/base/controller.py +++ b/lib/galaxy/web/base/controller.py @@ -85,7 +85,7 @@ Convenience method to get a model object with the specified checks. """ return managers_base.get_object( trans, id, class_name, check_ownership=check_ownership, check_accessible=check_accessible, deleted=deleted ) - + # this should be here - but catching errors from sharable item controllers that *should* have SharableItemMixin # but *don't* then becomes difficult #def security_check( self, trans, item, check_ownership=False, check_accessible=False ): @@ -1596,6 +1596,8 @@ else: name = data['name'] workflow.name = name + if 'uuid' in data: + workflow.uuid = data['uuid'] # Assume no errors until we find a step that has some workflow.has_errors = False # Create each step @@ -1703,7 +1705,7 @@ data['name'] = workflow.name data['annotation'] = annotation_str if workflow.uuid is not None: - data['uuid'] = str(workflow.uuid) + data['uuid'] = str(workflow.uuid) data['steps'] = {} # For each step, rebuild the form and encode the state for step in workflow.steps: https://bitbucket.org/galaxy/galaxy-central/commits/f1172da99fb5/ Changeset: f1172da99fb5 Branch: workflow-input-fix User: kellrott Date: 2014-11-06 22:18:03+00:00 Summary: Removing whitespace fixes to avoid merge conflict Affected #: 1 file diff -r a8f45564f23fdacc27bec05364be7d99176bdec2 -r f1172da99fb5501f2fce6cdac5646bbda442cac7 lib/galaxy/web/base/controller.py --- a/lib/galaxy/web/base/controller.py +++ b/lib/galaxy/web/base/controller.py @@ -85,7 +85,7 @@ Convenience method to get a model object with the specified checks. """ return managers_base.get_object( trans, id, class_name, check_ownership=check_ownership, check_accessible=check_accessible, deleted=deleted ) - + # this should be here - but catching errors from sharable item controllers that *should* have SharableItemMixin # but *don't* then becomes difficult #def security_check( self, trans, item, check_ownership=False, check_accessible=False ): @@ -1705,7 +1705,7 @@ data['name'] = workflow.name data['annotation'] = annotation_str if workflow.uuid is not None: - data['uuid'] = str(workflow.uuid) + data['uuid'] = str(workflow.uuid) data['steps'] = {} # For each step, rebuild the form and encode the state for step in workflow.steps: https://bitbucket.org/galaxy/galaxy-central/commits/93723d1cf699/ Changeset: 93723d1cf699 User: dannon Date: 2014-11-08 00:48:15+00:00 Summary: Merged in kellrott/galaxy-farm/workflow-input-fix (pull request #552) Fixing workflow import to correctly set the uuid Affected #: 1 file diff -r 04644e64c498ca4eacbfa1c6df26cb546705b96c -r 93723d1cf699eab771ccde086d34bec1fd1c22e6 lib/galaxy/web/base/controller.py --- a/lib/galaxy/web/base/controller.py +++ b/lib/galaxy/web/base/controller.py @@ -1596,6 +1596,8 @@ else: name = data['name'] workflow.name = name + if 'uuid' in data: + workflow.uuid = data['uuid'] # Assume no errors until we find a step that has some workflow.has_errors = False # Create each step 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.