Merge pull request #7074 from dannon/fix_for_facebook_auth

[18.09] Fix welcome on redirect from facebook auth
galaxyproject · Dec 12, 2018 · 4df43ad · 4df43ad
2 parents 6db7219 + f8ed3e7
commit 4df43ad
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/client/galaxy/scripts/apps/analysis.js b/client/galaxy/scripts/apps/analysis.js
@@ -51,7 +51,7 @@ window.app = function app(options, bootstrapped) {
     /** Routes */
     var AnalysisRouter = Router.extend({
         routes: {
-            "(/)": "home",
+            "(/)(#)(_=_)": "home",
             "(/)root*": "home",
             "(/)tours(/)(:tour_id)": "show_tours",
             "(/)user(/)": "show_user",

diff --git a/client/galaxy/scripts/layout/menu.js b/client/galaxy/scripts/layout/menu.js
@@ -221,9 +221,9 @@ var Collection = Backbone.Collection.extend({
         }
         if (options.helpsite_url) {
             helpTab.menu.unshift({
-                    title: _l("Galaxy Help"),
-                    url: options.helpsite_url,
-                    target: "_blank"
+                title: _l("Galaxy Help"),
+                url: options.helpsite_url,
+                target: "_blank"
             });
         }
         this.add(helpTab);