2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/25d75b83632b/ Changeset: 25d75b83632b Branch: next-stable User: greg Date: 2014-01-27 22:10:36 Summary: Fixes for searching and page rendering in the tool shed's admin grids. Affected #: 1 file diff -r 31b4f3ee40d638fd7bd47951e443dec59a99a193 -r 25d75b83632ba45035c28dafd55975a695059797 lib/tool_shed/grids/admin_grids.py --- a/lib/tool_shed/grids/admin_grids.py +++ b/lib/tool_shed/grids/admin_grids.py @@ -135,9 +135,8 @@ grids.GridColumnFilter( "Purged", args=dict( purged=True ) ), grids.GridColumnFilter( "All", args=dict( deleted='All' ) ) ] - num_rows_per_page = 50 - preserve_state = False - use_paging = True + + use_paging = False def get_current_item( self, trans, **kwargs ): return trans.user @@ -220,7 +219,7 @@ filterable="advanced" ) ] columns.append( grids.MulticolFilterColumn( "Search", - cols_to_filter=[ columns[0], columns[1], columns[2] ], + cols_to_filter=[ columns[0] ], key="free-text-search", visible=False, filterable="standard" ) ) @@ -252,9 +251,8 @@ grids.GridColumnFilter( "Deleted", args=dict( deleted=True ) ), grids.GridColumnFilter( "All", args=dict( deleted='All' ) ) ] - num_rows_per_page = 50 - preserve_state = False - use_paging = True + + use_paging = False def apply_query_filter( self, trans, query, **kwd ): return query.filter( model.Role.type != model.Role.types.PRIVATE ) @@ -266,7 +264,7 @@ class NameColumn( grids.TextColumn ): def get_value( self, trans, grid, group ): - return group.name + return str( group.name ) class StatusColumn( grids.GridColumn ): @@ -298,6 +296,7 @@ default_sort_key = "name" columns = [ NameColumn( "Name", + key="name", link=( lambda item: dict( operation="Manage users and roles", id=item.id ) ), attach_popup=True ), UsersColumn( "Users", attach_popup=False ), @@ -310,7 +309,7 @@ filterable="advanced" ) ] columns.append( grids.MulticolFilterColumn( "Search", - cols_to_filter=[ columns[0], columns[1], columns[2] ], + cols_to_filter=[ columns[0] ], key="free-text-search", visible=False, filterable="standard" ) ) @@ -339,9 +338,8 @@ grids.GridColumnFilter( "Deleted", args=dict( deleted=True ) ), grids.GridColumnFilter( "All", args=dict( deleted='All' ) ) ] - num_rows_per_page = 50 - preserve_state = False - use_paging = True + + use_paging = False class ManageCategoryGrid( CategoryGrid ): @@ -540,9 +538,7 @@ confirm="Repository metadata records cannot be recovered after they are deleted. Click OK to delete the selected items." ) ] standard_filters = [] default_filter = {} - num_rows_per_page = 50 - preserve_state = False - use_paging = True + use_paging = False def build_initial_query( self, trans, **kwd ): return trans.sa_session.query( model.RepositoryMetadata ) \ https://bitbucket.org/galaxy/galaxy-central/commits/a6fed0f56ec8/ Changeset: a6fed0f56ec8 User: greg Date: 2014-01-27 22:11:00 Summary: Merged from next-stable Affected #: 1 file diff -r 8d90711f302d9b51a8fc506461143128f516411a -r a6fed0f56ec84682302dc64bb5498333e7dc7666 lib/tool_shed/grids/admin_grids.py --- a/lib/tool_shed/grids/admin_grids.py +++ b/lib/tool_shed/grids/admin_grids.py @@ -135,9 +135,8 @@ grids.GridColumnFilter( "Purged", args=dict( purged=True ) ), grids.GridColumnFilter( "All", args=dict( deleted='All' ) ) ] - num_rows_per_page = 50 - preserve_state = False - use_paging = True + + use_paging = False def get_current_item( self, trans, **kwargs ): return trans.user @@ -220,7 +219,7 @@ filterable="advanced" ) ] columns.append( grids.MulticolFilterColumn( "Search", - cols_to_filter=[ columns[0], columns[1], columns[2] ], + cols_to_filter=[ columns[0] ], key="free-text-search", visible=False, filterable="standard" ) ) @@ -252,9 +251,8 @@ grids.GridColumnFilter( "Deleted", args=dict( deleted=True ) ), grids.GridColumnFilter( "All", args=dict( deleted='All' ) ) ] - num_rows_per_page = 50 - preserve_state = False - use_paging = True + + use_paging = False def apply_query_filter( self, trans, query, **kwd ): return query.filter( model.Role.type != model.Role.types.PRIVATE ) @@ -266,7 +264,7 @@ class NameColumn( grids.TextColumn ): def get_value( self, trans, grid, group ): - return group.name + return str( group.name ) class StatusColumn( grids.GridColumn ): @@ -298,6 +296,7 @@ default_sort_key = "name" columns = [ NameColumn( "Name", + key="name", link=( lambda item: dict( operation="Manage users and roles", id=item.id ) ), attach_popup=True ), UsersColumn( "Users", attach_popup=False ), @@ -310,7 +309,7 @@ filterable="advanced" ) ] columns.append( grids.MulticolFilterColumn( "Search", - cols_to_filter=[ columns[0], columns[1], columns[2] ], + cols_to_filter=[ columns[0] ], key="free-text-search", visible=False, filterable="standard" ) ) @@ -339,9 +338,8 @@ grids.GridColumnFilter( "Deleted", args=dict( deleted=True ) ), grids.GridColumnFilter( "All", args=dict( deleted='All' ) ) ] - num_rows_per_page = 50 - preserve_state = False - use_paging = True + + use_paging = False class ManageCategoryGrid( CategoryGrid ): @@ -540,9 +538,7 @@ confirm="Repository metadata records cannot be recovered after they are deleted. Click OK to delete the selected items." ) ] standard_filters = [] default_filter = {} - num_rows_per_page = 50 - preserve_state = False - use_paging = True + use_paging = False def build_initial_query( self, trans, **kwd ): return trans.sa_session.query( model.RepositoryMetadata ) \ Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.