[galaxy-commits] commit/galaxy-central: 2 new changesets

20 Aug 2014

2 new commits in galaxy-central:

https://bitbucket.org/galaxy/galaxy-central/commits/8fbff1243ec6/
Changeset:   8fbff1243ec6
User:        dannon
Date:        2014-08-20 18:55:32
Summary:     Swap remote user logout to actually follow galaxy internal logout procedure and then redirect.  Also fix logic for user dropdown -- it was preventing users from seeing stuff that was actually available before.
Affected #:  3 files

diff -r 30c4d8730943a40646341e6adf3659cf9fd36985 -r 8fbff1243ec6a676ba6434600592ba0141bcafc2 lib/galaxy/webapps/galaxy/controllers/user.py

--- a/lib/galaxy/webapps/galaxy/controllers/user.py
+++ b/lib/galaxy/webapps/galaxy/controllers/user.py
@@ -616,11 +616,14 @@
             if biostar_url:
                 # TODO: It would be better if we automatically logged this user out of biostar
                 message += '<br>To logout of Biostar, please click <a href="%s" target="_blank">here</a>.' % ( biostar_url )
-        return trans.fill_template( '/user/logout.mako',
-                                    refresh_frames=refresh_frames,
-                                    message=message,
-                                    status='done',
-                                    active_view="user" )
+        if trans.app.config.use_remote_user and trans.app.config.remote_user_logout_href:
+            trans.response.send_redirect(trans.app.config.remote_user_logout_href)
+        else:
+            return trans.fill_template('/user/logout.mako',
+                                       refresh_frames=refresh_frames,
+                                       message=message,
+                                       status='done',
+                                       active_view="user" )
 
     @web.expose
     def create( self, trans, cntrller='user', redirect_url='', refresh_frames=[], **kwd ):

diff -r 30c4d8730943a40646341e6adf3659cf9fd36985 -r 8fbff1243ec6a676ba6434600592ba0141bcafc2 static/scripts/galaxy.menu.js
--- a/static/scripts/galaxy.menu.js
+++ b/static/scripts/galaxy.menu.js
@@ -289,34 +289,24 @@
                 title       : "Logged in as " + this.options.user.email
             });
 
-            // remote user
-            if (this.options.use_remote_user && this.options.remote_user_logout_href)
-            {
-                tab_user.add({
-                    title   : "Logout",
-                    content : this.options.remote_user_logout_href,
-                    target  : "_top"
-                });
-            } else {
-                tab_user.add({
-                    title   : "Preferences",
-                    content : "user?cntrller=user",
-                    target  : "galaxy_main"
-                });
+            tab_user.add({
+                title   : "Preferences",
+                content : "user?cntrller=user",
+                target  : "galaxy_main"
+            });
 
-                tab_user.add({
-                    title   : "Custom Builds",
-                    content : "user/dbkeys",
-                    target  : "galaxy_main"
-                });
-            
-                tab_user.add({
-                    title   : "Logout",
-                    content : "user/logout",
-                    target  : "_top",
-                    divider : true
-                });
-            }
+            tab_user.add({
+                title   : "Custom Builds",
+                content : "user/dbkeys",
+                target  : "galaxy_main"
+            });
+        
+            tab_user.add({
+                title   : "Logout",
+                content : "user/logout",
+                target  : "_top",
+                divider : true
+            });
         
             // default tabs
             tab_user.add({

diff -r 30c4d8730943a40646341e6adf3659cf9fd36985 -r 8fbff1243ec6a676ba6434600592ba0141bcafc2 templates/user/index.mako
--- a/templates/user/index.mako
+++ b/templates/user/index.mako
@@ -19,13 +19,7 @@
             %if trans.app.config.enable_openid and not trans.app.config.use_remote_user:
                 <li><a href="${h.url_for( controller='user', action='openid_manage', cntrller=cntrller )}">${_('Manage OpenIDs')}</a> linked to your account</li>
             %endif
-            %if trans.app.config.use_remote_user:
-                %if trans.app.config.remote_user_logout_href:
-                    <li><a href="${trans.app.config.remote_user_logout_href}" target="_top">${_('Logout')}</a></li>
-                %endif
-            %else:
-                <li><a href="${h.url_for( controller='user', action='logout', logout_all=True )}" target="_top">${_('Logout')}</a> ${_('of all user sessions')}</li>
-            %endif
+            <li><a href="${h.url_for( controller='user', action='logout', logout_all=True )}" target="_top">${_('Logout')}</a> ${_('of all user sessions')}</li>
         %else:
             <li><a href="${h.url_for( controller='user', action='manage_user_info', cntrller=cntrller )}">${_('Manage your information')}</a></li><li><a href="${h.url_for( controller='user', action='api_keys', cntrller=cntrller )}">${_('Manage your API keys')}</a></li>


https://bitbucket.org/galaxy/galaxy-central/commits/871a781a0507/
Changeset:   871a781a0507
User:        dannon
Date:        2014-08-20 18:56:01
Summary:     Strip trailing whitespace from galaxy.menu.js
Affected #:  1 file

diff -r 8fbff1243ec6a676ba6434600592ba0141bcafc2 -r 871a781a05070d5a227469c55c4249dbe6945e2d static/scripts/galaxy.menu.js
--- a/static/scripts/galaxy.menu.js
+++ b/static/scripts/galaxy.menu.js
@@ -10,10 +10,10 @@
 {
     // options
     options: null,
-    
+
     // link masthead class
     masthead: null,
-    
+
     // initialize
     initialize: function(options)
     {
@@ -21,7 +21,7 @@
         this.masthead  = options.masthead;
         this.create();
     },
-    
+
     // default menu
     create: function()
     {
@@ -149,7 +149,7 @@
                 content     : "visualization/list",
                 target      : "_frame"
             });
-        } 
+        }
         this.masthead.append(tab_visualization);
 
         //
@@ -300,14 +300,14 @@
                 content : "user/dbkeys",
                 target  : "galaxy_main"
             });
-        
+
             tab_user.add({
                 title   : "Logout",
                 content : "user/logout",
                 target  : "_top",
                 divider : true
             });
-        
+
             // default tabs
             tab_user.add({
                 title   : "Saved Histories",
@@ -343,7 +343,7 @@
             // add to masthead
             this.masthead.append(tab_user);
         }
-        
+
         // identify active tab
         if (this.options.active_view)
             this.masthead.highlight(this.options.active_view);

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.

    

[galaxy-commits] commit/galaxy-central: 2 new changesets

commits-noreply＠bitbucket.org