Commit ea426df6 authored by Mathieu Giraud's avatar Mathieu Giraud
Browse files

Merge branch 'feature-s/4533-remove-compare-stats-main-page' into 'dev'

sample_set/all.html: remove now buttons for comparison/stats on the main page

See merge request !848
parents 7311d943 80374369
Pipeline #192548 failed with stages
in 9 minutes and 47 seconds
...@@ -69,6 +69,7 @@ class TestTag < ServerTest ...@@ -69,6 +69,7 @@ class TestTag < ServerTest
def test_search_sample def test_search_sample
table = go_to_list table = go_to_list
$b.devel_mode()
$b.span(:class => "button2", :text => "compare samples/patients").click $b.span(:class => "button2", :text => "compare samples/patients").click
Watir::Wait.until(timeout: 30) {$b.execute_script("return jQuery.active") == 0} Watir::Wait.until(timeout: 30) {$b.execute_script("return jQuery.active") == 0}
......
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
{{if auth.can_create_patient():}} {{if auth.can_create_patient():}}
<span class="button2" onclick="db.call('sample_set/form', {'type': '{{=helper.type}}'})"> + new {{=helper.get_type_display()}}s </span> <span class="button2" onclick="db.call('sample_set/form', {'type': '{{=helper.type}}'})"> + new {{=helper.get_type_display()}}s </span>
<span class="button2" onclick="db.call('sample_set/custom', {'filter': '{{=request.vars['filter']}}' })"> compare samples/patients </span> <span class="button2 devel-mode" onclick="db.call('sample_set/custom', {'filter': '{{=request.vars['filter']}}' })"> compare samples/patients </span>
{{else:}} {{else:}}
<!-- <span class="button2 inactive" onclick="db.call('sample_set/add')" title="you don't have permission to create new {{=helper.get_type_display()}}s"> add sample_set </span> --> <!-- <span class="button2 inactive" onclick="db.call('sample_set/add')" title="you don't have permission to create new {{=helper.get_type_display()}}s"> add sample_set </span> -->
{{pass}} {{pass}}
......
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