Merge pull request #1059 from guerler/fix_message_000

[15.10] Fix parsing of message configuration
galaxyproject · Nov 11, 2015 · 6953bdf · 6953bdf
2 parents 4f72178 + 6580701
commit 6953bdf
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/client/galaxy/scripts/galaxy-app-base.js b/client/galaxy/scripts/galaxy-app-base.js
@@ -27,7 +27,6 @@ GalaxyApp.prototype.defaultOptions = {
     /** monkey patch attributes from existing window.Galaxy object? */
     patchExisting   : true,
     /** root url of this app */
-    // move to self.root?
     root            : '/'
 };
 
@@ -53,6 +52,8 @@ GalaxyApp.prototype._init = function init( options ){
     self._initUser( options.user || bootstrapped.user || {} );
     self.debug( 'GalaxyApp.user: ', self.user );
 
+    self.root = options.root;
+    self.debug( 'GalaxyApp.root: ', self.root );
     //TODO: temp
     self.trigger( 'ready', self );
     //if( typeof options.onload === 'function' ){

diff --git a/lib/galaxy/managers/configuration.py b/lib/galaxy/managers/configuration.py
@@ -62,6 +62,10 @@ def _defaults_to( default ):
             'ftp_upload_dir'            : _defaults_to( None ),
             'ftp_upload_site'           : _defaults_to( None ),
             'version_major'             : _defaults_to( None ),
+            'inactivity_box_content'    : _defaults_to( None ),
+            'message_box_content'       : _defaults_to( None ),
+            'message_box_visible'       : _defaults_to( False ),
+            'message_box_class'         : _defaults_to( 'info' ),
         }
 
 

diff --git a/static/maps/galaxy-app-base.js.map b/static/maps/galaxy-app-base.js.map
diff --git a/static/scripts/galaxy-app-base.js b/static/scripts/galaxy-app-base.js