2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/ef86eb163f3f/ Changeset: ef86eb163f3f User: jmchilton Date: 2014-12-04 14:16:01+00:00 Summary: Easier debugging of API test problems. Affected #: 1 file diff -r 50fe8f57c2fbe71ec3ee7b7dd2b489a0d7c32d78 -r ef86eb163f3f66c046f7ca4ff0d829b38b0728d4 test/api/helpers.py --- a/test/api/helpers.py +++ b/test/api/helpers.py @@ -76,7 +76,11 @@ return run_response.json()["outputs"][0] def wait_for_history( self, history_id, assert_ok=False, timeout=DEFAULT_HISTORY_TIMEOUT ): - return wait_on_state( lambda: self.galaxy_interactor.get( "histories/%s" % history_id ), assert_ok=assert_ok, timeout=timeout ) + try: + return wait_on_state( lambda: self.galaxy_interactor.get( "histories/%s" % history_id ), assert_ok=assert_ok, timeout=timeout ) + except AssertionError: + self.galaxy_interactor._summarize_history_errors( history_id ) + raise def wait_for_job( self, job_id, assert_ok=False, timeout=DEFAULT_HISTORY_TIMEOUT ): return wait_on_state( lambda: self.galaxy_interactor.get( "jobs/%s" % job_id ), assert_ok=assert_ok, timeout=timeout ) https://bitbucket.org/galaxy/galaxy-central/commits/100a7353b7fa/ Changeset: 100a7353b7fa User: jmchilton Date: 2014-12-04 14:16:01+00:00 Summary: Remove seemingly unlinked to workflow action and template. Please let me know if I missed something. Affected #: 2 files diff -r ef86eb163f3f66c046f7ca4ff0d829b38b0728d4 -r 100a7353b7faf9815783ec7f1245bb539a1b2717 lib/galaxy/webapps/galaxy/controllers/workflow.py --- a/lib/galaxy/webapps/galaxy/controllers/workflow.py +++ b/lib/galaxy/webapps/galaxy/controllers/workflow.py @@ -407,27 +407,6 @@ @web.expose @web.require_login( "use Galaxy workflows" ) - def edit_attributes( self, trans, id, **kwargs ): - # Get workflow and do error checking. - stored = self.get_stored_workflow( trans, id ) - if not stored: - error( "You do not own this workflow or workflow ID is invalid." ) - # Update workflow attributes if new values submitted. - if 'name' in kwargs: - # Rename workflow. - stored.name = sanitize_html( kwargs['name'] ) - if 'annotation' in kwargs: - # Set workflow annotation; sanitize annotation before adding it. - annotation = sanitize_html( kwargs[ 'annotation' ], 'utf-8', 'text/html' ) - self.add_item_annotation( trans.sa_session, trans.get_user(), stored, annotation ) - trans.sa_session.flush() - return trans.fill_template( 'workflow/edit_attributes.mako', - stored=stored, - annotation=self.get_item_annotation_str( trans.sa_session, trans.user, stored ) - ) - - @web.expose - @web.require_login( "use Galaxy workflows" ) def rename( self, trans, id, new_name=None, **kwargs ): stored = self.get_stored_workflow( trans, id ) if new_name is not None: diff -r ef86eb163f3f66c046f7ca4ff0d829b38b0728d4 -r 100a7353b7faf9815783ec7f1245bb539a1b2717 templates/webapps/galaxy/workflow/edit_attributes.mako --- a/templates/webapps/galaxy/workflow/edit_attributes.mako +++ /dev/null @@ -1,66 +0,0 @@ -<%inherit file="/base.mako"/> -<%namespace file="/message.mako" import="render_msg" /> - -<%def name="title()">${_('Edit Workflow Attributes')}</%def> - -<%def name="stylesheets()"> - ${h.css( "base", "autocomplete_tagging" )} -</%def> - -<%def name="javascripts()"> - ${parent.javascripts()} - ${h.js( "libs/jquery/jquery.autocomplete", "galaxy.autocom_tagging" )} -</%def> - -%if msg: - ${render_msg( msg, messagetype )} -%endif - -<%def name="body()"> - <div class="toolForm"> - <div class="toolFormTitle">${_('Edit Workflow Attributes')}</div> - <div class="toolFormBody"> - <form name="edit_attributes" action="${h.url_for(controller='workflow', action='edit_attributes' )}" method="post"> - <input type="hidden" name="id" value="${trans.security.encode_id( stored.id )}"/> - <div class="form-row"> - <label> - Name: - </label> - <div style="float: left; width: 225px; margin-right: 10px;"> - <input type="text" name="name" value="${stored.name}" size="30"/> - </div> - <div style="clear: both"></div> - </div> - <%namespace file="/tagging_common.mako" import="render_individual_tagging_element" /> - <div class="form-row"> - <label> - Tags: - </label> - <div style="float: left; width: 265px; margin-right: 10px; border-style: inset; border-width: 1px; margin-left: 2px"> - <style> - .tag-area { - border: none; - } - </style> - ${render_individual_tagging_element(user=trans.get_user(), tagged_item=stored, elt_context="edit_attributes.mako", use_toggle_link=False, in_form=True, input_size="25")} - </div> - <div style="clear: both"></div> - <div class="toolParamHelp">Apply tags to make it easy to search for and find items with the same tag.</div> - </div> - <div class="form-row"> - <label> - Annotation / Notes: - </label> - <div style="float: left; width: 225px; margin-right: 10px;"> - <textarea name="annotation" cols="30" rows="2">${annotation}</textarea> - </div> - <div style="clear: both"></div> - <div class="toolParamHelp">Add an annotation notes to a workflow; annotations are available when a workflow is viewed.</div> - </div> - <div class="form-row"> - <input type="submit" name="save" value="${_('Save')}"/> - </div> - </form> - </div> - </div> -</%def> 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.