3 new commits in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/a47f9e36d1d0/
Changeset: a47f9e36d1d0
Branch: search
User: Kyle Ellrott
Date: 2014-01-31 01:54:44
Summary: Adding deleted field to StoredWorkflow 'to_dict' and ability to use
deleted as selection field in search
Affected #: 2 files
diff -r 985e3d88f9ac85a90de7aa541b5844037cccd120 -r
a47f9e36d1d001a2e96ee1043fa7a563cb7e60bd lib/galaxy/model/__init__.py
--- a/lib/galaxy/model/__init__.py
+++ b/lib/galaxy/model/__init__.py
@@ -2430,8 +2430,8 @@
class StoredWorkflow( object, Dictifiable):
- dict_collection_visible_keys = ( 'id', 'name', 'published' )
- dict_element_visible_keys = ( 'id', 'name', 'published' )
+ dict_collection_visible_keys = ( 'id', 'name', 'published',
'deleted' )
+ dict_element_visible_keys = ( 'id', 'name', 'published',
'deleted' )
def __init__( self ):
self.id = None
diff -r 985e3d88f9ac85a90de7aa541b5844037cccd120 -r
a47f9e36d1d001a2e96ee1043fa7a563cb7e60bd lib/galaxy/model/search.py
--- a/lib/galaxy/model/search.py
+++ b/lib/galaxy/model/search.py
@@ -407,7 +407,8 @@
FIELDS = {
'name': ViewField('name', sqlalchemy_field=(StoredWorkflow,
"name")),
'id': ViewField('id', sqlalchemy_field=(StoredWorkflow,
"id"), id_decode=True),
- 'tag': ViewField('tag', handler=workflow_tag_handler)
+ 'tag': ViewField('tag', handler=workflow_tag_handler),
+ 'deleted': ViewField('deleted', sqlalchemy_field=(StoredWorkflow,
"deleted")),
}
def search(self, trans):
https://bitbucket.org/galaxy/galaxy-central/commits/b5c16a375e42/
Changeset: b5c16a375e42
Branch: search
User: Kyle Ellrott
Date: 2014-01-31 01:56:57
Summary: Adding ability to select Histories based on 'deleted' status during
search
Affected #: 1 file
diff -r a47f9e36d1d001a2e96ee1043fa7a563cb7e60bd -r
b5c16a375e42932c8416b4c235d777b3e4088ad8 lib/galaxy/model/search.py
--- a/lib/galaxy/model/search.py
+++ b/lib/galaxy/model/search.py
@@ -376,7 +376,8 @@
'name': ViewField('name', sqlalchemy_field=(History,
"name")),
'id': ViewField('id', sqlalchemy_field=(History, "id"),
id_decode=True),
'tag': ViewField("tag", handler=history_handle_tag),
- 'annotation': ViewField("annotation",
handler=history_handle_annotation)
+ 'annotation': ViewField("annotation",
handler=history_handle_annotation),
+ 'deleted': ViewField('deleted', sqlalchemy_field=(History,
"deleted"))
}
def search(self, trans):
https://bitbucket.org/galaxy/galaxy-central/commits/a629ff293db6/
Changeset: a629ff293db6
User: jmchilton
Date: 2014-02-02 02:57:47
Summary: Merged in kellrott/galaxy-central/search (pull request #318)
Adding deleted field to 'to_dict' and search selection of Workflows
Affected #: 2 files
diff -r 00810d29c09d351e6e582d4868907b989e686059 -r
a629ff293db60b781a9abb29309bc56a2107d366 lib/galaxy/model/__init__.py
--- a/lib/galaxy/model/__init__.py
+++ b/lib/galaxy/model/__init__.py
@@ -2448,8 +2448,8 @@
class StoredWorkflow( object, Dictifiable):
- dict_collection_visible_keys = ( 'id', 'name', 'published' )
- dict_element_visible_keys = ( 'id', 'name', 'published' )
+ dict_collection_visible_keys = ( 'id', 'name', 'published',
'deleted' )
+ dict_element_visible_keys = ( 'id', 'name', 'published',
'deleted' )
def __init__( self ):
self.id = None
diff -r 00810d29c09d351e6e582d4868907b989e686059 -r
a629ff293db60b781a9abb29309bc56a2107d366 lib/galaxy/model/search.py
--- a/lib/galaxy/model/search.py
+++ b/lib/galaxy/model/search.py
@@ -376,7 +376,8 @@
'name': ViewField('name', sqlalchemy_field=(History,
"name")),
'id': ViewField('id', sqlalchemy_field=(History, "id"),
id_decode=True),
'tag': ViewField("tag", handler=history_handle_tag),
- 'annotation': ViewField("annotation",
handler=history_handle_annotation)
+ 'annotation': ViewField("annotation",
handler=history_handle_annotation),
+ 'deleted': ViewField('deleted', sqlalchemy_field=(History,
"deleted"))
}
def search(self, trans):
@@ -407,7 +408,8 @@
FIELDS = {
'name': ViewField('name', sqlalchemy_field=(StoredWorkflow,
"name")),
'id': ViewField('id', sqlalchemy_field=(StoredWorkflow,
"id"), id_decode=True),
- 'tag': ViewField('tag', handler=workflow_tag_handler)
+ 'tag': ViewField('tag', handler=workflow_tag_handler),
+ 'deleted': ViewField('deleted', sqlalchemy_field=(StoredWorkflow,
"deleted")),
}
def search(self, trans):
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.