Skip to content

Commit 2c9f5eb

Browse files
authored
Merge pull request #9 from mattip/deemphasize-old
comparison page: use the DEF_ENVIRONMENT when loading the page, uncheck old exes
2 parents 6a831e5 + 270d607 commit 2c9f5eb

4 files changed

Lines changed: 16 additions & 2 deletions

File tree

codespeed/static/js/comparison.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -394,10 +394,12 @@ function init(defaults) {
394394
$("#baseline").val(defaults.baseline);
395395
$("#direction").prop('checked', defaults.direction === "True");
396396

397+
/*
397398
var sel = $("input[name='executables']");
398399
$.each(defaults.executables, function(i, exe) {
399400
sel.filter("[value='" + exe + "']").prop('checked', true);
400401
});
402+
*/
401403

402404
sel = $("input[name='benchmarks']");
403405
$.each(defaults.benchmarks, function(i, bench) {

codespeed/templates/codespeed/comparison.html

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,19 @@
3232
<div class="boxbody">
3333
{% for proj, executable in executables.items %}
3434
<ul><a href="#" class="togglefold">{{ proj }}</a> <a href="#" class="checkall">(All</a>, <a href="#" class="uncheckall">None)</a>
35+
{% if forloop.counter > 3 %}
3536
{% for exe in executable %}
3637
<li title="{{ exe.executable }} - {{ exe.revision }}">
3738
<input id="exe_{{ exe.key }}" type="checkbox" name="executables" value="{{ exe.key }}" />
3839
<label for="exe_{{ exe.key }}">{{ exe.name }}</label><div class="seriescolor"></div>
3940
</li>{% endfor %}
41+
{% else %}
42+
{% for exe in executable %}
43+
<li title="{{ exe.executable }} - {{ exe.revision }}">
44+
<input id="exe_{{ exe.key }}" type="checkbox" name="executables" value="{{ exe.key }}" checked />
45+
<label for="exe_{{ exe.key }}">{{ exe.name }}</label><div class="seriescolor"></div>
46+
</li>{% endfor %}
47+
{% endif %}
4048
</ul>{% endfor %}
4149
</div>
4250
</div>
@@ -92,6 +100,10 @@
92100
<script type="text/javascript" src="{% static 'js/comparison.js' %}"></script>
93101

94102
<script type="text/javascript">
103+
var checkboxes = document.getElementsByTagName('environments');
104+
for (c in checkboxes) {
105+
c.checked = false;
106+
}
95107
$(function() {
96108
Comparison.init({
97109
chart_type: "{{ selectedchart }}",

codespeed/views.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ def comparison(request):
199199
enviros = Environment.objects.all()
200200
if not enviros:
201201
return no_environment_error(request)
202-
checkedenviros = get_default_environment(enviros, data, multi=True)
202+
checkedenviros = get_default_environment(enviros, data)
203203

204204
if not len(Project.objects.filter(track=True)):
205205
return no_default_project_error(request)

codespeed/views_data.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ def get_default_environment(enviros, data, multi=False):
4646
if multi:
4747
return defaultenviros
4848
else:
49-
return defaultenviros[0]
49+
return [defaultenviros[0],]
5050

5151

5252
def getbaselineexecutables():

0 commit comments

Comments
 (0)