diff --git a/gracedb/views.py b/gracedb/views.py index 10acbe57b0817b37e4598047ce95608293306b7e..718c55be7a2290bd0e0060b86fd897d9dabe1f1f 100644 --- a/gracedb/views.py +++ b/gracedb/views.py @@ -462,12 +462,12 @@ def search(request, format=""): # Flexigrid request. return flexigridResponse(request, objects) else: - objects = objects[:limit] - if objects.count() >= limit: - request.session['flash_msg'] = \ - "Number of events in results exceeds maximum (%s) allowed." % limit + #objects = objects[:limit] + #if objects.count() >= limit: + # request.session['flash_msg'] = \ + # "Number of events in results exceeds maximum (%s) allowed." % limit context = { - 'title':"Query Results. %s event(s)" % objects.count(), + 'title':"Query Results", #. %s event(s)" % objects.count(), 'form': form, 'formAction': reverse(search), 'maxCount': limit, diff --git a/templates/gracedb/event_list.html b/templates/gracedb/event_list.html index e3d6debe3a317a4a685f1dc109973315e5579142..b568a184d92436d47011ff98ce25a83958b40db7 100644 --- a/templates/gracedb/event_list.html +++ b/templates/gracedb/event_list.html @@ -35,7 +35,7 @@ {display: 'UID', name : 'id', width : 100, sortable : true, align: 'left'}, {display: 'Labels', name : 'labels', width : 100, sortable : false, align: 'left'}, {display: 'Group', name : 'group', width : 100, sortable : false, align: 'left'}, - {display: 'Type', name : 'type', width : 130, sortable : true, align: 'left', hide: false}, + {display: 'Type', name : 'analysisType', width : 130, sortable : true, align: 'left', hide: false}, {display: 'Event Time', name : 'gpstime', width : 100, sortable : true, align: 'right'}, {display: 'Links', name : 'links', width : 100, sortable : false, align: 'center'}, {display: 'Submitted', name : 'created', width : 100, sortable : true, align: 'right'},