From dbc3cd95f3bd23998308c89aceb7157b4bda64c0 Mon Sep 17 00:00:00 2001 From: Ramkrishna Chakrabarty Date: Wed, 30 Jun 2010 14:24:15 -0400 Subject: [PATCH] lims: added option to rename sequencer datasets by prepending the experiment name. --- lib/galaxy/model/__init__.py | 1 + lib/galaxy/web/controllers/requests_admin.py | 2 ++ 2 files changed, 3 insertions(+) diff --git a/lib/galaxy/model/__init__.py b/lib/galaxy/model/__init__.py index 63ec40af125..ff5d2142a17 100644 --- a/lib/galaxy/model/__init__.py +++ b/lib/galaxy/model/__init__.py @@ -1554,6 +1554,7 @@ class RequestEvent( object ): class RequestType( object ): rename_dataset_options = Bunch( NO = 'Do not rename', SAMPLE_NAME = 'Preprend sample name', + EXPERIMENT_NAME = 'Prepend experiment name', EXPERIMENT_AND_SAMPLE_NAME = 'Prepend experiment and sample name') permitted_actions = get_permitted_actions( filter='REQUEST_TYPE' ) def __init__(self, name=None, desc=None, request_form=None, sample_form=None, diff --git a/lib/galaxy/web/controllers/requests_admin.py b/lib/galaxy/web/controllers/requests_admin.py index b4d716b5022..fee152a2980 100644 --- a/lib/galaxy/web/controllers/requests_admin.py +++ b/lib/galaxy/web/controllers/requests_admin.py @@ -673,6 +673,8 @@ class RequestsAdmin( BaseController ): return sample.name+'_'+name elif opt == sample.request.type.rename_dataset_options.EXPERIMENT_AND_SAMPLE_NAME: return sample.request.name+'_'+sample.name+'_'+name + elif opt == sample.request.type.rename_dataset_options.EXPERIMENT_NAME: + return sample.request.name+'_'+name def __setup_datatx_user(self, trans, library, folder): ''' This method sets up the datatx user: