details: http://www.bx.psu.edu/hg/galaxy/rev/acaf971320bd changeset: 3758:acaf971320bd user: rc date: Mon May 10 10:03:00 2010 -0400 description: lims: default view of requests page now shows requests belonging to any state diffstat: lib/galaxy/web/controllers/requests.py | 2 +- lib/galaxy/web/controllers/requests_admin.py | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diffs (44 lines): diff -r 42de27d4215f -r acaf971320bd lib/galaxy/web/controllers/requests.py --- a/lib/galaxy/web/controllers/requests.py Sun May 09 22:37:50 2010 -0400 +++ b/lib/galaxy/web/controllers/requests.py Mon May 10 10:03:00 2010 -0400 @@ -79,7 +79,7 @@ num_rows_per_page = 50 preserve_state = True use_paging = True - default_filter = dict( deleted="False", state=model.Request.states.NEW) + default_filter = dict( deleted="False") columns = [ NameColumn( "Name", key="name", diff -r 42de27d4215f -r acaf971320bd lib/galaxy/web/controllers/requests_admin.py --- a/lib/galaxy/web/controllers/requests_admin.py Sun May 09 22:37:50 2010 -0400 +++ b/lib/galaxy/web/controllers/requests_admin.py Mon May 10 10:03:00 2010 -0400 @@ -90,7 +90,7 @@ num_rows_per_page = 50 preserve_state = True use_paging = True - default_filter = dict( deleted="False", state=model.Request.states.SUBMITTED) + default_filter = dict( deleted="False") columns = [ NameColumn( "Name", key="name", @@ -259,7 +259,7 @@ ''' List all request made by the current user ''' - #self.__sample_datasets(trans, **kwd) + self.__sample_datasets(trans, **kwd) if 'operation' in kwd: operation = kwd['operation'].lower() if not kwd.get( 'id', None ): @@ -1774,7 +1774,9 @@ status=status) def __sample_datasets(self, trans, **kwd): - samples = trans.sa_session.query( trans.app.model.Sample ).all() + samples = trans.sa_session.query( trans.app.model.Sample )\ + .filter( trans.app.model.Sample.table.c.deleted==False)\ + .all() for s in samples: if s.dataset_files: newdf = []