Merge.

lib/galaxy/web/framework/helpers/grids.py

@@ -24,6 +24,7 @@ class Grid( object ):
     template = "grid_base.mako"
     async_template = "grid_base_async.mako"
     use_async = False
+    use_hide_message = True
     global_actions = []
     columns = []
     operations = []
@@ -286,6 +287,7 @@ class Grid( object ):
                                     status = status,
                                     message = message,
                                     use_panels=self.use_panels,
+                                    use_hide_message=self.use_hide_message,
                                     advanced_search=self.advanced_search,
                                     show_item_checkboxes = ( self.show_item_checkboxes or
                                                              kwargs.get( 'show_item_checkboxes', '' ) in [ 'True', 'true' ] ),

lib/tool_shed/grids/admin_grids.py

@@ -508,6 +508,7 @@ class RepositoryMetadataGrid( grids.Grid ):
     model_class = model.RepositoryMetadata
     template='/webapps/tool_shed/repository/grid.mako'
     default_sort_key = "name"
+    use_hide_message = False
     columns = [
         IdColumn( "Id",
                   visible=False,

lib/tool_shed/grids/repository_grids.py

@@ -236,6 +236,7 @@ class RepositoryGrid( grids.Grid ):
     model_class = model.Repository
     template='/webapps/tool_shed/repository/grid.mako'
     default_sort_key = "name"
+    use_hide_message = False
     columns = [
         NameColumn( "Name",
                     key="name",
@@ -344,6 +345,7 @@ class MatchedRepositoryGrid( grids.Grid ):
     model_class = model.RepositoryMetadata
     template='/webapps/tool_shed/repository/grid.mako'
     default_sort_key = "Repository.name"
+    use_hide_message = False
     columns = [
         NameColumn( "Repository name",
                     link=( lambda item: dict( operation="view_or_manage_repository", id=item.id ) ),
@@ -652,7 +654,7 @@ class MyWritableRepositoriesMissingToolTestComponentsGrid( RepositoriesMissingTo
     columns = [ col for col in RepositoriesMissingToolTestComponentsGrid.columns ]
     operations = []
     use_paging = False
-
+    
     def build_initial_query( self, trans, **kwd ):
         # First get all repositories that the current user is authorized to update.
         username = trans.user.username

lib/tool_shed/grids/repository_review_grids.py

@@ -36,6 +36,7 @@ class ComponentGrid( grids.Grid ):
     model_class = model.Component
     template='/webapps/tool_shed/repository_review/grid.mako'
     default_sort_key = "name"
+    use_hide_message = False
     columns = [
         NameColumn( "Name",
                     key="Component.name",
@@ -333,6 +334,7 @@ class RepositoryReviewsByUserGrid( grids.Grid ):
     model_class = model.RepositoryReview
     template='/webapps/tool_shed/repository_review/grid.mako'
     default_sort_key = 'repository_id'
+    use_hide_message = False
     columns = [
         RepositoryNameColumn( "Repository Name",
                               model_class=model.Repository,

static/scripts/galaxy.grids.js

@@ -194,7 +194,9 @@ var GridView = Backbone.View.extend({
         // update message
         if (options.message) {
             $('#grid-message').html(this.template_message(options));
-            setTimeout( function() { $('#grid-message').html(''); }, 5000);
+            if (options.use_hide_message) {
+                setTimeout( function() { $('#grid-message').html(''); }, 5000);
+            }
         }
         
         // configure elements

templates/grid_base.mako

@@ -64,6 +64,7 @@
         'legend'                        : grid.legend,
         'current_item_id'               : False,
         'use_panels'                    : context.get('use_panels'),
+        'use_hide_message'              : grid.use_hide_message,
         'insert'                        : insert,
         'default_filter_dict'           : default_filter_dict,
         'advanced_search'               : advanced_search,