1. galaxy
  2. galaxy-dist

Commits

Init Hello  committed 56de0ee

Fix for server error when logging out of the tool shed.

  • Participants
  • Parent commits 9722c83
  • Branches next-stable

Comments (0)

Files changed (3)

File lib/galaxy/web/framework/__init__.py

View file
                 other_galaxy_session.is_valid = False
                 self.sa_session.add( other_galaxy_session )
         self.sa_session.flush()
-        # This method is not called from the Galaxy reports, so the cookie will always be galaxysession
-        self.__update_session_cookie( name='galaxysession' )
+        if self.webapp.name == 'galaxy':
+            # This method is not called from the Galaxy reports, so the cookie will always be galaxysession
+            self.__update_session_cookie( name='galaxysession' )
+        elif self.webapp.name == 'tool_shed':
+            self.__update_session_cookie( name='galaxycommunitysession' )
     def get_galaxy_session( self ):
         """
         Return the current galaxy session

File templates/user/login.mako

View file
-<%!
-    def inherit(context):
-        if context.get('use_panels'):
-            return '/webapps/galaxy/base_panels.mako'
-        else:
-            return '/base.mako'
-%>
+%if trans.webapp.name == 'galaxy':
+    <%!
+        def inherit(context):
+            if context.get('use_panels'):
+                return '/webapps/galaxy/base_panels.mako'
+            else:
+                return '/base.mako'
+    %>
+%elif trans.webapp.name == 'tool_shed':
+    <%!
+        def inherit(context):
+            if context.get('use_panels'):
+                return '/webapps/tool_shed/base_panels.mako'
+            else:
+                return '/base.mako'
+    %>
+%endif
+
 <%inherit file="${inherit(context)}"/>
 
 <%def name="init()">

File templates/user/logout.mako

View file
-<%inherit file="/webapps/galaxy/base_panels.mako"/>
+%if trans.webapp.name == 'galaxy':
+    <%inherit file="/webapps/galaxy/base_panels.mako"/>
+%elif trans.webapp.name == 'tool_shed':
+    <%inherit file="/webapps/tool_shed/base_panels.mako"/>
+%endif
+
 <%namespace file="/message.mako" import="render_msg" />
 
-
 <%def name="init()">
 <%
     self.has_left_panel=False