opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Select sub-sub folder bug fixed in edit samples.

Browse Source 
Library/folder selection now possible when request is complete.
This commit is contained in:
Ramkrishna Chakrabarty
2010-11-23 10:02:32 -05:00
parent c22691a2af
commit 40dca76f37
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/web/controllers/requests_common.py
+7 -7
View File
@@ -1198,13 +1198,13 @@ class RequestsCommon( BaseController, UsesFormDefinitionWidgets ):
else:
folder = None
return library, folder
def __get_active_folders( self, library ):
def __get_active_folders( self, folder, active_folders_list=[] ):
# print >> sys.stderr, '#######', [ f.name for f in active_folders_list]
"""Return all of the active folders for the received library"""
root_folder = library.root_folder
active_folders = [ root_folder ]
for folder in root_folder.active_folders:
active_folders.append( folder )
return active_folders
active_folders_list.extend( folder.active_folders )
for sub_folder in folder.active_folders:
self.__get_active_folders( sub_folder, active_folders_list )
return active_folders_list
# ===== Methods for handling form definition widgets =====
def __get_request_widgets( self, trans, id ):
"""Get the widgets for the request"""
@@ -1402,7 +1402,7 @@ class RequestsCommon( BaseController, UsesFormDefinitionWidgets ):
refresh_on_change=True )
# Get all folders for the selected library, if one is indeed selected
if selected_library:
folders = self.__get_active_folders( selected_library )
folders = self.__get_active_folders( selected_library.root_folder, active_folders_list=[] )
if folder_id:
selected_folder_id = folder_id
elif sample and sample.folder:
templates/requests/common/edit_samples.mako
+1 -1
View File
@@ -114,7 +114,7 @@
Optional
</div>
</div>
%elif not is_complete and sample_operation_selected_value == trans.app.model.Sample.bulk_operations.SELECT_LIBRARY:
%elif sample_operation_selected_value == trans.app.model.Sample.bulk_operations.SELECT_LIBRARY:
<% libraries_selected_value = libraries_select_field.get_selected( return_value=True ) %>
<div class="form-row">
<label>Select data library:</label>