From b88fc51fa2f2ed65fa53fe610ccfb0d89cbde890 Mon Sep 17 00:00:00 2001
From: Ramkrishna Chakrabarty <rc@bx.psu.edu>
Date: Tue, 23 Mar 2010 13:15:56 -0400
Subject: [PATCH] lims: fixed a bug in the csv importer for samples

---
 lib/galaxy/web/controllers/requests.py       | 14 ++++++++++++--
 lib/galaxy/web/controllers/requests_admin.py | 11 ++++++++++-
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/lib/galaxy/web/controllers/requests.py b/lib/galaxy/web/controllers/requests.py
index 4aee64b3730..20ba8c372f0 100644
--- a/lib/galaxy/web/controllers/requests.py
+++ b/lib/galaxy/web/controllers/requests.py
@@ -438,18 +438,28 @@ class Requests( BaseController ):
         current_samples, details, edit_mode, libraries = self.__update_samples( trans, request, **kwd )
         if params.get('import_samples_button', False) == 'Import samples':
             try:
+                lib_widget, folder_widget = self.__library_widgets(trans, request.user, 
+                                                                   len(current_samples), 
+                                                                   libraries, None, **kwd)
                 file_obj = params.get('file_data', '')
                 import csv
                 reader = csv.reader(file_obj.file)
                 for row in reader:
-                    current_samples.append([row[0], row[1:]])  
-                return trans.fill_template( '/requests/show_request.mako',
+                    current_samples.append(dict(name=row[0], 
+                                                barcode='',
+                                                library=None,
+                                                folder=None,
+                                                lib_widget=lib_widget,
+                                                folder_widget=folder_widget,
+                                                field_values=row[1:]))  
+                return trans.fill_template( '/admin/requests/show_request.mako',
                                             request=request,
                                             request_details=self.request_details(trans, request.id),
                                             current_samples=current_samples,
                                             sample_copy=self.__copy_sample(current_samples), 
                                             details=details,
                                             edit_mode=edit_mode)
+
             except:
                 return trans.response.send_redirect( web.url_for( controller='requests',
                                                                   action='list',
diff --git a/lib/galaxy/web/controllers/requests_admin.py b/lib/galaxy/web/controllers/requests_admin.py
index 3c286d50a0d..72c9b3510c3 100644
--- a/lib/galaxy/web/controllers/requests_admin.py
+++ b/lib/galaxy/web/controllers/requests_admin.py
@@ -946,11 +946,20 @@ class RequestsAdmin( BaseController ):
         current_samples, details, edit_mode, libraries = self.__update_samples( trans, request, **kwd )
         if params.get('import_samples_button', False) == 'Import samples':
             try:
+                lib_widget, folder_widget = self.__library_widgets(trans, request.user, 
+                                                                   len(current_samples), 
+                                                                   libraries, None, **kwd)
                 file_obj = params.get('file_data', '')
                 import csv
                 reader = csv.reader(file_obj.file)
                 for row in reader:
-                    current_samples.append([row[0], row[1:]])  
+                    current_samples.append(dict(name=row[0], 
+                                                barcode='',
+                                                library=None,
+                                                folder=None,
+                                                lib_widget=lib_widget,
+                                                folder_widget=folder_widget,
+                                                field_values=row[1:]))  
                 return trans.fill_template( '/admin/requests/show_request.mako',
                                             request=request,
                                             request_details=self.request_details(trans, request.id),