Merge branch 'release_16.07' into fix_history_refresh

galaxyproject · Aug 5, 2016 · fe3db95 · fe3db95
2 parents 5c79aa8 + 258e4a7
commit fe3db95
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/client/galaxy/scripts/layout/scratchbook.js b/client/galaxy/scripts/layout/scratchbook.js
@@ -175,7 +175,7 @@ return Backbone.View.extend({
             var $galaxy_main = $( window.parent.document ).find( '#galaxy_main' );
             if ( options.target == 'galaxy_main' || options.target == 'center' ) {
                 if ( $galaxy_main.length === 0 ) {
-                    window.location = options.url + ( href.indexOf( '?' ) == -1 ? '?' : '&' ) + 'use_panels=True';
+                    window.location = options.url + ( options.url.indexOf( '?' ) == -1 ? '?' : '&' ) + 'use_panels=True';
                 } else {
                     $galaxy_main.attr( 'src', options.url );
                 }

diff --git a/static/maps/layout/scratchbook.js.map b/static/maps/layout/scratchbook.js.map
diff --git a/static/scripts/bundled/libs.bundled.js b/static/scripts/bundled/libs.bundled.js
diff --git a/static/scripts/bundled/libs.bundled.js.map b/static/scripts/bundled/libs.bundled.js.map
diff --git a/static/scripts/layout/scratchbook.js b/static/scripts/layout/scratchbook.js