[galaxy-commits] galaxy-dist commit e110168a83c9: lims: added option to rename sequencer datasets by prepending the experiment name.

[commits-noreply at bitbucket.org]

# HG changeset patch -- Bitbucket.org
# Project galaxy-dist
# URL http://bitbucket.org/galaxy/galaxy-dist/overview
# User rc
# Date 1277922255 14400
# Node ID e110168a83c91f14a2923149e195aa4e8855fde5
# Parent  428ce38ba8e92af0d2099a381e38863e09b46cd1
lims: added option to rename sequencer datasets by prepending the experiment name.

--- 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,

--- 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: