2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/6cba7c5f3635/ Changeset: 6cba7c5f3635 User: carlfeberhard Date: 2014-01-14 22:41:20 Summary: Histories API: apply None rule from 5c5e543 to history update Affected #: 1 file diff -r be5f0c5df96fba1a12e3e96fdb6f1805703f0b73 -r 6cba7c5f36358f7e71168cff6118e15642d01cef lib/galaxy/webapps/galaxy/api/histories.py --- a/lib/galaxy/webapps/galaxy/api/histories.py +++ b/lib/galaxy/webapps/galaxy/api/histories.py @@ -344,6 +344,8 @@ ) validated_payload = {} for key, val in payload.items(): + if val is None: + continue if key in ( 'name', 'genome_build', 'annotation' ): validated_payload[ key ] = self.validate_and_sanitize_basestring( key, val ) if key in ( 'deleted', 'published' ): https://bitbucket.org/galaxy/galaxy-central/commits/027eb5827bab/ Changeset: 027eb5827bab User: carlfeberhard Date: 2014-01-14 22:41:37 Summary: merge Affected #: 1 file diff -r 6cba7c5f36358f7e71168cff6118e15642d01cef -r 027eb5827babc5a6b07b6c3e098bacd09185adf4 templates/webapps/galaxy/tool_form.mako --- a/templates/webapps/galaxy/tool_form.mako +++ b/templates/webapps/galaxy/tool_form.mako @@ -268,12 +268,12 @@ <%def name="row_for_rerun()"> %if trans.app.config.track_jobs_in_database and tool_state.rerun_remap_job_id is not None: - <div class="form-row"> + <div id="remap-row" class="form-row"><input type="checkbox" name="rerun_remap_job_id" value="${tool_state.rerun_remap_job_id}"> Resume dependencies from this job <div class="toolParamHelp" style="clear: both;"> The previous run of this tool failed and other tools were waiting for it to finish successfully, use this option to resume those tools using the outputs of this tool run. </div> - <div> + </div><div style="clear: both;"></div> %endif </%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.