7 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/b16496b8311b/ Changeset: b16496b8311b Branch: list_published_export User: saketkc Date: 2013-06-17 21:03:41 Summary: Adding new branch for export support of published_workflows Affected #: 0 files https://bitbucket.org/galaxy/galaxy-central/commits/21a6b29982e9/ Changeset: 21a6b29982e9 Branch: list_published_export User: saketkc Date: 2013-06-17 21:35:15 Summary: Add support for exporting published workflows directly from the main '/list_published page' Affected #: 1 file diff -r b16496b8311b8e09ac11aa0c634dd2fbe4bdac4f -r 21a6b29982e97a764097464595c024b8777e713f lib/galaxy/webapps/galaxy/controllers/workflow.py --- a/lib/galaxy/webapps/galaxy/controllers/workflow.py +++ b/lib/galaxy/webapps/galaxy/controllers/workflow.py @@ -81,7 +81,7 @@ default_filter = dict( public_url="All", username="All", tags="All" ) use_async = True columns = [ - grids.PublicURLColumn( "Name", key="name", filterable="advanced" ), + grids.PublicURLColumn( "Name", key="name", filterable="advanced", attach_popup=True ), grids.OwnerAnnotationColumn( "Annotation", key="annotation", model_annotation_association_class=model.StoredWorkflowAnnotationAssociation, filterable="advanced" ), grids.OwnerColumn( "Owner", key="username", model_class=model.User, filterable="advanced" ), grids.CommunityRatingColumn( "Community Rating", key="rating" ), @@ -94,7 +94,16 @@ cols_to_filter=[ columns[0], columns[1], columns[2], columns[4] ], key="free-text-search", visible=False, filterable="standard" ) ) - operations = [] + operations = [ + grids.GridOperation( "Import", + condition=( lambda item: not item.deleted ), + allow_multiple=False, + url_args=dict( webapp="galaxy", action="imp" ) ), + grids.GridOperation( "Export", + condition=( lambda item: not item.deleted ), + allow_multiple=False, + url_args=dict( webapp="galaxy", action="export_to_file" ) ), + ] def build_initial_query( self, trans, **kwargs ): # Join so that searching stored_workflow.user makes sense. @@ -1013,7 +1022,9 @@ return self._workflow_to_dict( trans, stored ) @web.json_pretty - def export_to_file( self, trans, id ): + def export_to_file( self, trans, id, **kwd ): + ## NOTE: kwd added to allow passing custom named arguments like '?webapp=galaxy' as while + ## exporting published_workflows directly from '/list_published' """ Get the latest Workflow for the StoredWorkflow identified by `id` and encode it as a json string that can be imported back into Galaxy @@ -1869,7 +1880,7 @@ stored.user = trans.user if data[ 'annotation' ]: self.add_item_annotation( trans.sa_session, stored.user, stored, data[ 'annotation' ] ) - + # Persist trans.sa_session.add( stored ) trans.sa_session.flush() https://bitbucket.org/galaxy/galaxy-central/commits/1a1120f46692/ Changeset: 1a1120f46692 Branch: list_published_export User: saketkc Date: 2013-06-18 05:40:44 Summary: Removing optional arguments from export_to_file as it was not required from the last commit Affected #: 1 file diff -r 21a6b29982e97a764097464595c024b8777e713f -r 1a1120f466923ca6b1e3613f4b0ff9efdb5345e7 lib/galaxy/webapps/galaxy/controllers/workflow.py --- a/lib/galaxy/webapps/galaxy/controllers/workflow.py +++ b/lib/galaxy/webapps/galaxy/controllers/workflow.py @@ -102,7 +102,7 @@ grids.GridOperation( "Export", condition=( lambda item: not item.deleted ), allow_multiple=False, - url_args=dict( webapp="galaxy", action="export_to_file" ) ), + url_args=dict( action="export_to_file" ) ), ] def build_initial_query( self, trans, **kwargs ): @@ -1023,8 +1023,6 @@ @web.json_pretty def export_to_file( self, trans, id, **kwd ): - ## NOTE: kwd added to allow passing custom named arguments like '?webapp=galaxy' as while - ## exporting published_workflows directly from '/list_published' """ Get the latest Workflow for the StoredWorkflow identified by `id` and encode it as a json string that can be imported back into Galaxy https://bitbucket.org/galaxy/galaxy-central/commits/e3d7bd8ef0df/ Changeset: e3d7bd8ef0df Branch: list_published_export User: saketkc Date: 2013-06-19 08:59:39 Summary: Changing 'export' text Affected #: 1 file diff -r 1a1120f466923ca6b1e3613f4b0ff9efdb5345e7 -r e3d7bd8ef0df4637bedbbdd8690a280c713addea lib/galaxy/webapps/galaxy/controllers/workflow.py --- a/lib/galaxy/webapps/galaxy/controllers/workflow.py +++ b/lib/galaxy/webapps/galaxy/controllers/workflow.py @@ -99,7 +99,7 @@ condition=( lambda item: not item.deleted ), allow_multiple=False, url_args=dict( webapp="galaxy", action="imp" ) ), - grids.GridOperation( "Export", + grids.GridOperation( "Save as File", condition=( lambda item: not item.deleted ), allow_multiple=False, url_args=dict( action="export_to_file" ) ), https://bitbucket.org/galaxy/galaxy-central/commits/fe1fe2a8ad70/ Changeset: fe1fe2a8ad70 Branch: list_published_export User: saketkc Date: 2013-06-21 06:55:06 Summary: *kwd argument is not required Affected #: 1 file diff -r e3d7bd8ef0df4637bedbbdd8690a280c713addea -r fe1fe2a8ad706ef577596ef9841c32dda2a06544 lib/galaxy/webapps/galaxy/controllers/workflow.py --- a/lib/galaxy/webapps/galaxy/controllers/workflow.py +++ b/lib/galaxy/webapps/galaxy/controllers/workflow.py @@ -1022,7 +1022,7 @@ return self._workflow_to_dict( trans, stored ) @web.json_pretty - def export_to_file( self, trans, id, **kwd ): + def export_to_file( self, trans, id): """ Get the latest Workflow for the StoredWorkflow identified by `id` and encode it as a json string that can be imported back into Galaxy https://bitbucket.org/galaxy/galaxy-central/commits/1d71126419b2/ Changeset: 1d71126419b2 Branch: list_published_export User: saketkc Date: 2013-06-21 07:03:28 Summary: fixed the spacing Affected #: 1 file diff -r fe1fe2a8ad706ef577596ef9841c32dda2a06544 -r 1d71126419b29293159599ff5d42b42aee9ad62a lib/galaxy/webapps/galaxy/controllers/workflow.py --- a/lib/galaxy/webapps/galaxy/controllers/workflow.py +++ b/lib/galaxy/webapps/galaxy/controllers/workflow.py @@ -1022,7 +1022,7 @@ return self._workflow_to_dict( trans, stored ) @web.json_pretty - def export_to_file( self, trans, id): + def export_to_file( self, trans, id ): """ Get the latest Workflow for the StoredWorkflow identified by `id` and encode it as a json string that can be imported back into Galaxy https://bitbucket.org/galaxy/galaxy-central/commits/6fc05699ebaf/ Changeset: 6fc05699ebaf User: jgoecks Date: 2013-06-21 14:58:47 Summary: Merged in saketkc/galaxy-central/list_published_export (pull request #183) UI Add Support for directly exporting pulished workflows from the main 'list_published' page Affected #: 1 file diff -r 434335f801613d882ff57ea8c7dcdc00a1b8d4f2 -r 6fc05699ebafaf8acaae58f281bd576bebcfcd90 lib/galaxy/webapps/galaxy/controllers/workflow.py --- a/lib/galaxy/webapps/galaxy/controllers/workflow.py +++ b/lib/galaxy/webapps/galaxy/controllers/workflow.py @@ -81,7 +81,7 @@ default_filter = dict( public_url="All", username="All", tags="All" ) use_async = True columns = [ - grids.PublicURLColumn( "Name", key="name", filterable="advanced" ), + grids.PublicURLColumn( "Name", key="name", filterable="advanced", attach_popup=True ), grids.OwnerAnnotationColumn( "Annotation", key="annotation", model_annotation_association_class=model.StoredWorkflowAnnotationAssociation, filterable="advanced" ), grids.OwnerColumn( "Owner", key="username", model_class=model.User, filterable="advanced" ), grids.CommunityRatingColumn( "Community Rating", key="rating" ), @@ -94,7 +94,16 @@ cols_to_filter=[ columns[0], columns[1], columns[2], columns[4] ], key="free-text-search", visible=False, filterable="standard" ) ) - operations = [] + operations = [ + grids.GridOperation( "Import", + condition=( lambda item: not item.deleted ), + allow_multiple=False, + url_args=dict( webapp="galaxy", action="imp" ) ), + grids.GridOperation( "Save as File", + condition=( lambda item: not item.deleted ), + allow_multiple=False, + url_args=dict( action="export_to_file" ) ), + ] def build_initial_query( self, trans, **kwargs ): # Join so that searching stored_workflow.user makes sense. @@ -1827,7 +1836,7 @@ stored.user = trans.user if data[ 'annotation' ]: self.add_item_annotation( trans.sa_session, stored.user, stored, data[ 'annotation' ] ) - + # Persist trans.sa_session.add( stored ) trans.sa_session.flush() 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.