Commit 0aa91600 authored by Mathieu Giraud's avatar Mathieu Giraud

Merge branch 'feature-s/bikeshed-strings' into 'dev'

views/*: bikeshedding, processes

Closes #4587

See merge request !863
parents c23fd31a baf43734
Pipeline #200094 failed with stages
in 27 minutes and 12 seconds
......@@ -18,7 +18,7 @@ class TestPreProcess < ServerTest
end
def go_to_list
$b.a(:class => "button", :text => "pre-process").click
$b.a(:class => "button", :text => "pre-process configs").click
Watir::Wait.until(timeout: 30) {$b.execute_script("return jQuery.active") == 0}
table = $b.table(:id => "table")
table.wait_until(&:present?)
......
......@@ -10,8 +10,8 @@
<!-- <a class="button" onclick="db.call('log/index');">log</a> -->
{{if auth.is_admin():}}
- - -
<a class="button" onclick="db.call('pre_process/index');">pre-process</a>
<a class="button" onclick="db.call('config/index');">analysis configs</a>
<a class="button" onclick="db.call('pre_process/index');">pre-process configs</a>
<a class="button" onclick="db.call('config/index');">process configs</a>
<a class="button" onclick="db.call('group/index');">groups</a>
<a class="button" onclick="db.call('user/index');">users</a>
<a class="button" onclick="db.call('admin/index');">admin</a>
......
......@@ -17,7 +17,7 @@
<div class="db_block_left"> {{=info["label"]}} </div>
<div class="db_block_right"> {{if auth.can_process_sample_set(request.vars['id']) :}}
config
process config
<span>
<select id="choose_config" name="config" onchange="db.call('sample_set/index', {'id' :'{{=request.vars['id']}}', 'config_id' : this.value})">
<option value="-1" {{if not config :}}selected{{pass}}> --- </option>
......@@ -156,7 +156,7 @@
<td>
{{if row.sequence_file.data_file != None and ( row.results_file.id != None or ( status not in ["RUNNING", "QUEUED", "ASSIGNED"]) ) and (not has_pre_process or (row.sequence_file.pre_process_flag != None and row.sequence_file.pre_process_flag != "FAILED")) :}}
{{if auth.can_process_sample_set(request.vars['id']) and (config_id > 0 and auth.can_use_config(config_id)) :}}
<span class="pointer" onclick="db.call('default/run_request', { 'sequence_file_id' : '{{=row.sequence_file.id}}', 'sample_set_id' : {{=request.vars["id"]}}, 'config_id' : {{=config_id}} } )"><i class="icon-cog-2" title="Run the selected configuration for this file"></i></span>
<span class="pointer" onclick="db.call('default/run_request', { 'sequence_file_id' : '{{=row.sequence_file.id}}', 'sample_set_id' : {{=request.vars["id"]}}, 'config_id' : {{=config_id}} } )"><i class="icon-cog-2" title="Run a process with the selected configuration for this file"></i></span>
{{pass}}
{{pass}}
</td>
......
......@@ -17,7 +17,7 @@
</div>
</div>
<div class="db_block_right">
config
process config
<span>
<select id="choose_config" name="config" onchange="db.updateStatsButton()">
<option value="-1" selected> --- </option>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment