1 new changeset in galaxy-central:
http://bitbucket.org/galaxy/galaxy-central/changeset/a8bfcfeca73b/ changeset: r5045:a8bfcfeca73b user: jgoecks date: 2011-02-11 14:42:05 summary: Fix searching functionality and labels in published item grids. affected #: 4 files (174 bytes)
--- a/lib/galaxy/web/controllers/history.py Fri Feb 11 00:53:49 2011 -0500 +++ b/lib/galaxy/web/controllers/history.py Fri Feb 11 08:42:05 2011 -0500 @@ -135,15 +135,15 @@ columns = [ NameURLColumn( "Name", key="name", filterable="advanced" ), grids.OwnerAnnotationColumn( "Annotation", key="annotation", model_annotation_association_class=model.HistoryAnnotationAssociation, filterable="advanced" ), - grids.OwnerColumn( "Owner", key="owner", model_class=model.User, filterable="advanced" ), + grids.OwnerColumn( "Owner", key="username", model_class=model.User, filterable="advanced" ), grids.CommunityRatingColumn( "Community Rating", key="rating" ), grids.CommunityTagsColumn( "Community Tags", key="tags", model_tag_association_class=model.HistoryTagAssociation, filterable="advanced", grid_name="PublicHistoryListGrid" ), grids.ReverseSortColumn( "Last Updated", key="update_time", format=time_ago ) ] columns.append( grids.MulticolFilterColumn( - "Search", - cols_to_filter=[ columns[0], columns[1], columns[2] ], + "Search name, annotation, owner, and tags", + cols_to_filter=[ columns[0], columns[1], columns[2], columns[4] ], key="free-text-search", visible=False, filterable="standard" ) ) operations = []
--- a/lib/galaxy/web/controllers/page.py Fri Feb 11 00:53:49 2011 -0500 +++ b/lib/galaxy/web/controllers/page.py Fri Feb 11 08:42:05 2011 -0500 @@ -63,15 +63,15 @@ columns = [ grids.PublicURLColumn( "Title", key="title", filterable="advanced" ), grids.OwnerAnnotationColumn( "Annotation", key="annotation", model_annotation_association_class=model.PageAnnotationAssociation, filterable="advanced" ), - grids.OwnerColumn( "Owner", key="owner", model_class=model.User, filterable="advanced" ), + grids.OwnerColumn( "Owner", key="username", model_class=model.User, filterable="advanced" ), grids.CommunityRatingColumn( "Community Rating", key="rating" ), grids.CommunityTagsColumn( "Community Tags", key="tags", model_tag_association_class=model.PageTagAssociation, filterable="advanced", grid_name="PageAllPublishedGrid" ), grids.ReverseSortColumn( "Last Updated", key="update_time", format=time_ago ) ] columns.append( grids.MulticolFilterColumn( - "Search", - cols_to_filter=[ columns[0], columns[1], columns[2], columns[3] ], + "Search title, annotation, owner, and tags", + cols_to_filter=[ columns[0], columns[1], columns[2], columns[4] ], key="free-text-search", visible=False, filterable="standard" ) ) def build_initial_query( self, trans, **kwargs ):
--- a/lib/galaxy/web/controllers/visualization.py Fri Feb 11 00:53:49 2011 -0500 +++ b/lib/galaxy/web/controllers/visualization.py Fri Feb 11 08:42:05 2011 -0500 @@ -50,15 +50,15 @@ columns = [ grids.PublicURLColumn( "Title", key="title", filterable="advanced" ), grids.OwnerAnnotationColumn( "Annotation", key="annotation", model_annotation_association_class=model.VisualizationAnnotationAssociation, filterable="advanced" ), - grids.OwnerColumn( "Owner", key="owner", model_class=model.User, filterable="advanced" ), + grids.OwnerColumn( "Owner", key="username", model_class=model.User, filterable="advanced" ), grids.CommunityRatingColumn( "Community Rating", key="rating" ), grids.CommunityTagsColumn( "Community Tags", key="tags", model_tag_association_class=model.VisualizationTagAssociation, filterable="advanced", grid_name="VisualizationAllPublishedGrid" ), grids.ReverseSortColumn( "Last Updated", key="update_time", format=time_ago ) ] columns.append( grids.MulticolFilterColumn( - "Search", - cols_to_filter=[ columns[0], columns[1], columns[2], columns[3] ], + "Search title, annotation, owner, and tags", + cols_to_filter=[ columns[0], columns[1], columns[2], columns[4] ], key="free-text-search", visible=False, filterable="standard" ) ) def build_initial_query( self, trans, **kwargs ):
--- a/lib/galaxy/web/controllers/workflow.py Fri Feb 11 00:53:49 2011 -0500 +++ b/lib/galaxy/web/controllers/workflow.py Fri Feb 11 08:42:05 2011 -0500 @@ -66,15 +66,15 @@ columns = [ grids.PublicURLColumn( "Name", key="name", filterable="advanced" ), grids.OwnerAnnotationColumn( "Annotation", key="annotation", model_annotation_association_class=model.StoredWorkflowAnnotationAssociation, filterable="advanced" ), - grids.OwnerColumn( "Owner", key="owner", model_class=model.User, filterable="advanced" ), + grids.OwnerColumn( "Owner", key="username", model_class=model.User, filterable="advanced" ), grids.CommunityRatingColumn( "Community Rating", key="rating" ), grids.CommunityTagsColumn( "Community Tags", key="tags", model_tag_association_class=model.StoredWorkflowTagAssociation, filterable="advanced", grid_name="PublicWorkflowListGrid" ), grids.ReverseSortColumn( "Last Updated", key="update_time", format=time_ago ) ] columns.append( grids.MulticolFilterColumn( - "Search", - cols_to_filter=[ columns[0], columns[1], columns[2] ], + "Search name, annotation, owner, and tags", + cols_to_filter=[ columns[0], columns[1], columns[2], columns[4] ], key="free-text-search", visible=False, filterable="standard" ) ) operations = []
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.