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

lims: workflow selectbox in the samples page fixed

Browse Source
This commit is contained in:
Ramkrishna Chakrabarty
2010-05-06 10:43:13 -04:00
parent 7b0207bc01
commit a983fdb2ab
3 changed files with 35 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/web/controllers/requests_admin.py
+17 -17
View File
@@ -1773,23 +1773,23 @@ class RequestsAdmin( BaseController ):
message=message,
status=status)
# def __sample_datasets(self, trans, **kwd):
# samples = trans.sa_session.query( trans.app.model.Sample ).all()
# for s in samples:
# if s.dataset_files:
# newdf = []
# for df in s.dataset_files:
# if type(s.dataset_files[0]) == type([1,2]):
# filepath = df[0]
# status = df[1]
# newdf.append(dict(filepath=filepath,
# status=status,
# name=filepath.split('/')[-1],
# error_msg='',
# size='Unknown'))
# s.dataset_files = newdf
# trans.sa_session.add( s )
# trans.sa_session.flush()
def __sample_datasets(self, trans, **kwd):
samples = trans.sa_session.query( trans.app.model.Sample ).all()
for s in samples:
if s.dataset_files:
newdf = []
for df in s.dataset_files:
if type(s.dataset_files[0]) == type([1,2]):
filepath = df[0]
status = df[1]
newdf.append(dict(filepath=filepath,
status=status,
name=filepath.split('/')[-1],
error_msg='',
size='Unknown'))
s.dataset_files = newdf
trans.sa_session.add( s )
trans.sa_session.flush()
#
##
#### Request Type Stuff ###################################################
templates/admin/requests/show_request.mako
+9 -2
View File
@@ -292,6 +292,11 @@ $(document).ready(function(){
</select>
%elif field['type'] == 'WorkflowField':
<select name="sample_${index}_field_${field_index}">
%if str(sample_values[field_index]) == 'none':
<option value="none" selected>Select one</option>
%else:
<option value="none">Select one</option>
%endif
%for option_index, option in enumerate(request.user.stored_workflows):
%if not option.deleted:
%if str(option.id) == str(sample_values[field_index]):
@@ -320,8 +325,10 @@ $(document).ready(function(){
<td>
%if sample_values[field_index]:
%if field['type'] == 'WorkflowField':
<% workflow = trans.sa_session.query( trans.app.model.StoredWorkflow ).get( int(sample_values[field_index]) ) %>
<a href="${h.url_for( controller='workflow', action='run', id=trans.security.encode_id(workflow.id) )}">${workflow.name}</a>
%if str(sample_values[field_index]) != 'none':
<% workflow = trans.sa_session.query( trans.app.model.StoredWorkflow ).get( int(sample_values[field_index]) ) %>
<a href="${h.url_for( controller='workflow', action='run', id=trans.security.encode_id(workflow.id) )}">${workflow.name}</a>
%endif
%else:
${sample_values[field_index]}
%endif
templates/requests/show_request.mako
+9 -2
View File
@@ -214,6 +214,11 @@ $(document).ready(function(){
</select>
%elif field['type'] == 'WorkflowField':
<select name="sample_${index}_field_${field_index}">
%if str(sample_values[field_index]) == 'none':
<option value="none" selected>Select one</option>
%else:
<option value="none">Select one</option>
%endif
%for option_index, option in enumerate(request.user.stored_workflows):
%if not option.deleted:
%if str(option.id) == str(sample_values[field_index]):
@@ -242,8 +247,10 @@ $(document).ready(function(){
<td>
%if sample_values[field_index]:
%if field['type'] == 'WorkflowField':
<% workflow = trans.sa_session.query( trans.app.model.StoredWorkflow ).get( int(sample_values[field_index]) ) %>
<a href="${h.url_for( controller='workflow', action='run', id=trans.security.encode_id(workflow.id) )}">${workflow.name}</a>
%if str(sample_values[field_index]) != 'none':
<% workflow = trans.sa_session.query( trans.app.model.StoredWorkflow ).get( int(sample_values[field_index]) ) %>
<a href="${h.url_for( controller='workflow', action='run', id=trans.security.encode_id(workflow.id) )}">${workflow.name}</a>
%endif
%else:
${sample_values[field_index]}
%endif