Commit fb32fded authored by Cage, Gregory's avatar Cage, Gregory
Browse files

Merge branch 'disable-log-out-2' into 'dev' 

Add config option to hide the sign out link in user menu

See merge request !52
parents cb32611e b11b8907

client/src/entry/analysis/menu.js

+1 −1
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ export function fetchMenu(options = {}) { 
        userTab.menu.push({

            title: _l("Sign Out"),

            onclick: userLogout,

            hidden: Galaxy.config.single_user,

            hidden: Galaxy.config.single_user || Galaxy.config.hide_sign_out,

        });

    }

    menu.push(userTab);

lib/galaxy/config/sample/galaxy.yml.sample

+5 −0
Original line number Diff line number Diff line
@@ -1977,6 +1977,11 @@ galaxy: 
  # Force everyone to log in (disable anonymous access).

  #require_login: false



  # Hide the sign out link in the user menu (Useful if only third party

  # authentication is enabled, and users should only sign out using the 

  # authentication provider's sign out page.)

  #hide_sign_out: true



  # Show the site's welcome page (see welcome_url) alongside the login

  # page (even if require_login is true).

  #show_welcome_with_login: false

lib/galaxy/config/schemas/config_schema.yml

+9 −0
Original line number Diff line number Diff line
@@ -2609,6 +2609,15 @@ mapping: 
        desc: |

          Force everyone to log in (disable anonymous access).



      hide_sign_out:

        type: bool

        default: false

        required: false

        desc: |

          Hide the sign out link in the user menu (Useful if only third party

          authentication is enabled, and users should only sign out using the 

          authentication provider's sign out page.)



      show_welcome_with_login:

        type: bool

        default: false

lib/galaxy/managers/configuration.py

+1 −0
Original line number Diff line number Diff line
@@ -171,6 +171,7 @@ class ConfigSerializer(base.ModelSerializer): 
            "version_minor": _defaults_to(None),

            "version_extra": _use_config,

            "require_login": _use_config,

            "hide_sign_out": _use_config,

            "inactivity_box_content": _use_config,

            "visualizations_visible": _use_config,

            "interactivetools_enable": _use_config,