From 0ba54e922046733e582b7c5b4066525edc3957aa Mon Sep 17 00:00:00 2001 From: Nate Coraor Date: Tue, 8 Nov 2016 12:21:09 -0500 Subject: [PATCH 1/2] Treat the value of `message_box_visible` in galaxy.ini as a boolean --- lib/galaxy/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/galaxy/config.py b/lib/galaxy/config.py index 703db8cfb18..be422486e5d 100644 --- a/lib/galaxy/config.py +++ b/lib/galaxy/config.py @@ -279,7 +279,7 @@ class Configuration( object ): self.welcome_url = kwargs.get( 'welcome_url', '/static/welcome.html' ) self.show_welcome_with_login = string_as_bool( kwargs.get( "show_welcome_with_login", "False" ) ) # Configuration for the message box directly below the masthead. - self.message_box_visible = kwargs.get( 'message_box_visible', False ) + self.message_box_visible = string_as_bool( kwargs.get( 'message_box_visible', False ) ) self.message_box_content = kwargs.get( 'message_box_content', None ) self.message_box_class = kwargs.get( 'message_box_class', 'info' ) self.support_url = kwargs.get( 'support_url', 'https://wiki.galaxyproject.org/Support' ) From 7bee2651aa8f08ea0495d167e33d317a22ae3ef9 Mon Sep 17 00:00:00 2001 From: Nate Coraor Date: Tue, 8 Nov 2016 13:35:18 -0500 Subject: [PATCH 2/2] string_as_bool for message_box_visible on webapps --- lib/galaxy/webapps/reports/config.py | 2 +- lib/galaxy/webapps/tool_shed/config.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/galaxy/webapps/reports/config.py b/lib/galaxy/webapps/reports/config.py index 05b1c0bdf76..203adb5766d 100644 --- a/lib/galaxy/webapps/reports/config.py +++ b/lib/galaxy/webapps/reports/config.py @@ -40,7 +40,7 @@ class Configuration( object ): self.log_actions = string_as_bool( kwargs.get( 'log_actions', 'False' ) ) self.brand = kwargs.get( 'brand', None ) # Configuration for the message box directly below the masthead. - self.message_box_visible = kwargs.get( 'message_box_visible', False ) + self.message_box_visible =string_as_bool( kwargs.get( 'message_box_visible', False ) ) self.message_box_content = kwargs.get( 'message_box_content', None ) self.message_box_class = kwargs.get( 'message_box_class', 'info' ) self.wiki_url = kwargs.get( 'wiki_url', 'https://wiki.galaxyproject.org/' ) diff --git a/lib/galaxy/webapps/tool_shed/config.py b/lib/galaxy/webapps/tool_shed/config.py index 6973c26a541..d787ace36c6 100644 --- a/lib/galaxy/webapps/tool_shed/config.py +++ b/lib/galaxy/webapps/tool_shed/config.py @@ -110,7 +110,7 @@ class Configuration( object ): self.brand = kwargs.get( 'brand', None ) self.pretty_datetime_format = expand_pretty_datetime_format( kwargs.get( 'pretty_datetime_format', '$locale (UTC)' ) ) # Configuration for the message box directly below the masthead. - self.message_box_visible = kwargs.get( 'message_box_visible', False ) + self.message_box_visible = string_as_bool( kwargs.get( 'message_box_visible', False ) ) self.message_box_content = kwargs.get( 'message_box_content', None ) self.message_box_class = kwargs.get( 'message_box_class', 'info' ) self.support_url = kwargs.get( 'support_url', 'https://wiki.galaxyproject.org/Support' )