Merge pull request #4214 from guerler/revise_tool_url

[17.05] Improve resilience of tool url building
2026-09-24 16:30:27 +08:00 · 2017-06-22 14:06:52 -04:00
parent f7ba729510 a498390bef
commit 9dca211e2f
6 changed files with 10 additions and 11 deletions
@@ -66,14 +66,13 @@ define( [ 'utils/utils', 'utils/deferred', 'mvc/ui/ui-misc', 'mvc/form/form-view
            // build request url
            var build_url = '';
            var build_data = {};
-            if ( options.job_id ) {
-                build_url = Galaxy.root + 'api/jobs/' + options.job_id + '/build_for_rerun';
+            if ( new_options.job_id ) {
+                build_url = Galaxy.root + 'api/jobs/' + new_options.job_id + '/build_for_rerun';
            } else {
                build_url = Galaxy.root + 'api/tools/' + options.id + '/build';
-                if ( Galaxy.params && Galaxy.params.tool_id == options.id ) {
-                    build_data = $.extend( {}, Galaxy.params );
-                    options.version && ( build_data[ 'tool_version' ] = options.version );
-                }
+                build_data = $.extend( {}, Galaxy.params );
+                build_data[ 'tool_id' ] && ( delete build_data[ 'tool_id' ] );
+                options.version && ( build_data[ 'tool_version' ] = options.version );
            }

            // get initial model